##// END OF EJS Templates
scmutil: fix revrange when multiple revs are specified...
Durham Goode -
r20798:170d6d59 default
parent child Browse files
Show More
@@ -499,7 +499,7 b' def revrange(repo, revs):'
499 try:
499 try:
500 if isinstance(spec, int):
500 if isinstance(spec, int):
501 seen.add(spec)
501 seen.add(spec)
502 l = l + [spec]
502 l = l + revset.baseset([spec])
503 continue
503 continue
504
504
505 if _revrangesep in spec:
505 if _revrangesep in spec:
@@ -520,14 +520,14 b' def revrange(repo, revs):'
520 seen.update(newrevs)
520 seen.update(newrevs)
521 else:
521 else:
522 seen = newrevs
522 seen = newrevs
523 l = l + sorted(newrevs, reverse=start > end)
523 l = l + revset.baseset(sorted(newrevs, reverse=start > end))
524 continue
524 continue
525 elif spec and spec in repo: # single unquoted rev
525 elif spec and spec in repo: # single unquoted rev
526 rev = revfix(repo, spec, None)
526 rev = revfix(repo, spec, None)
527 if rev in seen:
527 if rev in seen:
528 continue
528 continue
529 seen.add(rev)
529 seen.add(rev)
530 l = l + [rev]
530 l = l + revset.baseset([rev])
531 continue
531 continue
532 except error.RepoLookupError:
532 except error.RepoLookupError:
533 pass
533 pass
@@ -536,7 +536,7 b' def revrange(repo, revs):'
536 m = revset.match(repo.ui, spec, repo)
536 m = revset.match(repo.ui, spec, repo)
537 if seen or l:
537 if seen or l:
538 dl = [r for r in m(repo, revset.spanset(repo)) if r not in seen]
538 dl = [r for r in m(repo, revset.spanset(repo)) if r not in seen]
539 l = l + dl
539 l = l + revset.baseset(dl)
540 seen.update(dl)
540 seen.update(dl)
541 else:
541 else:
542 l = m(repo, revset.spanset(repo))
542 l = m(repo, revset.spanset(repo))
@@ -734,6 +734,16 b' parentrevspec'
734 hg: parse error: ^ expects a number 0, 1, or 2
734 hg: parse error: ^ expects a number 0, 1, or 2
735 [255]
735 [255]
736
736
737 multiple revspecs
738
739 $ hg log -r 'tip~1:tip' -r 'tip~2:tip~1' --template '{rev}\n'
740 8
741 9
742 4
743 5
744 6
745 7
746
737 aliases:
747 aliases:
738
748
739 $ echo '[revsetalias]' >> .hg/hgrc
749 $ echo '[revsetalias]' >> .hg/hgrc
General Comments 0
You need to be logged in to leave comments. Login now