--- a/mercurial/cmdutil.py Wed Aug 15 16:10:24 2007 -0500
+++ b/mercurial/cmdutil.py Wed Aug 15 16:10:36 2007 -0500
@@ -459,15 +459,6 @@
if opts.get('remotecmd'):
ui.setconfig("ui", "remotecmd", opts['remotecmd'])
-def parseurl(url, revs):
- '''parse url#branch, returning url, branch + revs'''
-
- if '#' not in url:
- return url, (revs or None)
-
- url, rev = url.split('#', 1)
- return url, revs + [rev]
-
def revpair(repo, revs):
'''return pair of nodes, given list of revisions. second item can
be None, meaning use working dir.'''
--- a/mercurial/commands.py Wed Aug 15 16:10:24 2007 -0500
+++ b/mercurial/commands.py Wed Aug 15 16:10:36 2007 -0500
@@ -336,7 +336,7 @@
visit.append(p)
else:
cmdutil.setremoteconfig(ui, opts)
- dest, revs = cmdutil.parseurl(
+ dest, revs = hg.parseurl(
ui.expandpath(dest or 'default-push', dest or 'default'), revs)
other = hg.repository(ui, dest)
o = repo.findoutgoing(other, force=opts['force'])
@@ -1475,7 +1475,7 @@
output = []
if source:
- source, revs = cmdutil.parseurl(ui.expandpath(source), [])
+ source, revs = hg.parseurl(ui.expandpath(source), [])
srepo = hg.repository(ui, source)
if not rev and revs:
rev = revs[0]
@@ -1638,7 +1638,7 @@
See pull for valid source format details.
"""
- source, revs = cmdutil.parseurl(ui.expandpath(source), opts['rev'])
+ source, revs = hg.parseurl(ui.expandpath(source), opts['rev'])
cmdutil.setremoteconfig(ui, opts)
other = hg.repository(ui, source)
@@ -1946,7 +1946,7 @@
See pull for valid destination format details.
"""
- dest, revs = cmdutil.parseurl(
+ dest, revs = hg.parseurl(
ui.expandpath(dest or 'default-push', dest or 'default'), opts['rev'])
cmdutil.setremoteconfig(ui, opts)
if revs:
@@ -2068,7 +2068,7 @@
Alternatively specify "ssh -C" as your ssh command in your hgrc or
with the --ssh command line option.
"""
- source, revs = cmdutil.parseurl(ui.expandpath(source), opts['rev'])
+ source, revs = hg.parseurl(ui.expandpath(source), opts['rev'])
cmdutil.setremoteconfig(ui, opts)
other = hg.repository(ui, source)
@@ -2113,7 +2113,7 @@
Pushing to http:// and https:// URLs is only possible, if this
feature is explicitly enabled on the remote Mercurial server.
"""
- dest, revs = cmdutil.parseurl(
+ dest, revs = hg.parseurl(
ui.expandpath(dest or 'default-push', dest or 'default'), opts['rev'])
cmdutil.setremoteconfig(ui, opts)
--- a/mercurial/hg.py Wed Aug 15 16:10:24 2007 -0500
+++ b/mercurial/hg.py Wed Aug 15 16:10:36 2007 -0500
@@ -10,7 +10,7 @@
from repo import *
from i18n import _
import localrepo, bundlerepo, httprepo, sshrepo, statichttprepo
-import errno, lock, os, shutil, util, cmdutil, extensions
+import errno, lock, os, shutil, util, extensions
import merge as _merge
import verify as _verify
@@ -18,6 +18,15 @@
return (os.path.isfile(util.drop_scheme('file', path)) and
bundlerepo or localrepo)
+def parseurl(url, revs):
+ '''parse url#branch, returning url, branch + revs'''
+
+ if '#' not in url:
+ return url, (revs or None)
+
+ url, rev = url.split('#', 1)
+ return url, revs + [rev]
+
schemes = {
'bundle': bundlerepo,
'file': _local,
@@ -95,7 +104,7 @@
"""
origsource = source
- source, rev = cmdutil.parseurl(ui.expandpath(source), rev)
+ source, rev = parseurl(ui.expandpath(source), rev)
if isinstance(source, str):
src_repo = repository(ui, source)