Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 11301:3d0591a66118

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 d320e70442a5
children e1dde7363601
comparison
equal deleted inserted replaced
11300:24eeca1f2791 11301:3d0591a66118
8 from node import hex, nullid, nullrev, short 8 from node import hex, nullid, nullrev, short
9 from lock import release 9 from lock import release
10 from i18n import _, gettext 10 from i18n import _, gettext
11 import os, re, sys, difflib, time, tempfile 11 import os, re, sys, difflib, time, tempfile
12 import hg, util, revlog, bundlerepo, extensions, copies, error 12 import hg, util, revlog, bundlerepo, extensions, copies, error
13 import patch, help, mdiff, url, encoding, templatekw 13 import patch, help, mdiff, url, encoding, templatekw, discovery
14 import archival, changegroup, cmdutil, sshserver, hbisect, hgweb, hgweb.server 14 import archival, changegroup, cmdutil, sshserver, hbisect, hgweb, hgweb.server
15 import merge as mergemod 15 import merge as mergemod
16 import minirst, revset 16 import minirst, revset
17 17
18 # Commands start here, listed alphabetically 18 # Commands start here, listed alphabetically
594 else: 594 else:
595 dest = ui.expandpath(dest or 'default-push', dest or 'default') 595 dest = ui.expandpath(dest or 'default-push', dest or 'default')
596 dest, branches = hg.parseurl(dest, opts.get('branch')) 596 dest, branches = hg.parseurl(dest, opts.get('branch'))
597 other = hg.repository(hg.remoteui(repo, opts), dest) 597 other = hg.repository(hg.remoteui(repo, opts), dest)
598 revs, checkout = hg.addbranchrevs(repo, other, branches, revs) 598 revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
599 o = repo.findoutgoing(other, force=opts.get('force')) 599 o = discovery.findoutgoing(repo, other, force=opts.get('force'))
600 600
601 if not o: 601 if not o:
602 ui.status(_("no changes found\n")) 602 ui.status(_("no changes found\n"))
603 return 1 603 return 1
604 604
2088 other = hg.repository(hg.remoteui(repo, opts), source) 2088 other = hg.repository(hg.remoteui(repo, opts), source)
2089 ui.status(_('comparing with %s\n') % url.hidepassword(source)) 2089 ui.status(_('comparing with %s\n') % url.hidepassword(source))
2090 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev')) 2090 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
2091 if revs: 2091 if revs:
2092 revs = [other.lookup(rev) for rev in revs] 2092 revs = [other.lookup(rev) for rev in revs]
2093 common, incoming, rheads = repo.findcommonincoming(other, heads=revs, 2093
2094 force=opts["force"]) 2094 tmp = discovery.findcommonincoming(repo, other, heads=revs,
2095 force=opts.get('force'))
2096 common, incoming, rheads = tmp
2095 if not incoming: 2097 if not incoming:
2096 try: 2098 try:
2097 os.unlink(opts["bundle"]) 2099 os.unlink(opts["bundle"])
2098 except: 2100 except:
2099 pass 2101 pass
2393 if revs: 2395 if revs:
2394 revs = [repo.lookup(rev) for rev in revs] 2396 revs = [repo.lookup(rev) for rev in revs]
2395 2397
2396 other = hg.repository(hg.remoteui(repo, opts), dest) 2398 other = hg.repository(hg.remoteui(repo, opts), dest)
2397 ui.status(_('comparing with %s\n') % url.hidepassword(dest)) 2399 ui.status(_('comparing with %s\n') % url.hidepassword(dest))
2398 o = repo.findoutgoing(other, force=opts.get('force')) 2400 o = discovery.findoutgoing(repo, other, force=opts.get('force'))
2399 if not o: 2401 if not o:
2400 ui.status(_("no changes found\n")) 2402 ui.status(_("no changes found\n"))
2401 return 1 2403 return 1
2402 o = repo.changelog.nodesbetween(o, revs)[0] 2404 o = repo.changelog.nodesbetween(o, revs)[0]
2403 if opts.get('newest_first'): 2405 if opts.get('newest_first'):
3322 source, branches = hg.parseurl(ui.expandpath('default')) 3324 source, branches = hg.parseurl(ui.expandpath('default'))
3323 other = hg.repository(hg.remoteui(repo, {}), source) 3325 other = hg.repository(hg.remoteui(repo, {}), source)
3324 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev')) 3326 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
3325 ui.debug('comparing with %s\n' % url.hidepassword(source)) 3327 ui.debug('comparing with %s\n' % url.hidepassword(source))
3326 repo.ui.pushbuffer() 3328 repo.ui.pushbuffer()
3327 common, incoming, rheads = repo.findcommonincoming(other) 3329 common, incoming, rheads = discovery.findcommonincoming(repo, other)
3328 repo.ui.popbuffer() 3330 repo.ui.popbuffer()
3329 if incoming: 3331 if incoming:
3330 t.append(_('1 or more incoming')) 3332 t.append(_('1 or more incoming'))
3331 3333
3332 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default')) 3334 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
3333 revs, checkout = hg.addbranchrevs(repo, repo, branches, None) 3335 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
3334 other = hg.repository(hg.remoteui(repo, {}), dest) 3336 other = hg.repository(hg.remoteui(repo, {}), dest)
3335 ui.debug('comparing with %s\n' % url.hidepassword(dest)) 3337 ui.debug('comparing with %s\n' % url.hidepassword(dest))
3336 repo.ui.pushbuffer() 3338 repo.ui.pushbuffer()
3337 o = repo.findoutgoing(other) 3339 o = discovery.findoutgoing(repo, other)
3338 repo.ui.popbuffer() 3340 repo.ui.popbuffer()
3339 o = repo.changelog.nodesbetween(o, None)[0] 3341 o = repo.changelog.nodesbetween(o, None)[0]
3340 if o: 3342 if o:
3341 t.append(_('%d outgoing') % len(o)) 3343 t.append(_('%d outgoing') % len(o))
3342 3344