Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 10389:6dc25b01e170

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix remaining hg.parseurl uses
author Sune Foldager <cryo@cyanite.org>
date Mon, 08 Feb 2010 10:32:44 +0100
parents 832f35386067
children f163775e36e0
comparison
equal deleted inserted replaced
10388:07bd7608a0ea 10389:6dc25b01e170
3052 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % 3052 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
3053 (new, len(bheads))) 3053 (new, len(bheads)))
3054 3054
3055 if opts.get('remote'): 3055 if opts.get('remote'):
3056 t = [] 3056 t = []
3057 source, revs, checkout = hg.parseurl(ui.expandpath('default'), 3057 source, branches = hg.parseurl(ui.expandpath('default'))
3058 opts.get('rev'))
3059 other = hg.repository(cmdutil.remoteui(repo, {}), source) 3058 other = hg.repository(cmdutil.remoteui(repo, {}), source)
3059 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
3060 ui.debug('comparing with %s\n' % url.hidepassword(source)) 3060 ui.debug('comparing with %s\n' % url.hidepassword(source))
3061 repo.ui.pushbuffer() 3061 repo.ui.pushbuffer()
3062 common, incoming, rheads = repo.findcommonincoming(other) 3062 common, incoming, rheads = repo.findcommonincoming(other)
3063 repo.ui.popbuffer() 3063 repo.ui.popbuffer()
3064 if incoming: 3064 if incoming:
3065 t.append(_('1 or more incoming')) 3065 t.append(_('1 or more incoming'))
3066 3066
3067 dest, revs, checkout = hg.parseurl( 3067 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
3068 ui.expandpath('default-push', 'default')) 3068 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
3069 other = hg.repository(cmdutil.remoteui(repo, {}), dest) 3069 other = hg.repository(cmdutil.remoteui(repo, {}), dest)
3070 ui.debug('comparing with %s\n' % url.hidepassword(dest)) 3070 ui.debug('comparing with %s\n' % url.hidepassword(dest))
3071 repo.ui.pushbuffer() 3071 repo.ui.pushbuffer()
3072 o = repo.findoutgoing(other) 3072 o = repo.findoutgoing(other)
3073 repo.ui.popbuffer() 3073 repo.ui.popbuffer()