Mercurial > hg

changeset 26103:30be3aeb5344

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
clone: fix updaterev to update to latest branch changeset (issue4528) Before this patch if clone --updaterev points to branch which head on src repo wasnt in dest repo, clone updated dest repo to default branch. After applying this patch, if changeset from src repo pointing at given branch is not in dest repo, it searches for changeset pointing for given branch locally in dest repo. Lookup in destination repo: 559: uprev = destrepo.lookup(update) is wrapped by try/except block to preserve current behaviour when given revset to -u is not found - it will not fail,but silently update dest repo to head of default branch.
author liscju <piotr.listkiewicz@gmail.com>
date Sun, 30 Aug 2015 11:47:43 +0200
parents 5618858dce26
children 0f1bc7faa50d
files mercurial/hg.py tests/test-clone-r.t
diffstat 2 files changed, 27 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hg.py	Thu Aug 20 17:19:32 2015 +0200
+++ b/mercurial/hg.py	Sun Aug 30 11:47:43 2015 +0200
@@ -582,7 +582,10 @@
                     try:
                         uprev = destrepo.lookup(checkout)
                     except error.RepoLookupError:
-                        pass
+                        try:
+                            uprev = destrepo.lookup(update)
+                        except error.RepoLookupError:
+                            pass
                 if uprev is None:
                     try:
                         uprev = destrepo._bookmarks['@']
--- a/tests/test-clone-r.t	Thu Aug 20 17:19:32 2015 +0200
+++ b/tests/test-clone-r.t	Sun Aug 30 11:47:43 2015 +0200
@@ -218,3 +218,26 @@
   4 files, 9 changesets, 7 total revisions
   $ cd ..
 
+  $ hg clone test test-9
+  updating to branch default
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd test-9
+  $ hg branch foobar
+  marked working directory as branch foobar
+  (branches are permanent and global, did you want a bookmark?)
+  $ echo file2 >> file2
+  $ hg add file2
+  $ hg commit -m "changeset9"
+  $ echo file3 >> file3
+  $ hg add file3
+  $ hg commit -m "changeset10"
+  $ cd ..
+  $ hg clone -r 9 -u foobar test-9 test-10
+  adding changesets
+  adding manifests
+  adding file changes
+  added 6 changesets with 6 changes to 3 files
+  updating to branch foobar
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+