Show More
@@ -502,7 +502,10 b' def diff(repo, node1=None, node2=None, 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: |
@@ -50,3 +50,7 b" hg ci -mrenamemod -d '0 0'" | |||||
50 | echo '% rename+mod+chmod' |
|
50 | echo '% rename+mod+chmod' | |
51 | hg diff --git -r 6:tip | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
|
51 | hg diff --git -r 6:tip | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
52 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |
|
52 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
|
53 | ||||
|
54 | echo '% nonexistent in tip+chmod' | |||
|
55 | hg diff --git -r 5:6 | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |||
|
56 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |
General Comments 0
You need to be logged in to leave comments.
Login now