facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

update: when deactivating a bookmark, print a message

Browse Source 
This helps prevent user confusion when innocent-seeming commands like
'hg update -C .' are run.
This commit is contained in:
Siddharth Agarwal 2014-05-14 12:49:55 -07:00
parent 81e850aaf0
commit 1dfb639cc9
11 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mercurial/commands.py
View File

@ -5901,6 +5901,9 @@ def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
elif brev in repo._bookmarks:
bookmarks.setcurrent(repo, brev)
elif brev:
if repo._bookmarkcurrent:
ui.status(_("(leaving bookmark %s)\n") %
repo._bookmarkcurrent)
bookmarks.unsetcurrent(repo)
return ret

4
tests/test-bookmarks-merge.t
View File

@ -32,6 +32,7 @@
$ hg up -C 3
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark c)
$ echo d > d
$ hg add d
$ hg commit -m'd'
@ -54,6 +55,7 @@
$ hg up -C 4
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(leaving bookmark e)
$ hg merge
abort: heads are bookmarked - please merge with an explicit rev
(run 'hg heads' to see all heads)
@ -72,6 +74,7 @@
$ hg up -C 4
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(leaving bookmark e)
$ echo f > f
$ hg commit -Am "f"
adding f
@ -114,6 +117,7 @@
$ hg up -C 6
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(leaving bookmark e)
$ echo g > g
$ hg commit -Am 'g'
adding g

1
tests/test-bookmarks-pushpull.t
View File

@ -411,6 +411,7 @@ bookmark, not all outgoing changes:
$ hg commit -m 'add bar'
$ hg co "tip^"
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(leaving bookmark @)
$ hg book add-foo
$ hg book -r tip add-bar
Note: this push *must* push only a single changeset, as that's the point

1
tests/test-bookmarks-strip.t
View File

@ -38,6 +38,7 @@ update to -2 (deactivates the active bookmark)
$ hg update -r -2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark test2)
$ echo eee>>qqq.txt

1
tests/test-bookmarks.t
View File

@ -582,6 +582,7 @@ test stripping a non-checked-out but bookmarked revision
$ hg book should-end-on-two
$ hg co --clean 4
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(leaving bookmark should-end-on-two)
$ hg book four
$ hg --config extensions.mq= strip 3
saved backup bundle to * (glob)

1
tests/test-commandserver.py.out
View File

@ -177,6 +177,7 @@ testing phasecacheafterstrip:
runcommand update -C 0
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
(leaving bookmark bm3)
runcommand commit -Am. a
created new head
runcommand log -Gq

1
tests/test-convert-hg-source.t
View File

@ -24,6 +24,7 @@
$ hg ci -m 'merge local copy' -d '3 0'
$ hg up -C 1
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(leaving bookmark premerge1)
$ hg bookmark premerge2
$ hg merge 2
merging foo and baz to baz

1
tests/test-issue1877.t
View File

@ -34,6 +34,7 @@ http://mercurial.selenic.com/bts/issue1877
$ hg up 1e6c11564562
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(leaving bookmark main)
$ hg merge main
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)

1
tests/test-rebase-bookmarks.t
View File

@ -154,6 +154,7 @@ rebase --continue with bookmarks present (issue3802)
$ hg up 2
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark X)
$ echo 'C' > c
$ hg add c
$ hg ci -m 'other C'

1
tests/test-rollback.t
View File

@ -82,6 +82,7 @@ working dir unaffected by rollback: do not restore dirstate et. al.
0 default add a again
$ hg update default
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(leaving bookmark foo)
$ hg bookmark bar
$ cat .hg/undo.branch ; echo
test

2
tests/test-subrepo-svn.t
View File

@ -470,6 +470,7 @@ test having obstructions when switching branches on checkout:
$ hg book other
$ hg co -r 'p1(tip)'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark other)
$ echo "obstruct = [svn] $SVNREPOURL/src" >> .hgsub
$ svn co -r5 --quiet "$SVNREPOURL"/src obstruct
$ hg commit -m 'Other branch which will be obstructed'
@ -543,6 +544,7 @@ First, create that condition in the repository.
A *recreated/somethingold (glob)
Checked out revision 10.
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark other)
$ test -f recreated/somethingold
Test archive