##// END OF EJS Templates
url: Remove the proxy env variables only when needed (issue2451)...
url: Remove the proxy env variables only when needed (issue2451) This is an attempt to fix issue 2451 and its duplicates (2599 and 2949, AFAIK). Its main idea is that it is only necessary to clean the proxy environment variables *when* http_proxy is set in the config file (since it takes precedence over the environment variables). Otherwise, hg shouldn't bother with them, since they will most likely be used to reach the server.

File last commit:

r14464:00256f68 default
r15077:02734d2b stable
Show More
test-mq-qpush-fail.t
152 lines | 3.2 KiB | text/troff | Tads3Lexer
/ tests / test-mq-qpush-fail.t
Matt Mackall
tests: unify test-mq-qpush-fail
r12467 Test that qpush cleans things up if it doesn't complete
$ echo "[extensions]" >> $HGRCPATH
$ echo "mq=" >> $HGRCPATH
$ hg init repo
$ cd repo
$ echo foo > foo
$ hg ci -Am 'add foo'
adding foo
$ touch untracked-file
$ echo 'syntax: glob' > .hgignore
$ echo '.hgignore' >> .hgignore
$ hg qinit
test qpush on empty series
$ hg qpush
no patches in series
$ hg qnew patch1
$ echo >> foo
$ hg qrefresh -m 'patch 1'
$ hg qnew patch2
$ echo bar > bar
$ hg add bar
$ hg qrefresh -m 'patch 2'
$ hg qnew --config 'mq.plain=true' bad-patch
$ echo >> foo
$ hg qrefresh
$ hg qpop -a
popping bad-patch
popping patch2
popping patch1
patch queue now empty
$ python -c 'print "\xe9"' > message
$ cat .hg/patches/bad-patch >> message
$ mv message .hg/patches/bad-patch
$ hg qpush -a && echo 'qpush succeded?!'
applying patch1
applying patch2
applying bad-patch
transaction abort!
rollback completed
cleaning up working directory...done
Mads Kiilerich
tests: use (esc) for all non-ASCII test output
r12942 abort: decoding near '\xe9': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! (esc)
Matt Mackall
tests: unify test-mq-qpush-fail
r12467 [255]
$ hg parents
changeset: 0:bbd179dfa0a7
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add foo
Matt Mackall
mq: fix qpush recursion in _findtags when status file is wrong (issue2664)...
r13508 test corrupt status file
$ hg qpush
applying patch1
now at: patch1
$ cp .hg/patches/status .hg/patches/status.orig
$ hg qpop
popping patch1
patch queue now empty
$ cp .hg/patches/status.orig .hg/patches/status
$ hg qpush
mq status file refers to unknown node * (glob)
abort: working directory revision is not qtip
[255]
$ rm .hg/patches/status .hg/patches/status.orig
Matt Mackall
tests: unify test-mq-qpush-fail
r12467 bar should be gone; other unknown/ignored files should still be around
$ hg status -A
? untracked-file
I .hgignore
C foo
preparing qpush of a missing patch
$ hg qpop -a
no patches applied
$ hg qpush
applying patch1
now at: patch1
$ rm .hg/patches/patch2
now we expect the push to fail, but it should NOT complain about patch1
$ hg qpush
applying patch2
unable to read patch2
now at: patch1
[1]
preparing qpush of missing patch with no patch applied
$ hg qpop -a
popping patch1
patch queue now empty
$ rm .hg/patches/patch1
qpush should fail the same way as below
$ hg qpush
applying patch1
unable to read patch1
[1]
Afuna
mq: catch attempt to qpush to an earlier patch (issue2587)...
r13369
Test qpush to a patch below the currently applied patch.
$ hg qq -c guardedseriesorder
$ hg qnew a
$ hg qguard +block
$ hg qnew b
$ hg qnew c
$ hg qpop -a
popping c
popping b
popping a
patch queue now empty
try to push and pop while a is guarded
$ hg qpush a
Martin Geisler
mq: print "'foo' 'bar'", not "['foo', 'bar']" when showing guards...
r14464 cannot push 'a' - guarded by '+block'
Afuna
mq: catch attempt to qpush to an earlier patch (issue2587)...
r13369 [1]
$ hg qpush -a
applying b
patch b is empty
applying c
patch c is empty
now at: c
now try it when a is unguarded, and we're at the top of the queue
$ hg qsel block
number of guarded, applied patches has changed from 1 to 0
$ hg qpush b
abort: cannot push to a previous patch: b
[255]
$ hg qpush a
abort: cannot push to a previous patch: a
[255]
and now we try it one more time with a unguarded, while we're not at the top of the queue
$ hg qpop b
popping c
now at: b
$ hg qpush a
abort: cannot push to a previous patch: a
[255]