Show More
@@ -1796,7 +1796,6 b' def trydiff(repo, revs, ctx1, ctx2, modi' | |||||
1796 | else: |
|
1796 | else: | |
1797 | copyop = 'copy' |
|
1797 | copyop = 'copy' | |
1798 | content1 = getfilectx(f1, ctx1).data() |
|
1798 | content1 = getfilectx(f1, ctx1).data() | |
1799 | binary = util.binary(content1) or util.binary(content2) |
|
|||
1800 | elif f in removedset: |
|
1799 | elif f in removedset: | |
1801 | if opts.git: |
|
1800 | if opts.git: | |
1802 | # have we already reported a copy above? |
|
1801 | # have we already reported a copy above? | |
@@ -1805,13 +1804,11 b' def trydiff(repo, revs, ctx1, ctx2, modi' | |||||
1805 | continue |
|
1804 | continue | |
1806 | else: |
|
1805 | else: | |
1807 | flag1 = ctx1.flags(f) |
|
1806 | flag1 = ctx1.flags(f) | |
1808 | binary = util.binary(content1) |
|
|||
1809 | else: |
|
|||
1810 | binary = util.binary(content1) |
|
|||
1811 | else: |
|
1807 | else: | |
1812 | flag1 = ctx1.flags(f) |
|
1808 | flag1 = ctx1.flags(f) | |
1813 | flag2 = ctx2.flags(f) |
|
1809 | flag2 = ctx2.flags(f) | |
1814 | binary = util.binary(content1) or util.binary(content2) |
|
1810 | ||
|
1811 | binary = util.binary(content1) or util.binary(content2) | |||
1815 |
|
1812 | |||
1816 | if losedatafn and not opts.git: |
|
1813 | if losedatafn and not opts.git: | |
1817 | if (binary or |
|
1814 | if (binary or |
General Comments 0
You need to be logged in to leave comments.
Login now