Show More
@@ -1807,12 +1807,9 b' def trydiff(repo, revs, ctx1, ctx2, modi' | |||||
1807 | if opts.git or losedatafn: |
|
1807 | if opts.git or losedatafn: | |
1808 | if f in addedset: |
|
1808 | if f in addedset: | |
1809 | mode = gitmode[ctx2.flags(f)] |
|
1809 | mode = gitmode[ctx2.flags(f)] | |
1810 |
if f in copy |
|
1810 | if f in copy: | |
1811 | if opts.git: |
|
1811 | if opts.git: | |
1812 |
|
|
1812 | a = copy[f] | |
1813 | a = copy[f] |
|
|||
1814 | else: |
|
|||
1815 | a = copyto[f] |
|
|||
1816 | omode = gitmode[ctx1.flags(a)] |
|
1813 | omode = gitmode[ctx1.flags(a)] | |
1817 | addmodehdr(header, omode, mode) |
|
1814 | addmodehdr(header, omode, mode) | |
1818 | if a in removedset and a not in gone: |
|
1815 | if a in removedset and a not in gone: | |
@@ -1841,10 +1838,8 b' def trydiff(repo, revs, ctx1, ctx2, modi' | |||||
1841 | elif f in removedset: |
|
1838 | elif f in removedset: | |
1842 | if opts.git: |
|
1839 | if opts.git: | |
1843 | # have we already reported a copy above? |
|
1840 | # have we already reported a copy above? | |
1844 |
if ( |
|
1841 | if (f in copyto and copyto[f] in addedset | |
1845 |
|
|
1842 | and copy[copyto[f]] == f): | |
1846 | (f in copyto and copyto[f] in addedset |
|
|||
1847 | and copy[copyto[f]] == f)): |
|
|||
1848 | continue |
|
1843 | continue | |
1849 | else: |
|
1844 | else: | |
1850 | header.append('deleted file mode %s\n' % |
|
1845 | header.append('deleted file mode %s\n' % |
General Comments 0
You need to be logged in to leave comments.
Login now