Mercurial > hg
comparison mercurial/context.py @ 11144:ca46910dd9ea
merge with stable
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Tue, 11 May 2010 20:21:25 +0200 |
| parents | 22f5ad0b5857 e0a0af140f2e |
| children | c5c190822501 |
comparison
equal
deleted
inserted
replaced
| 11142:0bf79efeaa20 | 11144:ca46910dd9ea |
|---|---|
| 722 orig = self._repo.dirstate.copies().get(path, path) | 722 orig = self._repo.dirstate.copies().get(path, path) |
| 723 | 723 |
| 724 def findflag(ctx): | 724 def findflag(ctx): |
| 725 mnode = ctx.changeset()[0] | 725 mnode = ctx.changeset()[0] |
| 726 node, flag = self._repo.manifest.find(mnode, orig) | 726 node, flag = self._repo.manifest.find(mnode, orig) |
| 727 ff = self._repo.dirstate.flagfunc(lambda x: flag or None) | 727 ff = self._repo.dirstate.flagfunc(lambda x: flag or '') |
| 728 try: | 728 try: |
| 729 return ff(path) | 729 return ff(path) |
| 730 except OSError: | 730 except OSError: |
| 731 pass | 731 pass |
| 732 | 732 |