facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity
1891591abc
sapling/eden/scm/tests/test-commitcloud-sync-bookmarks.t

176 lines
5.2 KiB
Perl
Raw Normal View History

mark all tests requiring Python 2 Summary: This diff marks **ALL** mercurial tests requiring Python 2 feature. After you fixes some tests, simply remove the `py2` feature requirement and that tests will be continuously run after your diff is landed. To bypass this feature requirement, run the tests command with `HGTEST_FORCE_PY2=1`. For example: ``` HGTEST_FORCE_PY2=1 buck test //eden/scm/tests:hg_run_tests ``` or ``` HGTEST_FORCE_PY2=1 python run-tests.py ``` ---- Basically this diff are created with the following commands: ``` $ sed -i 's/import feature\(.*\)$/import feature\1\n\nfeature.require(["py2"])/' test-*-t.py $ sed -i '1s/^/#require py2\n/' test-*.t $ ls | grep -P "^test.*(?<\!-t)\.py$" > list && vim -p $(cat list) # manually adding feature requires for these Python tests. ``` (Note: this ignores all push blocking failures!) ignore-conflict-markers Reviewed By: singhsrb Differential Revision: D19655148 fbshipit-source-id: 985e3ccb4010cc559049f1d89f8909bc2d9b5e20
2020-01-31 05:40:49 +03:00
#require py2
tests: enable chg for 572 tests Summary: Add `#chg-compatible` to 572 tests that seem to pass with chg enabled. This should make them run faster. Reviewed By: xavierd Differential Revision: D18870507 fbshipit-source-id: fe895e733efffc9286cd3d17c7a156c803124395
2019-12-10 02:24:31 +03:00
#chg-compatible
commitcloud: add test demonstrating bad sync behaviour when removing obsolete bookmark Summary: If the user has a bookmark pointing at an obsolete commit, and then moves that bookmark away from that commit, commit cloud can't tell whether the commit should really be obsolete or not. Previously the bookmark was the only thing keeping the commit visible, but commit cloud doesn't know that. I can't think of a way to fix this with obsmarkers. It works with separate mutation and visibility (T34204947). Reviewed By: quark-zju Differential Revision: D15097845 fbshipit-source-id: 5926553b4878b28823a6ce47d29c0346cba04e5e
2019-05-20 16:11:59 +03:00
$ enable amend commitcloud infinitepush rebase remotenames pullcreatemarkers
tests: use disable treemanifest in place of setconfig Summary: Use `disable treemanifest` in place of `setconfig extensions.treemanifest=!` Reviewed By: quark-zju Differential Revision: D19457678 fbshipit-source-id: 47c8b3c4f4ed5cfc97275ca67afab4a86ffe7f0d
2020-01-20 13:42:49 +03:00
$ disable treemanifest
commitcloud: add test demonstrating bad sync behaviour when removing obsolete bookmark Summary: If the user has a bookmark pointing at an obsolete commit, and then moves that bookmark away from that commit, commit cloud can't tell whether the commit should really be obsolete or not. Previously the bookmark was the only thing keeping the commit visible, but commit cloud doesn't know that. I can't think of a way to fix this with obsmarkers. It works with separate mutation and visibility (T34204947). Reviewed By: quark-zju Differential Revision: D15097845 fbshipit-source-id: 5926553b4878b28823a6ce47d29c0346cba04e5e
2019-05-20 16:11:59 +03:00
$ setconfig ui.ssh="python \"$TESTDIR/dummyssh\""
$ setconfig commitcloud.hostname=testhost
$ setconfig remotefilelog.reponame=server
$ hg init server
$ cd server
$ setconfig infinitepush.server=yes infinitepush.reponame=testrepo
$ setconfig infinitepush.indextype=disk infinitepush.storetype=disk
$ touch base
$ hg commit -Aqm base
$ hg phase -p .
$ cd ..
$ hg clone ssh://user@dummy/server client1 -q
$ cd client1
$ setconfig commitcloud.servicetype=local commitcloud.servicelocation=$TESTTMP
$ setconfig commitcloud.user_token_path=$TESTTMP
$ hg cloud auth -t xxxxxx
setting authentication token
authentication successful
$ hg cloud join
commitcloud: this repository is now connected to the 'user/test/default' workspace for the 'server' repo
commitcloud: synchronizing 'server' with 'user/test/default'
commitcloud: commits synchronized
finished in * (glob)
$ echo data > file
$ hg commit -Aqm "draft-commit
> Differential Revision: https://phabricator.fb.com/D1234"
$ hg book foo
$ hg prev -q
[df4f53] base
$ hg cloud sync -q
$ cd ..
$ hg clone ssh://user@dummy/server client2 -q
$ cd client2
$ setconfig commitcloud.servicetype=local commitcloud.servicelocation=$TESTTMP
$ setconfig commitcloud.user_token_path=$TESTTMP
$ hg cloud join
commitcloud: this repository is now connected to the 'user/test/default' workspace for the 'server' repo
commitcloud: synchronizing 'server' with 'user/test/default'
commitcloud: pull heads in small groups Summary: When pulling heads from commit cloud during sync, pull them in small groups of heads from around the same time, to prevent overloading the server when pulling a large number of heads. Reviewed By: mitrandir77 Differential Revision: D15317184 fbshipit-source-id: 5e69eb970b18292a4f5d643b25fac80c90c5d537
2019-05-20 16:11:59 +03:00
pulling 00422fad0026
commitcloud: add test demonstrating bad sync behaviour when removing obsolete bookmark Summary: If the user has a bookmark pointing at an obsolete commit, and then moves that bookmark away from that commit, commit cloud can't tell whether the commit should really be obsolete or not. Previously the bookmark was the only thing keeping the commit visible, but commit cloud doesn't know that. I can't think of a way to fix this with obsmarkers. It works with separate mutation and visibility (T34204947). Reviewed By: quark-zju Differential Revision: D15097845 fbshipit-source-id: 5926553b4878b28823a6ce47d29c0346cba04e5e
2019-05-20 16:11:59 +03:00
pulling from ssh://user@dummy/server
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
commitcloud: commits synchronized
finished in * (glob)
$ tglogp
o 1: 00422fad0026 draft 'draft-commit
| Differential Revision: https://phabricator.fb.com/D1234' foo
@ 0: df4f53cec30a public 'base'
$ cd ..
Fake land the commit
$ cd server
$ echo 1 > serverfile
$ hg commit -Aqm public-commit-1
$ echo data > file
$ hg commit -Aqm "landed-commit
> Differential Revision: https://phabricator.fb.com/D1234"
$ echo 2 > serverfile
$ hg commit -Aqm public-commit-2
$ hg phase -p .
$ cd ..
$ cd client1
$ hg pull
pulling from ssh://user@dummy/server
searching for changes
adding changesets
adding manifests
adding file changes
changegroup: do not show "(+/- ? heads)" Summary: In an upcoming change we'll replace `cl.heads()` with `repo.heads()`. In changegroup code path the repo can be in an inconsistent state (ex. a bookmark refers to an unknown commit) which breaks `repo.heads()`. Since the whole purpose of the heads calculation is just to show `(+/- ? heads)`, which does not affect any real features, let's just remove it. Reviewed By: markbt Differential Revision: D18366735 fbshipit-source-id: 893be2cec0c32b64a80b3ef4ca65b69f8ed76b27
2019-11-07 21:50:10 +03:00
added 3 changesets with 2 changes to 2 files
commitcloud: add test demonstrating bad sync behaviour when removing obsolete bookmark Summary: If the user has a bookmark pointing at an obsolete commit, and then moves that bookmark away from that commit, commit cloud can't tell whether the commit should really be obsolete or not. Previously the bookmark was the only thing keeping the commit visible, but commit cloud doesn't know that. I can't think of a way to fix this with obsmarkers. It works with separate mutation and visibility (T34204947). Reviewed By: quark-zju Differential Revision: D15097845 fbshipit-source-id: 5926553b4878b28823a6ce47d29c0346cba04e5e
2019-05-20 16:11:59 +03:00
obsoleted 1 changesets
$ tglogp
o 4: 67d363c9001e public 'public-commit-2'
|
o 3: 441f69264760 public 'landed-commit
| Differential Revision: https://phabricator.fb.com/D1234'
o 2: 031d760782fb public 'public-commit-1'
|
| x 1: 00422fad0026 draft 'draft-commit
|/ Differential Revision: https://phabricator.fb.com/D1234' foo
@ 0: df4f53cec30a public 'base'
$ hg cloud sync -q
$ cd ../client2
$ hg cloud sync -q
$ tglogp
x 1: 00422fad0026 draft 'draft-commit
| Differential Revision: https://phabricator.fb.com/D1234' foo
@ 0: df4f53cec30a public 'base'
commitcloud: refactor sync processing Summary: Refactor how commit cloud sync works. Sync is simplified by delegating backup processing to the existing backup code. This happens first, which means the user's work is backed up earlier, and the sync processing can assume that all backed up commits are available in the cloud storage. Sync no longer attempts to handle the case where cloud storage has changed. Instead, backup processing should ensure that all local commits are backed up to the current cloud storage. If a commit can't be backed up, then treat this as a normal failure to sync and ignore that commit for this sync attempt. If a commit can't be downloaded from the server then the sync fails. Reviewed By: mitrandir77 Differential Revision: D15295499 fbshipit-source-id: d371c5bf0daedbbe42e8c7d4a0c3d1a40c21a36f
2019-05-20 16:11:59 +03:00
Rebasing the bookmark will make the draft commit disappear.
commitcloud: add test demonstrating bad sync behaviour when removing obsolete bookmark Summary: If the user has a bookmark pointing at an obsolete commit, and then moves that bookmark away from that commit, commit cloud can't tell whether the commit should really be obsolete or not. Previously the bookmark was the only thing keeping the commit visible, but commit cloud doesn't know that. I can't think of a way to fix this with obsmarkers. It works with separate mutation and visibility (T34204947). Reviewed By: quark-zju Differential Revision: D15097845 fbshipit-source-id: 5926553b4878b28823a6ce47d29c0346cba04e5e
2019-05-20 16:11:59 +03:00
$ cd ../client1
$ hg rebase -b foo -d 4
rebase: remove rev number from rebase output Summary: Revision numbers are deprecated, let's not print them in the rebase output. The tests were automatically fixed with run-tests.py -i Reviewed By: quark-zju Differential Revision: D17936451 fbshipit-source-id: a8f0403b6af4573421ca874e9311f26931eba697
2019-10-16 02:28:01 +03:00
note: not rebasing 00422fad0026 "draft-commit" (foo), already in destination as 441f69264760 "landed-commit"
commitcloud: add test demonstrating bad sync behaviour when removing obsolete bookmark Summary: If the user has a bookmark pointing at an obsolete commit, and then moves that bookmark away from that commit, commit cloud can't tell whether the commit should really be obsolete or not. Previously the bookmark was the only thing keeping the commit visible, but commit cloud doesn't know that. I can't think of a way to fix this with obsmarkers. It works with separate mutation and visibility (T34204947). Reviewed By: quark-zju Differential Revision: D15097845 fbshipit-source-id: 5926553b4878b28823a6ce47d29c0346cba04e5e
2019-05-20 16:11:59 +03:00
$ tglogp
o 4: 67d363c9001e public 'public-commit-2' foo
|
o 3: 441f69264760 public 'landed-commit
| Differential Revision: https://phabricator.fb.com/D1234'
o 2: 031d760782fb public 'public-commit-1'
|
@ 0: df4f53cec30a public 'base'
$ hg cloud sync
commitcloud: synchronizing 'server' with 'user/test/default'
commitcloud: commits synchronized
finished in * (glob)
$ tglogp
o 4: 67d363c9001e public 'public-commit-2' foo
|
o 3: 441f69264760 public 'landed-commit
| Differential Revision: https://phabricator.fb.com/D1234'
o 2: 031d760782fb public 'public-commit-1'
|
@ 0: df4f53cec30a public 'base'
commitcloud: remove omitted bookmarks that are available locally Summary: When syncing, if a locally-available bookmark is synced to a new commit that has been omitted, remove the local bookmark to ensure that the next cloud sync doesn't move the bookmark back to where it used to be. Reviewed By: mitrandir77 Differential Revision: D15414172 fbshipit-source-id: 71aaa2d89f734e4c575c24da2c0ef6b59ca4deaa
2019-05-22 00:29:10 +03:00
Sync in client2. This will omit the bookmark because we don't have the landed commit.
commitcloud: add test demonstrating bad sync behaviour when removing obsolete bookmark Summary: If the user has a bookmark pointing at an obsolete commit, and then moves that bookmark away from that commit, commit cloud can't tell whether the commit should really be obsolete or not. Previously the bookmark was the only thing keeping the commit visible, but commit cloud doesn't know that. I can't think of a way to fix this with obsmarkers. It works with separate mutation and visibility (T34204947). Reviewed By: quark-zju Differential Revision: D15097845 fbshipit-source-id: 5926553b4878b28823a6ce47d29c0346cba04e5e
2019-05-20 16:11:59 +03:00
$ cd ../client2
$ hg cloud sync -q
67d363c9001e1d7227625f0fa5004aca4572d214 not found, omitting foo bookmark
$ tglogp
@ 0: df4f53cec30a public 'base'
commitcloud: remove omitted bookmarks that are available locally Summary: When syncing, if a locally-available bookmark is synced to a new commit that has been omitted, remove the local bookmark to ensure that the next cloud sync doesn't move the bookmark back to where it used to be. Reviewed By: mitrandir77 Differential Revision: D15414172 fbshipit-source-id: 71aaa2d89f734e4c575c24da2c0ef6b59ca4deaa
2019-05-22 00:29:10 +03:00
Pull so that we have the public commit and sync again.
commitcloud: add test demonstrating bad sync behaviour when removing obsolete bookmark Summary: If the user has a bookmark pointing at an obsolete commit, and then moves that bookmark away from that commit, commit cloud can't tell whether the commit should really be obsolete or not. Previously the bookmark was the only thing keeping the commit visible, but commit cloud doesn't know that. I can't think of a way to fix this with obsmarkers. It works with separate mutation and visibility (T34204947). Reviewed By: quark-zju Differential Revision: D15097845 fbshipit-source-id: 5926553b4878b28823a6ce47d29c0346cba04e5e
2019-05-20 16:11:59 +03:00
$ hg pull
pulling from ssh://user@dummy/server
searching for changes
adding changesets
adding manifests
adding file changes
changegroup: do not show "(+/- ? heads)" Summary: In an upcoming change we'll replace `cl.heads()` with `repo.heads()`. In changegroup code path the repo can be in an inconsistent state (ex. a bookmark refers to an unknown commit) which breaks `repo.heads()`. Since the whole purpose of the heads calculation is just to show `(+/- ? heads)`, which does not affect any real features, let's just remove it. Reviewed By: markbt Differential Revision: D18366735 fbshipit-source-id: 893be2cec0c32b64a80b3ef4ca65b69f8ed76b27
2019-11-07 21:50:10 +03:00
added 3 changesets with 2 changes to 2 files
commitcloud: add test demonstrating bad sync behaviour when removing obsolete bookmark Summary: If the user has a bookmark pointing at an obsolete commit, and then moves that bookmark away from that commit, commit cloud can't tell whether the commit should really be obsolete or not. Previously the bookmark was the only thing keeping the commit visible, but commit cloud doesn't know that. I can't think of a way to fix this with obsmarkers. It works with separate mutation and visibility (T34204947). Reviewed By: quark-zju Differential Revision: D15097845 fbshipit-source-id: 5926553b4878b28823a6ce47d29c0346cba04e5e
2019-05-20 16:11:59 +03:00
$ hg cloud sync
commitcloud: synchronizing 'server' with 'user/test/default'
commitcloud: commits synchronized
finished in * (glob)
commitcloud: refactor sync processing Summary: Refactor how commit cloud sync works. Sync is simplified by delegating backup processing to the existing backup code. This happens first, which means the user's work is backed up earlier, and the sync processing can assume that all backed up commits are available in the cloud storage. Sync no longer attempts to handle the case where cloud storage has changed. Instead, backup processing should ensure that all local commits are backed up to the current cloud storage. If a commit can't be backed up, then treat this as a normal failure to sync and ignore that commit for this sync attempt. If a commit can't be downloaded from the server then the sync fails. Reviewed By: mitrandir77 Differential Revision: D15295499 fbshipit-source-id: d371c5bf0daedbbe42e8c7d4a0c3d1a40c21a36f
2019-05-20 16:11:59 +03:00
The draft commit is also gone from here, and the workspace is stable.
commitcloud: add test demonstrating bad sync behaviour when removing obsolete bookmark Summary: If the user has a bookmark pointing at an obsolete commit, and then moves that bookmark away from that commit, commit cloud can't tell whether the commit should really be obsolete or not. Previously the bookmark was the only thing keeping the commit visible, but commit cloud doesn't know that. I can't think of a way to fix this with obsmarkers. It works with separate mutation and visibility (T34204947). Reviewed By: quark-zju Differential Revision: D15097845 fbshipit-source-id: 5926553b4878b28823a6ce47d29c0346cba04e5e
2019-05-20 16:11:59 +03:00
$ tglogp
o 4: 67d363c9001e public 'public-commit-2' foo
|
o 3: 441f69264760 public 'landed-commit
| Differential Revision: https://phabricator.fb.com/D1234'
o 2: 031d760782fb public 'public-commit-1'
|
@ 0: df4f53cec30a public 'base'
$ cd ../client1
$ hg cloud sync -q
$ tglogp
o 4: 67d363c9001e public 'public-commit-2' foo
|
o 3: 441f69264760 public 'landed-commit
| Differential Revision: https://phabricator.fb.com/D1234'
o 2: 031d760782fb public 'public-commit-1'
|
@ 0: df4f53cec30a public 'base'
Reference in New Issue Copy Permalink