Show More
@@ -1777,7 +1777,7 b' def trydiff(repo, revs, ctx1, ctx2, modi' | |||||
1777 | content1 = None |
|
1777 | content1 = None | |
1778 | content2 = None |
|
1778 | content2 = None | |
1779 | binarydiff = False |
|
1779 | binarydiff = False | |
1780 | op = None |
|
1780 | copyop = None | |
1781 | if f not in addedset: |
|
1781 | if f not in addedset: | |
1782 | content1 = getfilectx(f, ctx1).data() |
|
1782 | content1 = getfilectx(f, ctx1).data() | |
1783 | if f not in removedset: |
|
1783 | if f not in removedset: | |
@@ -1791,10 +1791,10 b' def trydiff(repo, revs, ctx1, ctx2, modi' | |||||
1791 | f1 = copy[f] |
|
1791 | f1 = copy[f] | |
1792 | flag1 = ctx1.flags(f1) |
|
1792 | flag1 = ctx1.flags(f1) | |
1793 | if f1 in removedset and f1 not in gone: |
|
1793 | if f1 in removedset and f1 not in gone: | |
1794 | op = 'rename' |
|
1794 | copyop = 'rename' | |
1795 | gone.add(f1) |
|
1795 | gone.add(f1) | |
1796 | else: |
|
1796 | else: | |
1797 | op = 'copy' |
|
1797 | copyop = 'copy' | |
1798 | content1 = getfilectx(f1, ctx1).data() |
|
1798 | content1 = getfilectx(f1, ctx1).data() | |
1799 | else: |
|
1799 | else: | |
1800 | losedatafn(f) |
|
1800 | losedatafn(f) | |
@@ -1847,9 +1847,9 b' def trydiff(repo, revs, ctx1, ctx2, modi' | |||||
1847 | if mode1 != mode2: |
|
1847 | if mode1 != mode2: | |
1848 | header.append('old mode %s' % mode1) |
|
1848 | header.append('old mode %s' % mode1) | |
1849 | header.append('new mode %s' % mode2) |
|
1849 | header.append('new mode %s' % mode2) | |
1850 | if op is not None: |
|
1850 | if copyop is not None: | |
1851 | header.append('%s from %s' % (op, path1)) |
|
1851 | header.append('%s from %s' % (copyop, path1)) | |
1852 | header.append('%s to %s' % (op, path2)) |
|
1852 | header.append('%s to %s' % (copyop, path2)) | |
1853 | elif revs and not repo.ui.quiet: |
|
1853 | elif revs and not repo.ui.quiet: | |
1854 | header.append(diffline(path1, revs)) |
|
1854 | header.append(diffline(path1, revs)) | |
1855 |
|
1855 |
General Comments 0
You need to be logged in to leave comments.
Login now