Mercurial > public > mercurial-scm > hg-stable
diff hgext/extdiff.py @ 14671:35c2cc322ba8
scmutil: switch match users to supplying contexts
The most appropriate context is not always clearly defined. The obvious cases:
For working directory commands, we use None
For commands (eg annotate) with single revs, we use that revision
The less obvious cases:
For commands (eg status, diff) with a pair of revs, we use the second revision
For commands that take a range (like log), we use None
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 18 Jun 2011 16:52:51 -0500 |
| parents | d943412e2fba |
| children | a95efd378641 |
line wrap: on
line diff
--- a/hgext/extdiff.py Sat Jun 18 16:52:51 2011 -0500 +++ b/hgext/extdiff.py Sat Jun 18 16:52:51 2011 -0500 @@ -137,7 +137,7 @@ if node1b == nullid: do3way = False - matcher = scmutil.match(repo, pats, opts) + matcher = scmutil.match(repo[node2], pats, opts) mod_a, add_a, rem_a = map(set, repo.status(node1a, node2, matcher)[:3]) if do3way: mod_b, add_b, rem_b = map(set, repo.status(node1b, node2, matcher)[:3])