Mercurial: tests/test-bookmarks.t@7160bdd56b84 (annotated)

31051 96eaefd350ae tests: make directory to prevent test process from going out of $TESTTMP FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 30556 diff changeset	1	$ hg init repo
96eaefd350ae tests: make directory to prevent test process from going out of $TESTTMP FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 30556 diff changeset	2	$ cd repo
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	3
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	4	no bookmarks
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	5
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	6	$ hg bookmarks
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	7	no bookmarks set
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	8
22776 564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	9	$ hg bookmarks -Tjson
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	10	[
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	11	]
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	12
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	13	bookmark rev -1
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	14
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	15	$ hg bookmark X
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	16
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	17	list bookmarks
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	18
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	19	$ hg bookmarks
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	20	* X -1:000000000000
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	21
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	22	list bookmarks with color
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	23
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	24	$ hg --config extensions.color= --config color.mode=ansi \
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	25	> bookmarks --color=always
22775 b59c2c8c45df bookmarks: split ui.write() so that it can be easily ported to formatter api Yuya Nishihara <yuya@tcha.org> parents: 22105 diff changeset	26	\x1b[0;32m * \x1b[0m\x1b[0;32mX\x1b[0m\x1b[0;32m -1:000000000000\x1b[0m (esc)
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	27
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	28	$ echo a > a
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	29	$ hg add a
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	30	$ hg commit -m 0
10826 717c35d55fb3 color: colorize based on output labels instead of parsing output Brodie Rao <brodie@bitheap.org> parents: 7261 diff changeset	31
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	32	bookmark X moved to rev 0
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	33
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	34	$ hg bookmarks
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	35	* X 0:f7b1eb17ad24
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	36
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	37	look up bookmark
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	38
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	39	$ hg log -r X
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	40	changeset: 0:f7b1eb17ad24
13386 f78bc5ddbe4f templater: add bookmarks to templates and default output David Soria Parra <dsp@php.net> parents: 13385 diff changeset	41	bookmark: X
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	42	tag: tip
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	43	user: test
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	44	date: Thu Jan 01 00:00:00 1970 +0000
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	45	summary: 0
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	46
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	47
18075 2c1fc483efa4 commands: 'hg bookmark NAME' should work even with ui.strict=True Kevin Bullock <kbullock@ringworld.org> parents: 17882 diff changeset	48	second bookmark for rev 0, command should work even with ui.strict on
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	49
18075 2c1fc483efa4 commands: 'hg bookmark NAME' should work even with ui.strict=True Kevin Bullock <kbullock@ringworld.org> parents: 17882 diff changeset	50	$ hg --config ui.strict=1 bookmark X2
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	51
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	52	bookmark rev -1 again
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	53
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	54	$ hg bookmark -r null Y
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	55
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	56	list bookmarks
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	57
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	58	$ hg bookmarks
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	59	X 0:f7b1eb17ad24
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	60	* X2 0:f7b1eb17ad24
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	61	Y -1:000000000000
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	62
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	63	$ echo b > b
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	64	$ hg add b
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	65	$ hg commit -m 1
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	66
22776 564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	67	$ hg bookmarks -Tjson
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	68	[
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	69	{
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	70	"active": false,
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	71	"bookmark": "X",
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	72	"node": "f7b1eb17ad24730a1651fccd46c43826d1bbc2ac",
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	73	"rev": 0
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	74	},
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	75	{
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	76	"active": true,
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	77	"bookmark": "X2",
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	78	"node": "925d80f479bb026b0fb3deb27503780b13f74123",
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	79	"rev": 1
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	80	},
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	81	{
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	82	"active": false,
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	83	"bookmark": "Y",
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	84	"node": "0000000000000000000000000000000000000000",
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	85	"rev": -1
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	86	}
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	87	]
564ae7d2ec9b bookmarks: port to generic templater Yuya Nishihara <yuya@tcha.org> parents: 22775 diff changeset	88
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	89	bookmarks revset
f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	90
f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	91	$ hg log -r 'bookmark()'
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	92	changeset: 0:f7b1eb17ad24
13386 f78bc5ddbe4f templater: add bookmarks to templates and default output David Soria Parra <dsp@php.net> parents: 13385 diff changeset	93	bookmark: X
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	94	user: test
f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	95	date: Thu Jan 01 00:00:00 1970 +0000
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	96	summary: 0
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	97
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	98	changeset: 1:925d80f479bb
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	99	bookmark: X2
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	100	tag: tip
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	101	user: test
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	102	date: Thu Jan 01 00:00:00 1970 +0000
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	103	summary: 1
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	104
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	105	$ hg log -r 'bookmark(Y)'
f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	106	$ hg log -r 'bookmark(X2)'
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	107	changeset: 1:925d80f479bb
13386 f78bc5ddbe4f templater: add bookmarks to templates and default output David Soria Parra <dsp@php.net> parents: 13385 diff changeset	108	bookmark: X2
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	109	tag: tip
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	110	user: test
f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	111	date: Thu Jan 01 00:00:00 1970 +0000
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	112	summary: 1
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	113
16822 da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	114	$ hg log -r 'bookmark("re:X")'
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	115	changeset: 0:f7b1eb17ad24
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	116	bookmark: X
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	117	user: test
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	118	date: Thu Jan 01 00:00:00 1970 +0000
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	119	summary: 0
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	120
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	121	changeset: 1:925d80f479bb
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	122	bookmark: X2
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	123	tag: tip
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	124	user: test
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	125	date: Thu Jan 01 00:00:00 1970 +0000
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	126	summary: 1
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16573 diff changeset	127
22105 3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	128	$ hg log -r 'bookmark("literal:X")'
3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	129	changeset: 0:f7b1eb17ad24
3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	130	bookmark: X
3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	131	user: test
3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	132	date: Thu Jan 01 00:00:00 1970 +0000
3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	133	summary: 0
3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	134
3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 22091 diff changeset	135
13925 c315ffc13a25 tests: add tests for non-existant branch/tag/bookmark Idan Kamara <idankk86@gmail.com> parents: 13911 diff changeset	136	$ hg log -r 'bookmark(unknown)'
23978 eeb5d5ab14a6 revset: raise RepoLookupError to make present() predicate continue the query FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22776 diff changeset	137	abort: bookmark 'unknown' does not exist!
13925 c315ffc13a25 tests: add tests for non-existant branch/tag/bookmark Idan Kamara <idankk86@gmail.com> parents: 13911 diff changeset	138	[255]
26538 5c9ec1cc671a revset: strip off "literal:" prefix from bookmark not found error Yuya Nishihara <yuya@tcha.org> parents: 26286 diff changeset	139	$ hg log -r 'bookmark("literal:unknown")'
5c9ec1cc671a revset: strip off "literal:" prefix from bookmark not found error Yuya Nishihara <yuya@tcha.org> parents: 26286 diff changeset	140	abort: bookmark 'unknown' does not exist!
5c9ec1cc671a revset: strip off "literal:" prefix from bookmark not found error Yuya Nishihara <yuya@tcha.org> parents: 26286 diff changeset	141	[255]
23978 eeb5d5ab14a6 revset: raise RepoLookupError to make present() predicate continue the query FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22776 diff changeset	142	$ hg log -r 'bookmark("re:unknown")'
eeb5d5ab14a6 revset: raise RepoLookupError to make present() predicate continue the query FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22776 diff changeset	143	abort: no bookmarks exist that match 'unknown'!
eeb5d5ab14a6 revset: raise RepoLookupError to make present() predicate continue the query FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22776 diff changeset	144	[255]
eeb5d5ab14a6 revset: raise RepoLookupError to make present() predicate continue the query FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22776 diff changeset	145	$ hg log -r 'present(bookmark("literal:unknown"))'
eeb5d5ab14a6 revset: raise RepoLookupError to make present() predicate continue the query FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22776 diff changeset	146	$ hg log -r 'present(bookmark("re:unknown"))'
13925 c315ffc13a25 tests: add tests for non-existant branch/tag/bookmark Idan Kamara <idankk86@gmail.com> parents: 13911 diff changeset	147
12822 f13acb96b2a7 Fix and unify transplant and bookmarks revsets doc registration Patrick Mezard <pmezard@gmail.com> parents: 12714 diff changeset	148	$ hg help revsets \| grep 'bookmark('
f13acb96b2a7 Fix and unify transplant and bookmarks revsets doc registration Patrick Mezard <pmezard@gmail.com> parents: 12714 diff changeset	149	"bookmark([name])"
12714 f5178fbcd197 bookmarks: add revset for referencing bookmarks Augie Fackler <durin42@gmail.com> parents: 12346 diff changeset	150
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	151	bookmarks X and X2 moved to rev 1, Y at rev -1
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	152
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	153	$ hg bookmarks
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	154	X 0:f7b1eb17ad24
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	155	* X2 1:925d80f479bb
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	156	Y -1:000000000000
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	157
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	158	bookmark rev 0 again
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	159
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	160	$ hg bookmark -r 0 Z
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	161
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	162	$ hg update X
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	163	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
21503 10f15e34d86c update: show message when a bookmark is activated by update Stephen Lee <sphen.lee@gmail.com> parents: 21404 diff changeset	164	(activating bookmark X)
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	165	$ echo c > c
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	166	$ hg add c
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	167	$ hg commit -m 2
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	168	created new head
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	169
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	170	bookmarks X moved to rev 2, Y at rev -1, Z at rev 0
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	171
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	172	$ hg bookmarks
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	173	* X 2:db815d6d32e6
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	174	X2 1:925d80f479bb
13388 a184dbd9b2c5 localrepo: sort hg bookmark output David Soria Parra <dsp@php.net> parents: 13386 diff changeset	175	Y -1:000000000000
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	176	Z 0:f7b1eb17ad24
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	177
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	178	rename nonexistent bookmark
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	179
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	180	$ hg bookmark -m A B
13911 6bc340940c18 bookmarks: change error messages to match those given by 'hg tag' commands Idan Kamara <idankk86@gmail.com> parents: 13663 diff changeset	181	abort: bookmark 'A' does not exist
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	182	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	183
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	184	rename to existent bookmark
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	185
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	186	$ hg bookmark -m X Y
13911 6bc340940c18 bookmarks: change error messages to match those given by 'hg tag' commands Idan Kamara <idankk86@gmail.com> parents: 13663 diff changeset	187	abort: bookmark 'Y' already exists (use -f to force)
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	188	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	189
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	190	force rename to existent bookmark
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	191
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	192	$ hg bookmark -f -m X Y
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	193
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	194	list bookmarks
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	195
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	196	$ hg bookmark
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	197	X2 1:925d80f479bb
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	198	* Y 2:db815d6d32e6
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	199	Z 0:f7b1eb17ad24
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	200
17686 6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	201	bookmarks from a revset
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	202	$ hg bookmark -r '.^1' REVSET
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	203	$ hg bookmark -r ':tip' TIP
19112 23f785b38af3 bookmarks: fix bug that activated a bookmark even with -r passed Sean Farley <sean.michael.farley@gmail.com> parents: 19111 diff changeset	204	$ hg up -q TIP
17686 6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	205	$ hg bookmarks
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	206	REVSET 0:f7b1eb17ad24
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	207	* TIP 2:db815d6d32e6
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	208	X2 1:925d80f479bb
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	209	Y 2:db815d6d32e6
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	210	Z 0:f7b1eb17ad24
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	211
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	212	$ hg bookmark -d REVSET
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	213	$ hg bookmark -d TIP
6e4b962600a3 bookmarks: teach the -r option to use revsets David Soria Parra <dsp@php.net> parents: 17264 diff changeset	214
19147 5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	215	rename without new name or multiple names
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	216
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	217	$ hg bookmark -m Y
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	218	abort: new bookmark name required
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	219	[255]
19147 5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	220	$ hg bookmark -m Y Y2 Y3
5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	221	abort: only one new bookmark name allowed
5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	222	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	223
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	224	delete without name
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	225
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	226	$ hg bookmark -d
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	227	abort: bookmark name required
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	228	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	229
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	230	delete nonexistent bookmark
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	231
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	232	$ hg bookmark -d A
13911 6bc340940c18 bookmarks: change error messages to match those given by 'hg tag' commands Idan Kamara <idankk86@gmail.com> parents: 13663 diff changeset	233	abort: bookmark 'A' does not exist
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	234	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	235
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	236	bookmark name with spaces should be stripped
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	237
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	238	$ hg bookmark ' x y '
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	239
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	240	list bookmarks
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	241
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	242	$ hg bookmarks
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	243	X2 1:925d80f479bb
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	244	Y 2:db815d6d32e6
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	245	Z 0:f7b1eb17ad24
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	246	* x y 2:db815d6d32e6
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	247
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	248	look up stripped bookmark name
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	249
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	250	$ hg log -r '"x y"'
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	251	changeset: 2:db815d6d32e6
13386 f78bc5ddbe4f templater: add bookmarks to templates and default output David Soria Parra <dsp@php.net> parents: 13385 diff changeset	252	bookmark: Y
f78bc5ddbe4f templater: add bookmarks to templates and default output David Soria Parra <dsp@php.net> parents: 13385 diff changeset	253	bookmark: x y
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	254	tag: tip
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	255	parent: 0:f7b1eb17ad24
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	256	user: test
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	257	date: Thu Jan 01 00:00:00 1970 +0000
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	258	summary: 2
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	259
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	260
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	261	reject bookmark name with newline
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	262
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	263	$ hg bookmark '
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	264	> '
17814 f88ca484c3e9 bookmarks: remove redundant check for newline Kevin Bullock <kbullock@ringworld.org> parents: 17790 diff changeset	265	abort: bookmark names cannot consist entirely of whitespace
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	266	[255]
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	267
17789 4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	268	$ hg bookmark -m Z '
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	269	> '
17814 f88ca484c3e9 bookmarks: remove redundant check for newline Kevin Bullock <kbullock@ringworld.org> parents: 17790 diff changeset	270	abort: bookmark names cannot consist entirely of whitespace
17789 4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	271	[255]
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	272
17816 19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	273	bookmark with reserved name
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	274
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	275	$ hg bookmark tip
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	276	abort: the name 'tip' is reserved
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	277	[255]
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	278
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	279	$ hg bookmark .
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	280	abort: the name '.' is reserved
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	281	[255]
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	282
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	283	$ hg bookmark null
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	284	abort: the name 'null' is reserved
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	285	[255]
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	286
19388ba75a06 bookmarks: disallow bookmarks named 'tip', '.', or 'null' Kevin Bullock <kbullock@ringworld.org> parents: 17814 diff changeset	287
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	288	bookmark with existing name
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	289
18773 56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	290	$ hg bookmark X2
56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	291	abort: bookmark 'X2' already exists (use -f to force)
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	292	[255]
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	293
17789 4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	294	$ hg bookmark -m Y Z
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	295	abort: bookmark 'Z' already exists (use -f to force)
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	296	[255]
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	297
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	298	bookmark with name of branch
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	299
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	300	$ hg bookmark default
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	301	abort: a bookmark cannot have the name of an existing branch
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	302	[255]
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	303
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	304	$ hg bookmark -m Y default
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	305	abort: a bookmark cannot have the name of an existing branch
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	306	[255]
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	307
18566 341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18471 diff changeset	308	bookmark with integer name
341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18471 diff changeset	309
341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18471 diff changeset	310	$ hg bookmark 10
19070 290a61833b99 translations: change label integer error to not specify the kind of label Durham Goode <durham@fb.com> parents: 18782 diff changeset	311	abort: cannot use an integer as a name
18566 341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18471 diff changeset	312	[255]
341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18471 diff changeset	313
17790 0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	314	incompatible options
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	315
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	316	$ hg bookmark -m Y -d Z
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	317	abort: --delete and --rename are incompatible
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	318	[255]
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	319
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	320	$ hg bookmark -r 1 -d Z
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	321	abort: --rev is incompatible with --delete
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	322	[255]
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	323
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	324	$ hg bookmark -r 1 -m Z Y
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	325	abort: --rev is incompatible with --rename
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	326	[255]
0291e122fb05 bookmarks: abort when incompatible options are used (issue3663) David Soria Parra <dsp@php.net> parents: 17789 diff changeset	327
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	328	force bookmark with existing name
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	329
18773 56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	330	$ hg bookmark -f X2
18782 22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	331
22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	332	force bookmark back to where it was, should deactivate it
22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	333
18773 56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	334	$ hg bookmark -fr1 X2
18782 22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	335	$ hg bookmarks
22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	336	X2 1:925d80f479bb
22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	337	Y 2:db815d6d32e6
22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	338	Z 0:f7b1eb17ad24
22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	339	x y 2:db815d6d32e6
18773 56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	340
56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	341	forward bookmark to descendant without --force
56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	342
56dd55da2f7d bookmarks: allow moving a bookmark forward to a descendant Kevin Bullock <kbullock@ringworld.org> parents: 18623 diff changeset	343	$ hg bookmark Z
18774 b616c9b8001d bookmarks: fix test broken by 0bba1ff2ac7b Kevin Bullock <kbullock@ringworld.org> parents: 18773 diff changeset	344	moving bookmark 'Z' forward from f7b1eb17ad24
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	345
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	346	list bookmarks
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	347
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	348	$ hg bookmark
13448 97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate David Soria Parra <dsp@php.net> parents: 13425 diff changeset	349	X2 1:925d80f479bb
13416 5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	350	Y 2:db815d6d32e6
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	351	* Z 2:db815d6d32e6
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC) David Soria Parra <dsp@php.net> parents: 13388 diff changeset	352	x y 2:db815d6d32e6
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	353
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	354	revision but no bookmark name
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	355
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	356	$ hg bookmark -r .
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	357	abort: bookmark name required
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	358	[255]
7261 4ba89b6d0e05 bookmarks: Add tests Joel Rosdahl <joel@rosdahl.net> parents: diff changeset	359
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	360	bookmark name with whitespace only
11704 18c47562d331 bookmarks: don't allow name to contain whitespaces only Idan Kamara <idankk86@gmail.com> parents: 11282 diff changeset	361
11861 41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	362	$ hg bookmark ' '
41d481ddd976 tests: unify test-bookmarks Martin Geisler <mg@lazybytes.net> parents: 11704 diff changeset	363	abort: bookmark names cannot consist entirely of whitespace
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11861 diff changeset	364	[255]
13425 0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC) David Soria Parra <dsp@php.net> parents: 13416 diff changeset	365
17789 4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	366	$ hg bookmark -m Y ' '
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	367	abort: bookmark names cannot consist entirely of whitespace
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	368	[255]
4cfd02c2df9a bookmarks: check bookmark format during rename (issue3662) David Soria Parra <dsp@php.net> parents: 17704 diff changeset	369
13425 0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC) David Soria Parra <dsp@php.net> parents: 13416 diff changeset	370	invalid bookmark
0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC) David Soria Parra <dsp@php.net> parents: 13416 diff changeset	371
0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC) David Soria Parra <dsp@php.net> parents: 13416 diff changeset	372	$ hg bookmark 'foo:bar'
17850 71c1513fd560 scmutil: generalize message to make it more i18n-friendly Wagner Bruna <wbruna@yahoo.com> parents: 17821 diff changeset	373	abort: ':' cannot be used in a name
17821 361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 17816 diff changeset	374	[255]
361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 17816 diff changeset	375
361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 17816 diff changeset	376	$ hg bookmark 'foo
361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 17816 diff changeset	377	> bar'
17850 71c1513fd560 scmutil: generalize message to make it more i18n-friendly Wagner Bruna <wbruna@yahoo.com> parents: 17821 diff changeset	378	abort: '\n' cannot be used in a name
13425 0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC) David Soria Parra <dsp@php.net> parents: 13416 diff changeset	379	[255]
0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC) David Soria Parra <dsp@php.net> parents: 13416 diff changeset	380
13474 6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	381	the bookmark extension should be ignored now that it is part of core
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	382
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	383	$ echo "[extensions]" >> $HGRCPATH
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	384	$ echo "bookmarks=" >> $HGRCPATH
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	385	$ hg bookmarks
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	386	X2 1:925d80f479bb
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	387	Y 2:db815d6d32e6
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	388	* Z 2:db815d6d32e6
6c2e476b7a11 tests: check if the bookmarks extension is ignored David Soria Parra <dsp@php.net> parents: 13469 diff changeset	389	x y 2:db815d6d32e6
14266 89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	390
13454 afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	391	test summary
afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	392
afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	393	$ hg summary
14906 7c3c8f37e84f summary: show bookmarks separate from tags and note active mark (issue2892) Augie Fackler <durin42@gmail.com> parents: 14846 diff changeset	394	parent: 2:db815d6d32e6 tip
13454 afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	395	2
afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	396	branch: default
14906 7c3c8f37e84f summary: show bookmarks separate from tags and note active mark (issue2892) Augie Fackler <durin42@gmail.com> parents: 14846 diff changeset	397	bookmarks: *Z Y x y
13454 afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	398	commit: (clean)
afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	399	update: 1 new changesets, 2 branch heads (merge)
25382 6084926366b9 summary: move the parents phase marker to commit line (issue4688) Gilles Moris <gilles.moris@free.fr> parents: 25349 diff changeset	400	phases: 3 draft
13454 afc84a879ac8 summary: add bookmarks to summary David Soria Parra <dsp@php.net> parents: 13448 diff changeset	401
13477 0fb2ff949790 id: add bookmarks to id Kevin Bullock <kbullock@ringworld.org> parents: 13474 diff changeset	402	test id
0fb2ff949790 id: add bookmarks to id Kevin Bullock <kbullock@ringworld.org> parents: 13474 diff changeset	403
0fb2ff949790 id: add bookmarks to id Kevin Bullock <kbullock@ringworld.org> parents: 13474 diff changeset	404	$ hg id
0fb2ff949790 id: add bookmarks to id Kevin Bullock <kbullock@ringworld.org> parents: 13474 diff changeset	405	db815d6d32e6 tip Y/Z/x y
14266 89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	406
89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	407	test rollback
89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	408
14268 a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	409	$ echo foo > f1
25744 e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	410	$ hg bookmark tmp-rollback
14268 a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	411	$ hg ci -Amr
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	412	adding f1
25744 e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	413	$ hg bookmarks
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	414	X2 1:925d80f479bb
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	415	Y 2:db815d6d32e6
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	416	Z 2:db815d6d32e6
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	417	* tmp-rollback 3:2bf5cfec5864
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	418	x y 2:db815d6d32e6
14266 89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	419	$ hg rollback
14268 a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	420	repository tip rolled back to revision 2 (undo commit)
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	421	working directory now based on revision 2
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	422	$ hg bookmarks
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	423	X2 1:925d80f479bb
a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	424	Y 2:db815d6d32e6
18782 22f87dc77604 bookmarks: moving the active bookmark deactivates it Kevin Bullock <kbullock@ringworld.org> parents: 18781 diff changeset	425	Z 2:db815d6d32e6
25744 e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	426	* tmp-rollback 2:db815d6d32e6
14268 a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	427	x y 2:db815d6d32e6
25744 e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	428	$ hg bookmark -f Z -r 1
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	429	$ hg rollback
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	430	repository tip rolled back to revision 2 (undo bookmark)
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	431	$ hg bookmarks
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	432	X2 1:925d80f479bb
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	433	Y 2:db815d6d32e6
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	434	Z 2:db815d6d32e6
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	435	* tmp-rollback 2:db815d6d32e6
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	436	x y 2:db815d6d32e6
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25382 diff changeset	437	$ hg bookmark -d tmp-rollback
14268 a55a0045704c merge with stable Matt Mackall <mpm@selenic.com> parents: 13925 14266 diff changeset	438
18781 99b78269a2ec bookmarks: allow (re-)activating a bookmark on the current changeset Kevin Bullock <kbullock@ringworld.org> parents: 18774 diff changeset	439	activate bookmark on working dir parent without --force
99b78269a2ec bookmarks: allow (re-)activating a bookmark on the current changeset Kevin Bullock <kbullock@ringworld.org> parents: 18774 diff changeset	440
99b78269a2ec bookmarks: allow (re-)activating a bookmark on the current changeset Kevin Bullock <kbullock@ringworld.org> parents: 18774 diff changeset	441	$ hg bookmark --inactive Z
99b78269a2ec bookmarks: allow (re-)activating a bookmark on the current changeset Kevin Bullock <kbullock@ringworld.org> parents: 18774 diff changeset	442	$ hg bookmark Z
99b78269a2ec bookmarks: allow (re-)activating a bookmark on the current changeset Kevin Bullock <kbullock@ringworld.org> parents: 18774 diff changeset	443
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	444	test clone
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	445
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	446	$ hg bookmark -r 2 -i @
6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	447	$ hg bookmark -r 2 -i a@
14266 89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	448	$ hg bookmarks
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	449	@ 2:db815d6d32e6
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	450	X2 1:925d80f479bb
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	451	Y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	452	* Z 2:db815d6d32e6
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	453	a@ 2:db815d6d32e6
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	454	x y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	455	$ hg clone . cloned-bookmarks
17882 36ed69d4593d clone: show status "updating to bookmark @" Adrian Buehlmann <adrian@cadifra.com> parents: 17872 diff changeset	456	updating to bookmark @
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	457	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	458	$ hg -R cloned-bookmarks bookmarks
17870 7d2dd10ce9ea clone: activate @ bookmark if updating to it Thomas Arendsen Hein <thomas@intevation.de> parents: 17868 diff changeset	459	* @ 2:db815d6d32e6
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	460	X2 1:925d80f479bb
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	461	Y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	462	Z 2:db815d6d32e6
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	463	a@ 2:db815d6d32e6
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	464	x y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	465
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	466	test clone with pull protocol
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	467
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	468	$ hg clone --pull . cloned-bookmarks-pull
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	469	requesting all changes
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	470	adding changesets
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	471	adding manifests
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	472	adding file changes
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	473	added 3 changesets with 3 changes to 3 files (+1 heads)
17882 36ed69d4593d clone: show status "updating to bookmark @" Adrian Buehlmann <adrian@cadifra.com> parents: 17872 diff changeset	474	updating to bookmark @
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	475	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	476	$ hg -R cloned-bookmarks-pull bookmarks
17870 7d2dd10ce9ea clone: activate @ bookmark if updating to it Thomas Arendsen Hein <thomas@intevation.de> parents: 17868 diff changeset	477	* @ 2:db815d6d32e6
14266 89e7d35e0ef0 fix bookmarks rollback behavior Alexander Solovyov <alexander@solovyov.net> parents: 13477 diff changeset	478	X2 1:925d80f479bb
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	479	Y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	480	Z 2:db815d6d32e6
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	481	a@ 2:db815d6d32e6
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	482	x y 2:db815d6d32e6
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	483
19147 5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	484	delete multiple bookmarks at once
5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	485
5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	486	$ hg bookmark -d @ a@
16276 6b16ded5c810 bookmarks: clone non-divergent bookmarks with @ in them Kevin Bullock <kbullock@ringworld.org> parents: 15615 diff changeset	487
17868 04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	488	test clone with a bookmark named "default" (issue3677)
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	489
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	490	$ hg bookmark -r 1 -f -i default
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	491	$ hg clone . cloned-bookmark-default
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	492	updating to branch default
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	493	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	494	$ hg -R cloned-bookmark-default bookmarks
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	495	X2 1:925d80f479bb
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	496	Y 2:db815d6d32e6
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	497	Z 2:db815d6d32e6
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	498	default 1:925d80f479bb
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	499	x y 2:db815d6d32e6
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	500	$ hg -R cloned-bookmark-default parents -q
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	501	2:db815d6d32e6
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	502	$ hg bookmark -d default
04755508f8ed test-bookmarks.t: check that bookmark "default" is not automatically checked out Thomas Arendsen Hein <thomas@intevation.de> parents: 17850 diff changeset	503
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	504	test clone with a specific revision
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	505
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	506	$ hg clone -r 925d80 . cloned-bookmarks-rev
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	507	adding changesets
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	508	adding manifests
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	509	adding file changes
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	510	added 2 changesets with 2 changes to 2 files
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	511	updating to branch default
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	512	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	513	$ hg -R cloned-bookmarks-rev bookmarks
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13477 diff changeset	514	X2 1:925d80f479bb
13663 d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	515
17703 4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	516	test clone with update to a bookmark
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	517
25893 04ae6feb04c5 test-bookmarks.t: avoid nested repo Siddharth Agarwal <sid0@fb.com> parents: 25789 diff changeset	518	$ hg clone -u Z . ../cloned-bookmarks-update
17703 4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	519	updating to branch default
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	520	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
25893 04ae6feb04c5 test-bookmarks.t: avoid nested repo Siddharth Agarwal <sid0@fb.com> parents: 25789 diff changeset	521	$ hg -R ../cloned-bookmarks-update bookmarks
17703 4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	522	X2 1:925d80f479bb
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	523	Y 2:db815d6d32e6
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	524	* Z 2:db815d6d32e6
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	525	x y 2:db815d6d32e6
4a07d2ff7c66 clone: activate bookmark specified with --updaterev Thomas Arendsen Hein <thomas@intevation.de> parents: 17264 diff changeset	526
13663 d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	527	create bundle with two heads
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	528
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	529	$ hg clone . tobundle
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	530	updating to branch default
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	531	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	532	$ echo x > tobundle/x
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	533	$ hg -R tobundle add tobundle/x
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	534	$ hg -R tobundle commit -m'x'
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	535	$ hg -R tobundle update -r -2
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	536	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	537	$ echo y > tobundle/y
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	538	$ hg -R tobundle branch test
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	539	marked working directory as branch test
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14906 diff changeset	540	(branches are permanent and global, did you want a bookmark?)
13663 d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	541	$ hg -R tobundle add tobundle/y
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	542	$ hg -R tobundle commit -m'y'
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	543	$ hg -R tobundle bundle tobundle.hg
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	544	searching for changes
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	545	2 changesets found
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	546	$ hg unbundle tobundle.hg
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	547	adding changesets
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	548	adding manifests
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	549	adding file changes
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	550	added 2 changesets with 2 changes to 2 files (+1 heads)
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	551	(run 'hg heads' to see heads, 'hg merge' to merge)
18471 2096e025a728 update: update to current bookmark if it moved out from under us (issue3682) Kevin Bullock <kbullock@ringworld.org> parents: 18075 diff changeset	552
25349 62da2d7745f9 commands: rename current to active in variables and comments Ryan McElroy <rmcelroy@fb.com> parents: 25111 diff changeset	553	update to active bookmark if it's not the parent
18471 2096e025a728 update: update to current bookmark if it moved out from under us (issue3682) Kevin Bullock <kbullock@ringworld.org> parents: 18075 diff changeset	554
18620 7da487b0256a summary: test that current bookmark isn't shown Kevin Bullock <kbullock@ringworld.org> parents: 18566 diff changeset	555	$ hg summary
7da487b0256a summary: test that current bookmark isn't shown Kevin Bullock <kbullock@ringworld.org> parents: 18566 diff changeset	556	parent: 2:db815d6d32e6
7da487b0256a summary: test that current bookmark isn't shown Kevin Bullock <kbullock@ringworld.org> parents: 18566 diff changeset	557	2
7da487b0256a summary: test that current bookmark isn't shown Kevin Bullock <kbullock@ringworld.org> parents: 18566 diff changeset	558	branch: default
22091 f72b71ba756b unbundle: don't advance bookmarks (issue4322) (BC) Matt Mackall <mpm@selenic.com> parents: 21503 diff changeset	559	bookmarks: *Z Y x y
18620 7da487b0256a summary: test that current bookmark isn't shown Kevin Bullock <kbullock@ringworld.org> parents: 18566 diff changeset	560	commit: 1 added, 1 unknown (new branch head)
7da487b0256a summary: test that current bookmark isn't shown Kevin Bullock <kbullock@ringworld.org> parents: 18566 diff changeset	561	update: 2 new changesets (update)
25382 6084926366b9 summary: move the parents phase marker to commit line (issue4688) Gilles Moris <gilles.moris@free.fr> parents: 25349 diff changeset	562	phases: 5 draft
13663 d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	563	$ hg update
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	564	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
22091 f72b71ba756b unbundle: don't advance bookmarks (issue4322) (BC) Matt Mackall <mpm@selenic.com> parents: 21503 diff changeset	565	updating bookmark Z
13663 d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	566	$ hg bookmarks
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	567	X2 1:925d80f479bb
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	568	Y 2:db815d6d32e6
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	569	* Z 3:125c9a1d6df6
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	570	x y 2:db815d6d32e6
d16c99f16f00 bundle: update current bookmark to most recent revision on current branch David Soria Parra <dsp@php.net> parents: 13604 diff changeset	571
19523 f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	572	pull --update works the same as pull && update
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	573
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	574	$ hg bookmark -r3 Y
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	575	moving bookmark 'Y' forward from db815d6d32e6
30556 c059286a0f9c tests: replace "cp -r" with "cp -R" Jun Wu <quark@fb.com> parents: 30332 diff changeset	576	$ cp -R ../cloned-bookmarks-update ../cloned-bookmarks-manual-update
c059286a0f9c tests: replace "cp -r" with "cp -R" Jun Wu <quark@fb.com> parents: 30332 diff changeset	577	$ cp -R ../cloned-bookmarks-update ../cloned-bookmarks-manual-update-with-divergence
26285 91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	578
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	579	(manual version)
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	580
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	581	$ hg -R ../cloned-bookmarks-manual-update update Y
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	582	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	583	(activating bookmark Y)
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	584	$ hg -R ../cloned-bookmarks-manual-update pull .
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	585	pulling from .
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	586	searching for changes
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	587	adding changesets
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	588	adding manifests
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	589	adding file changes
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	590	added 2 changesets with 2 changes to 2 files (+1 heads)
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	591	updating bookmark Y
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	592	updating bookmark Z
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	593	(run 'hg heads' to see heads, 'hg merge' to merge)
26286 4b685712fa45 bookmark: do not crash when active bookmark is forward and --date is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 26285 diff changeset	594
4b685712fa45 bookmark: do not crash when active bookmark is forward and --date is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 26285 diff changeset	595	(# tests strange but with --date crashing when bookmark have to move)
4b685712fa45 bookmark: do not crash when active bookmark is forward and --date is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 26285 diff changeset	596
4b685712fa45 bookmark: do not crash when active bookmark is forward and --date is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 26285 diff changeset	597	$ hg -R ../cloned-bookmarks-manual-update update -d 1986
4b685712fa45 bookmark: do not crash when active bookmark is forward and --date is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 26285 diff changeset	598	abort: revision matching date not found
4b685712fa45 bookmark: do not crash when active bookmark is forward and --date is used Pierre-Yves David <pierre-yves.david@fb.com> parents: 26285 diff changeset	599	[255]
26285 91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	600	$ hg -R ../cloned-bookmarks-manual-update update
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	601	updating to active bookmark Y
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	602	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	603
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	604	(all in one version)
91cad8eb7951 bookmark: actually test update behavior in both cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 25893 diff changeset	605
25893 04ae6feb04c5 test-bookmarks.t: avoid nested repo Siddharth Agarwal <sid0@fb.com> parents: 25789 diff changeset	606	$ hg -R ../cloned-bookmarks-update update Y
19523 f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	607	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
21503 10f15e34d86c update: show message when a bookmark is activated by update Stephen Lee <sphen.lee@gmail.com> parents: 21404 diff changeset	608	(activating bookmark Y)
25893 04ae6feb04c5 test-bookmarks.t: avoid nested repo Siddharth Agarwal <sid0@fb.com> parents: 25789 diff changeset	609	$ hg -R ../cloned-bookmarks-update pull --update .
19523 f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	610	pulling from .
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	611	searching for changes
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	612	adding changesets
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	613	adding manifests
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	614	adding file changes
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	615	added 2 changesets with 2 changes to 2 files (+1 heads)
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	616	updating bookmark Y
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	617	updating bookmark Z
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	618	updating to active bookmark Y
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	619	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	620
28029 72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	621	We warn about divergent during bare update to the active bookmark
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	622
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	623	$ hg -R ../cloned-bookmarks-manual-update-with-divergence update Y
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	624	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	625	(activating bookmark Y)
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	626	$ hg -R ../cloned-bookmarks-manual-update-with-divergence bookmarks -r X2 Y@1
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	627	$ hg -R ../cloned-bookmarks-manual-update-with-divergence bookmarks
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	628	X2 1:925d80f479bb
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	629	* Y 2:db815d6d32e6
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	630	Y@1 1:925d80f479bb
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	631	Z 2:db815d6d32e6
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	632	x y 2:db815d6d32e6
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	633	$ hg -R ../cloned-bookmarks-manual-update-with-divergence pull
31051 96eaefd350ae tests: make directory to prevent test process from going out of $TESTTMP FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 30556 diff changeset	634	pulling from $TESTTMP/repo (glob)
28029 72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	635	searching for changes
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	636	adding changesets
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	637	adding manifests
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	638	adding file changes
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	639	added 2 changesets with 2 changes to 2 files (+1 heads)
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	640	updating bookmark Y
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	641	updating bookmark Z
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	642	(run 'hg heads' to see heads, 'hg merge' to merge)
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	643	$ hg -R ../cloned-bookmarks-manual-update-with-divergence update
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	644	updating to active bookmark Y
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	645	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	646	1 other divergent bookmarks for "Y"
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27948 diff changeset	647
14845 677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	648	test wrongly formated bookmark
677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	649
677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	650	$ echo '' >> .hg/bookmarks
677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	651	$ hg bookmarks
677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	652	X2 1:925d80f479bb
19523 f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	653	Y 3:125c9a1d6df6
14845 677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	654	* Z 3:125c9a1d6df6
677339529a53 bookmarks: more robust parsing of bookmarks file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14268 diff changeset	655	x y 2:db815d6d32e6
14846 5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	656	$ echo "Ican'thasformatedlines" >> .hg/bookmarks
5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	657	$ hg bookmarks
5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	658	malformed line in .hg/bookmarks: "Ican'thasformatedlines"
5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	659	X2 1:925d80f479bb
19523 f37b5a17e6a0 bookmarks: pull --update updates to active bookmark if it moved (issue4007) Kevin Bullock <kbullock@ringworld.org> parents: 19147 diff changeset	660	Y 3:125c9a1d6df6
14846 5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	661	* Z 3:125c9a1d6df6
5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	662	x y 2:db815d6d32e6
5097d8b5078c bookmarks: add a warning for non empty malformed line Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14845 diff changeset	663
16573 5983de86462c bookmarks: catch the proper exception for missing revisions Matt Mackall <mpm@selenic.com> parents: 16276 diff changeset	664	test missing revisions
5983de86462c bookmarks: catch the proper exception for missing revisions Matt Mackall <mpm@selenic.com> parents: 16276 diff changeset	665
5983de86462c bookmarks: catch the proper exception for missing revisions Matt Mackall <mpm@selenic.com> parents: 16276 diff changeset	666	$ echo "925d80f479bc z" > .hg/bookmarks
5983de86462c bookmarks: catch the proper exception for missing revisions Matt Mackall <mpm@selenic.com> parents: 16276 diff changeset	667	$ hg book
5983de86462c bookmarks: catch the proper exception for missing revisions Matt Mackall <mpm@selenic.com> parents: 16276 diff changeset	668	no bookmarks set
17264 ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	669
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	670	test stripping a non-checked-out but bookmarked revision
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	671
20117 aa9385f983fa tests: don't load unnecessary graphlog extension Martin Geisler <martin@geisler.net> parents: 19523 diff changeset	672	$ hg log --graph
17264 ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	673	o changeset: 4:9ba5f110a0b3
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	674	\| branch: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	675	\| tag: tip
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	676	\| parent: 2:db815d6d32e6
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	677	\| user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	678	\| date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	679	\| summary: y
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	680	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	681	\| @ changeset: 3:125c9a1d6df6
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	682	\|/ user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	683	\| date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	684	\| summary: x
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	685	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	686	o changeset: 2:db815d6d32e6
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	687	\| parent: 0:f7b1eb17ad24
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	688	\| user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	689	\| date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	690	\| summary: 2
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	691	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	692	\| o changeset: 1:925d80f479bb
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	693	\|/ user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	694	\| date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	695	\| summary: 1
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	696	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	697	o changeset: 0:f7b1eb17ad24
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	698	user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	699	date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	700	summary: 0
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	701
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	702	$ hg book should-end-on-two
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	703	$ hg co --clean 4
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	704	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
21404 ca275f7ec576 update: when deactivating a bookmark, print a message Siddharth Agarwal <sid0@fb.com> parents: 20117 diff changeset	705	(leaving bookmark should-end-on-two)
17264 ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	706	$ hg book four
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	707	$ hg --config extensions.mq= strip 3
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	708	saved backup bundle to * (glob)
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	709	should-end-on-two should end up pointing to revision 2, as that's the
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	710	tipmost surviving ancestor of the stripped revision.
20117 aa9385f983fa tests: don't load unnecessary graphlog extension Martin Geisler <martin@geisler.net> parents: 19523 diff changeset	711	$ hg log --graph
17264 ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	712	@ changeset: 3:9ba5f110a0b3
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	713	\| branch: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	714	\| bookmark: four
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	715	\| tag: tip
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	716	\| user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	717	\| date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	718	\| summary: y
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	719	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	720	o changeset: 2:db815d6d32e6
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	721	\| bookmark: should-end-on-two
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	722	\| parent: 0:f7b1eb17ad24
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	723	\| user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	724	\| date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	725	\| summary: 2
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	726	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	727	\| o changeset: 1:925d80f479bb
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	728	\|/ user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	729	\| date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	730	\| summary: 1
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	731	\|
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	732	o changeset: 0:f7b1eb17ad24
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	733	user: test
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	734	date: Thu Jan 01 00:00:00 1970 +0000
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	735	summary: 0
ec7b9bec19c9 strip: move bookmarks to nearest ancestor rather than '.' Augie Fackler <raf@durin42.com> parents: 16822 diff changeset	736
19109 26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	737
30332 318a24b52eeb spelling: fixes of non-dictionary words Mads Kiilerich <madski@unity3d.com> parents: 28830 diff changeset	738	no-op update doesn't deactivate bookmarks
26676 71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	739
28500 2e1bceeea520 update: omit redundant activating message for already active bookmark FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28065 diff changeset	740	$ hg bookmarks
2e1bceeea520 update: omit redundant activating message for already active bookmark FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28065 diff changeset	741	* four 3:9ba5f110a0b3
2e1bceeea520 update: omit redundant activating message for already active bookmark FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28065 diff changeset	742	should-end-on-two 2:db815d6d32e6
28065 6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28029 diff changeset	743	$ hg up four
6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28029 diff changeset	744	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
26676 71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	745	$ hg up
71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	746	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	747	$ hg sum
71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	748	parent: 3:9ba5f110a0b3 tip
71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	749	y
71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	750	branch: test
71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	751	bookmarks: *four
71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	752	commit: 2 unknown (clean)
71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	753	update: (current)
71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	754	phases: 4 draft
71a485130beb bookmarks: don't deactivate on no-op update (issue4901) Matt Mackall <mpm@selenic.com> parents: 26538 diff changeset	755
19109 26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	756	test clearing divergent bookmarks of linear ancestors
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	757
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	758	$ hg bookmark Z -r 0
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	759	$ hg bookmark Z@1 -r 1
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	760	$ hg bookmark Z@2 -r 2
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	761	$ hg bookmark Z@3 -r 3
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	762	$ hg book
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	763	Z 0:f7b1eb17ad24
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	764	Z@1 1:925d80f479bb
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	765	Z@2 2:db815d6d32e6
19112 23f785b38af3 bookmarks: fix bug that activated a bookmark even with -r passed Sean Farley <sean.michael.farley@gmail.com> parents: 19111 diff changeset	766	Z@3 3:9ba5f110a0b3
23f785b38af3 bookmarks: fix bug that activated a bookmark even with -r passed Sean Farley <sean.michael.farley@gmail.com> parents: 19111 diff changeset	767	* four 3:9ba5f110a0b3
19109 26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	768	should-end-on-two 2:db815d6d32e6
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	769	$ hg bookmark Z
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	770	moving bookmark 'Z' forward from f7b1eb17ad24
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	771	$ hg book
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	772	* Z 3:9ba5f110a0b3
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	773	Z@1 1:925d80f479bb
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	774	four 3:9ba5f110a0b3
26c51e87e807 bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant Sean Farley <sean.michael.farley@gmail.com> parents: 19070 diff changeset	775	should-end-on-two 2:db815d6d32e6
19111 6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	776
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	777	test clearing only a single divergent bookmark across branches
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	778
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	779	$ hg book foo -r 1
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	780	$ hg book foo@1 -r 0
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	781	$ hg book foo@2 -r 2
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	782	$ hg book foo@3 -r 3
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	783	$ hg book foo -r foo@3
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	784	$ hg book
19112 23f785b38af3 bookmarks: fix bug that activated a bookmark even with -r passed Sean Farley <sean.michael.farley@gmail.com> parents: 19111 diff changeset	785	* Z 3:9ba5f110a0b3
19111 6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	786	Z@1 1:925d80f479bb
19112 23f785b38af3 bookmarks: fix bug that activated a bookmark even with -r passed Sean Farley <sean.michael.farley@gmail.com> parents: 19111 diff changeset	787	foo 3:9ba5f110a0b3
19111 6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	788	foo@1 0:f7b1eb17ad24
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	789	foo@2 2:db815d6d32e6
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	790	four 3:9ba5f110a0b3
6439d78e14fb bookmarks: resolve divergent bookmark when moving across a branch Sean Farley <sean.michael.farley@gmail.com> parents: 19109 diff changeset	791	should-end-on-two 2:db815d6d32e6
27948 7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	792
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	793	pull --update works the same as pull && update (case #2)
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	794
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	795	It is assumed that "hg pull" itself doesn't update current active
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	796	bookmark ('Y' in tests below).
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	797
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	798	$ hg pull -q ../cloned-bookmarks-update
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	799	divergent bookmark Z stored as Z@2
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	800
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	801	(pulling revision on another named branch with --update updates
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	802	neither the working directory nor current active bookmark: "no-op"
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	803	case)
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	804
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	805	$ echo yy >> y
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	806	$ hg commit -m yy
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	807
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	808	$ hg -R ../cloned-bookmarks-update bookmarks \| grep ' Y '
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	809	* Y 3:125c9a1d6df6
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	810	$ hg -R ../cloned-bookmarks-update pull . --update
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	811	pulling from .
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	812	searching for changes
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	813	adding changesets
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	814	adding manifests
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	815	adding file changes
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	816	added 1 changesets with 1 changes to 1 files
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	817	divergent bookmark Z stored as Z@default
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	818	adding remote bookmark foo
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	819	adding remote bookmark four
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	820	adding remote bookmark should-end-on-two
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	821	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	822	$ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node\|short}\n"
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	823	3:125c9a1d6df6
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	824	$ hg -R ../cloned-bookmarks-update bookmarks \| grep ' Y '
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	825	* Y 3:125c9a1d6df6
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	826
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	827	(pulling revision on current named/topological branch with --update
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	828	updates the working directory and current active bookmark)
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	829
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	830	$ hg update -C -q 125c9a1d6df6
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	831	$ echo xx >> x
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	832	$ hg commit -m xx
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	833
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	834	$ hg -R ../cloned-bookmarks-update bookmarks \| grep ' Y '
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	835	* Y 3:125c9a1d6df6
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	836	$ hg -R ../cloned-bookmarks-update pull . --update
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	837	pulling from .
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	838	searching for changes
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	839	adding changesets
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	840	adding manifests
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	841	adding file changes
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	842	added 1 changesets with 1 changes to 1 files
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	843	divergent bookmark Z stored as Z@default
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	844	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	845	updating bookmark Y
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	846	$ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node\|short}\n"
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	847	6:81dcce76aa0b
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	848	$ hg -R ../cloned-bookmarks-update bookmarks \| grep ' Y '
7cb7264cfd52 commands: advance current active bookmark at pull --update correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26676 diff changeset	849	* Y 6:81dcce76aa0b
28830 a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	850
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	851	$ cd ..
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	852
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	853	ensure changelog is written before bookmarks
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	854	$ hg init orderrepo
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	855	$ cd orderrepo
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	856	$ touch a
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	857	$ hg commit -Aqm one
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	858	$ hg book mybook
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	859	$ echo a > a
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	860
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	861	$ cat > $TESTTMP/pausefinalize.py <<EOF
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	862	> from mercurial import extensions, localrepo
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	863	> import os, time
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	864	> def transaction(orig, self, desc, report=None):
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	865	> tr = orig(self, desc, report)
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	866	> def sleep(args, *kwargs):
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	867	> retry = 20
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	868	> while retry > 0 and not os.path.exists("$TESTTMP/unpause"):
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	869	> retry -= 1
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	870	> time.sleep(0.5)
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	871	> if os.path.exists("$TESTTMP/unpause"):
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	872	> os.remove("$TESTTMP/unpause")
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	873	> # It is important that this finalizer start with 'a', so it runs before
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	874	> # the changelog finalizer appends to the changelog.
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	875	> tr.addfinalize('a-sleep', sleep)
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	876	> return tr
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	877	>
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	878	> def extsetup(ui):
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	879	> # This extension inserts an artifical pause during the transaction
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	880	> # finalizer, so we can run commands mid-transaction-close.
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	881	> extensions.wrapfunction(localrepo.localrepository, 'transaction',
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	882	> transaction)
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	883	> EOF
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	884	$ hg commit -qm two --config extensions.pausefinalize=$TESTTMP/pausefinalize.py &
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	885	$ sleep 2
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	886	$ hg log -r .
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	887	changeset: 0:867bc5792c8c
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	888	bookmark: mybook
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	889	tag: tip
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	890	user: test
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	891	date: Thu Jan 01 00:00:00 1970 +0000
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	892	summary: one
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	893
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	894	$ hg bookmarks
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	895	* mybook 0:867bc5792c8c
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	896	$ touch $TESTTMP/unpause
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	897
a5009789960c transaction: allow running file generators after finalizers Durham Goode <durham@fb.com> parents: 28500 diff changeset	898	$ cd ..
31052 0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	899
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	900	check whether HG_PENDING makes pending changes only in related
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	901	repositories visible to an external hook.
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	902
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	903	(emulate a transaction running concurrently by copied
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	904	.hg/bookmarks.pending in subsequent test)
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	905
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	906	$ cat > $TESTTMP/savepending.sh <<EOF
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	907	> cp .hg/bookmarks.pending .hg/bookmarks.pending.saved
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	908	> exit 1 # to avoid adding new bookmark for subsequent tests
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	909	> EOF
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	910
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	911	$ hg init unrelated
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	912	$ cd unrelated
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	913	$ echo a > a
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	914	$ hg add a
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	915	$ hg commit -m '#0'
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	916	$ hg --config hooks.pretxnclose="sh $TESTTMP/savepending.sh" bookmarks INVISIBLE
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	917	transaction abort!
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	918	rollback completed
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	919	abort: pretxnclose hook exited with status 1
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	920	[255]
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	921	$ cp .hg/bookmarks.pending.saved .hg/bookmarks.pending
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	922
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	923	(check visible bookmarks while transaction running in repo)
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	924
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	925	$ cat > $TESTTMP/checkpending.sh <<EOF
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	926	> echo "@repo"
31767 6c800688afe1 tests: quote paths in shell script hooks Matt Harbison <matt_harbison@yahoo.com> parents: 31052 diff changeset	927	> hg -R "$TESTTMP/repo" bookmarks
31052 0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	928	> echo "@unrelated"
31767 6c800688afe1 tests: quote paths in shell script hooks Matt Harbison <matt_harbison@yahoo.com> parents: 31052 diff changeset	929	> hg -R "$TESTTMP/unrelated" bookmarks
31052 0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	930	> exit 1 # to avoid adding new bookmark for subsequent tests
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	931	> EOF
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	932
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	933	$ cd ../repo
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	934	$ hg --config hooks.pretxnclose="sh $TESTTMP/checkpending.sh" bookmarks NEW
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	935	@repo
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	936	* NEW 6:81dcce76aa0b
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	937	X2 1:925d80f479bb
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	938	Y 4:125c9a1d6df6
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	939	Z 5:5fb12f0f2d51
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	940	Z@1 1:925d80f479bb
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	941	Z@2 4:125c9a1d6df6
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	942	foo 3:9ba5f110a0b3
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	943	foo@1 0:f7b1eb17ad24
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	944	foo@2 2:db815d6d32e6
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	945	four 3:9ba5f110a0b3
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	946	should-end-on-two 2:db815d6d32e6
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	947	x y 2:db815d6d32e6
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	948	@unrelated
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	949	no bookmarks set
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	950	transaction abort!
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	951	rollback completed
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	952	abort: pretxnclose hook exited with status 1
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31051 diff changeset	953	[255]

author	Denis Laxalde <denis.laxalde@logilab.fr>
	Thu, 06 Apr 2017 19:15:09 +0200
changeset 31848	7160bdd56b84
parent 31767	6c800688afe1
child 32451	bce5ebe72859
permissions	-rw-r--r--