Show More
@@ -1772,9 +1772,6 b' def trydiff(repo, revs, ctx1, ctx2, modi' | |||||
1772 |
|
1772 | |||
1773 | copyto = dict([(v, k) for k, v in copy.items()]) |
|
1773 | copyto = dict([(v, k) for k, v in copy.items()]) | |
1774 |
|
1774 | |||
1775 | if opts.git: |
|
|||
1776 | revs = None |
|
|||
1777 |
|
||||
1778 | addedset, removedset = set(added), set(removed) |
|
1775 | addedset, removedset = set(added), set(removed) | |
1779 | # Fix up added, since merged-in additions appear as |
|
1776 | # Fix up added, since merged-in additions appear as | |
1780 | # modifications during merges |
|
1777 | # modifications during merges | |
@@ -1845,9 +1842,7 b' def trydiff(repo, revs, ctx1, ctx2, modi' | |||||
1845 | path1 = posixpath.join(prefix, f1) |
|
1842 | path1 = posixpath.join(prefix, f1) | |
1846 | path2 = posixpath.join(prefix, f2) |
|
1843 | path2 = posixpath.join(prefix, f2) | |
1847 | header = [] |
|
1844 | header = [] | |
1848 |
if |
|
1845 | if opts.git: | |
1849 | header.append(diffline(path1, revs)) |
|
|||
1850 | elif opts.git: |
|
|||
1851 | header.append('diff --git %s%s %s%s\n' % |
|
1846 | header.append('diff --git %s%s %s%s\n' % | |
1852 | (aprefix, path1, bprefix, path2)) |
|
1847 | (aprefix, path1, bprefix, path2)) | |
1853 | if content1 is None: # added |
|
1848 | if content1 is None: # added | |
@@ -1862,6 +1857,8 b' def trydiff(repo, revs, ctx1, ctx2, modi' | |||||
1862 | if op is not None: |
|
1857 | if op is not None: | |
1863 | header.append('%s from %s\n' % (op, path1)) |
|
1858 | header.append('%s from %s\n' % (op, path1)) | |
1864 | header.append('%s to %s\n' % (op, path2)) |
|
1859 | header.append('%s to %s\n' % (op, path2)) | |
|
1860 | elif revs: | |||
|
1861 | header.append(diffline(path1, revs)) | |||
1865 |
|
1862 | |||
1866 | if binarydiff and not opts.nobinary: |
|
1863 | if binarydiff and not opts.nobinary: | |
1867 | text = mdiff.b85diff(content1, content2) |
|
1864 | text = mdiff.b85diff(content1, content2) |
General Comments 0
You need to be logged in to leave comments.
Login now