equal
deleted
inserted
replaced
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)) |