| Submitter | Siddharth Agarwal |
|---|---|
| Date | May 15, 2014, 6:04 p.m. |
| Message ID | <4b47bf238c325477bc7a.1400177057@dev1738.prn1.facebook.com> |
| Download | mbox | patch |
| Permalink | /patch/4754/ |
| State | Accepted |
| Headers | show |
Comments
On 05/15/2014 11:04 AM, Siddharth Agarwal wrote: > # HG changeset patch > # User Siddharth Agarwal <sid0@fb.com> > # Date 1400096995 25200 > # Wed May 14 12:49:55 2014 -0700 > # Node ID 4b47bf238c325477bc7a4df2f5f508b0a28808f1 > # Parent 883e268cb860c0ea2eb0faa94114e11c3a4a3893 > update: when deactivating a bookmark, print a message > > This helps prevent user confusion when innocent-seeming commands like > 'hg update -C .' are run. Since mpm has agreed that this is reasonable, I've gone ahead and clowncopterized it. > > diff --git a/mercurial/commands.py b/mercurial/commands.py > --- a/mercurial/commands.py > +++ b/mercurial/commands.py > @@ -5901,6 +5901,9 @@ > 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 > diff --git a/tests/test-bookmarks-merge.t b/tests/test-bookmarks-merge.t > --- a/tests/test-bookmarks-merge.t > +++ b/tests/test-bookmarks-merge.t > @@ -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 > diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t > --- a/tests/test-bookmarks-pushpull.t > +++ b/tests/test-bookmarks-pushpull.t > @@ -411,6 +411,7 @@ > $ 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 > diff --git a/tests/test-bookmarks-strip.t b/tests/test-bookmarks-strip.t > --- a/tests/test-bookmarks-strip.t > +++ b/tests/test-bookmarks-strip.t > @@ -38,6 +38,7 @@ > > $ hg update -r -2 > 1 files updated, 0 files merged, 0 files removed, 0 files unresolved > + (leaving bookmark test2) > > $ echo eee>>qqq.txt > > diff --git a/tests/test-bookmarks.t b/tests/test-bookmarks.t > --- a/tests/test-bookmarks.t > +++ b/tests/test-bookmarks.t > @@ -582,6 +582,7 @@ > $ 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) > diff --git a/tests/test-commandserver.py.out b/tests/test-commandserver.py.out > --- a/tests/test-commandserver.py.out > +++ b/tests/test-commandserver.py.out > @@ -177,6 +177,7 @@ > > 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 > diff --git a/tests/test-convert-hg-source.t b/tests/test-convert-hg-source.t > --- a/tests/test-convert-hg-source.t > +++ b/tests/test-convert-hg-source.t > @@ -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 > diff --git a/tests/test-issue1877.t b/tests/test-issue1877.t > --- a/tests/test-issue1877.t > +++ b/tests/test-issue1877.t > @@ -34,6 +34,7 @@ > > $ 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) > diff --git a/tests/test-rebase-bookmarks.t b/tests/test-rebase-bookmarks.t > --- a/tests/test-rebase-bookmarks.t > +++ b/tests/test-rebase-bookmarks.t > @@ -154,6 +154,7 @@ > > $ 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' > diff --git a/tests/test-rollback.t b/tests/test-rollback.t > --- a/tests/test-rollback.t > +++ b/tests/test-rollback.t > @@ -82,6 +82,7 @@ > 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 > diff --git a/tests/test-subrepo-svn.t b/tests/test-subrepo-svn.t > --- a/tests/test-subrepo-svn.t > +++ b/tests/test-subrepo-svn.t > @@ -470,6 +470,7 @@ > $ 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 @@ > 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 > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@selenic.com > http://selenic.com/mailman/listinfo/mercurial-devel
Patch
diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -5901,6 +5901,9 @@ 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 diff --git a/tests/test-bookmarks-merge.t b/tests/test-bookmarks-merge.t --- a/tests/test-bookmarks-merge.t +++ b/tests/test-bookmarks-merge.t @@ -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 diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t --- a/tests/test-bookmarks-pushpull.t +++ b/tests/test-bookmarks-pushpull.t @@ -411,6 +411,7 @@ $ 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 diff --git a/tests/test-bookmarks-strip.t b/tests/test-bookmarks-strip.t --- a/tests/test-bookmarks-strip.t +++ b/tests/test-bookmarks-strip.t @@ -38,6 +38,7 @@ $ hg update -r -2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + (leaving bookmark test2) $ echo eee>>qqq.txt diff --git a/tests/test-bookmarks.t b/tests/test-bookmarks.t --- a/tests/test-bookmarks.t +++ b/tests/test-bookmarks.t @@ -582,6 +582,7 @@ $ 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) diff --git a/tests/test-commandserver.py.out b/tests/test-commandserver.py.out --- a/tests/test-commandserver.py.out +++ b/tests/test-commandserver.py.out @@ -177,6 +177,7 @@ 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 diff --git a/tests/test-convert-hg-source.t b/tests/test-convert-hg-source.t --- a/tests/test-convert-hg-source.t +++ b/tests/test-convert-hg-source.t @@ -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 diff --git a/tests/test-issue1877.t b/tests/test-issue1877.t --- a/tests/test-issue1877.t +++ b/tests/test-issue1877.t @@ -34,6 +34,7 @@ $ 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) diff --git a/tests/test-rebase-bookmarks.t b/tests/test-rebase-bookmarks.t --- a/tests/test-rebase-bookmarks.t +++ b/tests/test-rebase-bookmarks.t @@ -154,6 +154,7 @@ $ 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' diff --git a/tests/test-rollback.t b/tests/test-rollback.t --- a/tests/test-rollback.t +++ b/tests/test-rollback.t @@ -82,6 +82,7 @@ 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 diff --git a/tests/test-subrepo-svn.t b/tests/test-subrepo-svn.t --- a/tests/test-subrepo-svn.t +++ b/tests/test-subrepo-svn.t @@ -470,6 +470,7 @@ $ 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 @@ 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