sapling/tests/test-pushrebase-remotenames.t

116 lines
2.7 KiB
Perl
Raw Normal View History

$ $PYTHON -c 'import remotenames' || exit 80
$ cat >> $HGRCPATH << EOF
> [ui]
> ssh = python "$TESTDIR/dummyssh"
> [extensions]
> remotenames =
> pushrebase = $TESTDIR/../pushrebase.py
2015-07-13 23:44:56 +03:00
> [remotenames]
> allownonfastforward=True
> [experimental]
> bundle2-exp=True
> EOF
Set up server repository
$ hg init server
$ cd server
$ echo foo > a
$ echo foo > b
$ hg commit -Am 'initial'
adding a
adding b
$ hg book master
$ cd ..
Set up client repository
$ hg clone ssh://user@dummy/server client -q
Test that pushing to a remotename gets rebased
$ cd server
$ hg up -q master
$ echo x >> a && hg commit -m "master's commit"
$ cd ../client
$ echo x >> b && hg commit -m "client's commit"
$ hg log -G -T '{rev} "{desc}" {remotebookmarks}'
@ 1 "client's commit"
|
o 0 "initial" default/master
2015-07-13 23:44:56 +03:00
$ hg push --to master
pushing rev 5c3cfb78df2f to destination ssh://user@dummy/server bookmark master
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 2 files (+1 heads)
updating bookmark master
$ hg log -G -T '{rev} "{desc}" {remotebookmarks}'
o 3 "client's commit" default/master
|
o 2 "master's commit"
|
| @ 1 "client's commit"
|/
o 0 "initial"
$ cd ../server
$ hg log -G -T '{rev} "{desc}" {bookmarks}'
o 2 "client's commit" master
|
@ 1 "master's commit"
|
o 0 "initial"
Test pushing a new bookmark
$ cd ..
$ hg -R client push --to newbook
pushing rev 5c3cfb78df2f to destination ssh://user@dummy/server bookmark newbook
searching for changes
abort: not creating new bookmark
(use --force to create a new bookmark)
[255]
$ hg -R client push --to newbook -f
pushing rev 5c3cfb78df2f to destination ssh://user@dummy/server bookmark newbook
searching for changes
exporting bookmark newbook
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 0 changes to 1 files (+1 heads)
$ hg -R server book
* master 2:796d44dcaae0
newbook 3:5c3cfb78df2f
$ hg -R server log -G -T '{rev} "{desc}" {bookmarks}'
o 3 "client's commit" newbook
|
| o 2 "client's commit" master
| |
| @ 1 "master's commit"
|/
o 0 "initial"
Test doing a non-fastforward bookmark move
$ hg -R client push --to newbook -r master -f
pushing rev 796d44dcaae0 to destination ssh://user@dummy/server bookmark newbook
searching for changes
no changes found
updating bookmark newbook
[1]
$ hg -R server log -G -T '{rev} "{desc}" {bookmarks}'
o 3 "client's commit"
|
| o 2 "client's commit" master newbook
| |
| @ 1 "master's commit"
|/
o 0 "initial"