Mercurial > hg

changeset 1465:be6b5ce60b7f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Implementing pull -r and changing clone -r. Both now support multiple 'target' revisions.
author Eric Hopper <hopper@omnifarious.org>
date Tue, 11 Oct 2005 08:39:21 -0700
parents 00117edce2dd
children b6d9ea0bc107
files mercurial/commands.py
diffstat 1 files changed, 16 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Tue Oct 11 08:06:52 2005 -0700
+++ b/mercurial/commands.py	Tue Oct 11 08:39:21 2005 -0700
@@ -654,11 +654,14 @@
         repo = hg.repository(ui, dest)
 
     else:
-        repo = hg.repository(ui, dest, create=1)
         rev = None
         if opts['rev']:
-            rev = [other.lookup(opts['rev'])]
-        repo.pull(other, heads = rev)
+            if not other.local():
+                raise util.Abort("clone -r not supported yet for remote repositories.")
+            else:
+                revs = [other.lookup(rev) for rev in opts['rev']]
+        repo = hg.repository(ui, dest, create=1)
+        repo.pull(other, heads = revs)
 
     f = repo.opener("hgrc", "w", text=True)
     f.write("[paths]\n")
@@ -1356,7 +1359,12 @@
         ui.setconfig("ui", "remotecmd", opts['remotecmd'])
 
     other = hg.repository(ui, source)
-    r = repo.pull(other)
+    revs = None
+    if opts['rev'] and not other.local():
+        raise util.Abort("pull -r doesn't work for remote repositories yet")
+    elif opts['rev']:
+        revs = [other.lookup(rev) for rev in opts['rev']]
+    r = repo.pull(other, heads=revs)
     if not r:
         if opts['update']:
             return update(ui, repo)
@@ -1785,7 +1793,7 @@
         (clone,
          [('U', 'noupdate', None, 'skip update after cloning'),
           ('e', 'ssh', "", 'ssh command'),
-          ('r', 'rev', "", 'only clone changesets needed to create revision'),
+          ('r', 'rev', [], 'a changeset you would like to have after cloning'),
           ('', 'pull', None, 'use pull protocol to copy metadata'),
           ('', 'remotecmd', "", 'remote hg command')],
          'hg clone [OPTION]... SOURCE [DEST]'),
@@ -1892,8 +1900,9 @@
         (pull,
          [('u', 'update', None, 'update working directory'),
           ('e', 'ssh', "", 'ssh command'),
-          ('', 'remotecmd', "", 'remote hg command')],
-         'hg pull [-u] [-e FILE] [--remotecmd FILE] [SOURCE]'),
+          ('', 'remotecmd', "", 'remote hg command'),
+          ('r', 'rev', [], 'a specific revision you would like to pull')],
+         'hg pull [-u] [-e FILE] [--remotecmd FILE] [-r rev]... [SOURCE]'),
     "^push":
         (push,
          [('f', 'force', None, 'force push'),