equal
deleted
inserted
replaced
1774 for f in sorted(modified + added + removed): |
1774 for f in sorted(modified + added + removed): |
1775 flag1 = None |
1775 flag1 = None |
1776 flag2 = None |
1776 flag2 = None |
1777 content1 = None |
1777 content1 = None |
1778 content2 = None |
1778 content2 = None |
1779 binary = False |
|
1780 copyop = None |
1779 copyop = None |
1781 if f not in addedset: |
1780 if f not in addedset: |
1782 content1 = getfilectx(f, ctx1).data() |
1781 content1 = getfilectx(f, ctx1).data() |
1783 if f not in removedset: |
1782 if f not in removedset: |
1784 content2 = getfilectx(f, ctx2).data() |
1783 content2 = getfilectx(f, ctx2).data() |
1808 flag1 = ctx1.flags(f) |
1807 flag1 = ctx1.flags(f) |
1809 else: |
1808 else: |
1810 flag1 = ctx1.flags(f) |
1809 flag1 = ctx1.flags(f) |
1811 flag2 = ctx2.flags(f) |
1810 flag2 = ctx2.flags(f) |
1812 |
1811 |
|
1812 binary = False |
|
1813 if opts.git or losedatafn: |
1813 binary = util.binary(content1) or util.binary(content2) |
1814 binary = util.binary(content1) or util.binary(content2) |
1814 |
1815 |
1815 if losedatafn and not opts.git: |
1816 if losedatafn and not opts.git: |
1816 if (binary or |
1817 if (binary or |
1817 # copy/rename |
1818 # copy/rename |