Show More
@@ -1804,18 +1804,18 b' def trydiff(repo, revs, ctx1, ctx2, modi' | |||
|
1804 | 1804 | ctx1, modified, added, removed, copy, opts): |
|
1805 | 1805 | content1 = None |
|
1806 | 1806 | content2 = None |
|
1807 | if f1: | |
|
1808 | content1 = getfilectx(f1, ctx1).data() | |
|
1809 | if f2: | |
|
1810 | content2 = getfilectx(f2, ctx2).data() | |
|
1811 | 1807 | flag1 = None |
|
1812 | 1808 | flag2 = None |
|
1809 | if f1: | |
|
1810 | content1 = getfilectx(f1, ctx1).data() | |
|
1811 | if opts.git or losedatafn: | |
|
1812 | flag1 = ctx1.flags(f1) | |
|
1813 | if f2: | |
|
1814 | content2 = getfilectx(f2, ctx2).data() | |
|
1815 | if opts.git or losedatafn: | |
|
1816 | flag2 = ctx2.flags(f2) | |
|
1813 | 1817 | binary = False |
|
1814 | 1818 | if opts.git or losedatafn: |
|
1815 | if f1: | |
|
1816 | flag1 = ctx1.flags(f1) | |
|
1817 | if f2: | |
|
1818 | flag2 = ctx2.flags(f2) | |
|
1819 | 1819 | binary = util.binary(content1) or util.binary(content2) |
|
1820 | 1820 | |
|
1821 | 1821 | if losedatafn and not opts.git: |
General Comments 0
You need to be logged in to leave comments.
Login now