Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/revset.py @ 12615:64db820c66a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Henrik Stuart <hg@hstuart.dk>
date Tue, 05 Oct 2010 20:25:51 +0200
parents 78a97859b90d f314723f36f5
children e797fdf91df4
comparison
equal deleted inserted replaced
12613:f365aed7cc5b 12615:64db820c66a2
454 import hg # avoid start-up nasties 454 import hg # avoid start-up nasties
455 l = getargs(x, 0, 1, _("outgoing wants a repository path")) 455 l = getargs(x, 0, 1, _("outgoing wants a repository path"))
456 dest = l and getstring(l[0], _("outgoing wants a repository path")) or '' 456 dest = l and getstring(l[0], _("outgoing wants a repository path")) or ''
457 dest = repo.ui.expandpath(dest or 'default-push', dest or 'default') 457 dest = repo.ui.expandpath(dest or 'default-push', dest or 'default')
458 dest, branches = hg.parseurl(dest) 458 dest, branches = hg.parseurl(dest)
459 revs, checkout = hg.addbranchrevs(repo, repo, branches, [])
460 if revs:
461 revs = [repo.lookup(rev) for rev in revs]
459 other = hg.repository(hg.remoteui(repo, {}), dest) 462 other = hg.repository(hg.remoteui(repo, {}), dest)
460 repo.ui.pushbuffer() 463 repo.ui.pushbuffer()
461 o = discovery.findoutgoing(repo, other) 464 o = discovery.findoutgoing(repo, other)
462 repo.ui.popbuffer() 465 repo.ui.popbuffer()
463 cl = repo.changelog 466 cl = repo.changelog
464 o = set([cl.rev(r) for r in repo.changelog.nodesbetween(o, None)[0]]) 467 o = set([cl.rev(r) for r in repo.changelog.nodesbetween(o, revs)[0]])
465 return [r for r in subset if r in o] 468 return [r for r in subset if r in o]
466 469
467 def tagged(repo, subset, x): 470 def tagged(repo, subset, x):
468 getargs(x, 0, 0, _("tagged takes no arguments")) 471 getargs(x, 0, 0, _("tagged takes no arguments"))
469 cl = repo.changelog 472 cl = repo.changelog