equal
deleted
inserted
replaced
1876 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn') |
1876 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn') |
1877 node2 = scmutil.revsingle(repo, change, None).node() |
1877 node2 = scmutil.revsingle(repo, change, None).node() |
1878 node1 = repo[node2].p1().node() |
1878 node1 = repo[node2].p1().node() |
1879 else: |
1879 else: |
1880 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn') |
1880 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn') |
1881 node1, node2 = scmutil.revpair(repo, revs) |
1881 node1, node2 = scmutil.revpairnodes(repo, revs) |
1882 |
1882 |
1883 if reverse: |
1883 if reverse: |
1884 node1, node2 = node2, node1 |
1884 node1, node2 = node2, node1 |
1885 |
1885 |
1886 diffopts = patch.diffallopts(ui, opts) |
1886 diffopts = patch.diffallopts(ui, opts) |
4878 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn') |
4878 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn') |
4879 node2 = scmutil.revsingle(repo, change, None).node() |
4879 node2 = scmutil.revsingle(repo, change, None).node() |
4880 node1 = repo[node2].p1().node() |
4880 node1 = repo[node2].p1().node() |
4881 else: |
4881 else: |
4882 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn') |
4882 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn') |
4883 node1, node2 = scmutil.revpair(repo, revs) |
4883 node1, node2 = scmutil.revpairnodes(repo, revs) |
4884 |
4884 |
4885 if pats or ui.configbool('commands', 'status.relative'): |
4885 if pats or ui.configbool('commands', 'status.relative'): |
4886 cwd = repo.getcwd() |
4886 cwd = repo.getcwd() |
4887 else: |
4887 else: |
4888 cwd = '' |
4888 cwd = '' |