mirror of
https://github.com/golang/go.git
synced 2025-11-07 12:11:00 +00:00
codereview: avoid exception in match
R=rsc CC=golang-dev https://golang.org/cl/1585041
This commit is contained in:
parent
19783ef482
commit
3ca72458ec
1 changed files with 2 additions and 1 deletions
|
|
@ -659,6 +659,7 @@ original_match = None
|
|||
def ReplacementForCmdutilMatch(repo, pats=[], opts={}, globbed=False, default='relpath'):
|
||||
taken = []
|
||||
files = []
|
||||
pats = pats or []
|
||||
for p in pats:
|
||||
if p.startswith('@'):
|
||||
taken.append(p)
|
||||
|
|
@ -671,7 +672,7 @@ def ReplacementForCmdutilMatch(repo, pats=[], opts={}, globbed=False, default='r
|
|||
if cl.files == None:
|
||||
raise util.Abort("no files in CL " + clname)
|
||||
files = Add(files, cl.files)
|
||||
pats = Sub(pats, taken) + ['path:'+f for f in files]
|
||||
pats = Sub(pats, taken) + ['path:'+f for f in files]
|
||||
return original_match(repo, pats=pats, opts=opts, globbed=globbed, default=default)
|
||||
|
||||
def RelativePath(path, cwd):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue