mercurial-scm/hg: mercurial/commands.py comparison

comparison mercurial/commands.py @ 4494:649dd2492ae5

Merge with crew.

author	Bryan O'Sullivan <bos@serpentine.com>
date	Sat, 02 Jun 2007 09:04:23 -0700
parents	c927c568a5ad b2b55acbacdd
children	0ca5ef554987

comparison

equal deleted inserted replaced

-:ead2fa544cbf
+:649dd2492ae5
 if p not in seen:
 seen[p] = 1
 visit.append(p)
 else:
 setremoteconfig(ui, opts)
-dest = ui.expandpath(dest or 'default-push', dest or 'default')
+dest, revs = cmdutil.parseurl(
+ui.expandpath(dest or 'default-push', dest or 'default'), revs)
 other = hg.repository(ui, dest)
 o = repo.findoutgoing(other, force=opts['force'])
 if revs:
 cg = repo.changegroupsubset(o, revs, 'bundle')
 .hg/hgrc and working directory will be created on the remote side.
 Look at the help text for the pull command for important details
 about ssh:// URLs.
 """
 setremoteconfig(ui, opts)
-hg.clone(ui, ui.expandpath(source), dest,
+hg.clone(ui, source, dest,
 pull=opts['pull'],
 stream=opts['uncompressed'],
 rev=opts['rev'],
 update=not opts['noupdate'])
 For remote repository, using --bundle avoids downloading the changesets
 twice if the incoming is followed by a pull.
 See pull for valid source format details.
 """
-source = ui.expandpath(source)
+source, revs = cmdutil.parseurl(ui.expandpath(source), opts['rev'])
 setremoteconfig(ui, opts)
 other = hg.repository(ui, source)
 ui.status(_('comparing with %s\n') % source)
-incoming = repo.findincoming(other, force=opts["force"])
+if revs:
+if 'lookup' in other.capabilities:
+revs = [other.lookup(rev) for rev in revs]
+else:
+error = _("Other repository doesn't support revision lookup, so a rev cannot be specified.")
+raise util.Abort(error)
+incoming = repo.findincoming(other, heads=revs, force=opts["force"])
 if not incoming:
 try:
 os.unlink(opts["bundle"])
 except:
 pass
 cleanup = None
 try:
 fname = opts["bundle"]
 if fname or not other.local():
 # create a bundle (uncompressed if other repo is not local)
-cg = other.changegroup(incoming, "incoming")
+if revs is None:
+cg = other.changegroup(incoming, "incoming")
+else:
+if 'changegroupsubset' not in other.capabilities:
+raise util.Abort(_("Partial incoming cannot be done because other repository doesn't support changegroupsubset."))
+cg = other.changegroupsubset(incoming, revs, 'incoming')
 bundletype = other.local() and "HG10BZ" or "HG10UN"
 fname = cleanup = changegroup.writebundle(cg, fname, bundletype)
 # keep written bundle?
 if opts["bundle"]:
 cleanup = None
 if not other.local():
 # use the created uncompressed bundlerepo
 other = bundlerepo.bundlerepository(ui, repo.root, fname)
-revs = None
-if opts['rev']:
-revs = [other.lookup(rev) for rev in opts['rev']]
 o = other.changelog.nodesbetween(incoming, revs)[0]
 if opts['newest_first']:
 o.reverse()
 displayer = cmdutil.show_changeset(ui, other, opts)
 for n in o:
 the default push location. These are the changesets that would be pushed
 if a push was requested.
 See pull for valid destination format details.
 """
-dest = ui.expandpath(dest or 'default-push', dest or 'default')
+dest, revs = cmdutil.parseurl(
+ui.expandpath(dest or 'default-push', dest or 'default'), opts['rev'])
 setremoteconfig(ui, opts)
-revs = None
+if revs:
-if opts['rev']:
+revs = [repo.lookup(rev) for rev in revs]
-revs = [repo.lookup(rev) for rev in opts['rev']]
 other = hg.repository(ui, dest)
 ui.status(_('comparing with %s\n') % dest)
 o = repo.findoutgoing(other, force=opts['force'])
 if not o:
 repositories or to bundle files (as created by 'hg bundle' or
 'hg incoming --bundle'). The static-http:// protocol, albeit slow,
 allows access to a Mercurial repository where you simply use a web
 server to publish the .hg directory as static content.
+An optional identifier after # indicates a particular branch, tag,
+or changeset to pull.
 Some notes about using SSH with Mercurial:
 - SSH requires an accessible shell account on the destination machine
 and a copy of hg in the remote path or specified with as remotecmd.
 - path is relative to the remote user's home directory by default.
 Use an extra slash at the start of a path to specify an absolute path:
 Host *
 Compression yes
 Alternatively specify "ssh -C" as your ssh command in your hgrc or
 with the --ssh command line option.
 """
-source = ui.expandpath(source)
+source, revs = cmdutil.parseurl(ui.expandpath(source), opts['rev'])
 setremoteconfig(ui, opts)
 other = hg.repository(ui, source)
 ui.status(_('pulling from %s\n') % (source))
-revs = None
+if revs:
-if opts['rev']:
 if 'lookup' in other.capabilities:
-revs = [other.lookup(rev) for rev in opts['rev']]
+revs = [other.lookup(rev) for rev in revs]
 else:
 error = _("Other repository doesn't support revision lookup, so a rev cannot be specified.")
 raise util.Abort(error)
 modheads = repo.pull(other, heads=revs, force=opts['force'])
 return postincoming(ui, repo, modheads, opts['update'])
 def push(ui, repo, dest=None, **opts):
 """push changes to the specified destination
 local/filesystem/path (or file://local/filesystem/path)
 ssh://[user@]host[:port]/[path]
 http://[user@]host[:port]/[path]
 https://[user@]host[:port]/[path]
+An optional identifier after # indicates a particular branch, tag,
+or changeset to push.
 Look at the help text for the pull command for important details
 about ssh:// URLs.
 Pushing to http:// and https:// URLs is only possible, if this
 feature is explicitly enabled on the remote Mercurial server.
 """
-dest = ui.expandpath(dest or 'default-push', dest or 'default')
+dest, revs = cmdutil.parseurl(
+ui.expandpath(dest or 'default-push', dest or 'default'), opts['rev'])
 setremoteconfig(ui, opts)
 other = hg.repository(ui, dest)
 ui.status('pushing to %s\n' % (dest))
-revs = None
+if revs:
-if opts['rev']:
+revs = [repo.lookup(rev) for rev in revs]
-revs = [repo.lookup(rev) for rev in opts['rev']]
 r = repo.push(other, opts['force'], revs=revs)
 return r == 0
 def rawcommit(ui, repo, *pats, **opts):
 """raw commit interface (DEPRECATED)

Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 4494:649dd2492ae5