equal
deleted
inserted
replaced
40 graphmod, |
40 graphmod, |
41 hbisect, |
41 hbisect, |
42 help, |
42 help, |
43 hg, |
43 hg, |
44 logcmdutil, |
44 logcmdutil, |
|
45 match as matchmod, |
45 merge as mergemod, |
46 merge as mergemod, |
46 narrowspec, |
47 narrowspec, |
47 obsolete, |
48 obsolete, |
48 obsutil, |
49 obsutil, |
49 patch, |
50 patch, |
1907 if reverse: |
1908 if reverse: |
1908 node1, node2 = node2, node1 |
1909 node1, node2 = node2, node1 |
1909 |
1910 |
1910 diffopts = patch.diffallopts(ui, opts) |
1911 diffopts = patch.diffallopts(ui, opts) |
1911 m = scmutil.match(ctx2, pats, opts) |
1912 m = scmutil.match(ctx2, pats, opts) |
|
1913 m = matchmod.intersectmatchers(m, repo.narrowmatch()) |
1912 ui.pager('diff') |
1914 ui.pager('diff') |
1913 logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, |
1915 logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, |
1914 listsubrepos=opts.get('subrepos'), |
1916 listsubrepos=opts.get('subrepos'), |
1915 root=opts.get('root')) |
1917 root=opts.get('root')) |
1916 |
1918 |