"repo2" is clearly meant to be a share from "repo1" but without
sharing bookmarks. However, hg unshare was called in the repo, so it
had become completely unrelated and thus not testing what it was
supposed to test.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | tests/test-share-bookmarks.t (23 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| share it | share it | ||||
| $ cd .. | $ cd .. | ||||
| $ hg share repo1 repo2 | $ hg share repo1 repo2 | ||||
| updating working directory | updating working directory | ||||
| 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| unshare it | |||||
| $ cd repo2 | |||||
| $ hg unshare | |||||
| check that a change does not propagate | |||||
| $ echo b >> b | |||||
| $ hg commit -m'change in unshared' | |||||
| $ cd ../repo1 | |||||
| $ hg id -r tip | |||||
| c2e0ac586386 tip | |||||
| $ cd .. | |||||
| test sharing bookmarks | test sharing bookmarks | ||||
| $ hg share -B repo1 repo3 | $ hg share -B repo1 repo3 | ||||
| updating working directory | updating working directory | ||||
| 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| $ cd repo1 | $ cd repo1 | ||||
| $ hg bookmark bm1 | $ hg bookmark bm1 | ||||
| $ hg bookmarks | $ hg bookmarks | ||||
| * bm1 2:c2e0ac586386 | * bm1 2:c2e0ac586386 | ||||
| $ cd ../repo2 | $ cd ../repo2 | ||||
| $ hg book bm2 | $ hg book bm2 | ||||
| $ hg bookmarks | $ hg bookmarks | ||||
| * bm2 3:0e6e70d1d5f1 | * bm2 2:c2e0ac586386 | ||||
| $ cd ../repo3 | $ cd ../repo3 | ||||
| $ hg bookmarks | $ hg bookmarks | ||||
| bm1 2:c2e0ac586386 | bm1 2:c2e0ac586386 | ||||
| $ hg book bm3 | $ hg book bm3 | ||||
| $ hg bookmarks | $ hg bookmarks | ||||
| bm1 2:c2e0ac586386 | bm1 2:c2e0ac586386 | ||||
| * bm3 2:c2e0ac586386 | * bm3 2:c2e0ac586386 | ||||
| $ cd ../repo1 | $ cd ../repo1 | ||||
| $ hg bookmarks | $ hg bookmarks | ||||
| * bm1 2:c2e0ac586386 | * bm1 2:c2e0ac586386 | ||||
| bm3 2:c2e0ac586386 | bm3 2:c2e0ac586386 | ||||
| check whether HG_PENDING makes pending changes only in relatd | check whether HG_PENDING makes pending changes only in relatd | ||||
| repositories visible to an external hook. | repositories visible to an external hook. | ||||
| In "hg share" case, another transaction can't run in other | In "hg share" case, another transaction can't run in other | ||||
| repositories sharing same source repository, because starting | repositories sharing same source repository, because starting | ||||
| transaction requires locking store of source repository. | transaction requires locking store of source repository. | ||||
| Therefore, this test scenario ignores checking visibility of | Therefore, this test scenario ignores checking visibility of | ||||
| .hg/bookmakrs.pending in repo2, which shares repo1 without bookmarks. | .hg/bookmarks.pending in repo2, which shares repo1 without bookmarks. | ||||
| $ cat > $TESTTMP/checkbookmarks.sh <<EOF | $ cat > $TESTTMP/checkbookmarks.sh <<EOF | ||||
| > echo "@repo1" | > echo "@repo1" | ||||
| > hg -R "$TESTTMP/repo1" bookmarks | > hg -R "$TESTTMP/repo1" bookmarks | ||||
| > echo "@repo2" | > echo "@repo2" | ||||
| > hg -R "$TESTTMP/repo2" bookmarks | > hg -R "$TESTTMP/repo2" bookmarks | ||||
| > echo "@repo3" | > echo "@repo3" | ||||
| > hg -R "$TESTTMP/repo3" bookmarks | > hg -R "$TESTTMP/repo3" bookmarks | ||||
| > exit 1 # to avoid adding new bookmark for subsequent tests | > exit 1 # to avoid adding new bookmark for subsequent tests | ||||
| > EOF | > EOF | ||||
| $ cd ../repo1 | $ cd ../repo1 | ||||
| $ hg --config hooks.pretxnclose="sh $TESTTMP/checkbookmarks.sh" -q book bmX | $ hg --config hooks.pretxnclose="sh $TESTTMP/checkbookmarks.sh" -q book bmX | ||||
| @repo1 | @repo1 | ||||
| bm1 2:c2e0ac586386 | bm1 2:c2e0ac586386 | ||||
| bm3 2:c2e0ac586386 | bm3 2:c2e0ac586386 | ||||
| * bmX 2:c2e0ac586386 | * bmX 2:c2e0ac586386 | ||||
| @repo2 | @repo2 | ||||
| * bm2 3:0e6e70d1d5f1 | * bm2 2:c2e0ac586386 | ||||
| @repo3 | @repo3 | ||||
| bm1 2:c2e0ac586386 | bm1 2:c2e0ac586386 | ||||
| * bm3 2:c2e0ac586386 | * bm3 2:c2e0ac586386 | ||||
| bmX 2:c2e0ac586386 | bmX 2:c2e0ac586386 | ||||
| transaction abort! | transaction abort! | ||||
| rollback completed | rollback completed | ||||
| abort: pretxnclose hook exited with status 1 | abort: pretxnclose hook exited with status 1 | ||||
| [255] | [255] | ||||
| $ hg book bm1 | $ hg book bm1 | ||||
| FYI, in contrast to above test, bmX is invisible in repo1 (= shared | FYI, in contrast to above test, bmX is invisible in repo1 (= shared | ||||
| src), because (1) HG_PENDING refers only repo3 and (2) | src), because (1) HG_PENDING refers only repo3 and (2) | ||||
| "bookmarks.pending" is written only into repo3. | "bookmarks.pending" is written only into repo3. | ||||
| $ cd ../repo3 | $ cd ../repo3 | ||||
| $ hg --config hooks.pretxnclose="sh $TESTTMP/checkbookmarks.sh" -q book bmX | $ hg --config hooks.pretxnclose="sh $TESTTMP/checkbookmarks.sh" -q book bmX | ||||
| @repo1 | @repo1 | ||||
| * bm1 2:c2e0ac586386 | * bm1 2:c2e0ac586386 | ||||
| bm3 2:c2e0ac586386 | bm3 2:c2e0ac586386 | ||||
| @repo2 | @repo2 | ||||
| * bm2 3:0e6e70d1d5f1 | * bm2 2:c2e0ac586386 | ||||
| @repo3 | @repo3 | ||||
| bm1 2:c2e0ac586386 | bm1 2:c2e0ac586386 | ||||
| bm3 2:c2e0ac586386 | bm3 2:c2e0ac586386 | ||||
| * bmX 2:c2e0ac586386 | * bmX 2:c2e0ac586386 | ||||
| transaction abort! | transaction abort! | ||||
| rollback completed | rollback completed | ||||
| abort: pretxnclose hook exited with status 1 | abort: pretxnclose hook exited with status 1 | ||||
| [255] | [255] | ||||