mercurial: tests/test-share-bookmarks.t@526750cdd02d (annotated)

42325 526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	1	#testcases vfs svfs
526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	2
12487 9792013e2f53 tests: unify test-share Matt Mackall <mpm@selenic.com> parents: 10468 diff changeset	3	$ echo "[extensions]" >> $HGRCPATH
9792013e2f53 tests: unify test-share Matt Mackall <mpm@selenic.com> parents: 10468 diff changeset	4	$ echo "share = " >> $HGRCPATH
9792013e2f53 tests: unify test-share Matt Mackall <mpm@selenic.com> parents: 10468 diff changeset	5
42325 526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	6	#if svfs
526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	7	$ echo "[format]" >> $HGRCPATH
526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	8	$ echo "bookmarks-in-store = yes " >> $HGRCPATH
526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	9	#endif
526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	10
12487 9792013e2f53 tests: unify test-share Matt Mackall <mpm@selenic.com> parents: 10468 diff changeset	11	prepare repo1
9990 c1d940d31aea share: add a test script. Greg Ward <greg-hg@gerg.ca> parents: diff changeset	12
12487 9792013e2f53 tests: unify test-share Matt Mackall <mpm@selenic.com> parents: 10468 diff changeset	13	$ hg init repo1
9792013e2f53 tests: unify test-share Matt Mackall <mpm@selenic.com> parents: 10468 diff changeset	14	$ cd repo1
9792013e2f53 tests: unify test-share Matt Mackall <mpm@selenic.com> parents: 10468 diff changeset	15	$ echo a > a
9792013e2f53 tests: unify test-share Matt Mackall <mpm@selenic.com> parents: 10468 diff changeset	16	$ hg commit -A -m'init'
9792013e2f53 tests: unify test-share Matt Mackall <mpm@selenic.com> parents: 10468 diff changeset	17	adding a
42313 81ece800576a tests: separate out bookmarks tests from test-share.t Martin von Zweigbergk <martinvonz@google.com> parents: 41965 diff changeset	18	$ echo a >> a
81ece800576a tests: separate out bookmarks tests from test-share.t Martin von Zweigbergk <martinvonz@google.com> parents: 41965 diff changeset	19	$ hg commit -m'change in shared clone'
81ece800576a tests: separate out bookmarks tests from test-share.t Martin von Zweigbergk <martinvonz@google.com> parents: 41965 diff changeset	20	$ echo b > b
81ece800576a tests: separate out bookmarks tests from test-share.t Martin von Zweigbergk <martinvonz@google.com> parents: 41965 diff changeset	21	$ hg commit -A -m'another file'
81ece800576a tests: separate out bookmarks tests from test-share.t Martin von Zweigbergk <martinvonz@google.com> parents: 41965 diff changeset	22	adding b
12487 9792013e2f53 tests: unify test-share Matt Mackall <mpm@selenic.com> parents: 10468 diff changeset	23
9792013e2f53 tests: unify test-share Matt Mackall <mpm@selenic.com> parents: 10468 diff changeset	24	share it
9990 c1d940d31aea share: add a test script. Greg Ward <greg-hg@gerg.ca> parents: diff changeset	25
12487 9792013e2f53 tests: unify test-share Matt Mackall <mpm@selenic.com> parents: 10468 diff changeset	26	$ cd ..
9792013e2f53 tests: unify test-share Matt Mackall <mpm@selenic.com> parents: 10468 diff changeset	27	$ hg share repo1 repo2
9792013e2f53 tests: unify test-share Matt Mackall <mpm@selenic.com> parents: 10468 diff changeset	28	updating working directory
42313 81ece800576a tests: separate out bookmarks tests from test-share.t Martin von Zweigbergk <martinvonz@google.com> parents: 41965 diff changeset	29	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
12487 9792013e2f53 tests: unify test-share Matt Mackall <mpm@selenic.com> parents: 10468 diff changeset	30
23614 cd79fb4d75fd share: add option to share bookmarks Ryan McElroy <rmcelroy@fb.com> parents: 23548 diff changeset	31	test sharing bookmarks
23548 141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	32
23614 cd79fb4d75fd share: add option to share bookmarks Ryan McElroy <rmcelroy@fb.com> parents: 23548 diff changeset	33	$ hg share -B repo1 repo3
23548 141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	34	updating working directory
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	35	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	36	$ cd repo1
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	37	$ hg bookmark bm1
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	38	$ hg bookmarks
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	39	* bm1 2:c2e0ac586386
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	40	$ cd ../repo2
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	41	$ hg book bm2
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	42	$ hg bookmarks
42325 526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	43	bm1 2:c2e0ac586386 (svfs !)
42314 314056e438a9 tests: fix share test to actually share the repo Martin von Zweigbergk <martinvonz@google.com> parents: 42313 diff changeset	44	* bm2 2:c2e0ac586386
23548 141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	45	$ cd ../repo3
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	46	$ hg bookmarks
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	47	bm1 2:c2e0ac586386
42325 526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	48	bm2 2:c2e0ac586386 (svfs !)
23548 141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	49	$ hg book bm3
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	50	$ hg bookmarks
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	51	bm1 2:c2e0ac586386
42325 526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	52	bm2 2:c2e0ac586386 (svfs !)
23548 141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	53	* bm3 2:c2e0ac586386
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	54	$ cd ../repo1
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	55	$ hg bookmarks
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	56	* bm1 2:c2e0ac586386
42325 526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	57	bm2 2:c2e0ac586386 (svfs !)
23548 141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	58	bm3 2:c2e0ac586386
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	59
31052 0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	60	check whether HG_PENDING makes pending changes only in relatd
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	61	repositories visible to an external hook.
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	62
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	63	In "hg share" case, another transaction can't run in other
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	64	repositories sharing same source repository, because starting
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	65	transaction requires locking store of source repository.
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	66
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	67	Therefore, this test scenario ignores checking visibility of
42314 314056e438a9 tests: fix share test to actually share the repo Martin von Zweigbergk <martinvonz@google.com> parents: 42313 diff changeset	68	.hg/bookmarks.pending in repo2, which shares repo1 without bookmarks.
31052 0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	69
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	70	$ cat > $TESTTMP/checkbookmarks.sh <<EOF
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	71	> echo "@repo1"
31767 6c800688afe1 tests: quote paths in shell script hooks Matt Harbison <matt_harbison@yahoo.com> parents: 31766 diff changeset	72	> hg -R "$TESTTMP/repo1" bookmarks
31052 0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	73	> echo "@repo2"
31767 6c800688afe1 tests: quote paths in shell script hooks Matt Harbison <matt_harbison@yahoo.com> parents: 31766 diff changeset	74	> hg -R "$TESTTMP/repo2" bookmarks
31052 0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	75	> echo "@repo3"
31767 6c800688afe1 tests: quote paths in shell script hooks Matt Harbison <matt_harbison@yahoo.com> parents: 31766 diff changeset	76	> hg -R "$TESTTMP/repo3" bookmarks
31052 0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	77	> exit 1 # to avoid adding new bookmark for subsequent tests
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	78	> EOF
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	79
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	80	$ cd ../repo1
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	81	$ hg --config hooks.pretxnclose="sh $TESTTMP/checkbookmarks.sh" -q book bmX
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	82	@repo1
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	83	bm1 2:c2e0ac586386
42325 526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	84	bm2 2:c2e0ac586386 (svfs !)
31052 0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	85	bm3 2:c2e0ac586386
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	86	* bmX 2:c2e0ac586386
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	87	@repo2
42325 526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	88	bm1 2:c2e0ac586386 (svfs !)
42314 314056e438a9 tests: fix share test to actually share the repo Martin von Zweigbergk <martinvonz@google.com> parents: 42313 diff changeset	89	* bm2 2:c2e0ac586386
42325 526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	90	bm3 2:c2e0ac586386 (svfs !)
31052 0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	91	@repo3
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	92	bm1 2:c2e0ac586386
42325 526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	93	bm2 2:c2e0ac586386 (svfs !)
31052 0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	94	* bm3 2:c2e0ac586386
42325 526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	95	bmX 2:c2e0ac586386 (vfs !)
31052 0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	96	transaction abort!
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	97	rollback completed
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	98	abort: pretxnclose hook exited with status 1
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	99	[255]
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	100	$ hg book bm1
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	101
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	102	FYI, in contrast to above test, bmX is invisible in repo1 (= shared
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	103	src), because (1) HG_PENDING refers only repo3 and (2)
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	104	"bookmarks.pending" is written only into repo3.
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	105
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	106	$ cd ../repo3
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	107	$ hg --config hooks.pretxnclose="sh $TESTTMP/checkbookmarks.sh" -q book bmX
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	108	@repo1
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	109	* bm1 2:c2e0ac586386
42325 526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	110	bm2 2:c2e0ac586386 (svfs !)
31052 0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	111	bm3 2:c2e0ac586386
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	112	@repo2
42325 526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	113	bm1 2:c2e0ac586386 (svfs !)
42314 314056e438a9 tests: fix share test to actually share the repo Martin von Zweigbergk <martinvonz@google.com> parents: 42313 diff changeset	114	* bm2 2:c2e0ac586386
42325 526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	115	bm3 2:c2e0ac586386 (svfs !)
31052 0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	116	@repo3
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	117	bm1 2:c2e0ac586386
42325 526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	118	bm2 2:c2e0ac586386 (svfs !)
31052 0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	119	bm3 2:c2e0ac586386
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	120	* bmX 2:c2e0ac586386
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	121	transaction abort!
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	122	rollback completed
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	123	abort: pretxnclose hook exited with status 1
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	124	[255]
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	125	$ hg book bm3
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	126
42325 526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	127	clean up bm2 since it's uninteresting (not shared in the vfs case and
526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	128	same as bm3 in the svfs case)
526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	129	$ cd ../repo2
526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	130	$ hg book -d bm2
526750cdd02d bookmarks: keep bookmarks in .hg/store if new config set Martin von Zweigbergk <martinvonz@google.com> parents: 42314 diff changeset	131
31052 0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	132	$ cd ../repo1
0332b8fafd05 bookmarks: check HG_PENDING strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25474 diff changeset	133
23548 141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	134	test that commits work
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	135
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	136	$ echo 'shared bookmarks' > a
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	137	$ hg commit -m 'testing shared bookmarks'
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	138	$ hg bookmarks
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	139	* bm1 3:b87954705719
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	140	bm3 2:c2e0ac586386
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	141	$ cd ../repo3
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	142	$ hg bookmarks
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	143	bm1 3:b87954705719
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	144	* bm3 2:c2e0ac586386
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	145	$ echo 'more shared bookmarks' > a
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	146	$ hg commit -m 'testing shared bookmarks'
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	147	created new head
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	148	$ hg bookmarks
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	149	bm1 3:b87954705719
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	150	* bm3 4:62f4ded848e4
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	151	$ cd ../repo1
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	152	$ hg bookmarks
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	153	* bm1 3:b87954705719
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	154	bm3 4:62f4ded848e4
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	155	$ cd ..
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	156
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	157	test pushing bookmarks works
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	158
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	159	$ hg clone repo3 repo4
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	160	updating to branch default
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	161	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	162	$ cd repo4
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	163	$ hg boo bm4
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	164	$ echo foo > b
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	165	$ hg commit -m 'foo in b'
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	166	$ hg boo
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	167	bm1 3:b87954705719
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	168	bm3 4:62f4ded848e4
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	169	* bm4 5:92793bfc8cad
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	170	$ hg push -B bm4
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33986 diff changeset	171	pushing to $TESTTMP/repo3
23548 141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	172	searching for changes
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	173	adding changesets
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	174	adding manifests
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	175	adding file changes
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	176	added 1 changesets with 1 changes to 1 files
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	177	exporting bookmark bm4
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	178	$ cd ../repo1
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	179	$ hg bookmarks
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	180	* bm1 3:b87954705719
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	181	bm3 4:62f4ded848e4
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	182	bm4 5:92793bfc8cad
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	183	$ cd ../repo3
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	184	$ hg bookmarks
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	185	bm1 3:b87954705719
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	186	* bm3 4:62f4ded848e4
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	187	bm4 5:92793bfc8cad
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	188	$ cd ..
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	189
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	190	test behavior when sharing a shared repo
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	191
39186 e8deaa77c1b6 share: allow more than one level of directories to be created Matt Harbison <matt_harbison@yahoo.com> parents: 38781 diff changeset	192	$ hg share -B repo3 missingdir/repo5
23548 141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	193	updating working directory
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	194	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
39186 e8deaa77c1b6 share: allow more than one level of directories to be created Matt Harbison <matt_harbison@yahoo.com> parents: 38781 diff changeset	195	$ cd missingdir/repo5
23548 141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	196	$ hg book
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	197	bm1 3:b87954705719
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	198	bm3 4:62f4ded848e4
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	199	bm4 5:92793bfc8cad
39186 e8deaa77c1b6 share: allow more than one level of directories to be created Matt Harbison <matt_harbison@yahoo.com> parents: 38781 diff changeset	200	$ cd ../..
23548 141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	201
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	202	test what happens when an active bookmark is deleted
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	203
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	204	$ cd repo1
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	205	$ hg boo -d bm3
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	206	$ hg boo
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	207	* bm1 3:b87954705719
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	208	bm4 5:92793bfc8cad
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	209	$ cd ../repo3
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	210	$ hg boo
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	211	bm1 3:b87954705719
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	212	bm4 5:92793bfc8cad
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	213	$ cd ..
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	214
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	215	verify that bookmarks are not written on failed transaction
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	216
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	217	$ cat > failpullbookmarks.py << EOF
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	218	> """A small extension that makes bookmark pulls fail, for testing"""
33986 169c97d4e722 tests: update test-share to pass our import checker Augie Fackler <raf@durin42.com> parents: 33539 diff changeset	219	> from __future__ import absolute_import
169c97d4e722 tests: update test-share to pass our import checker Augie Fackler <raf@durin42.com> parents: 33539 diff changeset	220	> from mercurial import (
169c97d4e722 tests: update test-share to pass our import checker Augie Fackler <raf@durin42.com> parents: 33539 diff changeset	221	> error,
169c97d4e722 tests: update test-share to pass our import checker Augie Fackler <raf@durin42.com> parents: 33539 diff changeset	222	> exchange,
169c97d4e722 tests: update test-share to pass our import checker Augie Fackler <raf@durin42.com> parents: 33539 diff changeset	223	> extensions,
169c97d4e722 tests: update test-share to pass our import checker Augie Fackler <raf@durin42.com> parents: 33539 diff changeset	224	> )
23548 141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	225	> def _pullbookmarks(orig, pullop):
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	226	> orig(pullop)
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	227	> raise error.HookAbort('forced failure by extension')
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	228	> def extsetup(ui):
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	229	> extensions.wrapfunction(exchange, '_pullbookmarks', _pullbookmarks)
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	230	> EOF
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	231	$ cd repo4
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	232	$ hg boo
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	233	bm1 3:b87954705719
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	234	bm3 4:62f4ded848e4
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	235	* bm4 5:92793bfc8cad
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	236	$ cd ../repo3
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	237	$ hg boo
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	238	bm1 3:b87954705719
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	239	bm4 5:92793bfc8cad
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	240	$ hg --config "extensions.failpullbookmarks=$TESTTMP/failpullbookmarks.py" pull $TESTTMP/repo4
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33986 diff changeset	241	pulling from $TESTTMP/repo4
23548 141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	242	searching for changes
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	243	no changes found
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	244	adding remote bookmark bm3
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	245	abort: forced failure by extension
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	246	[255]
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	247	$ hg boo
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	248	bm1 3:b87954705719
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	249	bm4 5:92793bfc8cad
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	250	$ hg pull $TESTTMP/repo4
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 33986 diff changeset	251	pulling from $TESTTMP/repo4
23548 141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	252	searching for changes
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	253	no changes found
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	254	adding remote bookmark bm3
38250 d0abd7949ea3 phases: use "published" in the phase movement message Boris Feld <boris.feld@octobus.net> parents: 38249 diff changeset	255	1 local changesets published
23548 141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	256	$ hg boo
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	257	bm1 3:b87954705719
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	258	* bm3 4:62f4ded848e4
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	259	bm4 5:92793bfc8cad
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	260	$ cd ..
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	261
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	262	verify bookmark behavior after unshare
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	263
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	264	$ cd repo3
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	265	$ hg unshare
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	266	$ hg boo
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	267	bm1 3:b87954705719
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	268	* bm3 4:62f4ded848e4
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	269	bm4 5:92793bfc8cad
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	270	$ hg boo -d bm4
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	271	$ hg boo bm5
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	272	$ hg boo
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	273	bm1 3:b87954705719
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	274	bm3 4:62f4ded848e4
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	275	* bm5 4:62f4ded848e4
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	276	$ cd ../repo1
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	277	$ hg boo
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	278	* bm1 3:b87954705719
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	279	bm3 4:62f4ded848e4
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	280	bm4 5:92793bfc8cad
141baca16059 share: implement shared bookmark functionality Ryan McElroy <rmcelroy@fb.com> parents: 22046 diff changeset	281	$ cd ..

author	Martin von Zweigbergk <martinvonz@google.com>
	Wed, 15 May 2019 22:09:02 -0700
changeset 42325	526750cdd02d
parent 42314	314056e438a9
child 45300	dc457177dbc1
permissions	-rw-r--r--