Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/context.py @ 3240:8d4855fd9d7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: use new working context object in update
author Matt Mackall <mpm@selenic.com>
date Tue, 03 Oct 2006 01:21:46 -0500
parents 6d98149d70fe
children a184cd0c2db9
comparison
equal deleted inserted replaced
3239:6d98149d70fe 3240:8d4855fd9d7b
340 raise AttributeError, name 340 raise AttributeError, name
341 341
342 def _buildmanifest(self): 342 def _buildmanifest(self):
343 """generate a manifest corresponding to the working directory""" 343 """generate a manifest corresponding to the working directory"""
344 344
345 man = self._parents[0].manifest().coy() 345 man = self._parents[0].manifest().copy()
346 copied = self._repo.dirstate.copies() 346 copied = self._repo.dirstate.copies()
347 modified, added, removed, deleted, unknown = self._status[:5] 347 modified, added, removed, deleted, unknown = self._status[:5]
348 for i,l in (("a", added), ("m", modified), ("u", unknown)): 348 for i,l in (("a", added), ("m", modified), ("u", unknown)):
349 for f in l: 349 for f in l:
350 man[f] = man.get(copied.get(f, f), nullid) + i 350 man[f] = man.get(copied.get(f, f), nullid) + i