Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/context.py @ 3353:69fe021cc23e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
author Matt Mackall <mpm@selenic.com>
date Wed, 11 Oct 2006 17:37:48 -0500
parents b02e60097bbe 50a18815e3f0
children d8eba1c3ce9b cc9c31b07c2c
comparison
equal deleted inserted replaced
3349:04fa31a43b93 3353:69fe021cc23e
365 for f in l: 365 for f in l:
366 man[f] = man.get(copied.get(f, f), nullid) + i 366 man[f] = man.get(copied.get(f, f), nullid) + i
367 man.set(f, util.is_exec(self._repo.wjoin(f), man.execf(f))) 367 man.set(f, util.is_exec(self._repo.wjoin(f), man.execf(f)))
368 368
369 for f in deleted + removed: 369 for f in deleted + removed:
370 del man[f] 370 if f in man:
371 del man[f]
371 372
372 self._manifest = man 373 self._manifest = man
373 374
374 def manifest(self): return self._manifest 375 def manifest(self): return self._manifest
375 376