##// END OF EJS Templates
split: close transaction in the unlikely event of a conflict while rebasing...
split: close transaction in the unlikely event of a conflict while rebasing `hg split` *should* never result in conflicts, but in case there are bugs, we should at least commit the transaction so they can continue the rebase. One of our users ran into the regression fixed by D10120. They fixed the conflict and the tried to continue the rebase, but it failed with "abort: cannot continue inconsistent rebase" because the rebase state referred to commits written in a transaction that was never committed. Side note: `hg split` should probably turn off copy tracing to reduce the impact of such bugs, and to speed it up as well. Copies made in the rebased commits should still be respected because `hg rebase` calls `copies.graftcopies()`. Differential Revision: https://phab.mercurial-scm.org/D10164

File last commit:

r46518:95c4cca6 default
r47492:7f6c002d default
Show More
test-pull.t
152 lines | 4.3 KiB | text/troff | Tads3Lexer
Matt Mackall
tests: replace exit 80 with #require
r22046 #require serve
Mads Kiilerich
tests: use 'hghave serve' to guard tests that requires serve daemon management
r15446
Gregory Szorc
tests: test using both versions of SSH protocol...
r36235 #testcases sshv1 sshv2
#if sshv2
$ cat >> $HGRCPATH << EOF
> [experimental]
> sshpeer.advertise-v2 = true
> sshserver.support-v2 = true
> EOF
#endif
Martin Geisler
tests: remove redundant mkdir...
r13956 $ hg init test
Adrian Buehlmann
combine tests
r12279 $ cd test
$ echo foo>foo
$ hg addremove
adding foo
$ hg commit -m 1
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 1 changesets with 1 changes to 1 files
Adrian Buehlmann
combine tests
r12279
$ hg serve -p $HGPORT -d --pid-file=hg.pid
$ cat hg.pid >> $DAEMON_PIDS
$ cd ..
Matt Mackall
tests: drop a bunch of sed calls from unified tests
r12366 $ hg clone --pull http://foo:bar@localhost:$HGPORT/ copy
Adrian Buehlmann
combine tests
r12279 requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets 340e38bdcde4
Adrian Buehlmann
combine tests
r12279 updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd copy
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 1 changesets with 1 changes to 1 files
Adrian Buehlmann
combine tests
r12279
$ hg co
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat foo
foo
$ hg manifest --debug
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
Matt Mackall
tests: drop a bunch of sed calls from unified tests
r12366 $ hg pull
Augie Fackler
clone: don't save user's password in .hg/hgrc (Issue3122)
r15552 pulling from http://foo@localhost:$HGPORT/
Adrian Buehlmann
combine tests
r12279 searching for changes
no changes found
Matt Mackall
tests: drop a bunch of sed calls from unified tests
r12366 $ hg rollback --dry-run --verbose
Gilles Moris
rollback: clarifies the message about the reverted state (issue2628)...
r13446 repository tip rolled back to revision -1 (undo pull: http://foo:***@localhost:$HGPORT/)
Adrian Buehlmann
combine tests
r12279
Mads Kiilerich
context: don't hex encode all unknown 20 char revision specs (issue4890)...
r26604 Test pull of non-existing 20 character revision specification, making sure plain ascii identifiers
not are encoded like a node:
$ hg pull -r 'xxxxxxxxxxxxxxxxxxxy'
pulling from http://foo@localhost:$HGPORT/
Martin von Zweigbergk
errors: remove trailing "!" from some error messages for consistency...
r46518 abort: unknown revision 'xxxxxxxxxxxxxxxxxxxy'
Mads Kiilerich
context: don't hex encode all unknown 20 char revision specs (issue4890)...
r26604 [255]
$ hg pull -r 'xxxxxxxxxxxxxxxxxx y'
pulling from http://foo@localhost:$HGPORT/
Martin von Zweigbergk
errors: remove trailing "!" from some error messages for consistency...
r46518 abort: unknown revision 'xxxxxxxxxxxxxxxxxx y'
Mads Kiilerich
context: don't hex encode all unknown 20 char revision specs (issue4890)...
r26604 [255]
Martin von Zweigbergk
tests: demonstrate broken pull of "ffffffffffff" revision...
r42247 Test pull of working copy revision
$ hg pull -r 'ffffffffffff'
pulling from http://foo@localhost:$HGPORT/
Martin von Zweigbergk
errors: remove trailing "!" from some error messages for consistency...
r46518 abort: unknown revision 'ffffffffffff'
Martin von Zweigbergk
tests: demonstrate broken pull of "ffffffffffff" revision...
r42247 [255]
Martin Geisler
tests: added a short description to issue numbers...
r12399 Issue622: hg init && hg pull -u URL doesn't checkout default branch
Adrian Buehlmann
combine tests
r12279
$ cd ..
$ hg init empty
$ cd empty
$ hg pull -u ../test
pulling from ../test
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets 340e38bdcde4
Adrian Buehlmann
combine tests
r12279 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Test 'file:' uri handling:
timeless@mozdev.org
spelling: doesn't/does not
r17486 $ hg pull -q file://../test-does-not-exist
Brodie Rao
hg: look up schemes using url.url
r13823 abort: file:// URLs can only refer to localhost
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Adrian Buehlmann
combine tests
r12279
Brodie Rao
url: refactor util.drop_scheme() and hg.localpath() into url.localpath()...
r13826 $ hg pull -q file://../test
abort: file:// URLs can only refer to localhost
[255]
Matt Harbison
test-serve: disable unfixable tests on Windows...
r31771 MSYS changes 'file:' into 'file;'
#if no-msys
Matt Mackall
check-code: allow disabling msys path check
r24205 $ hg pull -q file:../test # no-msys
Matt Harbison
test-serve: disable unfixable tests on Windows...
r31771 #endif
Adrian Buehlmann
combine tests
r12279
Matt Mackall
tests: fix a bunch of pointless #s in unified tests
r12328 It's tricky to make file:// URLs working on every platform with
regular shell commands.
Adrian Buehlmann
combine tests
r12279
Matt Harbison
tests: quote PYTHON usage...
r39743 $ URL=`"$PYTHON" -c "from __future__ import print_function; import os; print('file://foobar' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test')"`
Adrian Buehlmann
combine tests
r12279 $ hg pull -q "$URL"
Brodie Rao
url: abort on file:// URLs with non-localhost hosts
r13817 abort: file:// URLs can only refer to localhost
[255]
Adrian Buehlmann
combine tests
r12279
Matt Harbison
tests: quote PYTHON usage...
r39743 $ URL=`"$PYTHON" -c "from __future__ import print_function; import os; print('file://localhost' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test')"`
Brodie Rao
url: abort on file:// URLs with non-localhost hosts
r13817 $ hg pull -q "$URL"
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
Sean Farley
pull: add tests for unsafe ssh url (SEC)
r33710 SEC: check for unsafe ssh url
Yuya Nishihara
ssh: unban the use of pipe character in user@host:port string...
r33716 $ cat >> $HGRCPATH << EOF
> [ui]
> ssh = sh -c "read l; read l; read l"
> EOF
Sean Farley
pull: add tests for unsafe ssh url (SEC)
r33710 $ hg pull 'ssh://-oProxyCommand=touch${IFS}owned/path'
pulling from ssh://-oProxyCommand%3Dtouch%24%7BIFS%7Downed/path
abort: potentially unsafe url: 'ssh://-oProxyCommand=touch${IFS}owned/path'
[255]
$ hg pull 'ssh://%2DoProxyCommand=touch${IFS}owned/path'
pulling from ssh://-oProxyCommand%3Dtouch%24%7BIFS%7Downed/path
abort: potentially unsafe url: 'ssh://-oProxyCommand=touch${IFS}owned/path'
[255]
Yuya Nishihara
ssh: unban the use of pipe character in user@host:port string...
r33716 $ hg pull 'ssh://fakehost|touch${IFS}owned/path'
pulling from ssh://fakehost%7Ctouch%24%7BIFS%7Downed/path
Martin von Zweigbergk
errors: remove trailing "!" from some error messages for consistency...
r46518 abort: no suitable response from remote hg
Sean Farley
pull: add tests for unsafe ssh url (SEC)
r33710 [255]
Joerg Sonnenberger
ui: add option to timestamp status and diagnostic messages...
r45564 $ hg --config ui.timestamp-output=true pull 'ssh://fakehost%7Ctouch%20owned/path'
\[20[2-9][0-9]-[01][0-9]-[0-3][0-9]T[0-5][0-9]:[0-5][0-9]:[0-5][0-9]\.[0-9][0-9][0-9][0-9][0-9][0-9]\] pulling from ssh://fakehost%7Ctouch%20owned/path (re)
Martin von Zweigbergk
errors: remove trailing "!" from some error messages for consistency...
r46518 \[20[2-9][0-9]-[01][0-9]-[0-3][0-9]T[0-5][0-9]:[0-5][0-9]:[0-5][0-9]\.[0-9][0-9][0-9][0-9][0-9][0-9]\] abort: no suitable response from remote hg (re)
Sean Farley
pull: add tests for unsafe ssh url (SEC)
r33710 [255]
Yuya Nishihara
ssh: unban the use of pipe character in user@host:port string...
r33716 $ [ ! -f owned ] || echo 'you got owned'
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913 $ cd ..