facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-11 01:07:15 +03:00
Code Issues Projects Releases Wiki Activity
4eeab3b81b
sapling/eden/scm/tests/test-commitcloud-backup-restore-obsolete.t

62 lines
1.7 KiB
Perl
Raw Normal View History

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: incorporate infinitepush backups into commitcloud Summary: Merge the functionality of the infinitepushbackup extension (backing up commits to commit cloud) into the commitcloud extension. These two extensions are highly coupled, and the commitcloud extension monkey-patches the infinitepushbackup extension for a lot of its functionality. There is also a lot of code duplication between the two extensions which we can remove if they are part of the same extension. The infinitepushbackup commands (`hg pushbackup`, ...) are moved to subcommands of the `hg cloud` command, e.g. `hg cloud backup`. Each feature of the infinitepushbackup extension is moved to a new module in the commit cloud extension: The `background` module controls background execution of `hg cloud backup` and `hg cloud sync`. The `backupbookmarks` module tracks and updates scratch bookmarks for backups. This will be deprecated in the future. The `backupstate` module tracks whether or not a commit has been backed up. This is now tracked separately from backup bookmarks in a new file: `.hg/commitcloud/backedupheads.<remote-identifier>`. This also covers hidden commits, preventing a re-backup of previously backed up commits when they are unhidden. Previously the commitcloud extension customized the smartlog annotations: `Backing up` became `Syncing`, etc. This is now removed for consistency. Previously the infinitepushbackup extension disabled background backup by injecting an `infinitepushbackup.disableduntil` config entry into the user's config. This is now replaced with a state file at `.hg/commitcloud/autobackup`. Either option can be set to disable auto backup. Commit cloud will wait until both have expired before starting to run background backups again. Reviewed By: DurhamG Differential Revision: D15276939 fbshipit-source-id: 1d28989a157286e47d3dd97ca9c70b27f692dda1
2019-05-20 16:11:59 +03:00
$ enable amend
$ setconfig infinitepushbackup.hostname=testhost
infinitepush: do not backup extinct heads Summary: Previously we backed up extinct node if bookmark pointed to them. But this not is not present in the bundle because `findcommonoutgoing()` intentionally skips extinct and secret commits. In this case we'll have infinitepush bookmark that points to non-existent infinitepush commit. To fix it let's filter extinct heads Test Plan: arc unit Reviewers: #mercurial Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4803322 Tasks: 15389402
2017-04-05 10:56:28 +03:00
$ . "$TESTDIR/library.sh"
infinitepush: move library-infinitepush.sh to infinitepush/library.sh Summary: Makes more sense to have this structure after D6691821. Test Plan: Ran all the tests. Reviewers: quark, #mercurial, #sourcecontrol Reviewed By: quark Differential Revision: https://phabricator.intern.facebook.com/D6694171 Signature: 6694171:1515609818:1142419346e3458db7674b1b69036d88e82a1903
2018-01-10 21:44:15 +03:00
$ . "$TESTDIR/infinitepush/library.sh"
infinitepush: do not backup extinct heads Summary: Previously we backed up extinct node if bookmark pointed to them. But this not is not present in the bundle because `findcommonoutgoing()` intentionally skips extinct and secret commits. In this case we'll have infinitepush bookmark that points to non-existent infinitepush commit. To fix it let's filter extinct heads Test Plan: arc unit Reviewers: #mercurial Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4803322 Tasks: 15389402
2017-04-05 10:56:28 +03:00
$ setupcommon
Setup server
$ hg init repo
$ cd repo
$ setupserver
$ cd ..
Setup backupsource
$ hg clone ssh://user@dummy/repo backupsource -q
$ cd backupsource
Do a normal backup
$ mkcommit first
commitcloud: incorporate infinitepush backups into commitcloud Summary: Merge the functionality of the infinitepushbackup extension (backing up commits to commit cloud) into the commitcloud extension. These two extensions are highly coupled, and the commitcloud extension monkey-patches the infinitepushbackup extension for a lot of its functionality. There is also a lot of code duplication between the two extensions which we can remove if they are part of the same extension. The infinitepushbackup commands (`hg pushbackup`, ...) are moved to subcommands of the `hg cloud` command, e.g. `hg cloud backup`. Each feature of the infinitepushbackup extension is moved to a new module in the commit cloud extension: The `background` module controls background execution of `hg cloud backup` and `hg cloud sync`. The `backupbookmarks` module tracks and updates scratch bookmarks for backups. This will be deprecated in the future. The `backupstate` module tracks whether or not a commit has been backed up. This is now tracked separately from backup bookmarks in a new file: `.hg/commitcloud/backedupheads.<remote-identifier>`. This also covers hidden commits, preventing a re-backup of previously backed up commits when they are unhidden. Previously the commitcloud extension customized the smartlog annotations: `Backing up` became `Syncing`, etc. This is now removed for consistency. Previously the infinitepushbackup extension disabled background backup by injecting an `infinitepushbackup.disableduntil` config entry into the user's config. This is now replaced with a state file at `.hg/commitcloud/autobackup`. Either option can be set to disable auto backup. Commit cloud will wait until both have expired before starting to run background backups again. Reviewed By: DurhamG Differential Revision: D15276939 fbshipit-source-id: 1d28989a157286e47d3dd97ca9c70b27f692dda1
2019-05-20 16:11:59 +03:00
$ hg cloud backup
infinitepushbackup: back up commits stack-by-stack Summary: Use the new stack-by-stack commit backup for infinitepushbackup as well as commitcloud. Reviewed By: DurhamG Differential Revision: D8241380 fbshipit-source-id: 0c1481ad1ab5759ab642d0b02c7fe08523056292
2018-06-05 14:24:26 +03:00
backing up stack rooted at b75a450e74d5
tests: opt-in DUMMYSSH_STABLE_ORDER for more tests Summary: This should help reduce test flakiness. Reviewed By: xavierd Differential Revision: D19872952 fbshipit-source-id: d66f6c404534b3f47903b478e3cdfdda5ed46284
2020-02-28 04:51:13 +03:00
commitcloud: backed up 1 commit
infinitepush: do not backup extinct heads Summary: Previously we backed up extinct node if bookmark pointed to them. But this not is not present in the bundle because `findcommonoutgoing()` intentionally skips extinct and secret commits. In this case we'll have infinitepush bookmark that points to non-existent infinitepush commit. To fix it let's filter extinct heads Test Plan: arc unit Reviewers: #mercurial Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4803322 Tasks: 15389402
2017-04-05 10:56:28 +03:00
remote: pushing 1 commit:
remote: b75a450e74d5 first
Make a commit, than prune a commit, than create a bookmark on top of it.
Do a backup and try to restore. Make sure it doesn't fail
$ hg up -q null
$ mkcommit tobepruned
$ hg log -r . -T '{node}\n'
edb281c9cc7e2e51c382b6f254d1967fdfa5e6ff
$ hg prune .
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 000000000000
1 changesets pruned
prune: use hint framework Summary: This allows users to silence the "hide" advice. In the future, we might want to change "hide/unhide" to only affect visibility without changing obsolesce. So "strip" is not fully deprecated yet. Reviewed By: markbt Differential Revision: D7392131 fbshipit-source-id: 2448d4c91dffce31d29e2dd99078cb555c9a8f8c
2018-04-07 10:36:49 +03:00
hint[strip-hide]: 'hg strip' may be deprecated in the future - use 'hg hide' instead
hint[hint-ack]: use 'hg hint --ack strip-hide' to silence these hints
infinitepush: do not backup extinct heads Summary: Previously we backed up extinct node if bookmark pointed to them. But this not is not present in the bundle because `findcommonoutgoing()` intentionally skips extinct and secret commits. In this case we'll have infinitepush bookmark that points to non-existent infinitepush commit. To fix it let's filter extinct heads Test Plan: arc unit Reviewers: #mercurial Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4803322 Tasks: 15389402
2017-04-05 10:56:28 +03:00
$ hg --hidden book -r edb281c9cc7e2e51c382b6f254d1967fdfa5e6ff newbookonpruned
commitcloud: incorporate infinitepush backups into commitcloud Summary: Merge the functionality of the infinitepushbackup extension (backing up commits to commit cloud) into the commitcloud extension. These two extensions are highly coupled, and the commitcloud extension monkey-patches the infinitepushbackup extension for a lot of its functionality. There is also a lot of code duplication between the two extensions which we can remove if they are part of the same extension. The infinitepushbackup commands (`hg pushbackup`, ...) are moved to subcommands of the `hg cloud` command, e.g. `hg cloud backup`. Each feature of the infinitepushbackup extension is moved to a new module in the commit cloud extension: The `background` module controls background execution of `hg cloud backup` and `hg cloud sync`. The `backupbookmarks` module tracks and updates scratch bookmarks for backups. This will be deprecated in the future. The `backupstate` module tracks whether or not a commit has been backed up. This is now tracked separately from backup bookmarks in a new file: `.hg/commitcloud/backedupheads.<remote-identifier>`. This also covers hidden commits, preventing a re-backup of previously backed up commits when they are unhidden. Previously the commitcloud extension customized the smartlog annotations: `Backing up` became `Syncing`, etc. This is now removed for consistency. Previously the infinitepushbackup extension disabled background backup by injecting an `infinitepushbackup.disableduntil` config entry into the user's config. This is now replaced with a state file at `.hg/commitcloud/autobackup`. Either option can be set to disable auto backup. Commit cloud will wait until both have expired before starting to run background backups again. Reviewed By: DurhamG Differential Revision: D15276939 fbshipit-source-id: 1d28989a157286e47d3dd97ca9c70b27f692dda1
2019-05-20 16:11:59 +03:00
$ hg cloud backup
infinitepushbackup: use better revset for determining what to back up Summary: Change how infinitepush determines what to back up. Commits to back up are all draft ancestors of non-obsolete commits, *plus* all draft ancestors of bookmarked commits, which may be obsolete. Previously, in a stack of the form: ``` | x B (obsolete, bookmarked) | | | o A |/ o ``` neither A or B would be backed up, despite normally being visible to the user. Reviewed By: liubov-dmitrieva Differential Revision: D14540356 fbshipit-source-id: 0d6ad330c53c818b08f736a9af64704cf0be7cd5
2019-03-20 21:19:33 +03:00
backing up stack rooted at edb281c9cc7e
tests: opt-in DUMMYSSH_STABLE_ORDER for more tests Summary: This should help reduce test flakiness. Reviewed By: xavierd Differential Revision: D19872952 fbshipit-source-id: d66f6c404534b3f47903b478e3cdfdda5ed46284
2020-02-28 04:51:13 +03:00
commitcloud: backed up 1 commit
infinitepushbackup: use better revset for determining what to back up Summary: Change how infinitepush determines what to back up. Commits to back up are all draft ancestors of non-obsolete commits, *plus* all draft ancestors of bookmarked commits, which may be obsolete. Previously, in a stack of the form: ``` | x B (obsolete, bookmarked) | | | o A |/ o ``` neither A or B would be backed up, despite normally being visible to the user. Reviewed By: liubov-dmitrieva Differential Revision: D14540356 fbshipit-source-id: 0d6ad330c53c818b08f736a9af64704cf0be7cd5
2019-03-20 21:19:33 +03:00
remote: pushing 1 commit:
remote: edb281c9cc7e tobepruned
infinitepush: do not backup extinct heads Summary: Previously we backed up extinct node if bookmark pointed to them. But this not is not present in the bundle because `findcommonoutgoing()` intentionally skips extinct and secret commits. In this case we'll have infinitepush bookmark that points to non-existent infinitepush commit. To fix it let's filter extinct heads Test Plan: arc unit Reviewers: #mercurial Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4803322 Tasks: 15389402
2017-04-05 10:56:28 +03:00
Restore the repo
$ cd ..
$ hg clone ssh://user@dummy/repo restored -q
$ cd restored
commitcloud: incorporate infinitepush backups into commitcloud Summary: Merge the functionality of the infinitepushbackup extension (backing up commits to commit cloud) into the commitcloud extension. These two extensions are highly coupled, and the commitcloud extension monkey-patches the infinitepushbackup extension for a lot of its functionality. There is also a lot of code duplication between the two extensions which we can remove if they are part of the same extension. The infinitepushbackup commands (`hg pushbackup`, ...) are moved to subcommands of the `hg cloud` command, e.g. `hg cloud backup`. Each feature of the infinitepushbackup extension is moved to a new module in the commit cloud extension: The `background` module controls background execution of `hg cloud backup` and `hg cloud sync`. The `backupbookmarks` module tracks and updates scratch bookmarks for backups. This will be deprecated in the future. The `backupstate` module tracks whether or not a commit has been backed up. This is now tracked separately from backup bookmarks in a new file: `.hg/commitcloud/backedupheads.<remote-identifier>`. This also covers hidden commits, preventing a re-backup of previously backed up commits when they are unhidden. Previously the commitcloud extension customized the smartlog annotations: `Backing up` became `Syncing`, etc. This is now removed for consistency. Previously the infinitepushbackup extension disabled background backup by injecting an `infinitepushbackup.disableduntil` config entry into the user's config. This is now replaced with a state file at `.hg/commitcloud/autobackup`. Either option can be set to disable auto backup. Commit cloud will wait until both have expired before starting to run background backups again. Reviewed By: DurhamG Differential Revision: D15276939 fbshipit-source-id: 1d28989a157286e47d3dd97ca9c70b27f692dda1
2019-05-20 16:11:59 +03:00
$ hg cloud restorebackup
restoring backup for test from $TESTTMP/backupsource on testhost
infinitepush: do not backup extinct heads Summary: Previously we backed up extinct node if bookmark pointed to them. But this not is not present in the bundle because `findcommonoutgoing()` intentionally skips extinct and secret commits. In this case we'll have infinitepush bookmark that points to non-existent infinitepush commit. To fix it let's filter extinct heads Test Plan: arc unit Reviewers: #mercurial Subscribers: mjpieters, #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D4803322 Tasks: 15389402
2017-04-05 10:56:28 +03:00
pulling from ssh://user@dummy/repo
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
infinitepushbackup: use better revset for determining what to back up Summary: Change how infinitepush determines what to back up. Commits to back up are all draft ancestors of non-obsolete commits, *plus* all draft ancestors of bookmarked commits, which may be obsolete. Previously, in a stack of the form: ``` | x B (obsolete, bookmarked) | | | o A |/ o ``` neither A or B would be backed up, despite normally being visible to the user. Reviewed By: liubov-dmitrieva Differential Revision: D14540356 fbshipit-source-id: 0d6ad330c53c818b08f736a9af64704cf0be7cd5
2019-03-20 21:19:33 +03:00
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 1 changesets with 1 changes to 1 files
Reference in New Issue Copy Permalink