Mercurial > public > mercurial-scm > hg
comparison mercurial/revset.py @ 11301:3d0591a66118
move discovery methods from localrepo into new discovery module
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Mon, 07 Jun 2010 18:35:54 +0200 |
parents | 0e5ce2325795 |
children | 8c377f2feee1 |
comparison
equal
deleted
inserted
replaced
11300:24eeca1f2791 | 11301:3d0591a66118 |
---|---|
4 # | 4 # |
5 # This software may be used and distributed according to the terms of the | 5 # This software may be used and distributed according to the terms of the |
6 # GNU General Public License version 2 or any later version. | 6 # GNU General Public License version 2 or any later version. |
7 | 7 |
8 import re | 8 import re |
9 import parser, util, error | 9 import parser, util, error, discovery |
10 import match as _match | 10 import match as _match |
11 | 11 |
12 elements = { | 12 elements = { |
13 "(": (20, ("group", 1, ")"), ("func", 1, ")")), | 13 "(": (20, ("group", 1, ")"), ("func", 1, ")")), |
14 "-": (19, ("negate", 19), ("minus", 19)), | 14 "-": (19, ("negate", 19), ("minus", 19)), |
418 dest = '' | 418 dest = '' |
419 dest = repo.ui.expandpath(dest or 'default-push', dest or 'default') | 419 dest = repo.ui.expandpath(dest or 'default-push', dest or 'default') |
420 dest, branches = hg.parseurl(dest) | 420 dest, branches = hg.parseurl(dest) |
421 other = hg.repository(hg.remoteui(repo, {}), dest) | 421 other = hg.repository(hg.remoteui(repo, {}), dest) |
422 repo.ui.pushbuffer() | 422 repo.ui.pushbuffer() |
423 o = repo.findoutgoing(other) | 423 o = discovery.findoutgoing(repo, other) |
424 repo.ui.popbuffer() | 424 repo.ui.popbuffer() |
425 cl = repo.changelog | 425 cl = repo.changelog |
426 o = set([cl.rev(r) for r in repo.changelog.nodesbetween(o, None)[0]]) | 426 o = set([cl.rev(r) for r in repo.changelog.nodesbetween(o, None)[0]]) |
427 print 'out', dest, o | 427 print 'out', dest, o |
428 return [r for r in subset if r in o] | 428 return [r for r in subset if r in o] |