mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
2105ae2bdd
Summary: For short hashes it is nice to warn if the commit is too old. Scenario: After making commit on one machine, you can wait not enough time to try to upload it on another machine using short hash from `hg sl` in case of conflict (single conflict!) you can get automatically a very old commit, that is not yours, without a warning. (And there were cases, when this screwed up hg that tried to go 250,000 commits ago) I added a warning with a description of found commit if it is more than configured number of days old (default is 60) Also, format of output has been redesigned. Now it is bold and got colors! Also, I added #commitcloud Another new features is that I added sorting by date in suggestions block. Reviewed By: mjpieters Differential Revision: D7195265 fbshipit-source-id: 7225a9b0fa8a7381f1e88ef7eb8a8fe2dfff43cd
295 lines
9.4 KiB
Perl
295 lines
9.4 KiB
Perl
Create an ondisk bundlestore
|
|
$ . "$TESTDIR/library.sh"
|
|
$ . "$TESTDIR/infinitepush/library.sh"
|
|
$ cp $HGRCPATH $TESTTMP/defaulthgrc
|
|
$ setupcommon
|
|
$ hg init repo
|
|
$ cd repo
|
|
$ setupserver
|
|
$ cd ..
|
|
|
|
Test `hg up` command for the commit that doesn't exist locally but does remotely.
|
|
We are making commit in repo (server) and will recover it in client 1 via short hash.
|
|
|
|
$ hg clone ssh://user@dummy/repo client2 -q
|
|
$ (cd repo && mkcommit somecommit && hg log -r .)
|
|
changeset: 0:f8b49bf62d4d
|
|
tag: tip
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: somecommit
|
|
|
|
$ (cd ./client2 && hg up f8b49b)
|
|
'f8b49b' does not exist locally - looking for it remotely...
|
|
pulling from ssh://user@dummy/repo
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
new changesets f8b49bf62d4d
|
|
(run 'hg update' to get a working copy)
|
|
'f8b49b' found remotely
|
|
pull finished in * sec (glob)
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
Test `hg up` command for the commit that doesn't exist locally
|
|
Also doesn't exist remotely
|
|
But can be recovered from backup
|
|
We are making a test commit in client 1 and will recover it from client2
|
|
We will also run few checks with `hg hide` / `hg up` commands.
|
|
|
|
$ hg clone ssh://user@dummy/repo client1 -q
|
|
$ cd client1
|
|
$ mkcommit someothercommit
|
|
$ hg log -r .
|
|
changeset: 1:c1b6fe8fce73
|
|
tag: tip
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: someothercommit
|
|
|
|
Backup commit
|
|
$ hg pushbackup
|
|
starting backup * (glob)
|
|
searching for changes
|
|
remote: pushing 1 commit:
|
|
remote: c1b6fe8fce73 someothercommit
|
|
finished in * seconds (glob)
|
|
|
|
Quick test `hg hide` / `hg up`
|
|
Check update now accesses hidden commits rather than trying to pull
|
|
$ cat >> .hg/hgrc << EOF
|
|
> [extensions]
|
|
> fbamend=
|
|
> [experimental]
|
|
> evolution=exchange
|
|
> evolution.createmarkers=True
|
|
> EOF
|
|
$ hg hide c1b6fe8fce73
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
working directory now at f8b49bf62d4d
|
|
1 changesets hidden
|
|
$ hg up c1b6fe8fce73
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
Check hg up on another client.
|
|
Commit should be pulled from backup storage.
|
|
$ (cd ../client2 && hg up c1b6fe)
|
|
'c1b6fe' does not exist locally - looking for it remotely...
|
|
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
|
|
new changesets c1b6fe8fce73
|
|
(run 'hg update' to get a working copy)
|
|
'c1b6fe' found remotely
|
|
pull finished in * sec (glob)
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ cd ..
|
|
|
|
Test pulling a commit with the same prefix by creating fake files
|
|
$ echo ' ' > ./repo/.hg/scratchbranches/index/nodemap/b1b6fe8fce73221de4162469dac9a6f8d01744a1
|
|
$ echo ' ' > ./repo/.hg/scratchbranches/index/nodemap/b1b6fe8fce73221de4162469dac9a6f8d01744a2
|
|
$ (cd ./client2 && hg up b1b6fe)
|
|
'b1b6fe' does not exist locally - looking for it remotely...
|
|
pulling from ssh://user@dummy/repo
|
|
pull failed: ambiguous identifier 'b1b6fe'
|
|
suggestion: provide longer commithash prefix
|
|
abort: unknown revision 'b1b6fe'!
|
|
[255]
|
|
|
|
Clean up from the previous tests
|
|
$ rm -r ./client1
|
|
$ rm -r ./client2
|
|
|
|
Set up similar test but with sql infinitepush storage
|
|
The test scenario will cover several different lengths of prefix
|
|
|
|
#if no-osx
|
|
$ now=`date +%s`
|
|
$ then30=`expr $now - 30 \* 24 \* 60 \* 60`
|
|
$ then32=`expr $now - 32 \* 24 \* 60 \* 60`
|
|
$ mkcommitveryold() {
|
|
> echo "$1" > "$1"
|
|
> hg add "$1"
|
|
> hg ci -d "0 0" -m "$1"
|
|
> }
|
|
$ mkcommitrecent() {
|
|
> echo "$1" > "$1"
|
|
> hg add "$1"
|
|
> hg ci -m "$1" -d"$now 0"
|
|
> }
|
|
$ mkcommitsold32days() {
|
|
> echo "$1" > "$1"
|
|
> hg add "$1"
|
|
> hg ci -m "$1" -d "$then32 0"
|
|
> }
|
|
$ mkcommitsold30days() {
|
|
> echo "$1" > "$1"
|
|
> hg add "$1"
|
|
> hg ci -m "$1" -d "$then30 0"
|
|
> }
|
|
$ . "$TESTDIR/infinitepush/library.sh"
|
|
$ setupcommon
|
|
|
|
With no configuration it should abort
|
|
$ hg init server
|
|
$ cd server
|
|
$ setupsqlserverhgrc babar
|
|
$ echo "[infinitepush]" >> .hg/hgrc
|
|
$ echo "shorthasholdrevthreshold=31" >> .hg/hgrc
|
|
$ setupdb
|
|
$ cd ..
|
|
$ hg clone -q ssh://user@dummy/server client1
|
|
$ hg clone -q ssh://user@dummy/server client2
|
|
$ cd ./client1
|
|
$ setupsqlclienthgrc
|
|
$ cd ../client2
|
|
$ setupsqlclienthgrc
|
|
$ cd ../client1
|
|
|
|
$ mkcommitrecent someothercommit1
|
|
$ my_new_commit1=`hg parent --template '{node}'`
|
|
$ my_new_commit1_hashlen6=`echo $my_new_commit1 | fold -w 6 | head -n 1`
|
|
|
|
$ mkcommitrecent someothercommit2
|
|
$ my_new_commit2=`hg parent --template '{node}'`
|
|
$ my_new_commit2_hashlen5=`echo $my_new_commit2 | fold -w 5 | head -n 1`
|
|
|
|
$ mkcommitveryold someothercommit3
|
|
$ my_new_commit3=`hg parent --template '{node}'`
|
|
$ my_new_commit3_hashlen9=`echo $my_new_commit3 | fold -w 9 | head -n 1`
|
|
|
|
$ mkcommitsold32days someothercommit4
|
|
$ my_new_commit4=`hg parent --template '{node}'`
|
|
$ my_new_commit4_hashlen12=`echo $my_new_commit4 | fold -w 12 | head -n 1`
|
|
|
|
$ mkcommitsold30days someothercommit5
|
|
$ my_new_commit5=`hg parent --template '{node}'`
|
|
$ my_new_commit5_hashlen10=`echo $my_new_commit5 | fold -w 10 | head -n 1`
|
|
|
|
$ hg pushbackup
|
|
starting backup * (glob)
|
|
searching for changes
|
|
remote: pushing 5 commits:
|
|
remote: * someothercommit1 (glob)
|
|
remote: * someothercommit2 (glob)
|
|
remote: * someothercommit3 (glob)
|
|
remote: * someothercommit4 (glob)
|
|
remote: * someothercommit5 (glob)
|
|
finished in * seconds (glob)
|
|
$ cd ../
|
|
|
|
case 1: recent commit, length of prefix = 6 characters
|
|
$ (cd ./client2 && hg up $my_new_commit1_hashlen6)
|
|
'*' does not exist locally - looking for it remotely... (glob)
|
|
pulling from ssh://user@dummy/server
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
new changesets * (glob)
|
|
(run 'hg update' to get a working copy)
|
|
'*' found remotely (glob)
|
|
pull finished in * sec (glob)
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
case 2: recent commit, length of prefix < 6 characters
|
|
$ (cd ./client2 && hg up $my_new_commit2_hashlen5)
|
|
'*' does not exist locally - looking for it remotely... (glob)
|
|
pulling from ssh://user@dummy/server
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 2 files
|
|
new changesets * (glob)
|
|
(run 'hg update' to get a working copy)
|
|
'*' found remotely (glob)
|
|
pull finished in * sec (glob)
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
case 3: test longerlength
|
|
in this case we also test pulling old commits
|
|
|
|
case 3a: very old commit, hash size 9 characters
|
|
$ (cd ./client2 && hg up $my_new_commit3_hashlen9)
|
|
'*' does not exist locally - looking for it remotely... (glob)
|
|
pulling from ssh://user@dummy/server
|
|
pull failed: commit * is more than 31 days old (glob)
|
|
description:
|
|
changeset: * (glob)
|
|
author: test
|
|
date: 01 Jan 1970 00:00
|
|
summary: someothercommit3
|
|
#commitcloud hint: if you would like to fetch this commit, please provide the full hash
|
|
abort: unknown revision '*'! (glob)
|
|
[255]
|
|
|
|
case 3b: 32 days old commit, hash size 12 characters
|
|
$ (cd ./client2 && hg up $my_new_commit4_hashlen12)
|
|
'*' does not exist locally - looking for it remotely... (glob)
|
|
pulling from ssh://user@dummy/server
|
|
pull failed: commit '*' is more than 31 days old (glob)
|
|
description:
|
|
changeset: * (glob)
|
|
author: test
|
|
date: * (glob)
|
|
summary: someothercommit4
|
|
#commitcloud hint: if you would like to fetch this commit, please provide the full hash
|
|
abort: unknown revision '*'! (glob)
|
|
[255]
|
|
|
|
case 3ba: same test but check that output contains the full hash
|
|
$ (cd ./client2 && hg up $my_new_commit4_hashlen12 2>&1 | grep $my_new_commit4)
|
|
* changeset: * (glob)
|
|
|
|
case 3b: 32 days old commit, hash size - full hash
|
|
$ (cd ./client2 && hg up $my_new_commit4)
|
|
* does not exist locally - looking for it remotely... (glob)
|
|
pulling from ssh://user@dummy/server
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 2 changesets with 2 changes to 4 files
|
|
new changesets *:* (glob)
|
|
(run 'hg update' to get a working copy)
|
|
* found remotely (glob)
|
|
pull finished in * sec (glob)
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
case 3c: 30 days old, hash size 10 characters
|
|
$ (cd ./client2 && hg up $my_new_commit5_hashlen10)
|
|
'*' does not exist locally - looking for it remotely... (glob)
|
|
pulling from ssh://user@dummy/server
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 5 files
|
|
new changesets * (glob)
|
|
(run 'hg update' to get a working copy)
|
|
'*' found remotely (glob)
|
|
pull finished in * sec (glob)
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
case 3ba: 32 days old commit, hash size 12 characters but it was already uploaded
|
|
so, it is just local switch
|
|
$ (cd ./client2 && hg up $my_new_commit4_hashlen12)
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
case 3d: commit doesn't exists in the DB
|
|
Test when the commit is not found
|
|
$ (cd ./client2 && hg up aaaaaa)
|
|
'aaaaaa' does not exist locally - looking for it remotely...
|
|
pulling from ssh://user@dummy/server
|
|
pull failed: unknown revision 'aaaaaa'
|
|
abort: unknown revision 'aaaaaa'!
|
|
[255]
|
|
|
|
#endif
|