Mercurial > public > mercurial-scm > hg-stable
diff mercurial/scmutil.py @ 16171:336e61875335
graphlog: restore FILE glob expansion on Windows
On platforms not supporting shell expansion, scmutil.match() performs glob
expansion on 'pats' arguments. But _matchfiles() revset calls match.match()
directly, bypassing this behaviour. To avoid duplicating scmutil.match(), a
secondary scmutil.matchandpats() is introduced returning both the match object
and the expanded inputs. Note the expanded pats are also needed in the fast
path, and will be used by --follow code path.
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Sat, 25 Feb 2012 22:11:34 +0100 |
| parents | 94a8396c9305 |
| children | 85db991780b7 |
line wrap: on
line diff
--- a/mercurial/scmutil.py Sat Feb 25 21:51:13 2012 +0100 +++ b/mercurial/scmutil.py Sat Feb 25 22:11:34 2012 +0100 @@ -579,7 +579,7 @@ ret.append(p) return ret -def match(ctx, pats=[], opts={}, globbed=False, default='relpath'): +def matchandpats(ctx, pats=[], opts={}, globbed=False, default='relpath'): if pats == ("",): pats = [] if not globbed and default == 'relpath': @@ -590,7 +590,10 @@ def badfn(f, msg): ctx._repo.ui.warn("%s: %s\n" % (m.rel(f), msg)) m.bad = badfn - return m + return m, pats + +def match(ctx, pats=[], opts={}, globbed=False, default='relpath'): + return matchandpats(ctx, pats, opts, globbed, default)[0] def matchall(repo): return matchmod.always(repo.root, repo.getcwd())