comparison hgext/evolve.py @ 1211:9523c027a240 stable

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.
author Durham Goode <durham@fb.com>
date Fri, 13 Mar 2015 09:05:34 -0700
parents fa35aeb64d32
children 2c1b6e2ec59a 72a3f8d307b2
comparison
equal deleted inserted replaced
1210:1f8428096078 1211:9523c027a240
1420 # Create the new commit context 1420 # Create the new commit context
1421 repo.ui.status(_('computing new diff\n')) 1421 repo.ui.status(_('computing new diff\n'))
1422 files = set() 1422 files = set()
1423 copied = copies.pathcopies(prec, bumped) 1423 copied = copies.pathcopies(prec, bumped)
1424 precmanifest = prec.manifest() 1424 precmanifest = prec.manifest()
1425 for key, val in bumped.manifest().items(): 1425 for key, val in bumped.manifest().iteritems():
1426 if precmanifest.pop(key, None) != val: 1426 precvalue = precmanifest.get(key, None)
1427 if precvalue is not None:
1428 del precmanifest[key]
1429 if precvalue != val:
1427 files.add(key) 1430 files.add(key)
1428 files.update(precmanifest) # add missing files 1431 files.update(precmanifest) # add missing files
1429 # commit it 1432 # commit it
1430 if files: # something to commit! 1433 if files: # something to commit!
1431 def filectxfn(repo, ctx, path): 1434 def filectxfn(repo, ctx, path):