Skip to content
Snippets Groups Projects
Commit 36ed69d4593d authored by Adrian Buehlmann's avatar Adrian Buehlmann
Browse files

clone: show status "updating to bookmark @"

if bookmark @ is not on the default branch, we show

  updating to bookmark @ on branch <name>
parent 603d4fbad36d
No related branches found
No related tags found
No related merge requests found
......@@ -411,6 +411,7 @@
if update is not True:
checkout = srcpeer.lookup(update)
uprev = None
status = None
if checkout is not None:
try:
uprev = destrepo.lookup(checkout)
......@@ -420,8 +421,14 @@
try:
uprev = destrepo._bookmarks['@']
update = '@'
bn = destrepo[uprev].branch()
if bn == 'default':
status = _("updating to bookmark @\n")
else:
status = _("updating to bookmark @ on branch %s\n"
% bn)
except KeyError:
try:
uprev = destrepo.branchtip('default')
except error.RepoLookupError:
uprev = destrepo.lookup('tip')
......@@ -423,10 +430,12 @@
except KeyError:
try:
uprev = destrepo.branchtip('default')
except error.RepoLookupError:
uprev = destrepo.lookup('tip')
bn = destrepo[uprev].branch()
destrepo.ui.status(_("updating to branch %s\n") % bn)
if not status:
bn = destrepo[uprev].branch()
status = _("updating to branch %s\n") % bn
destrepo.ui.status(status)
_update(destrepo, uprev)
if update in destrepo._bookmarks:
bookmarks.setcurrent(destrepo, update)
......
......@@ -335,7 +335,7 @@
adding manifests
adding file changes
added 5 changesets with 5 changes to 3 files (+2 heads)
updating to branch default
updating to bookmark @
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R cloned-bookmarks bookmarks
* @ 1:9b140be10808
......@@ -355,7 +355,7 @@
adding manifests
adding file changes
added 5 changesets with 5 changes to 3 files (+2 heads)
updating to branch default
updating to bookmark @
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd addmarks
$ echo foo > foo
......
......@@ -363,7 +363,7 @@
a@ 2:db815d6d32e6
x y 2:db815d6d32e6
$ hg clone . cloned-bookmarks
updating to branch default
updating to bookmark @
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R cloned-bookmarks bookmarks
* @ 2:db815d6d32e6
......@@ -381,7 +381,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+1 heads)
updating to branch default
updating to bookmark @
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R cloned-bookmarks-pull bookmarks
* @ 2:db815d6d32e6
......
......@@ -507,7 +507,7 @@
$ cd a
$ hg bookmark -r a7949464abda @ # branch point of stable from default
$ hg clone . ../i
updating to branch default
updating to bookmark @
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg id -i ../i
a7949464abda
......@@ -511,6 +511,16 @@
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg id -i ../i
a7949464abda
$ rm -r ../i
$ hg bookmark -f -r stable @
$ hg bookmarks
@ 15:0aae7cf88f0d
$ hg clone . ../i
updating to bookmark @ on branch stable
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg id -i ../i
0aae7cf88f0d
$ cd "$TESTTMP"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment