# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 1426262734 25200
# Node ID 9523c027a240fe4ed5d9bb1afdd9960f66c9ba0c
# Parent  1f8428096078660da0fcf1cfa41d32df6f750edc
evolve: fix manifest usage to match upstream

The manifest class upstream is no longer a dictionary, so switch to using an API
it does support.

diff -r 1f8428096078 -r 9523c027a240 hgext/evolve.py
--- a/hgext/evolve.py	Fri Mar 13 09:04:12 2015 -0700
+++ b/hgext/evolve.py	Fri Mar 13 09:05:34 2015 -0700
@@ -1422,8 +1422,11 @@
         files = set()
         copied = copies.pathcopies(prec, bumped)
         precmanifest = prec.manifest()
-        for key, val in bumped.manifest().items():
-            if precmanifest.pop(key, None) != val:
+        for key, val in bumped.manifest().iteritems():
+            precvalue = precmanifest.get(key, None)
+            if precvalue is not None:
+                del precmanifest[key]
+            if precvalue != val:
                 files.add(key)
         files.update(precmanifest)  # add missing files
         # commit it