mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +03:00
d02477d831
Summary: Some scripts are parsing all hg outputs. The remote stderr output could contain random noise that break the scripts. Therefore let's forward remote stderr to local stderr, instead of local stdout. Reviewed By: DurhamG Differential Revision: D8514952 fbshipit-source-id: 2f205fdc948fbeacd20b5af9d6d52eaa8212e90e
393 lines
13 KiB
Perl
393 lines
13 KiB
Perl
$ . helpers-usechg.sh
|
|
|
|
$ . "$TESTDIR/library.sh"
|
|
$ . "$TESTDIR/infinitepush/library.sh"
|
|
$ setupcommon
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [infinitepushbackup]
|
|
> logdir=$TESTTMP/logs
|
|
> hostname=testhost
|
|
> EOF
|
|
|
|
Setup server
|
|
$ hg init repo
|
|
$ cd repo
|
|
$ setupserver
|
|
$ cd ..
|
|
|
|
Create backup source
|
|
$ hg clone ssh://user@dummy/repo backupsource -q
|
|
|
|
Create restore target
|
|
$ hg clone ssh://user@dummy/repo restored -q
|
|
|
|
Backup
|
|
$ cd backupsource
|
|
$ mkcommit firstcommit
|
|
$ hg book abook
|
|
|
|
Actually do a backup, make sure that backup check doesn't fail for empty backup state
|
|
$ hg pushbackup
|
|
starting backup .* (re)
|
|
backing up stack rooted at 89ecc969c0ac
|
|
remote: pushing 1 commit:
|
|
remote: 89ecc969c0ac firstcommit
|
|
finished in \d+\.(\d+)? seconds (re)
|
|
$ cd ..
|
|
|
|
Create logdir
|
|
$ setuplogdir
|
|
|
|
Restore
|
|
$ cd restored
|
|
$ hg pullbackup --config infinitepushbackup.autobackup=True
|
|
pulling from ssh://user@dummy/repo
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
new changesets 89ecc969c0ac
|
|
(run 'hg update' to get a working copy)
|
|
$ waitbgbackup
|
|
$ hg log --graph -T '{desc}'
|
|
o firstcommit
|
|
|
|
$ hg book
|
|
abook 0:89ecc969c0ac
|
|
$ cd ..
|
|
Check that autobackup doesn't happen on pullbackup. Logs should be empty and backupstate should be correct
|
|
$ test -f $TESTTMP/logs/test/*
|
|
[1]
|
|
$ python -c "import sys; import json; bst = json.loads(sys.stdin.read()); print(bst['bookmarks'], bst['heads'])" < restored/.hg/infinitepushbackupstate
|
|
({u'abook': u'89ecc969c0ac7d7344728f1255250df7c54a56af'}, [u'89ecc969c0ac7d7344728f1255250df7c54a56af'])
|
|
|
|
|
|
Create second backup source
|
|
$ hg clone ssh://user@dummy/repo backupsource2 -q
|
|
$ cd backupsource2
|
|
$ mkcommit secondcommit
|
|
$ hg book secondbook
|
|
$ hg pushbackup
|
|
starting backup .* (re)
|
|
backing up stack rooted at c1bfda8efb6e
|
|
remote: pushing 1 commit:
|
|
remote: c1bfda8efb6e secondcommit
|
|
finished in \d+\.(\d+)? seconds (re)
|
|
$ cd ..
|
|
|
|
Restore with ambiguous repo root
|
|
$ rm -rf restored
|
|
$ hg clone ssh://user@dummy/repo restored -q
|
|
$ cd restored
|
|
$ hg pullbackup
|
|
user test has 2 available backups:
|
|
(backups are ordered with the most recent at the top of the list)
|
|
$TESTTMP/backupsource2 on testhost
|
|
$TESTTMP/backupsource on testhost
|
|
abort: multiple backups found
|
|
(set --hostname and --reporoot to pick a backup)
|
|
[255]
|
|
$ hg pullbackup --reporoot $TESTTMP/backupsource2
|
|
pulling from ssh://user@dummy/repo
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
new changesets c1bfda8efb6e
|
|
(run 'hg update' to get a working copy)
|
|
$ hg log --graph -T '{desc}'
|
|
o secondcommit
|
|
|
|
$ cd ..
|
|
|
|
Check bookmarks escaping
|
|
$ cd backupsource
|
|
$ hg book book/bookmarks/somebook
|
|
$ hg book book/bookmarksbookmarks/somebook
|
|
$ hg pushbackup
|
|
starting backup .* (re)
|
|
finished in \d+\.(\d+)? seconds (re)
|
|
$ cd ../restored
|
|
$ hg pullbackup --reporoot $TESTTMP/backupsource
|
|
pulling from ssh://user@dummy/repo
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
new changesets 89ecc969c0ac
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
$ hg book
|
|
abook 1:89ecc969c0ac
|
|
book/bookmarks/somebook 1:89ecc969c0ac
|
|
book/bookmarksbookmarks/somebook 1:89ecc969c0ac
|
|
secondbook 0:c1bfda8efb6e
|
|
$ cd ..
|
|
|
|
Create a repo with `/bookmarks/` in path
|
|
$ mkdir bookmarks
|
|
$ cd bookmarks
|
|
$ hg clone ssh://user@dummy/repo backupsource3 -q
|
|
$ cd backupsource3
|
|
$ mkcommit commitinweirdrepo
|
|
$ hg book bookbackupsource3
|
|
$ hg pushbackup
|
|
starting backup .* (re)
|
|
backing up stack rooted at a2a9ae518b62
|
|
remote: pushing 1 commit:
|
|
remote: a2a9ae518b62 commitinweirdrepo
|
|
finished in \d+\.(\d+)? seconds (re)
|
|
$ cd ../../restored
|
|
$ hg pullbackup --reporoot $TESTTMP/bookmarks/backupsource3
|
|
pulling from ssh://user@dummy/repo
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
new changesets a2a9ae518b62
|
|
(run 'hg heads .' to see heads, 'hg merge' to merge)
|
|
$ hg book
|
|
abook 1:89ecc969c0ac
|
|
book/bookmarks/somebook 1:89ecc969c0ac
|
|
book/bookmarksbookmarks/somebook 1:89ecc969c0ac
|
|
bookbackupsource3 2:a2a9ae518b62
|
|
secondbook 0:c1bfda8efb6e
|
|
|
|
Check that correct path is used in pushbackup
|
|
$ cd ../backupsource
|
|
$ hg book badpathbookmark
|
|
$ hg --config paths.default=badpath --config paths.anotherpath=ssh://user@dummy/repo pushbackup
|
|
starting backup .* (re)
|
|
finished in \d+\.(\d+)? seconds (re)
|
|
abort: repository $TESTTMP/backupsource/badpath not found!
|
|
[255]
|
|
$ hg pushbackup anotherpath --config paths.default=badpath --config paths.anotherpath=ssh://user@dummy/repo
|
|
starting backup .* (re)
|
|
finished in \d+\.(\d+)? seconds (re)
|
|
$ hg up -q book/bookmarksbookmarks/somebook
|
|
$ hg book -d badpathbookmark
|
|
$ cd ../restored
|
|
|
|
Check that correct path is used in pullbackup
|
|
$ hg pullbackup --config paths.default=badpath --config paths.anotherpath=ssh://user@dummy/repo --reporoot $TESTTMP/bookmarks/backupsource3
|
|
abort: repository $TESTTMP/restored/badpath not found!
|
|
[255]
|
|
$ hg pullbackup anotherpath --config paths.default=badpath --config paths.anotherpath=ssh://user@dummy/repo --reporoot $TESTTMP/bookmarks/backupsource3
|
|
pulling from ssh://user@dummy/repo
|
|
no changes found
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 0 changesets with 0 changes to 1 files
|
|
|
|
$ cd ..
|
|
|
|
Backup and restore two commits
|
|
$ cd backupsource
|
|
$ mkcommit firstinbatch
|
|
$ hg up 0
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(leaving bookmark book/bookmarksbookmarks/somebook)
|
|
$ mkcommit secondinbatch
|
|
$ hg pushbackup
|
|
starting backup .* (re)
|
|
backing up stack rooted at 89ecc969c0ac
|
|
remote: pushing 3 commits:
|
|
remote: 89ecc969c0ac firstcommit
|
|
remote: 33c1c9df81e9 firstinbatch
|
|
remote: 0e1a088ff282 secondinbatch
|
|
finished in \d+\.(\d+)? seconds (re)
|
|
$ cd ../restored
|
|
|
|
Install server-side extension that will print message every time when bundlerepo
|
|
is created
|
|
$ cd ../repo
|
|
$ printf "\n[extensions]\nbundlerepologger=$TESTDIR/bundlerepologger.py" >> .hg/hgrc
|
|
$ hg st
|
|
$ cd ../restored
|
|
|
|
Pull the backup and check bundlerepo was created only once
|
|
$ hg pullbackup --reporoot $TESTTMP/backupsource 2>&1 | grep 'creating bundlerepo'
|
|
remote: creating bundlerepo
|
|
$ cd ../repo
|
|
$ printf "\n[extensions]\nbundlerepologger=!" >> .hg/hgrc
|
|
$ cd ../restored
|
|
|
|
Make sure that commits were restored
|
|
$ hg log -r '33c1c9df81e9 + 0e1a088ff282' > /dev/null
|
|
|
|
Backup as another user, then restore it
|
|
$ cd ../backupsource
|
|
$ mkcommit backupasanotheruser
|
|
$ hg log -r . -T '{node}\n'
|
|
e0230a60975b38a9014f098fb973199efd25c46f
|
|
$ HGUSER=anotheruser hg pushbackup
|
|
starting backup .* (re)
|
|
backing up stack rooted at 89ecc969c0ac
|
|
remote: pushing 3 commits:
|
|
remote: 89ecc969c0ac firstcommit
|
|
remote: 0e1a088ff282 secondinbatch
|
|
remote: e0230a60975b backupasanotheruser
|
|
finished in \d+\.(\d+)? seconds (re)
|
|
$ cd ../restored
|
|
|
|
Make sure commit was pulled by checking that commit is present
|
|
$ hg log -r e0230a60975b38a9014f098fb973199efd25c46f -T '{node}\n'
|
|
abort: unknown revision 'e0230a60975b38a9014f098fb973199efd25c46f'!
|
|
[255]
|
|
$ hg pullbackup --user anotheruser --reporoot $TESTTMP/backupsource > /dev/null
|
|
$ hg log -r tip -T '{node}\n'
|
|
e0230a60975b38a9014f098fb973199efd25c46f
|
|
|
|
Test debugcheckbackup
|
|
$ hg debugcheckbackup
|
|
user test has 4 available backups:
|
|
(backups are ordered with the most recent at the top of the list)
|
|
$TESTTMP on testhost
|
|
$TESTTMP/bookmarks/backupsource3 on testhost
|
|
$TESTTMP/backupsource2 on testhost
|
|
$TESTTMP/backupsource on testhost
|
|
abort: multiple backups found
|
|
(set --hostname and --reporoot to pick a backup)
|
|
[255]
|
|
$ hg debugcheckbackup --user anotheruser --reporoot $TESTTMP/backupsource
|
|
checking \$TESTTMP/backupsource on .* (re)
|
|
$ hg debugcheckbackup --all 2>&1 | sort
|
|
checking \$TESTTMP on .* (re)
|
|
checking \$TESTTMP/backupsource on .* (re)
|
|
checking \$TESTTMP/backupsource2 on .* (re)
|
|
checking \$TESTTMP/bookmarks/backupsource3 on .* (re)
|
|
$ rm ../repo/.hg/scratchbranches/index/nodemap/e0230a60975b38a9014f098fb973199efd25c46f
|
|
$ hg debugcheckbackup --user anotheruser --reporoot $TESTTMP/backupsource
|
|
checking \$TESTTMP/backupsource on .* (re)
|
|
unknown revision 'e0230a60975b38a9014f098fb973199efd25c46f'
|
|
[255]
|
|
|
|
Make another backup from backupsource2 and run `hg debugcheckbackup --all` again.
|
|
Make sure that both repos were checked even though check for one of them fails
|
|
$ cd ../backupsource2
|
|
$ mkcommit newcommit
|
|
$ HGUSER=anotheruser hg pushbackup
|
|
starting backup .* (re)
|
|
backing up stack rooted at c1bfda8efb6e
|
|
remote: pushing 2 commits:
|
|
remote: c1bfda8efb6e secondcommit
|
|
remote: c03baa769a20 newcommit
|
|
finished in \d+\.(\d+)? seconds (re)
|
|
$ cd ../backupsource
|
|
$ hg debugcheckbackup --user anotheruser --all 2>&1 | sort
|
|
checking \$TESTTMP/backupsource on .* (re)
|
|
checking \$TESTTMP/backupsource2 on .* (re)
|
|
unknown revision 'e0230a60975b38a9014f098fb973199efd25c46f'
|
|
|
|
Test getavailablebackups command
|
|
$ hg getavailablebackups
|
|
user test has 4 available backups:
|
|
(backups are ordered with the most recent at the top of the list)
|
|
\$TESTTMP on .* (re)
|
|
\$TESTTMP/bookmarks/backupsource3 on .* (re)
|
|
\$TESTTMP/backupsource2 on .* (re)
|
|
\$TESTTMP/backupsource on .* (re)
|
|
$ hg getavailablebackups --user anotheruser
|
|
user anotheruser has 2 available backups:
|
|
(backups are ordered with the most recent at the top of the list)
|
|
\$TESTTMP/backupsource2 on .* (re)
|
|
\$TESTTMP/backupsource on .* (re)
|
|
$ hg getavailablebackups --json
|
|
{
|
|
".*": \[ (re)
|
|
"$TESTTMP",
|
|
"$TESTTMP/bookmarks/backupsource3",
|
|
"$TESTTMP/backupsource2",
|
|
"$TESTTMP/backupsource"
|
|
]
|
|
}
|
|
|
|
Make a couple more backup sources
|
|
$ cd ..
|
|
$ hg clone ssh://user@dummy/repo backupsource4 -q
|
|
$ cd backupsource4
|
|
$ mkcommit commit4
|
|
$ hg pushbackup
|
|
starting backup .* (re)
|
|
backing up stack rooted at 56d472a48d80
|
|
remote: pushing 1 commit:
|
|
remote: 56d472a48d80 commit4
|
|
finished in \d+\.(\d+)? seconds (re)
|
|
$ cd ..
|
|
$ hg clone ssh://user@dummy/repo backupsource5 -q
|
|
$ cd backupsource5
|
|
$ mkcommit commit5
|
|
$ hg pushbackup
|
|
starting backup .* (re)
|
|
backing up stack rooted at 6def11a9e22f
|
|
remote: pushing 1 commit:
|
|
remote: 6def11a9e22f commit5
|
|
finished in \d+\.(\d+)? seconds (re)
|
|
$ cd ../backupsource
|
|
|
|
$ hg getavailablebackups
|
|
user test has 6 available backups:
|
|
(backups are ordered with the most recent at the top of the list)
|
|
$TESTTMP on testhost
|
|
$TESTTMP/bookmarks/backupsource3 on testhost
|
|
$TESTTMP/backupsource5 on testhost
|
|
$TESTTMP/backupsource4 on testhost
|
|
$TESTTMP/backupsource2 on testhost
|
|
(older backups have been hidden, run 'hg getavailablebackups --all' to see them all)
|
|
$ hg getavailablebackups --all
|
|
user test has 6 available backups:
|
|
(backups are ordered with the most recent at the top of the list)
|
|
$TESTTMP on testhost
|
|
$TESTTMP/bookmarks/backupsource3 on testhost
|
|
$TESTTMP/backupsource5 on testhost
|
|
$TESTTMP/backupsource4 on testhost
|
|
$TESTTMP/backupsource2 on testhost
|
|
$TESTTMP/backupsource on testhost
|
|
|
|
Delete a backup
|
|
$ echo y | hg backupdelete --reporoot "$TESTTMP/backupsource2" --hostname testhost --config ui.interactive=true
|
|
$TESTTMP/backupsource2 on testhost:
|
|
heads:
|
|
c1bfda8efb6e73473d6874e35125861a34a5594d
|
|
bookmarks:
|
|
secondbook: c1bfda8efb6e73473d6874e35125861a34a5594d
|
|
delete this backup (yn)? y
|
|
deleting backup for $TESTTMP/backupsource2 on testhost
|
|
backup deleted
|
|
(you can still access the commits directly using their hashes)
|
|
|
|
$ hg getavailablebackups
|
|
user test has 5 available backups:
|
|
(backups are ordered with the most recent at the top of the list)
|
|
$TESTTMP on testhost
|
|
$TESTTMP/bookmarks/backupsource3 on testhost
|
|
$TESTTMP/backupsource5 on testhost
|
|
$TESTTMP/backupsource4 on testhost
|
|
$TESTTMP/backupsource on testhost
|
|
|
|
Try deleting invalid backup names
|
|
$ hg backupdelete --reporoot '%' --hostname testhost
|
|
abort: repo root contains unexpected characters
|
|
[255]
|
|
$ hg backupdelete --reporoot foo --hostname '*'
|
|
abort: hostname contains unexpected characters
|
|
[255]
|
|
$ hg backupdelete --reporoot foo --hostname bar
|
|
abort: no backup found for foo on bar
|
|
[255]
|
|
|
|
Try deleting the backup for the current directory
|
|
$ hg backupdelete --reporoot "$TESTTMP/backupsource" --hostname testhost
|
|
warning: this backup matches the current repo
|
|
$TESTTMP/backupsource on testhost:
|
|
heads:
|
|
0e1a088ff2825213eaa838a82a842bc186f10dd5
|
|
33c1c9df81e943319194decdb886cced08e67a29
|
|
bookmarks:
|
|
abook: 89ecc969c0ac7d7344728f1255250df7c54a56af
|
|
book/bookmarks/somebook: 89ecc969c0ac7d7344728f1255250df7c54a56af
|
|
book/bookmarksbookmarks/somebook: 33c1c9df81e943319194decdb886cced08e67a29
|
|
delete this backup (yn)? n
|