Mercurial > public > mercurial-scm > hg
comparison mercurial/patch.py @ 3066:035fd2029575
git --diff: fix traceback when getting mode change
- use the manifest instead of the mode in the working dir
if the diff is against two revisions
- add a testcase
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Thu, 07 Sep 2006 14:12:39 +0200 |
| parents | d16b93f4a6ca |
| children | f422c8265ae5 |
comparison
equal
deleted
inserted
replaced
| 3065:32fd512ca7c0 | 3066:035fd2029575 |
|---|---|
| 500 else: | 500 else: |
| 501 mode = gitmode(mmap.execf(f)) | 501 mode = gitmode(mmap.execf(f)) |
| 502 header.append('deleted file mode %s\n' % mode) | 502 header.append('deleted file mode %s\n' % mode) |
| 503 else: | 503 else: |
| 504 omode = gitmode(mmap.execf(f)) | 504 omode = gitmode(mmap.execf(f)) |
| 505 nmode = gitmode(util.is_exec(repo.wjoin(f), mmap.execf(f))) | 505 if node2: |
| 506 nmode = gitmode(mmap2.execf(f)) | |
| 507 else: | |
| 508 nmode = gitmode(util.is_exec(repo.wjoin(f), mmap.execf(f))) | |
| 506 addmodehdr(header, omode, nmode) | 509 addmodehdr(header, omode, nmode) |
| 507 r = None | 510 r = None |
| 508 if dodiff: | 511 if dodiff: |
| 509 header.insert(0, 'diff --git a/%s b/%s\n' % (a, b)) | 512 header.insert(0, 'diff --git a/%s b/%s\n' % (a, b)) |
| 510 fp.write(''.join(header)) | 513 fp.write(''.join(header)) |