2017-02-20 19:20:59 +03:00
|
|
|
$ hg init repo
|
|
|
|
|
$ cd repo
|
2010-08-14 04:57:54 +04:00
|
|
|
|
|
|
|
|
no bookmarks
|
|
|
|
|
|
|
|
|
|
$ hg bookmarks
|
|
|
|
|
no bookmarks set
|
|
|
|
|
|
2014-10-02 19:43:22 +04:00
|
|
|
$ hg bookmarks -Tjson
|
|
|
|
|
[
|
|
|
|
|
]
|
|
|
|
|
|
2010-08-14 04:57:54 +04:00
|
|
|
bookmark rev -1
|
|
|
|
|
|
|
|
|
|
$ hg bookmark X
|
|
|
|
|
|
|
|
|
|
list bookmarks
|
|
|
|
|
|
|
|
|
|
$ hg bookmarks
|
|
|
|
|
* X -1:000000000000
|
|
|
|
|
|
|
|
|
|
list bookmarks with color
|
|
|
|
|
|
|
|
|
|
$ hg --config extensions.color= --config color.mode=ansi \
|
|
|
|
|
> bookmarks --color=always
|
2014-10-02 19:36:36 +04:00
|
|
|
\x1b[0;32m * \x1b[0m\x1b[0;32mX\x1b[0m\x1b[0;32m -1:000000000000\x1b[0m (esc)
|
2010-08-14 04:57:54 +04:00
|
|
|
|
|
|
|
|
$ echo a > a
|
|
|
|
|
$ hg add a
|
|
|
|
|
$ hg commit -m 0
|
|
|
|
|
|
|
|
|
|
bookmark X moved to rev 0
|
|
|
|
|
|
|
|
|
|
$ hg bookmarks
|
|
|
|
|
* X 0:f7b1eb17ad24
|
|
|
|
|
|
|
|
|
|
look up bookmark
|
|
|
|
|
|
|
|
|
|
$ hg log -r X
|
|
|
|
|
changeset: 0:f7b1eb17ad24
|
2011-02-11 21:47:39 +03:00
|
|
|
bookmark: X
|
2010-08-14 04:57:54 +04:00
|
|
|
tag: tip
|
|
|
|
|
user: test
|
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
|
summary: 0
|
|
|
|
|
|
|
|
|
|
|
2012-12-17 08:00:38 +04:00
|
|
|
second bookmark for rev 0, command should work even with ui.strict on
|
2010-08-14 04:57:54 +04:00
|
|
|
|
2012-12-17 08:00:38 +04:00
|
|
|
$ hg --config ui.strict=1 bookmark X2
|
2010-08-14 04:57:54 +04:00
|
|
|
|
|
|
|
|
bookmark rev -1 again
|
|
|
|
|
|
|
|
|
|
$ hg bookmark -r null Y
|
|
|
|
|
|
|
|
|
|
list bookmarks
|
|
|
|
|
|
|
|
|
|
$ hg bookmarks
|
2011-02-16 03:29:26 +03:00
|
|
|
X 0:f7b1eb17ad24
|
2011-02-20 02:57:55 +03:00
|
|
|
* X2 0:f7b1eb17ad24
|
2010-08-14 04:57:54 +04:00
|
|
|
Y -1:000000000000
|
|
|
|
|
|
|
|
|
|
$ echo b > b
|
|
|
|
|
$ hg add b
|
|
|
|
|
$ hg commit -m 1
|
|
|
|
|
|
2014-10-02 19:43:22 +04:00
|
|
|
$ hg bookmarks -Tjson
|
|
|
|
|
[
|
|
|
|
|
{
|
|
|
|
|
"active": false,
|
|
|
|
|
"bookmark": "X",
|
|
|
|
|
"node": "f7b1eb17ad24730a1651fccd46c43826d1bbc2ac",
|
|
|
|
|
"rev": 0
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"active": true,
|
|
|
|
|
"bookmark": "X2",
|
|
|
|
|
"node": "925d80f479bb026b0fb3deb27503780b13f74123",
|
|
|
|
|
"rev": 1
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
"active": false,
|
|
|
|
|
"bookmark": "Y",
|
|
|
|
|
"node": "0000000000000000000000000000000000000000",
|
|
|
|
|
"rev": -1
|
|
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
|
2010-10-10 21:40:25 +04:00
|
|
|
bookmarks revset
|
|
|
|
|
|
|
|
|
|
$ hg log -r 'bookmark()'
|
2011-02-16 03:29:26 +03:00
|
|
|
changeset: 0:f7b1eb17ad24
|
2011-02-11 21:47:39 +03:00
|
|
|
bookmark: X
|
2010-10-10 21:40:25 +04:00
|
|
|
user: test
|
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
2011-02-16 03:29:26 +03:00
|
|
|
summary: 0
|
2010-10-10 21:40:25 +04:00
|
|
|
|
2011-02-20 02:57:55 +03:00
|
|
|
changeset: 1:925d80f479bb
|
|
|
|
|
bookmark: X2
|
|
|
|
|
tag: tip
|
|
|
|
|
user: test
|
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
|
summary: 1
|
|
|
|
|
|
2010-10-10 21:40:25 +04:00
|
|
|
$ hg log -r 'bookmark(Y)'
|
|
|
|
|
$ hg log -r 'bookmark(X2)'
|
2011-02-20 02:57:55 +03:00
|
|
|
changeset: 1:925d80f479bb
|
2011-02-11 21:47:39 +03:00
|
|
|
bookmark: X2
|
2011-02-20 02:57:55 +03:00
|
|
|
tag: tip
|
2010-10-10 21:40:25 +04:00
|
|
|
user: test
|
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
2011-02-20 02:57:55 +03:00
|
|
|
summary: 1
|
2010-10-10 21:40:25 +04:00
|
|
|
|
2012-05-31 02:13:33 +04:00
|
|
|
$ hg log -r 'bookmark("re:X")'
|
|
|
|
|
changeset: 0:f7b1eb17ad24
|
|
|
|
|
bookmark: X
|
|
|
|
|
user: test
|
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
|
summary: 0
|
|
|
|
|
|
|
|
|
|
changeset: 1:925d80f479bb
|
|
|
|
|
bookmark: X2
|
|
|
|
|
tag: tip
|
|
|
|
|
user: test
|
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
|
summary: 1
|
|
|
|
|
|
2014-08-12 07:45:08 +04:00
|
|
|
$ hg log -r 'bookmark("literal:X")'
|
|
|
|
|
changeset: 0:f7b1eb17ad24
|
|
|
|
|
bookmark: X
|
|
|
|
|
user: test
|
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
|
summary: 0
|
|
|
|
|
|
|
|
|
|
|
2011-04-10 12:30:53 +04:00
|
|
|
$ hg log -r 'bookmark(unknown)'
|
revset: raise RepoLookupError to make present() predicate continue the query
Before this patch, "bookmark()", "named()" and "tag()" predicates
raise "Abort", when the specified pattern doesn't match against
existing ones.
This prevents "present()" predicate from continuing the query, because
it only catches "RepoLookupError".
This patch raises "RepoLookupError" instead of "Abort", to make
"present()" predicate continue the query, even if "bookmark()",
"named()" or "tag()" in the sub-query of it are aborted.
This patch doesn't contain raising "RepoLookupError" for "re:" pattern
in "tag()", because "tag()" treats it differently from others. Actions
of each predicates at failure of pattern matching can be summarized as
below:
predicate "literal:" "re:"
---------- ----------- ------------
bookmark abort abort
named abort abort
tag abort continue (*1)
branch abort continue (*2)
---------- ----------- ------------
"tag()" may have to abort in the (*1) case for similarity, but this
change may break backward compatibility of existing revset queries. It
seems to have to be changed on "default" branch (with "BC" ?).
On the other hand, (*2) seems to be reasonable, even though it breaks
similarity, because "branch()" in this case doesn't check exact
existence of branches, but does pick up revisions of which branch
matches against the pattern.
This patch also adds tests for "branch()" to clarify behavior around
"present()" of similar predicates, even though this patch doesn't
change "branch()".
2015-01-30 19:00:50 +03:00
|
|
|
abort: bookmark 'unknown' does not exist!
|
2011-04-10 12:30:53 +04:00
|
|
|
[255]
|
2015-10-07 17:04:31 +03:00
|
|
|
$ hg log -r 'bookmark("literal:unknown")'
|
|
|
|
|
abort: bookmark 'unknown' does not exist!
|
|
|
|
|
[255]
|
revset: raise RepoLookupError to make present() predicate continue the query
Before this patch, "bookmark()", "named()" and "tag()" predicates
raise "Abort", when the specified pattern doesn't match against
existing ones.
This prevents "present()" predicate from continuing the query, because
it only catches "RepoLookupError".
This patch raises "RepoLookupError" instead of "Abort", to make
"present()" predicate continue the query, even if "bookmark()",
"named()" or "tag()" in the sub-query of it are aborted.
This patch doesn't contain raising "RepoLookupError" for "re:" pattern
in "tag()", because "tag()" treats it differently from others. Actions
of each predicates at failure of pattern matching can be summarized as
below:
predicate "literal:" "re:"
---------- ----------- ------------
bookmark abort abort
named abort abort
tag abort continue (*1)
branch abort continue (*2)
---------- ----------- ------------
"tag()" may have to abort in the (*1) case for similarity, but this
change may break backward compatibility of existing revset queries. It
seems to have to be changed on "default" branch (with "BC" ?).
On the other hand, (*2) seems to be reasonable, even though it breaks
similarity, because "branch()" in this case doesn't check exact
existence of branches, but does pick up revisions of which branch
matches against the pattern.
This patch also adds tests for "branch()" to clarify behavior around
"present()" of similar predicates, even though this patch doesn't
change "branch()".
2015-01-30 19:00:50 +03:00
|
|
|
$ hg log -r 'bookmark("re:unknown")'
|
|
|
|
|
abort: no bookmarks exist that match 'unknown'!
|
|
|
|
|
[255]
|
|
|
|
|
$ hg log -r 'present(bookmark("literal:unknown"))'
|
|
|
|
|
$ hg log -r 'present(bookmark("re:unknown"))'
|
2011-04-10 12:30:53 +04:00
|
|
|
|
2010-10-23 21:22:42 +04:00
|
|
|
$ hg help revsets | grep 'bookmark('
|
|
|
|
|
"bookmark([name])"
|
2010-10-10 21:40:25 +04:00
|
|
|
|
2010-08-14 04:57:54 +04:00
|
|
|
bookmarks X and X2 moved to rev 1, Y at rev -1
|
|
|
|
|
|
|
|
|
|
$ hg bookmarks
|
2011-02-16 03:29:26 +03:00
|
|
|
X 0:f7b1eb17ad24
|
2011-02-20 02:57:55 +03:00
|
|
|
* X2 1:925d80f479bb
|
2010-08-14 04:57:54 +04:00
|
|
|
Y -1:000000000000
|
|
|
|
|
|
|
|
|
|
bookmark rev 0 again
|
|
|
|
|
|
|
|
|
|
$ hg bookmark -r 0 Z
|
|
|
|
|
|
2011-02-16 03:29:26 +03:00
|
|
|
$ hg update X
|
|
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
2013-03-07 07:17:56 +04:00
|
|
|
(activating bookmark X)
|
2010-08-14 04:57:54 +04:00
|
|
|
$ echo c > c
|
|
|
|
|
$ hg add c
|
|
|
|
|
$ hg commit -m 2
|
2011-02-16 03:29:26 +03:00
|
|
|
created new head
|
2010-08-14 04:57:54 +04:00
|
|
|
|
2011-02-16 03:29:26 +03:00
|
|
|
bookmarks X moved to rev 2, Y at rev -1, Z at rev 0
|
2010-08-14 04:57:54 +04:00
|
|
|
|
|
|
|
|
$ hg bookmarks
|
2011-02-16 03:29:26 +03:00
|
|
|
* X 2:db815d6d32e6
|
2011-02-20 02:57:55 +03:00
|
|
|
X2 1:925d80f479bb
|
2010-08-14 04:57:54 +04:00
|
|
|
Y -1:000000000000
|
2011-02-11 22:35:32 +03:00
|
|
|
Z 0:f7b1eb17ad24
|
2010-08-14 04:57:54 +04:00
|
|
|
|
|
|
|
|
rename nonexistent bookmark
|
|
|
|
|
|
|
|
|
|
$ hg bookmark -m A B
|
2011-04-07 18:57:38 +04:00
|
|
|
abort: bookmark 'A' does not exist
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-14 04:57:54 +04:00
|
|
|
|
|
|
|
|
rename to existent bookmark
|
|
|
|
|
|
|
|
|
|
$ hg bookmark -m X Y
|
2011-04-07 18:57:38 +04:00
|
|
|
abort: bookmark 'Y' already exists (use -f to force)
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-14 04:57:54 +04:00
|
|
|
|
|
|
|
|
force rename to existent bookmark
|
|
|
|
|
|
|
|
|
|
$ hg bookmark -f -m X Y
|
|
|
|
|
|
|
|
|
|
list bookmarks
|
|
|
|
|
|
|
|
|
|
$ hg bookmark
|
2011-02-20 02:57:55 +03:00
|
|
|
X2 1:925d80f479bb
|
2011-02-16 03:29:26 +03:00
|
|
|
* Y 2:db815d6d32e6
|
2010-08-14 04:57:54 +04:00
|
|
|
Z 0:f7b1eb17ad24
|
|
|
|
|
|
2012-10-01 05:19:23 +04:00
|
|
|
bookmarks from a revset
|
|
|
|
|
$ hg bookmark -r '.^1' REVSET
|
|
|
|
|
$ hg bookmark -r ':tip' TIP
|
2013-05-02 00:24:21 +04:00
|
|
|
$ hg up -q TIP
|
2012-10-01 05:19:23 +04:00
|
|
|
$ hg bookmarks
|
|
|
|
|
REVSET 0:f7b1eb17ad24
|
|
|
|
|
* TIP 2:db815d6d32e6
|
|
|
|
|
X2 1:925d80f479bb
|
|
|
|
|
Y 2:db815d6d32e6
|
|
|
|
|
Z 0:f7b1eb17ad24
|
|
|
|
|
|
|
|
|
|
$ hg bookmark -d REVSET
|
|
|
|
|
$ hg bookmark -d TIP
|
|
|
|
|
|
2013-05-03 06:28:18 +04:00
|
|
|
rename without new name or multiple names
|
2010-08-14 04:57:54 +04:00
|
|
|
|
|
|
|
|
$ hg bookmark -m Y
|
|
|
|
|
abort: new bookmark name required
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2013-05-03 06:28:18 +04:00
|
|
|
$ hg bookmark -m Y Y2 Y3
|
|
|
|
|
abort: only one new bookmark name allowed
|
|
|
|
|
[255]
|
2010-08-14 04:57:54 +04:00
|
|
|
|
|
|
|
|
delete without name
|
|
|
|
|
|
|
|
|
|
$ hg bookmark -d
|
|
|
|
|
abort: bookmark name required
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-14 04:57:54 +04:00
|
|
|
|
|
|
|
|
delete nonexistent bookmark
|
|
|
|
|
|
|
|
|
|
$ hg bookmark -d A
|
2011-04-07 18:57:38 +04:00
|
|
|
abort: bookmark 'A' does not exist
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-14 04:57:54 +04:00
|
|
|
|
|
|
|
|
bookmark name with spaces should be stripped
|
|
|
|
|
|
|
|
|
|
$ hg bookmark ' x y '
|
|
|
|
|
|
|
|
|
|
list bookmarks
|
|
|
|
|
|
|
|
|
|
$ hg bookmarks
|
2011-02-20 02:57:55 +03:00
|
|
|
X2 1:925d80f479bb
|
2011-02-16 03:29:26 +03:00
|
|
|
Y 2:db815d6d32e6
|
2010-08-14 04:57:54 +04:00
|
|
|
Z 0:f7b1eb17ad24
|
2011-02-16 03:29:26 +03:00
|
|
|
* x y 2:db815d6d32e6
|
2010-08-14 04:57:54 +04:00
|
|
|
|
|
|
|
|
look up stripped bookmark name
|
|
|
|
|
|
|
|
|
|
$ hg log -r '"x y"'
|
2011-02-16 03:29:26 +03:00
|
|
|
changeset: 2:db815d6d32e6
|
2011-02-11 21:47:39 +03:00
|
|
|
bookmark: Y
|
|
|
|
|
bookmark: x y
|
2010-08-14 04:57:54 +04:00
|
|
|
tag: tip
|
2011-02-16 03:29:26 +03:00
|
|
|
parent: 0:f7b1eb17ad24
|
2010-08-14 04:57:54 +04:00
|
|
|
user: test
|
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
|
summary: 2
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
reject bookmark name with newline
|
|
|
|
|
|
|
|
|
|
$ hg bookmark '
|
|
|
|
|
> '
|
2012-10-18 01:23:42 +04:00
|
|
|
abort: bookmark names cannot consist entirely of whitespace
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-14 04:57:54 +04:00
|
|
|
|
2012-10-17 10:44:49 +04:00
|
|
|
$ hg bookmark -m Z '
|
|
|
|
|
> '
|
2012-10-18 01:23:42 +04:00
|
|
|
abort: bookmark names cannot consist entirely of whitespace
|
2012-10-17 10:44:49 +04:00
|
|
|
[255]
|
|
|
|
|
|
2012-10-18 01:32:43 +04:00
|
|
|
bookmark with reserved name
|
|
|
|
|
|
|
|
|
|
$ hg bookmark tip
|
|
|
|
|
abort: the name 'tip' is reserved
|
|
|
|
|
[255]
|
|
|
|
|
|
|
|
|
|
$ hg bookmark .
|
|
|
|
|
abort: the name '.' is reserved
|
|
|
|
|
[255]
|
|
|
|
|
|
|
|
|
|
$ hg bookmark null
|
|
|
|
|
abort: the name 'null' is reserved
|
|
|
|
|
[255]
|
|
|
|
|
|
|
|
|
|
|
2010-08-14 04:57:54 +04:00
|
|
|
bookmark with existing name
|
|
|
|
|
|
2013-03-16 08:39:07 +04:00
|
|
|
$ hg bookmark X2
|
|
|
|
|
abort: bookmark 'X2' already exists (use -f to force)
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-14 04:57:54 +04:00
|
|
|
|
2012-10-17 10:44:49 +04:00
|
|
|
$ hg bookmark -m Y Z
|
|
|
|
|
abort: bookmark 'Z' already exists (use -f to force)
|
|
|
|
|
[255]
|
|
|
|
|
|
|
|
|
|
bookmark with name of branch
|
|
|
|
|
|
|
|
|
|
$ hg bookmark default
|
|
|
|
|
abort: a bookmark cannot have the name of an existing branch
|
|
|
|
|
[255]
|
|
|
|
|
|
|
|
|
|
$ hg bookmark -m Y default
|
|
|
|
|
abort: a bookmark cannot have the name of an existing branch
|
|
|
|
|
[255]
|
|
|
|
|
|
2013-02-06 04:22:53 +04:00
|
|
|
bookmark with integer name
|
|
|
|
|
|
|
|
|
|
$ hg bookmark 10
|
2013-04-19 21:55:11 +04:00
|
|
|
abort: cannot use an integer as a name
|
2013-02-06 04:22:53 +04:00
|
|
|
[255]
|
|
|
|
|
|
2012-10-17 13:50:47 +04:00
|
|
|
incompatible options
|
|
|
|
|
|
|
|
|
|
$ hg bookmark -m Y -d Z
|
|
|
|
|
abort: --delete and --rename are incompatible
|
|
|
|
|
[255]
|
|
|
|
|
|
|
|
|
|
$ hg bookmark -r 1 -d Z
|
|
|
|
|
abort: --rev is incompatible with --delete
|
|
|
|
|
[255]
|
|
|
|
|
|
|
|
|
|
$ hg bookmark -r 1 -m Z Y
|
|
|
|
|
abort: --rev is incompatible with --rename
|
|
|
|
|
[255]
|
|
|
|
|
|
2010-08-14 04:57:54 +04:00
|
|
|
force bookmark with existing name
|
|
|
|
|
|
2013-03-16 08:39:07 +04:00
|
|
|
$ hg bookmark -f X2
|
2013-03-17 07:48:22 +04:00
|
|
|
|
|
|
|
|
force bookmark back to where it was, should deactivate it
|
|
|
|
|
|
2013-03-16 08:39:07 +04:00
|
|
|
$ hg bookmark -fr1 X2
|
2013-03-17 07:48:22 +04:00
|
|
|
$ hg bookmarks
|
|
|
|
|
X2 1:925d80f479bb
|
|
|
|
|
Y 2:db815d6d32e6
|
|
|
|
|
Z 0:f7b1eb17ad24
|
|
|
|
|
x y 2:db815d6d32e6
|
2013-03-16 08:39:07 +04:00
|
|
|
|
|
|
|
|
forward bookmark to descendant without --force
|
|
|
|
|
|
|
|
|
|
$ hg bookmark Z
|
2013-03-17 06:21:54 +04:00
|
|
|
moving bookmark 'Z' forward from f7b1eb17ad24
|
2010-08-14 04:57:54 +04:00
|
|
|
|
|
|
|
|
list bookmarks
|
|
|
|
|
|
|
|
|
|
$ hg bookmark
|
2011-02-20 02:57:55 +03:00
|
|
|
X2 1:925d80f479bb
|
2011-02-16 03:29:26 +03:00
|
|
|
Y 2:db815d6d32e6
|
|
|
|
|
* Z 2:db815d6d32e6
|
|
|
|
|
x y 2:db815d6d32e6
|
2010-08-14 04:57:54 +04:00
|
|
|
|
|
|
|
|
revision but no bookmark name
|
|
|
|
|
|
|
|
|
|
$ hg bookmark -r .
|
|
|
|
|
abort: bookmark name required
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-14 04:57:54 +04:00
|
|
|
|
|
|
|
|
bookmark name with whitespace only
|
|
|
|
|
|
|
|
|
|
$ hg bookmark ' '
|
|
|
|
|
abort: bookmark names cannot consist entirely of whitespace
|
2012-10-17 10:44:49 +04:00
|
|
|
[255]
|
|
|
|
|
|
|
|
|
|
$ hg bookmark -m Y ' '
|
|
|
|
|
abort: bookmark names cannot consist entirely of whitespace
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2011-02-16 20:36:45 +03:00
|
|
|
|
|
|
|
|
invalid bookmark
|
|
|
|
|
|
|
|
|
|
$ hg bookmark 'foo:bar'
|
2012-10-21 17:20:33 +04:00
|
|
|
abort: ':' cannot be used in a name
|
2012-10-18 06:42:06 +04:00
|
|
|
[255]
|
|
|
|
|
|
|
|
|
|
$ hg bookmark 'foo
|
|
|
|
|
> bar'
|
2012-10-21 17:20:33 +04:00
|
|
|
abort: '\n' cannot be used in a name
|
2011-02-16 20:36:45 +03:00
|
|
|
[255]
|
|
|
|
|
|
2011-02-24 21:15:00 +03:00
|
|
|
the bookmark extension should be ignored now that it is part of core
|
|
|
|
|
|
|
|
|
|
$ echo "[extensions]" >> $HGRCPATH
|
|
|
|
|
$ echo "bookmarks=" >> $HGRCPATH
|
|
|
|
|
$ hg bookmarks
|
|
|
|
|
X2 1:925d80f479bb
|
|
|
|
|
Y 2:db815d6d32e6
|
|
|
|
|
* Z 2:db815d6d32e6
|
|
|
|
|
x y 2:db815d6d32e6
|
2011-05-01 15:07:00 +04:00
|
|
|
|
2011-02-22 01:27:45 +03:00
|
|
|
test summary
|
|
|
|
|
|
|
|
|
|
$ hg summary
|
2011-07-18 16:53:26 +04:00
|
|
|
parent: 2:db815d6d32e6 tip
|
2011-02-22 01:27:45 +03:00
|
|
|
2
|
|
|
|
|
branch: default
|
2011-07-18 16:53:26 +04:00
|
|
|
bookmarks: *Z Y x y
|
2011-02-22 01:27:45 +03:00
|
|
|
commit: (clean)
|
|
|
|
|
update: 1 new changesets, 2 branch heads (merge)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 3 draft
|
2011-02-22 01:27:45 +03:00
|
|
|
|
2011-02-19 02:09:08 +03:00
|
|
|
test id
|
|
|
|
|
|
|
|
|
|
$ hg id
|
|
|
|
|
db815d6d32e6 tip Y/Z/x y
|
2011-03-13 14:24:17 +03:00
|
|
|
|
2011-05-01 15:07:00 +04:00
|
|
|
test rollback
|
|
|
|
|
|
2011-05-09 01:16:41 +04:00
|
|
|
$ echo foo > f1
|
2014-09-28 11:49:36 +04:00
|
|
|
$ hg bookmark tmp-rollback
|
2011-05-09 01:16:41 +04:00
|
|
|
$ hg ci -Amr
|
|
|
|
|
adding f1
|
2014-09-28 11:49:36 +04:00
|
|
|
$ hg bookmarks
|
|
|
|
|
X2 1:925d80f479bb
|
|
|
|
|
Y 2:db815d6d32e6
|
|
|
|
|
Z 2:db815d6d32e6
|
|
|
|
|
* tmp-rollback 3:2bf5cfec5864
|
|
|
|
|
x y 2:db815d6d32e6
|
2011-05-01 15:07:00 +04:00
|
|
|
$ hg rollback
|
2011-05-09 01:16:41 +04:00
|
|
|
repository tip rolled back to revision 2 (undo commit)
|
|
|
|
|
working directory now based on revision 2
|
2011-05-01 15:07:00 +04:00
|
|
|
$ hg bookmarks
|
|
|
|
|
X2 1:925d80f479bb
|
2011-05-09 01:16:41 +04:00
|
|
|
Y 2:db815d6d32e6
|
2013-03-17 07:48:22 +04:00
|
|
|
Z 2:db815d6d32e6
|
2014-09-28 11:49:36 +04:00
|
|
|
* tmp-rollback 2:db815d6d32e6
|
|
|
|
|
x y 2:db815d6d32e6
|
|
|
|
|
$ hg bookmark -f Z -r 1
|
|
|
|
|
$ hg rollback
|
|
|
|
|
repository tip rolled back to revision 2 (undo bookmark)
|
|
|
|
|
$ hg bookmarks
|
|
|
|
|
X2 1:925d80f479bb
|
|
|
|
|
Y 2:db815d6d32e6
|
|
|
|
|
Z 2:db815d6d32e6
|
|
|
|
|
* tmp-rollback 2:db815d6d32e6
|
2011-05-09 01:16:41 +04:00
|
|
|
x y 2:db815d6d32e6
|
2014-09-28 11:49:36 +04:00
|
|
|
$ hg bookmark -d tmp-rollback
|
2011-05-09 01:16:41 +04:00
|
|
|
|
2013-03-17 06:36:44 +04:00
|
|
|
activate bookmark on working dir parent without --force
|
|
|
|
|
|
|
|
|
|
$ hg bookmark --inactive Z
|
|
|
|
|
$ hg bookmark Z
|
|
|
|
|
|
2011-03-13 14:24:17 +03:00
|
|
|
test clone
|
|
|
|
|
|
2012-03-22 01:39:38 +04:00
|
|
|
$ hg bookmark -r 2 -i @
|
|
|
|
|
$ hg bookmark -r 2 -i a@
|
2011-03-13 14:24:17 +03:00
|
|
|
$ hg bookmarks
|
2012-03-22 01:39:38 +04:00
|
|
|
@ 2:db815d6d32e6
|
2011-03-13 14:24:17 +03:00
|
|
|
X2 1:925d80f479bb
|
|
|
|
|
Y 2:db815d6d32e6
|
|
|
|
|
* Z 2:db815d6d32e6
|
2012-03-22 01:39:38 +04:00
|
|
|
a@ 2:db815d6d32e6
|
2011-03-13 14:24:17 +03:00
|
|
|
x y 2:db815d6d32e6
|
|
|
|
|
$ hg clone . cloned-bookmarks
|
2012-10-29 17:02:30 +04:00
|
|
|
updating to bookmark @
|
2011-03-13 14:24:17 +03:00
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
$ hg -R cloned-bookmarks bookmarks
|
2012-10-26 16:37:03 +04:00
|
|
|
* @ 2:db815d6d32e6
|
2011-03-13 14:24:17 +03:00
|
|
|
X2 1:925d80f479bb
|
|
|
|
|
Y 2:db815d6d32e6
|
|
|
|
|
Z 2:db815d6d32e6
|
2012-03-22 01:39:38 +04:00
|
|
|
a@ 2:db815d6d32e6
|
2011-03-13 14:24:17 +03:00
|
|
|
x y 2:db815d6d32e6
|
|
|
|
|
|
|
|
|
|
test clone with pull protocol
|
|
|
|
|
|
|
|
|
|
$ hg clone --pull . cloned-bookmarks-pull
|
|
|
|
|
requesting all changes
|
|
|
|
|
adding changesets
|
|
|
|
|
adding manifests
|
|
|
|
|
adding file changes
|
|
|
|
|
added 3 changesets with 3 changes to 3 files (+1 heads)
|
2012-10-29 17:02:30 +04:00
|
|
|
updating to bookmark @
|
2011-03-13 14:24:17 +03:00
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
$ hg -R cloned-bookmarks-pull bookmarks
|
2012-10-26 16:37:03 +04:00
|
|
|
* @ 2:db815d6d32e6
|
2011-03-13 14:24:17 +03:00
|
|
|
X2 1:925d80f479bb
|
|
|
|
|
Y 2:db815d6d32e6
|
|
|
|
|
Z 2:db815d6d32e6
|
2012-03-22 01:39:38 +04:00
|
|
|
a@ 2:db815d6d32e6
|
2011-03-13 14:24:17 +03:00
|
|
|
x y 2:db815d6d32e6
|
|
|
|
|
|
2013-05-03 06:28:18 +04:00
|
|
|
delete multiple bookmarks at once
|
|
|
|
|
|
|
|
|
|
$ hg bookmark -d @ a@
|
2012-03-22 01:39:38 +04:00
|
|
|
|
2012-10-26 15:09:55 +04:00
|
|
|
test clone with a bookmark named "default" (issue3677)
|
|
|
|
|
|
|
|
|
|
$ hg bookmark -r 1 -f -i default
|
|
|
|
|
$ hg clone . cloned-bookmark-default
|
|
|
|
|
updating to branch default
|
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
$ hg -R cloned-bookmark-default bookmarks
|
|
|
|
|
X2 1:925d80f479bb
|
|
|
|
|
Y 2:db815d6d32e6
|
|
|
|
|
Z 2:db815d6d32e6
|
|
|
|
|
default 1:925d80f479bb
|
|
|
|
|
x y 2:db815d6d32e6
|
|
|
|
|
$ hg -R cloned-bookmark-default parents -q
|
|
|
|
|
2:db815d6d32e6
|
|
|
|
|
$ hg bookmark -d default
|
|
|
|
|
|
2011-03-13 14:24:17 +03:00
|
|
|
test clone with a specific revision
|
|
|
|
|
|
|
|
|
|
$ hg clone -r 925d80 . cloned-bookmarks-rev
|
|
|
|
|
adding changesets
|
|
|
|
|
adding manifests
|
|
|
|
|
adding file changes
|
|
|
|
|
added 2 changesets with 2 changes to 2 files
|
|
|
|
|
updating to branch default
|
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
$ hg -R cloned-bookmarks-rev bookmarks
|
|
|
|
|
X2 1:925d80f479bb
|
2011-03-15 01:03:56 +03:00
|
|
|
|
2012-10-02 11:26:42 +04:00
|
|
|
test clone with update to a bookmark
|
|
|
|
|
|
2015-08-03 07:56:38 +03:00
|
|
|
$ hg clone -u Z . ../cloned-bookmarks-update
|
2012-10-02 11:26:42 +04:00
|
|
|
updating to branch default
|
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2015-08-03 07:56:38 +03:00
|
|
|
$ hg -R ../cloned-bookmarks-update bookmarks
|
2012-10-02 11:26:42 +04:00
|
|
|
X2 1:925d80f479bb
|
|
|
|
|
Y 2:db815d6d32e6
|
|
|
|
|
* Z 2:db815d6d32e6
|
|
|
|
|
x y 2:db815d6d32e6
|
|
|
|
|
|
2011-03-15 01:03:56 +03:00
|
|
|
create bundle with two heads
|
|
|
|
|
|
|
|
|
|
$ hg clone . tobundle
|
|
|
|
|
updating to branch default
|
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
$ echo x > tobundle/x
|
|
|
|
|
$ hg -R tobundle add tobundle/x
|
|
|
|
|
$ hg -R tobundle commit -m'x'
|
|
|
|
|
$ hg -R tobundle update -r -2
|
|
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
|
$ echo y > tobundle/y
|
|
|
|
|
$ hg -R tobundle branch test
|
|
|
|
|
marked working directory as branch test
|
2011-12-09 00:32:44 +04:00
|
|
|
(branches are permanent and global, did you want a bookmark?)
|
2011-03-15 01:03:56 +03:00
|
|
|
$ hg -R tobundle add tobundle/y
|
|
|
|
|
$ hg -R tobundle commit -m'y'
|
|
|
|
|
$ hg -R tobundle bundle tobundle.hg
|
|
|
|
|
searching for changes
|
|
|
|
|
2 changesets found
|
|
|
|
|
$ hg unbundle tobundle.hg
|
|
|
|
|
adding changesets
|
|
|
|
|
adding manifests
|
|
|
|
|
adding file changes
|
|
|
|
|
added 2 changesets with 2 changes to 2 files (+1 heads)
|
|
|
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
2013-01-21 23:47:10 +04:00
|
|
|
|
2015-05-29 06:06:19 +03:00
|
|
|
update to active bookmark if it's not the parent
|
2013-01-21 23:47:10 +04:00
|
|
|
|
2013-02-09 01:32:43 +04:00
|
|
|
$ hg summary
|
|
|
|
|
parent: 2:db815d6d32e6
|
|
|
|
|
2
|
|
|
|
|
branch: default
|
2014-08-11 08:09:23 +04:00
|
|
|
bookmarks: *Z Y x y
|
2013-02-09 01:32:43 +04:00
|
|
|
commit: 1 added, 1 unknown (new branch head)
|
|
|
|
|
update: 2 new changesets (update)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 5 draft
|
2011-03-15 01:03:56 +03:00
|
|
|
$ hg update
|
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2014-08-11 08:09:23 +04:00
|
|
|
updating bookmark Z
|
2011-03-15 01:03:56 +03:00
|
|
|
$ hg bookmarks
|
|
|
|
|
X2 1:925d80f479bb
|
|
|
|
|
Y 2:db815d6d32e6
|
|
|
|
|
* Z 3:125c9a1d6df6
|
|
|
|
|
x y 2:db815d6d32e6
|
|
|
|
|
|
2013-08-02 06:43:14 +04:00
|
|
|
pull --update works the same as pull && update
|
|
|
|
|
|
|
|
|
|
$ hg bookmark -r3 Y
|
|
|
|
|
moving bookmark 'Y' forward from db815d6d32e6
|
2016-11-30 22:25:18 +03:00
|
|
|
$ cp -R ../cloned-bookmarks-update ../cloned-bookmarks-manual-update
|
|
|
|
|
$ cp -R ../cloned-bookmarks-update ../cloned-bookmarks-manual-update-with-divergence
|
2015-09-18 03:17:54 +03:00
|
|
|
|
|
|
|
|
(manual version)
|
|
|
|
|
|
|
|
|
|
$ hg -R ../cloned-bookmarks-manual-update update Y
|
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
(activating bookmark Y)
|
|
|
|
|
$ hg -R ../cloned-bookmarks-manual-update pull .
|
|
|
|
|
pulling from .
|
|
|
|
|
searching for changes
|
|
|
|
|
adding changesets
|
|
|
|
|
adding manifests
|
|
|
|
|
adding file changes
|
|
|
|
|
added 2 changesets with 2 changes to 2 files (+1 heads)
|
|
|
|
|
updating bookmark Y
|
|
|
|
|
updating bookmark Z
|
|
|
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
2015-09-18 02:08:10 +03:00
|
|
|
|
|
|
|
|
(# tests strange but with --date crashing when bookmark have to move)
|
|
|
|
|
|
|
|
|
|
$ hg -R ../cloned-bookmarks-manual-update update -d 1986
|
|
|
|
|
abort: revision matching date not found
|
|
|
|
|
[255]
|
2015-09-18 03:17:54 +03:00
|
|
|
$ hg -R ../cloned-bookmarks-manual-update update
|
|
|
|
|
updating to active bookmark Y
|
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
|
|
|
|
|
(all in one version)
|
|
|
|
|
|
2015-08-03 07:56:38 +03:00
|
|
|
$ hg -R ../cloned-bookmarks-update update Y
|
2013-08-02 06:43:14 +04:00
|
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2013-03-07 07:17:56 +04:00
|
|
|
(activating bookmark Y)
|
2015-08-03 07:56:38 +03:00
|
|
|
$ hg -R ../cloned-bookmarks-update pull --update .
|
2013-08-02 06:43:14 +04:00
|
|
|
pulling from .
|
|
|
|
|
searching for changes
|
|
|
|
|
adding changesets
|
|
|
|
|
adding manifests
|
|
|
|
|
adding file changes
|
|
|
|
|
added 2 changesets with 2 changes to 2 files (+1 heads)
|
|
|
|
|
updating bookmark Y
|
|
|
|
|
updating bookmark Z
|
|
|
|
|
updating to active bookmark Y
|
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
|
2016-02-02 17:49:02 +03:00
|
|
|
We warn about divergent during bare update to the active bookmark
|
|
|
|
|
|
|
|
|
|
$ hg -R ../cloned-bookmarks-manual-update-with-divergence update Y
|
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
(activating bookmark Y)
|
|
|
|
|
$ hg -R ../cloned-bookmarks-manual-update-with-divergence bookmarks -r X2 Y@1
|
|
|
|
|
$ hg -R ../cloned-bookmarks-manual-update-with-divergence bookmarks
|
|
|
|
|
X2 1:925d80f479bb
|
|
|
|
|
* Y 2:db815d6d32e6
|
|
|
|
|
Y@1 1:925d80f479bb
|
|
|
|
|
Z 2:db815d6d32e6
|
|
|
|
|
x y 2:db815d6d32e6
|
|
|
|
|
$ hg -R ../cloned-bookmarks-manual-update-with-divergence pull
|
2017-02-20 19:20:59 +03:00
|
|
|
pulling from $TESTTMP/repo (glob)
|
2016-02-02 17:49:02 +03:00
|
|
|
searching for changes
|
|
|
|
|
adding changesets
|
|
|
|
|
adding manifests
|
|
|
|
|
adding file changes
|
|
|
|
|
added 2 changesets with 2 changes to 2 files (+1 heads)
|
|
|
|
|
updating bookmark Y
|
|
|
|
|
updating bookmark Z
|
|
|
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
|
|
|
$ hg -R ../cloned-bookmarks-manual-update-with-divergence update
|
|
|
|
|
updating to active bookmark Y
|
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
1 other divergent bookmarks for "Y"
|
|
|
|
|
|
2011-07-05 12:13:54 +04:00
|
|
|
test wrongly formated bookmark
|
|
|
|
|
|
|
|
|
|
$ echo '' >> .hg/bookmarks
|
|
|
|
|
$ hg bookmarks
|
|
|
|
|
X2 1:925d80f479bb
|
2013-08-02 06:43:14 +04:00
|
|
|
Y 3:125c9a1d6df6
|
2011-07-05 12:13:54 +04:00
|
|
|
* Z 3:125c9a1d6df6
|
|
|
|
|
x y 2:db815d6d32e6
|
2011-07-05 12:20:27 +04:00
|
|
|
$ echo "Ican'thasformatedlines" >> .hg/bookmarks
|
|
|
|
|
$ hg bookmarks
|
|
|
|
|
malformed line in .hg/bookmarks: "Ican'thasformatedlines"
|
|
|
|
|
X2 1:925d80f479bb
|
2013-08-02 06:43:14 +04:00
|
|
|
Y 3:125c9a1d6df6
|
2011-07-05 12:20:27 +04:00
|
|
|
* Z 3:125c9a1d6df6
|
|
|
|
|
x y 2:db815d6d32e6
|
|
|
|
|
|
2012-05-04 01:03:08 +04:00
|
|
|
test missing revisions
|
|
|
|
|
|
|
|
|
|
$ echo "925d80f479bc z" > .hg/bookmarks
|
|
|
|
|
$ hg book
|
|
|
|
|
no bookmarks set
|
2012-07-27 01:57:50 +04:00
|
|
|
|
|
|
|
|
test stripping a non-checked-out but bookmarked revision
|
|
|
|
|
|
2013-11-22 22:14:17 +04:00
|
|
|
$ hg log --graph
|
2012-07-27 01:57:50 +04:00
|
|
|
o changeset: 4:9ba5f110a0b3
|
|
|
|
|
| branch: test
|
|
|
|
|
| tag: tip
|
|
|
|
|
| parent: 2:db815d6d32e6
|
|
|
|
|
| user: test
|
|
|
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
|
| summary: y
|
|
|
|
|
|
|
|
|
|
|
| @ changeset: 3:125c9a1d6df6
|
|
|
|
|
|/ user: test
|
|
|
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
|
| summary: x
|
|
|
|
|
|
|
|
|
|
|
o changeset: 2:db815d6d32e6
|
|
|
|
|
| parent: 0:f7b1eb17ad24
|
|
|
|
|
| user: test
|
|
|
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
|
| summary: 2
|
|
|
|
|
|
|
|
|
|
|
| o changeset: 1:925d80f479bb
|
|
|
|
|
|/ user: test
|
|
|
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
|
| summary: 1
|
|
|
|
|
|
|
|
|
|
|
o changeset: 0:f7b1eb17ad24
|
|
|
|
|
user: test
|
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
|
summary: 0
|
|
|
|
|
|
|
|
|
|
$ hg book should-end-on-two
|
|
|
|
|
$ hg co --clean 4
|
|
|
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
2014-05-14 23:49:55 +04:00
|
|
|
(leaving bookmark should-end-on-two)
|
2012-07-27 01:57:50 +04:00
|
|
|
$ hg book four
|
|
|
|
|
$ hg --config extensions.mq= strip 3
|
|
|
|
|
saved backup bundle to * (glob)
|
|
|
|
|
should-end-on-two should end up pointing to revision 2, as that's the
|
|
|
|
|
tipmost surviving ancestor of the stripped revision.
|
2013-11-22 22:14:17 +04:00
|
|
|
$ hg log --graph
|
2012-07-27 01:57:50 +04:00
|
|
|
@ changeset: 3:9ba5f110a0b3
|
|
|
|
|
| branch: test
|
|
|
|
|
| bookmark: four
|
|
|
|
|
| tag: tip
|
|
|
|
|
| user: test
|
|
|
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
|
| summary: y
|
|
|
|
|
|
|
|
|
|
|
o changeset: 2:db815d6d32e6
|
|
|
|
|
| bookmark: should-end-on-two
|
|
|
|
|
| parent: 0:f7b1eb17ad24
|
|
|
|
|
| user: test
|
|
|
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
|
| summary: 2
|
|
|
|
|
|
|
|
|
|
|
| o changeset: 1:925d80f479bb
|
|
|
|
|
|/ user: test
|
|
|
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
|
| summary: 1
|
|
|
|
|
|
|
|
|
|
|
o changeset: 0:f7b1eb17ad24
|
|
|
|
|
user: test
|
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
|
summary: 0
|
|
|
|
|
|
2013-05-02 00:31:39 +04:00
|
|
|
|
2016-10-18 00:16:55 +03:00
|
|
|
no-op update doesn't deactivate bookmarks
|
2015-10-15 02:03:17 +03:00
|
|
|
|
2016-03-11 22:35:42 +03:00
|
|
|
$ hg bookmarks
|
|
|
|
|
* four 3:9ba5f110a0b3
|
|
|
|
|
should-end-on-two 2:db815d6d32e6
|
2016-02-02 18:24:11 +03:00
|
|
|
$ hg up four
|
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2015-10-15 02:03:17 +03:00
|
|
|
$ hg up
|
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
$ hg sum
|
|
|
|
|
parent: 3:9ba5f110a0b3 tip
|
|
|
|
|
y
|
|
|
|
|
branch: test
|
|
|
|
|
bookmarks: *four
|
|
|
|
|
commit: 2 unknown (clean)
|
|
|
|
|
update: (current)
|
|
|
|
|
phases: 4 draft
|
|
|
|
|
|
2013-05-02 00:31:39 +04:00
|
|
|
test clearing divergent bookmarks of linear ancestors
|
|
|
|
|
|
|
|
|
|
$ hg bookmark Z -r 0
|
|
|
|
|
$ hg bookmark Z@1 -r 1
|
|
|
|
|
$ hg bookmark Z@2 -r 2
|
|
|
|
|
$ hg bookmark Z@3 -r 3
|
|
|
|
|
$ hg book
|
|
|
|
|
Z 0:f7b1eb17ad24
|
|
|
|
|
Z@1 1:925d80f479bb
|
|
|
|
|
Z@2 2:db815d6d32e6
|
2013-05-02 00:24:21 +04:00
|
|
|
Z@3 3:9ba5f110a0b3
|
|
|
|
|
* four 3:9ba5f110a0b3
|
2013-05-02 00:31:39 +04:00
|
|
|
should-end-on-two 2:db815d6d32e6
|
|
|
|
|
$ hg bookmark Z
|
|
|
|
|
moving bookmark 'Z' forward from f7b1eb17ad24
|
|
|
|
|
$ hg book
|
|
|
|
|
* Z 3:9ba5f110a0b3
|
|
|
|
|
Z@1 1:925d80f479bb
|
|
|
|
|
four 3:9ba5f110a0b3
|
|
|
|
|
should-end-on-two 2:db815d6d32e6
|
2013-05-01 06:12:49 +04:00
|
|
|
|
|
|
|
|
test clearing only a single divergent bookmark across branches
|
|
|
|
|
|
|
|
|
|
$ hg book foo -r 1
|
|
|
|
|
$ hg book foo@1 -r 0
|
|
|
|
|
$ hg book foo@2 -r 2
|
|
|
|
|
$ hg book foo@3 -r 3
|
|
|
|
|
$ hg book foo -r foo@3
|
|
|
|
|
$ hg book
|
2013-05-02 00:24:21 +04:00
|
|
|
* Z 3:9ba5f110a0b3
|
2013-05-01 06:12:49 +04:00
|
|
|
Z@1 1:925d80f479bb
|
2013-05-02 00:24:21 +04:00
|
|
|
foo 3:9ba5f110a0b3
|
2013-05-01 06:12:49 +04:00
|
|
|
foo@1 0:f7b1eb17ad24
|
|
|
|
|
foo@2 2:db815d6d32e6
|
|
|
|
|
four 3:9ba5f110a0b3
|
|
|
|
|
should-end-on-two 2:db815d6d32e6
|
commands: advance current active bookmark at pull --update correctly
Before this patch, "hg pull --update" doesn't advance current active
bookmark correctly, if pulling itself doesn't advance it, even though
"hg pull" + "hg update" does so.
Existing test for "pull --update works the same as pull && update" in
test-bookmarks.t doesn't examine this case, because pulling itself
advance current active bookmark before actual updating the working
directory in that test case.
To advance current active bookmark at "hg pull --update" correctly,
this patch examines 'movemarkfrom' instead of 'not checkout'.
Even if 'not checkout' at the invocation of postincoming(), 'checkout'
is overwritten by "the revision to update to" value returned by
destutil.destupdate() in such case. Therefore, 'not checkout'
condition means "update destination is revision #0", and isn't
suitable for examining whether active bookmark should be advanced.
Even though examination around "movemarkfrom == repo['.'].node()" may
seem a little redundant just for this issue, this makes it easier to
compare (and unify in the future, maybe) with the same logic to update
bookmark at "hg update" below.
if not ret and movemarkfrom:
if movemarkfrom == repo['.'].node():
pass # no-op update
elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
ui.status(_("updating bookmark %s\n") % repo._activebookmark)
else:
# this can happen with a non-linear update
ui.status(_("(leaving bookmark %s)\n") %
repo._activebookmark)
bookmarks.deactivate(repo)
2016-01-28 14:10:06 +03:00
|
|
|
|
|
|
|
|
pull --update works the same as pull && update (case #2)
|
|
|
|
|
|
|
|
|
|
It is assumed that "hg pull" itself doesn't update current active
|
|
|
|
|
bookmark ('Y' in tests below).
|
|
|
|
|
|
|
|
|
|
$ hg pull -q ../cloned-bookmarks-update
|
|
|
|
|
divergent bookmark Z stored as Z@2
|
|
|
|
|
|
|
|
|
|
(pulling revision on another named branch with --update updates
|
|
|
|
|
neither the working directory nor current active bookmark: "no-op"
|
|
|
|
|
case)
|
|
|
|
|
|
|
|
|
|
$ echo yy >> y
|
|
|
|
|
$ hg commit -m yy
|
|
|
|
|
|
|
|
|
|
$ hg -R ../cloned-bookmarks-update bookmarks | grep ' Y '
|
|
|
|
|
* Y 3:125c9a1d6df6
|
|
|
|
|
$ hg -R ../cloned-bookmarks-update pull . --update
|
|
|
|
|
pulling from .
|
|
|
|
|
searching for changes
|
|
|
|
|
adding changesets
|
|
|
|
|
adding manifests
|
|
|
|
|
adding file changes
|
|
|
|
|
added 1 changesets with 1 changes to 1 files
|
|
|
|
|
divergent bookmark Z stored as Z@default
|
|
|
|
|
adding remote bookmark foo
|
|
|
|
|
adding remote bookmark four
|
|
|
|
|
adding remote bookmark should-end-on-two
|
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
$ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node|short}\n"
|
|
|
|
|
3:125c9a1d6df6
|
|
|
|
|
$ hg -R ../cloned-bookmarks-update bookmarks | grep ' Y '
|
|
|
|
|
* Y 3:125c9a1d6df6
|
|
|
|
|
|
|
|
|
|
(pulling revision on current named/topological branch with --update
|
|
|
|
|
updates the working directory and current active bookmark)
|
|
|
|
|
|
|
|
|
|
$ hg update -C -q 125c9a1d6df6
|
|
|
|
|
$ echo xx >> x
|
|
|
|
|
$ hg commit -m xx
|
|
|
|
|
|
|
|
|
|
$ hg -R ../cloned-bookmarks-update bookmarks | grep ' Y '
|
|
|
|
|
* Y 3:125c9a1d6df6
|
|
|
|
|
$ hg -R ../cloned-bookmarks-update pull . --update
|
|
|
|
|
pulling from .
|
|
|
|
|
searching for changes
|
|
|
|
|
adding changesets
|
|
|
|
|
adding manifests
|
|
|
|
|
adding file changes
|
|
|
|
|
added 1 changesets with 1 changes to 1 files
|
|
|
|
|
divergent bookmark Z stored as Z@default
|
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
updating bookmark Y
|
|
|
|
|
$ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node|short}\n"
|
|
|
|
|
6:81dcce76aa0b
|
|
|
|
|
$ hg -R ../cloned-bookmarks-update bookmarks | grep ' Y '
|
|
|
|
|
* Y 6:81dcce76aa0b
|
transaction: allow running file generators after finalizers
Previously, transaction.close would run the file generators before running the
finalizers (see the list below for what is in each). Since file generators
contain the bookmarks and the dirstate, this meant we made the dirstate and
bookmarks visible to external readers before we actually wrote the commits into
the changelog, which could result in missing bookmarks and missing working copy
parents (especially on servers with high commit throughput, since pulls might
fail to see certain bookmarks in this situation).
By moving the changelog writing to be before the bookmark/dirstate writing, we
ensure the commits are present before they are referenced.
This implementation allows certain file generators to be after the finalizers.
We didn't want to move all of the generators, since it's important that things
like phases actually run before the finalizers (otherwise you could expose
commits as public when they really shouldn't be).
For reference, file generators currently consist of: bookmarks, dirstate, and
phases. Finalizers currently consist of: changelog, revbranchcache, and fncache.
2016-04-08 00:10:49 +03:00
|
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
|
|
ensure changelog is written before bookmarks
|
|
|
|
|
$ hg init orderrepo
|
|
|
|
|
$ cd orderrepo
|
|
|
|
|
$ touch a
|
|
|
|
|
$ hg commit -Aqm one
|
|
|
|
|
$ hg book mybook
|
|
|
|
|
$ echo a > a
|
|
|
|
|
|
|
|
|
|
$ cat > $TESTTMP/pausefinalize.py <<EOF
|
|
|
|
|
> from mercurial import extensions, localrepo
|
|
|
|
|
> import os, time
|
|
|
|
|
> def transaction(orig, self, desc, report=None):
|
|
|
|
|
> tr = orig(self, desc, report)
|
|
|
|
|
> def sleep(*args, **kwargs):
|
|
|
|
|
> retry = 20
|
|
|
|
|
> while retry > 0 and not os.path.exists("$TESTTMP/unpause"):
|
|
|
|
|
> retry -= 1
|
|
|
|
|
> time.sleep(0.5)
|
|
|
|
|
> if os.path.exists("$TESTTMP/unpause"):
|
|
|
|
|
> os.remove("$TESTTMP/unpause")
|
|
|
|
|
> # It is important that this finalizer start with 'a', so it runs before
|
|
|
|
|
> # the changelog finalizer appends to the changelog.
|
|
|
|
|
> tr.addfinalize('a-sleep', sleep)
|
|
|
|
|
> return tr
|
|
|
|
|
>
|
|
|
|
|
> def extsetup(ui):
|
|
|
|
|
> # This extension inserts an artifical pause during the transaction
|
|
|
|
|
> # finalizer, so we can run commands mid-transaction-close.
|
|
|
|
|
> extensions.wrapfunction(localrepo.localrepository, 'transaction',
|
|
|
|
|
> transaction)
|
|
|
|
|
> EOF
|
|
|
|
|
$ hg commit -qm two --config extensions.pausefinalize=$TESTTMP/pausefinalize.py &
|
|
|
|
|
$ sleep 2
|
|
|
|
|
$ hg log -r .
|
|
|
|
|
changeset: 0:867bc5792c8c
|
|
|
|
|
bookmark: mybook
|
|
|
|
|
tag: tip
|
|
|
|
|
user: test
|
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
|
summary: one
|
|
|
|
|
|
|
|
|
|
$ hg bookmarks
|
|
|
|
|
* mybook 0:867bc5792c8c
|
|
|
|
|
$ touch $TESTTMP/unpause
|
|
|
|
|
|
|
|
|
|
$ cd ..
|
