Show More
@@ -2885,7 +2885,7 b' def debugrevspec(ui, repo, expr, **opts)' | |||||
2885 | weight, optimizedtree = revset.optimize(newtree, True) |
|
2885 | weight, optimizedtree = revset.optimize(newtree, True) | |
2886 | ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n") |
|
2886 | ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n") | |
2887 | func = revset.match(ui, expr) |
|
2887 | func = revset.match(ui, expr) | |
2888 |
for c in func(repo |
|
2888 | for c in func(repo): | |
2889 | ui.write("%s\n" % c) |
|
2889 | ui.write("%s\n" % c) | |
2890 |
|
2890 | |||
2891 | @command('debugsetparents', [], _('REV1 [REV2]')) |
|
2891 | @command('debugsetparents', [], _('REV1 [REV2]')) |
@@ -237,7 +237,7 b' def _search(web, req, tmpl):' | |||||
237 |
|
237 | |||
238 | mfunc = revset.match(web.repo.ui, revdef) |
|
238 | mfunc = revset.match(web.repo.ui, revdef) | |
239 | try: |
|
239 | try: | |
240 |
revs = mfunc(web.repo |
|
240 | revs = mfunc(web.repo) | |
241 | return MODE_REVSET, revs |
|
241 | return MODE_REVSET, revs | |
242 | # ParseError: wrongly placed tokens, wrongs arguments, etc |
|
242 | # ParseError: wrongly placed tokens, wrongs arguments, etc | |
243 | # RepoLookupError: no such revision, e.g. in 'revision:' |
|
243 | # RepoLookupError: no such revision, e.g. in 'revision:' |
@@ -482,7 +482,7 b' class localrepository(object):' | |||||
482 | '''Return a list of revisions matching the given revset''' |
|
482 | '''Return a list of revisions matching the given revset''' | |
483 | expr = revset.formatspec(expr, *args) |
|
483 | expr = revset.formatspec(expr, *args) | |
484 | m = revset.match(None, expr) |
|
484 | m = revset.match(None, expr) | |
485 |
return m(self |
|
485 | return m(self) | |
486 |
|
486 | |||
487 | def set(self, expr, *args): |
|
487 | def set(self, expr, *args): | |
488 | ''' |
|
488 | ''' |
@@ -2448,7 +2448,9 b' def match(ui, spec, repo=None):' | |||||
2448 | tree = findaliases(ui, tree, showwarning=ui.warn) |
|
2448 | tree = findaliases(ui, tree, showwarning=ui.warn) | |
2449 | tree = foldconcat(tree) |
|
2449 | tree = foldconcat(tree) | |
2450 | weight, tree = optimize(tree, True) |
|
2450 | weight, tree = optimize(tree, True) | |
2451 | def mfunc(repo, subset): |
|
2451 | def mfunc(repo, subset=None): | |
|
2452 | if subset is None: | |||
|
2453 | subset = spanset(repo) | |||
2452 | if util.safehasattr(subset, 'isascending'): |
|
2454 | if util.safehasattr(subset, 'isascending'): | |
2453 | result = getset(repo, subset, tree) |
|
2455 | result = getset(repo, subset, tree) | |
2454 | else: |
|
2456 | else: |
@@ -672,11 +672,11 b' def revrange(repo, revs):' | |||||
672 | # fall through to new-style queries if old-style fails |
|
672 | # fall through to new-style queries if old-style fails | |
673 | m = revset.match(repo.ui, spec, repo) |
|
673 | m = revset.match(repo.ui, spec, repo) | |
674 | if seen or l: |
|
674 | if seen or l: | |
675 |
dl = [r for r in m(repo |
|
675 | dl = [r for r in m(repo) if r not in seen] | |
676 | l = l + revset.baseset(dl) |
|
676 | l = l + revset.baseset(dl) | |
677 | seen.update(dl) |
|
677 | seen.update(dl) | |
678 | else: |
|
678 | else: | |
679 |
l = m(repo |
|
679 | l = m(repo) | |
680 |
|
680 | |||
681 | return l |
|
681 | return l | |
682 |
|
682 |
@@ -393,7 +393,7 b' def revset(context, mapping, args):' | |||||
393 |
|
393 | |||
394 | def query(expr): |
|
394 | def query(expr): | |
395 | m = revsetmod.match(repo.ui, expr) |
|
395 | m = revsetmod.match(repo.ui, expr) | |
396 |
return m(repo |
|
396 | return m(repo) | |
397 |
|
397 | |||
398 | if len(args) > 1: |
|
398 | if len(args) > 1: | |
399 | formatargs = list([a[0](context, mapping, a[1]) for a in args[1:]]) |
|
399 | formatargs = list([a[0](context, mapping, a[1]) for a in args[1:]]) |
General Comments 0
You need to be logged in to leave comments.
Login now