From patchwork Fri Mar 13 16:14:32 2015
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [2,of,2,evolve] evolve: fix manifest usage to match upstream
From: Durham Goode <durham@fb.com>
X-Patchwork-Id: 8056
Message-Id: <864eef97808b4faf0a23.1426263272@dev2000.prn2.facebook.com>
To: <mercurial-devel@selenic.com>
Cc: pierre-yves.david@ens-lyon.org
Date: Fri, 13 Mar 2015 09:14:32 -0700

# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 1426262734 25200
#      Fri Mar 13 09:05:34 2015 -0700
# Branch stable
# Node ID 864eef97808b4faf0a2384dae0d091d20d986f14
# Parent  31f4a25075b234ca280b93702998ac49f55ccad1
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 --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -1422,8 +1422,11 @@ def _solvebumped(ui, repo, bumped, dryru
         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