##// END OF EJS Templates
shelve: add a shelve extension to save/restore working changes...
shelve: add a shelve extension to save/restore working changes This extension saves shelved changes using a temporary draft commit, and bundles the temporary commit and its draft ancestors, then strips them. This strategy makes it possible to use Mercurial's bundle and merge machinery to resolve conflicts if necessary when unshelving, even when the destination commit or its ancestors have been amended, squashed, or evolved. (Once a change has been unshelved, its associated unbundled commits are either rolled back or stripped.) Storing the shelved change as a bundle also avoids the difficulty that hidden commits would cause, of making it impossible to amend the parent if it is a draft commits (a common scenario). Although this extension shares its name and some functionality with the third party hgshelve extension, it has little else in common. Notably, the hgshelve extension shelves changes as unified diffs, which makes conflict resolution a matter of finding .rej files and conflict markers, and cleaning up the mess by hand. We do not yet allow hunk-level choosing of changes to record. Compared to the hgshelve extension, this is a small regression in usability, but we hope to integrate that at a later point, once the record machinery becomes more reusable and robust.

File last commit:

r18255:7ca534f3 default
r19854:49d4919d default
Show More
test-ssh.t
384 lines | 11.0 KiB | text/troff | Tads3Lexer
Matt Mackall
tests: unify test-ssh
r12414
This test tries to exercise the ssh functionality with a dummy script
Mads Kiilerich
tests: fix test-ssh.t after 6bd9778ae749
r14185 creating 'remote' repo
Matt Mackall
tests: unify test-ssh
r12414
$ hg init remote
$ cd remote
$ echo this > foo
$ echo this > fooO
$ hg ci -A -m "init" foo fooO
Mads Kiilerich
tests: fix test-ssh.t after 6bd9778ae749
r14185 $ cat <<EOF > .hg/hgrc
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
r12969 > [server]
> uncompressed = True
>
> [hooks]
Mads Kiilerich
tests: consistently use printenv.py the same MSYS/Windows-compatible way...
r17018 > changegroup = python "$TESTDIR/printenv.py" changegroup-in-remote 0 ../dummylog
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
r12969 > EOF
Matt Mackall
tests: unify test-ssh
r12414 $ cd ..
repo not found error
Mads Kiilerich
tests: quote dummyssh in a way that works on windows too...
r16541 $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/nonexistent local
Martin Geisler
serve: lowercase "no repo here" message
r16935 remote: abort: there is no Mercurial repository here (.hg not found)!
Matt Mackall
tests: unify test-ssh
r12414 abort: no suitable response from remote hg!
[255]
non-existent absolute path
Mads Kiilerich
tests: quote dummyssh in a way that works on windows too...
r16541 $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy//`pwd`/nonexistent local
Martin Geisler
serve: lowercase "no repo here" message
r16935 remote: abort: there is no Mercurial repository here (.hg not found)!
Matt Mackall
tests: unify test-ssh
r12414 abort: no suitable response from remote hg!
[255]
clone remote via stream
Mads Kiilerich
tests: quote dummyssh in a way that works on windows too...
r16541 $ hg clone -e "python \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/remote local-stream
Matt Mackall
tests: unify test-ssh
r12414 streaming all changes
Matt Mackall
tests: unify test-ssh
r12489 4 files to transfer, 392 bytes of data
timeless
test-ssh: handle very slow ssh transfer rate
r12773 transferred 392 bytes in * seconds (*/sec) (glob)
Matt Mackall
tests: unify test-ssh
r12414 updating to branch default
Matt Mackall
tests: unify test-ssh
r12489 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall
tests: unify test-ssh
r12414 $ cd local-stream
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 1 changesets, 2 total revisions
$ cd ..
clone remote via pull
Mads Kiilerich
tests: quote dummyssh in a way that works on windows too...
r16541 $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local
Matt Mackall
tests: unify test-ssh
r12414 requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
verify
$ cd local
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 1 changesets, 2 total revisions
$ echo '[hooks]' >> .hg/hgrc
Mads Kiilerich
tests: consistently use printenv.py the same MSYS/Windows-compatible way...
r17018 $ echo "changegroup = python \"$TESTDIR/printenv.py\" changegroup-in-local 0 ../dummylog" >> .hg/hgrc
Matt Mackall
tests: unify test-ssh
r12414
empty default pull
$ hg paths
default = ssh://user@dummy/remote
Mads Kiilerich
tests: quote dummyssh in a way that works on windows too...
r16541 $ hg pull -e "python \"$TESTDIR/dummyssh\""
Matt Mackall
tests: unify test-ssh
r12414 pulling from ssh://user@dummy/remote
searching for changes
no changes found
local change
$ echo bleah > foo
$ hg ci -m "add"
updating rc
$ echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc
$ echo "[ui]" >> .hg/hgrc
Mads Kiilerich
tests: quote dummyssh in a way that works on windows too...
r16541 $ echo "ssh = python \"$TESTDIR/dummyssh\"" >> .hg/hgrc
Matt Mackall
tests: unify test-ssh
r12414
find outgoing
$ hg out ssh://user@dummy/remote
comparing with ssh://user@dummy/remote
searching for changes
changeset: 1:a28a9d1a809c
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add
find incoming on the remote side
Mads Kiilerich
tests: quote dummyssh in a way that works on windows too...
r16541 $ hg incoming -R ../remote -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/local
Matt Mackall
tests: unify test-ssh
r12414 comparing with ssh://user@dummy/local
searching for changes
changeset: 1:a28a9d1a809c
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add
Brodie Rao
test-ssh: test absolute path that exists
r12504 find incoming on the remote side (using absolute path)
Mads Kiilerich
tests: quote dummyssh in a way that works on windows too...
r16541 $ hg incoming -R ../remote -e "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/`pwd`"
Mads Kiilerich
tests: remove redundant globs...
r12640 comparing with ssh://user@dummy/$TESTTMP/local
Brodie Rao
test-ssh: test absolute path that exists
r12504 searching for changes
changeset: 1:a28a9d1a809c
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add
Matt Mackall
tests: unify test-ssh
r12414 push
$ hg push
pushing to ssh://user@dummy/remote
searching for changes
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
$ cd ../remote
check remote tip
$ hg tip
changeset: 1:a28a9d1a809c
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 2 changesets, 3 total revisions
$ hg cat -r tip foo
bleah
$ echo z > z
$ hg ci -A -m z z
created new head
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
r12969 test pushkeys and bookmarks
$ cd ../local
Mads Kiilerich
tests: quote dummyssh in a way that works on windows too...
r16541 $ hg debugpushkey --config ui.ssh="python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote namespaces
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
r12969 bookmarks
Mads Kiilerich <mads at kiilerich.com>
debugpushkey: list keys sorted
r18255 namespaces
Pierre-Yves David
phases: add basic pushkey support
r15648 phases
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
r12969 $ hg book foo -r 0
$ hg out -B
comparing with ssh://user@dummy/remote
searching for changed bookmarks
foo 1160648e36ce
$ hg push -B foo
pushing to ssh://user@dummy/remote
searching for changes
no changes found
exporting bookmark foo
Matt Mackall
push: don't treat bookmark as a found change...
r16038 [1]
Mads Kiilerich
tests: quote dummyssh in a way that works on windows too...
r16541 $ hg debugpushkey --config ui.ssh="python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote bookmarks
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
r12969 foo 1160648e36cec0054048a7edc4110c6f84fde594
$ hg book -f foo
Matt Mackall
pushkey: use UTF-8
r13050 $ hg push --traceback
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
r12969 pushing to ssh://user@dummy/remote
searching for changes
no changes found
updating bookmark foo
Matt Mackall
push: return 1 if no changes found (issue3228)...
r16023 [1]
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
r12969 $ hg book -d foo
$ hg in -B
comparing with ssh://user@dummy/remote
searching for changed bookmarks
foo a28a9d1a809c
$ hg book -f -r 0 foo
$ hg pull -B foo
pulling from ssh://user@dummy/remote
no changes found
updating bookmark foo
importing bookmark foo
$ hg book -d foo
$ hg push -B foo
Matt Mackall
bookmarks: move push/pull command features to core
r13368 pushing to ssh://user@dummy/remote
searching for changes
no changes found
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
r12969 deleting remote bookmark foo
Matt Mackall
push: don't treat bookmark as a found change...
r16038 [1]
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
r12969
Matt Mackall
tests: unify test-ssh
r12414 a bad, evil hook that prints to stdout
Mads Kiilerich
tests: share dummyssh
r14186 $ cat <<EOF > $TESTTMP/badhook
> import sys
> sys.stdout.write("KABOOM\n")
> EOF
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
r12969 $ echo '[hooks]' >> ../remote/.hg/hgrc
Mads Kiilerich
tests: share dummyssh
r14186 $ echo "changegroup.stdout = python $TESTTMP/badhook" >> ../remote/.hg/hgrc
Matt Mackall
tests: unify test-ssh
r12414 $ echo r > r
$ hg ci -A -m z r
push should succeed even though it has an unexpected response
$ hg push
pushing to ssh://user@dummy/remote
searching for changes
note: unsynced remote changes!
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
remote: KABOOM
$ hg -R ../remote heads
changeset: 3:1383141674ec
tag: tip
parent: 1:a28a9d1a809c
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: z
changeset: 2:6c0482d977a3
parent: 0:1160648e36ce
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: z
Adrian Buehlmann
sshrepo: catch passwords in ssh urls...
r13464
David Soria Parra
hg: add support for cloning bookmarks
r13604 clone bookmarks
$ hg -R ../remote bookmark test
$ hg -R ../remote bookmarks
* test 2:6c0482d977a3
Mads Kiilerich
tests: quote dummyssh in a way that works on windows too...
r16541 $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local-bookmarks
David Soria Parra
hg: add support for cloning bookmarks
r13604 requesting all changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 5 changes to 4 files (+1 heads)
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R local-bookmarks bookmarks
test 2:6c0482d977a3
Adrian Buehlmann
sshrepo: catch passwords in ssh urls...
r13464 passwords in ssh urls are not supported
Matt Mackall
ssh: fix password test...
r13755 (we use a glob here because different Python versions give different
results here)
Adrian Buehlmann
sshrepo: catch passwords in ssh urls...
r13464
$ hg push ssh://user:erroneouspwd@dummy/remote
Matt Mackall
ssh: fix password test...
r13755 pushing to ssh://user:*@dummy/remote (glob)
Adrian Buehlmann
sshrepo: catch passwords in ssh urls...
r13464 abort: password in URL not supported!
[255]
Matt Mackall
tests: unify test-ssh
r12414 $ cd ..
Mads Kiilerich
ssh: quote remote paths (issue2983)
r15581
Mads Kiilerich
tests: add missing no-outer-repo requirements...
r17015 hide outer repo
$ hg init
Mads Kiilerich
ssh: quote remote paths (issue2983)
r15581 Test remote paths with spaces (issue2983):
Mads Kiilerich
tests: quote dummyssh in a way that works on windows too...
r16541 $ hg init --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
Brad Hall
tag: don't allow tagging the null revision (issue1915)...
r17260 $ touch "$TESTTMP/a repo/test"
$ hg -R 'a repo' commit -A -m "test"
adding test
Mads Kiilerich
ssh: quote remote paths (issue2983)
r15581 $ hg -R 'a repo' tag tag
Mads Kiilerich
tests: quote dummyssh in a way that works on windows too...
r16541 $ hg id --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
Brad Hall
tag: don't allow tagging the null revision (issue1915)...
r17260 73649e48688a
Mads Kiilerich
ssh: quote remote paths (issue2983)
r15581
Matt Mackall
clone: don't %-escape the default destination (issue3145)
r17844 Test (non-)escaping of remote paths with spaces when cloning (issue3145):
$ hg clone --ssh "python \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
destination directory: a repo
abort: destination 'a repo' is not empty
[255]
Mads Kiilerich
tests: improve test of hg-ssh and make the test pass on windows
r16608 Test hg-ssh using a helper script that will restore PYTHONPATH (which might
have been cleared by a hg.exe wrapper) and invoke hg-ssh with the right
parameters:
Mads Kiilerich
hg-ssh: use shlex for shell-like parsing of SSH_ORIGINAL_COMMAND...
r15897
Mads Kiilerich
tests: improve test of hg-ssh and make the test pass on windows
r16608 $ cat > ssh.sh << EOF
> userhost="\$1"
> SSH_ORIGINAL_COMMAND="\$2"
> export SSH_ORIGINAL_COMMAND
> PYTHONPATH="$PYTHONPATH"
> export PYTHONPATH
> python "$TESTDIR/../contrib/hg-ssh" "$TESTTMP/a repo"
> EOF
$ hg id --ssh "sh ssh.sh" "ssh://user@dummy/a repo"
Brad Hall
tag: don't allow tagging the null revision (issue1915)...
r17260 73649e48688a
Mads Kiilerich
hg-ssh: use %s for printing paths in error messages...
r16606
Mads Kiilerich
tests: improve test of hg-ssh and make the test pass on windows
r16608 $ hg id --ssh "sh ssh.sh" "ssh://user@dummy/a'repo"
remote: Illegal repository "$TESTTMP/a'repo" (glob)
Mads Kiilerich
hg-ssh: use shlex for shell-like parsing of SSH_ORIGINAL_COMMAND...
r15897 abort: no suitable response from remote hg!
[255]
Mads Kiilerich
hg-ssh: use %s for printing paths in error messages...
r16606
Mads Kiilerich
tests: improve test of hg-ssh and make the test pass on windows
r16608 $ hg id --ssh "sh ssh.sh" --remotecmd hacking "ssh://user@dummy/a'repo"
remote: Illegal command "hacking -R 'a'\''repo' serve --stdio"
Mads Kiilerich
hg-ssh: use shlex for shell-like parsing of SSH_ORIGINAL_COMMAND...
r15897 abort: no suitable response from remote hg!
[255]
Mads Kiilerich
tests: improve test of hg-ssh and make the test pass on windows
r16608 $ SSH_ORIGINAL_COMMAND="'hg' -R 'a'repo' serve --stdio" python "$TESTDIR/../contrib/hg-ssh"
Illegal command "'hg' -R 'a'repo' serve --stdio": No closing quotation
[255]
David Schleimer
hg-ssh: read-only flag...
r16836 Test hg-ssh in read-only mode:
$ cat > ssh.sh << EOF
> userhost="\$1"
> SSH_ORIGINAL_COMMAND="\$2"
> export SSH_ORIGINAL_COMMAND
> PYTHONPATH="$PYTHONPATH"
> export PYTHONPATH
> python "$TESTDIR/../contrib/hg-ssh" --read-only "$TESTTMP/remote"
> EOF
$ hg clone --ssh "sh ssh.sh" "ssh://user@dummy/$TESTTMP/remote" read-only-local
requesting all changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 5 changes to 4 files (+1 heads)
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd read-only-local
$ echo "baz" > bar
$ hg ci -A -m "unpushable commit" bar
$ hg push --ssh "sh ../ssh.sh"
Adrian Buehlmann
tests/run-tests: avoid C:/ in arguments...
r16897 pushing to ssh://user@dummy/*/remote (glob)
David Schleimer
hg-ssh: read-only flag...
r16836 searching for changes
remote: Permission denied
remote: abort: prechangegroup.hg-ssh hook failed
remote: Permission denied
remote: abort: prepushkey.hg-ssh hook failed
abort: unexpected response: empty string
[255]
$ cd ..
Matt Mackall
tests: unify test-ssh
r12414 $ cat dummylog
Mads Kiilerich
sshrepo: don't quote obviously safe strings (issue2983)...
r15622 Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio
Got arguments 1:user@dummy 2:hg -R /$TESTTMP/nonexistent serve --stdio
Got arguments 1:user@dummy 2:hg -R remote serve --stdio
Got arguments 1:user@dummy 2:hg -R remote serve --stdio
Got arguments 1:user@dummy 2:hg -R remote serve --stdio
Got arguments 1:user@dummy 2:hg -R remote serve --stdio
Got arguments 1:user@dummy 2:hg -R local serve --stdio
Got arguments 1:user@dummy 2:hg -R $TESTTMP/local serve --stdio
Got arguments 1:user@dummy 2:hg -R remote serve --stdio
Adrian Buehlmann
tests/printenv.py: eliminate trailing spaces on output
r16982 changegroup-in-remote hook: HG_NODE=a28a9d1a809cab7d4e2fde4bee738a9ede948b60 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1
Mads Kiilerich
sshrepo: don't quote obviously safe strings (issue2983)...
r15622 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
Got arguments 1:user@dummy 2:hg -R remote serve --stdio
Got arguments 1:user@dummy 2:hg -R remote serve --stdio
Got arguments 1:user@dummy 2:hg -R remote serve --stdio
Got arguments 1:user@dummy 2:hg -R remote serve --stdio
Got arguments 1:user@dummy 2:hg -R remote serve --stdio
Got arguments 1:user@dummy 2:hg -R remote serve --stdio
Got arguments 1:user@dummy 2:hg -R remote serve --stdio
Got arguments 1:user@dummy 2:hg -R remote serve --stdio
Adrian Buehlmann
tests/printenv.py: eliminate trailing spaces on output
r16982 changegroup-in-remote hook: HG_NODE=1383141674ec756a6056f6a9097618482fe0f4a6 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1
Mads Kiilerich
sshrepo: don't quote obviously safe strings (issue2983)...
r15622 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
Got arguments 1:user@dummy 2:hg init 'a repo'
Got arguments 1:user@dummy 2:hg -R 'a repo' serve --stdio
Got arguments 1:user@dummy 2:hg -R 'a repo' serve --stdio
Matt Mackall
clone: don't %-escape the default destination (issue3145)
r17844 Got arguments 1:user@dummy 2:hg -R 'a repo' serve --stdio