mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
f73efddf9c
Today, the terms 'active' and 'current' are interchangeably used throughout the codebase in reference to the active bookmark (the bookmark that will be updated with the next commit). This leads to confusion among developers and users. This patch is part of a series to standardize the usage to 'active' throughout the mercurial codebase and user interface.
205 lines
4.3 KiB
Perl
205 lines
4.3 KiB
Perl
$ hg init
|
|
|
|
no bookmarks
|
|
|
|
$ hg bookmarks
|
|
no bookmarks set
|
|
|
|
set bookmark X
|
|
|
|
$ hg bookmark X
|
|
|
|
list bookmarks
|
|
|
|
$ hg bookmark
|
|
* X -1:000000000000
|
|
|
|
list bookmarks with color
|
|
|
|
$ hg --config extensions.color= --config color.mode=ansi \
|
|
> bookmark --color=always
|
|
\x1b[0;32m * \x1b[0m\x1b[0;32mX\x1b[0m\x1b[0;32m -1:000000000000\x1b[0m (esc)
|
|
|
|
update to bookmark X
|
|
|
|
$ hg update X
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark X)
|
|
|
|
list bookmarks
|
|
|
|
$ hg bookmarks
|
|
* X -1:000000000000
|
|
|
|
rename
|
|
|
|
$ hg bookmark -m X Z
|
|
|
|
list bookmarks
|
|
|
|
$ cat .hg/bookmarks.current
|
|
Z (no-eol)
|
|
$ cat .hg/bookmarks
|
|
0000000000000000000000000000000000000000 Z
|
|
$ hg bookmarks
|
|
* Z -1:000000000000
|
|
|
|
new bookmarks X and Y, first one made active
|
|
|
|
$ hg bookmark Y X
|
|
|
|
list bookmarks
|
|
|
|
$ hg bookmark
|
|
X -1:000000000000
|
|
* Y -1:000000000000
|
|
Z -1:000000000000
|
|
|
|
$ hg bookmark -d X
|
|
|
|
commit
|
|
|
|
$ echo 'b' > b
|
|
$ hg add b
|
|
$ hg commit -m'test'
|
|
|
|
list bookmarks
|
|
|
|
$ hg bookmark
|
|
* Y 0:719295282060
|
|
Z -1:000000000000
|
|
|
|
Verify that switching to Z updates the active bookmark:
|
|
$ hg update Z
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(activating bookmark Z)
|
|
$ hg bookmark
|
|
Y 0:719295282060
|
|
* Z -1:000000000000
|
|
|
|
Switch back to Y for the remaining tests in this file:
|
|
$ hg update Y
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark Y)
|
|
|
|
delete bookmarks
|
|
|
|
$ hg bookmark -d Y
|
|
$ hg bookmark -d Z
|
|
|
|
list bookmarks
|
|
|
|
$ hg bookmark
|
|
no bookmarks set
|
|
|
|
update to tip
|
|
|
|
$ hg update tip
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
set bookmark Y using -r . but make sure that the active
|
|
bookmark is not activated
|
|
|
|
$ hg bookmark -r . Y
|
|
|
|
list bookmarks, Y should not be active
|
|
|
|
$ hg bookmark
|
|
Y 0:719295282060
|
|
|
|
now, activate Y
|
|
|
|
$ hg up -q Y
|
|
|
|
set bookmark Z using -i
|
|
|
|
$ hg bookmark -r . -i Z
|
|
$ hg bookmarks
|
|
* Y 0:719295282060
|
|
Z 0:719295282060
|
|
|
|
deactivate active bookmark using -i
|
|
|
|
$ hg bookmark -i Y
|
|
$ hg bookmarks
|
|
Y 0:719295282060
|
|
Z 0:719295282060
|
|
|
|
$ hg up -q Y
|
|
$ hg bookmark -i
|
|
$ hg bookmarks
|
|
Y 0:719295282060
|
|
Z 0:719295282060
|
|
$ hg bookmark -i
|
|
no active bookmark
|
|
$ hg up -q Y
|
|
$ hg bookmarks
|
|
* Y 0:719295282060
|
|
Z 0:719295282060
|
|
|
|
deactivate active bookmark while renaming
|
|
|
|
$ hg bookmark -i -m Y X
|
|
$ hg bookmarks
|
|
X 0:719295282060
|
|
Z 0:719295282060
|
|
|
|
bare update moves the active bookmark forward and clear the divergent bookmarks
|
|
|
|
$ echo a > a
|
|
$ hg ci -Am1
|
|
adding a
|
|
$ echo b >> a
|
|
$ hg ci -Am2
|
|
$ hg bookmark X@1 -r 1
|
|
$ hg bookmark X@2 -r 2
|
|
$ hg update X
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(activating bookmark X)
|
|
$ hg bookmarks
|
|
* X 0:719295282060
|
|
X@1 1:cc586d725fbe
|
|
X@2 2:49e1c4e84c58
|
|
Z 0:719295282060
|
|
$ hg update
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
updating bookmark X
|
|
$ hg bookmarks
|
|
* X 2:49e1c4e84c58
|
|
Z 0:719295282060
|
|
|
|
test deleting .hg/bookmarks.current when explicitly updating
|
|
to a revision
|
|
|
|
$ echo a >> b
|
|
$ hg ci -m.
|
|
$ hg up -q X
|
|
$ test -f .hg/bookmarks.current
|
|
|
|
try to update to it again to make sure we don't
|
|
set and then unset it
|
|
|
|
$ hg up -q X
|
|
$ test -f .hg/bookmarks.current
|
|
|
|
$ hg up -q 1
|
|
$ test -f .hg/bookmarks.current
|
|
[1]
|
|
|
|
when a bookmark is active, hg up -r . is
|
|
analogous to hg book -i <active bookmark>
|
|
|
|
$ hg up -q X
|
|
$ hg up -q .
|
|
$ test -f .hg/bookmarks.current
|
|
[1]
|
|
|
|
issue 4552 -- simulate a pull moving the active bookmark
|
|
|
|
$ hg up -q X
|
|
$ printf "Z" > .hg/bookmarks.current
|
|
$ hg log -T '{activebookmark}\n' -r Z
|
|
Z
|
|
$ hg log -T '{bookmarks % "{active}\n"}' -r Z
|
|
Z
|