tests/test-mq-qpush-fail.t
author timeless <timeless@mozdev.org>
Fri, 06 May 2016 19:16:16 +0000
changeset 29178 0fb2fddd00a3
parent 26943 263edb591b72
child 33278 87bca10a06ed
permissions -rw-r--r--
tests: test-archive.t use open() instead of file() for py3 compat
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12467
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
     1
Test that qpush cleans things up if it doesn't complete
4658
17f5d2069551 mq: test that qpush cleans things up when it fails
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
     2
12467
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
     3
  $ echo "[extensions]" >> $HGRCPATH
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
     4
  $ echo "mq=" >> $HGRCPATH
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
     5
  $ hg init repo
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
     6
  $ cd repo
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
     7
  $ echo foo > foo
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
     8
  $ hg ci -Am 'add foo'
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
     9
  adding foo
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    10
  $ touch untracked-file
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    11
  $ echo 'syntax: glob' > .hgignore
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    12
  $ echo '.hgignore' >> .hgignore
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    13
  $ hg qinit
8795
51c29aec0b75 mq: eliminate warning on qpush with empty series
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    14
12467
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    15
test qpush on empty series
4658
17f5d2069551 mq: test that qpush cleans things up when it fails
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
    16
12467
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    17
  $ hg qpush
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    18
  no patches in series
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    19
  $ hg qnew patch1
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    20
  $ echo >> foo
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    21
  $ hg qrefresh -m 'patch 1'
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    22
  $ hg qnew patch2
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    23
  $ echo bar > bar
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    24
  $ hg add bar
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    25
  $ hg qrefresh -m 'patch 2'
22545
6a2cfa61acb0 mq: upgrade non-plain patches to HG format when setting parent in patchheader
Mads Kiilerich <madski@unity3d.com>
parents: 22453
diff changeset
    26
  $ hg qnew --config 'mq.plain=true' -U bad-patch
12467
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    27
  $ echo >> foo
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    28
  $ hg qrefresh
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    29
  $ hg qpop -a
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    30
  popping bad-patch
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    31
  popping patch2
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    32
  popping patch1
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    33
  patch queue now empty
22947
c63a09b6b337 tests: use $PYTHON instead of hardcoding python
Augie Fackler <raf@durin42.com>
parents: 22545
diff changeset
    34
  $ $PYTHON -c 'print "\xe9"' > message
12467
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    35
  $ cat .hg/patches/bad-patch >> message
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    36
  $ mv message .hg/patches/bad-patch
24992
7df090c9c9fe localrepo: use changelog.hasnode instead of self.__contains__
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24826
diff changeset
    37
  $ cat > $TESTTMP/wrapplayback.py <<EOF
7df090c9c9fe localrepo: use changelog.hasnode instead of self.__contains__
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24826
diff changeset
    38
  > import os
7df090c9c9fe localrepo: use changelog.hasnode instead of self.__contains__
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24826
diff changeset
    39
  > from mercurial import extensions, transaction
7df090c9c9fe localrepo: use changelog.hasnode instead of self.__contains__
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24826
diff changeset
    40
  > def wrapplayback(orig,
7df090c9c9fe localrepo: use changelog.hasnode instead of self.__contains__
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24826
diff changeset
    41
  >                  journal, report, opener, vfsmap, entries, backupentries,
7df090c9c9fe localrepo: use changelog.hasnode instead of self.__contains__
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24826
diff changeset
    42
  >                  unlink=True):
7df090c9c9fe localrepo: use changelog.hasnode instead of self.__contains__
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24826
diff changeset
    43
  >     orig(journal, report, opener, vfsmap, entries, backupentries, unlink)
7df090c9c9fe localrepo: use changelog.hasnode instead of self.__contains__
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24826
diff changeset
    44
  >     # Touching files truncated at "transaction.abort" causes
7df090c9c9fe localrepo: use changelog.hasnode instead of self.__contains__
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24826
diff changeset
    45
  >     # forcible re-loading invalidated filecache properties
7df090c9c9fe localrepo: use changelog.hasnode instead of self.__contains__
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24826
diff changeset
    46
  >     # (including repo.changelog)
7df090c9c9fe localrepo: use changelog.hasnode instead of self.__contains__
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24826
diff changeset
    47
  >     for f, o, _ignore in entries:
7df090c9c9fe localrepo: use changelog.hasnode instead of self.__contains__
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24826
diff changeset
    48
  >         if o or not unlink:
7df090c9c9fe localrepo: use changelog.hasnode instead of self.__contains__
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24826
diff changeset
    49
  >             os.utime(opener.join(f), (0.0, 0.0))
7df090c9c9fe localrepo: use changelog.hasnode instead of self.__contains__
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24826
diff changeset
    50
  > def extsetup(ui):
7df090c9c9fe localrepo: use changelog.hasnode instead of self.__contains__
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24826
diff changeset
    51
  >     extensions.wrapfunction(transaction, '_playback', wrapplayback)
7df090c9c9fe localrepo: use changelog.hasnode instead of self.__contains__
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24826
diff changeset
    52
  > EOF
7df090c9c9fe localrepo: use changelog.hasnode instead of self.__contains__
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24826
diff changeset
    53
  $ hg qpush -a --config extensions.wrapplayback=$TESTTMP/wrapplayback.py  && echo 'qpush succeeded?!'
12467
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    54
  applying patch1
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    55
  applying patch2
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    56
  applying bad-patch
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    57
  transaction abort!
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    58
  rollback completed
26654
30657909b2ba mq: use cmdutil.revert instead of hg.revert
Matt Mackall <mpm@selenic.com>
parents: 24992
diff changeset
    59
  cleaning up working directory...
30657909b2ba mq: use cmdutil.revert instead of hg.revert
Matt Mackall <mpm@selenic.com>
parents: 24992
diff changeset
    60
  reverting foo
30657909b2ba mq: use cmdutil.revert instead of hg.revert
Matt Mackall <mpm@selenic.com>
parents: 24992
diff changeset
    61
  done
12942
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12467
diff changeset
    62
  abort: decoding near '\xe9': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! (esc)
12467
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    63
  [255]
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    64
  $ hg parents
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    65
  changeset:   0:bbd179dfa0a7
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    66
  tag:         tip
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    67
  user:        test
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    68
  date:        Thu Jan 01 00:00:00 1970 +0000
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    69
  summary:     add foo
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    70
  
4658
17f5d2069551 mq: test that qpush cleans things up when it fails
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
    71
13508
0396ca8015be mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents: 13369
diff changeset
    72
test corrupt status file
0396ca8015be mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents: 13369
diff changeset
    73
  $ hg qpush
0396ca8015be mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents: 13369
diff changeset
    74
  applying patch1
0396ca8015be mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents: 13369
diff changeset
    75
  now at: patch1
0396ca8015be mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents: 13369
diff changeset
    76
  $ cp .hg/patches/status .hg/patches/status.orig
0396ca8015be mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents: 13369
diff changeset
    77
  $ hg qpop
0396ca8015be mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents: 13369
diff changeset
    78
  popping patch1
0396ca8015be mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents: 13369
diff changeset
    79
  patch queue now empty
0396ca8015be mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents: 13369
diff changeset
    80
  $ cp .hg/patches/status.orig .hg/patches/status
0396ca8015be mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents: 13369
diff changeset
    81
  $ hg qpush
0396ca8015be mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents: 13369
diff changeset
    82
  abort: working directory revision is not qtip
0396ca8015be mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents: 13369
diff changeset
    83
  [255]
0396ca8015be mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents: 13369
diff changeset
    84
  $ rm .hg/patches/status .hg/patches/status.orig
0396ca8015be mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents: 13369
diff changeset
    85
0396ca8015be mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
Matt Mackall <mpm@selenic.com>
parents: 13369
diff changeset
    86
12467
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    87
bar should be gone; other unknown/ignored files should still be around
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    88
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    89
  $ hg status -A
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    90
  ? untracked-file
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    91
  I .hgignore
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    92
  C foo
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    93
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    94
preparing qpush of a missing patch
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    95
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    96
  $ hg qpop -a
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    97
  no patches applied
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    98
  $ hg qpush
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
    99
  applying patch1
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
   100
  now at: patch1
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
   101
  $ rm .hg/patches/patch2
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
   102
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
   103
now we expect the push to fail, but it should NOT complain about patch1
8875
801cacf46e62 mq: fix error message for qpush inexistent-patch (issue1702)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8795
diff changeset
   104
12467
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
   105
  $ hg qpush
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
   106
  applying patch2
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
   107
  unable to read patch2
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
   108
  now at: patch1
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
   109
  [1]
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
   110
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
   111
preparing qpush of missing patch with no patch applied
8875
801cacf46e62 mq: fix error message for qpush inexistent-patch (issue1702)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8795
diff changeset
   112
12467
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
   113
  $ hg qpop -a
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
   114
  popping patch1
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
   115
  patch queue now empty
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
   116
  $ rm .hg/patches/patch1
9590
07a62819b309 mq: fix traceback for qpush inexistant-patch with no patch applied
Benoit Allard <benoit@aeteurope.nl>
parents: 8875
diff changeset
   117
12467
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
   118
qpush should fail the same way as below
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
   119
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
   120
  $ hg qpush
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
   121
  applying patch1
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
   122
  unable to read patch1
05e1171cf4ca tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
   123
  [1]
13369
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   124
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   125
Test qpush to a patch below the currently applied patch.
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   126
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   127
  $ hg qq -c guardedseriesorder
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   128
  $ hg qnew a
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   129
  $ hg qguard +block
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   130
  $ hg qnew b
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   131
  $ hg qnew c
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   132
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   133
  $ hg qpop -a
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   134
  popping c
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   135
  popping b
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   136
  popping a
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   137
  patch queue now empty
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   138
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   139
try to push and pop while a is guarded
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   140
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   141
  $ hg qpush a
14464
00256f689f9c mq: print "'foo' 'bar'", not "['foo', 'bar']" when showing guards
Martin Geisler <mg@aragost.com>
parents: 13508
diff changeset
   142
  cannot push 'a' - guarded by '+block'
13369
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   143
  [1]
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   144
  $ hg qpush -a
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   145
  applying b
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   146
  patch b is empty
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   147
  applying c
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   148
  patch c is empty
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   149
  now at: c
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   150
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   151
now try it when a is unguarded, and we're at the top of the queue
22453
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18217
diff changeset
   152
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18217
diff changeset
   153
  $ hg qapplied -v
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18217
diff changeset
   154
  0 G a
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18217
diff changeset
   155
  1 A b
fd0f0b0d316d mq: report correct numbers for changing "number of guarded, applied patches"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18217
diff changeset
   156
  2 A c
13369
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   157
  $ hg qsel block
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   158
  $ hg qpush b
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   159
  abort: cannot push to a previous patch: b
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   160
  [255]
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   161
  $ hg qpush a
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   162
  abort: cannot push to a previous patch: a
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   163
  [255]
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   164
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   165
and now we try it one more time with a unguarded, while we're not at the top of the queue
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   166
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   167
  $ hg qpop b
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   168
  popping c
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   169
  now at: b
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   170
  $ hg qpush a
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   171
  abort: cannot push to a previous patch: a
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   172
  [255]
69238d0ca60f mq: catch attempt to qpush to an earlier patch (issue2587)
Afuna <afunamatata@gmail.com>
parents: 12942
diff changeset
   173
16633
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   174
test qpop --force and backup files
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   175
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   176
  $ hg qpop -a
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   177
  popping b
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   178
  patch queue now empty
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   179
  $ hg qq --create force
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   180
  $ echo a > a
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   181
  $ echo b > b
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   182
  $ echo c > c
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   183
  $ hg ci -Am add a b c
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   184
  $ echo a >> a
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   185
  $ hg rm b
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   186
  $ hg rm c
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   187
  $ hg qnew p1
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   188
  $ echo a >> a
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   189
  $ echo bb > b
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   190
  $ hg add b
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   191
  $ echo cc > c
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   192
  $ hg add c
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   193
  $ hg qpop --force --verbose
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   194
  saving current version of a as a.orig
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   195
  saving current version of b as b.orig
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   196
  saving current version of c as c.orig
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   197
  popping p1
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   198
  patch queue now empty
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   199
  $ hg st
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   200
  ? a.orig
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   201
  ? b.orig
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   202
  ? c.orig
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   203
  ? untracked-file
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   204
  $ cat a.orig
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   205
  a
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   206
  a
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   207
  a
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   208
  $ cat b.orig
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   209
  bb
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   210
  $ cat c.orig
b2ca2f40c9c1 mq: backup local changes in qpop --force (issue3433)
Patrick Mezard <patrick@mezard.eu>
parents: 14464
diff changeset
   211
  cc
16634
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   212
16635
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   213
test qpop --force --no-backup
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   214
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   215
  $ hg qpush
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   216
  applying p1
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   217
  now at: p1
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   218
  $ rm a.orig
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   219
  $ echo a >> a
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   220
  $ hg qpop --force --no-backup --verbose
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   221
  popping p1
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   222
  patch queue now empty
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   223
  $ test -f a.orig && echo 'error: backup with --no-backup'
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   224
  [1]
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   225
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   226
test qpop --keep-changes
16653
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   227
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   228
  $ hg qpush
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   229
  applying p1
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   230
  now at: p1
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   231
  $ hg qpop --keep-changes --force
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   232
  abort: cannot use both --force and --keep-changes
16653
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   233
  [255]
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   234
  $ echo a >> a
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   235
  $ hg qpop --keep-changes
26780
bbf544b5f2e9 mq: consistently use qrefresh
timeless@mozdev.org
parents: 26654
diff changeset
   236
  abort: local changes found, qrefresh first
16653
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   237
  [255]
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   238
  $ hg revert -qa a
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   239
  $ rm a
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   240
  $ hg qpop --keep-changes
26780
bbf544b5f2e9 mq: consistently use qrefresh
timeless@mozdev.org
parents: 26654
diff changeset
   241
  abort: local changes found, qrefresh first
16653
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   242
  [255]
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   243
  $ hg rm -A a
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   244
  $ hg qpop --keep-changes
26780
bbf544b5f2e9 mq: consistently use qrefresh
timeless@mozdev.org
parents: 26654
diff changeset
   245
  abort: local changes found, qrefresh first
16653
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   246
  [255]
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   247
  $ hg revert -qa a
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   248
  $ echo b > b
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   249
  $ hg add b
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   250
  $ hg qpop --keep-changes
26780
bbf544b5f2e9 mq: consistently use qrefresh
timeless@mozdev.org
parents: 26654
diff changeset
   251
  abort: local changes found, qrefresh first
16653
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   252
  [255]
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   253
  $ hg forget b
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   254
  $ echo d > d
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   255
  $ hg add d
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   256
  $ hg qpop --keep-changes
16653
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   257
  popping p1
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   258
  patch queue now empty
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   259
  $ hg forget d
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   260
  $ rm d
73b8c2554be8 mq: introduce qpop --check
Patrick Mezard <patrick@mezard.eu>
parents: 16635
diff changeset
   261
16634
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   262
test qpush --force and backup files
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   263
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   264
  $ echo a >> a
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   265
  $ hg qnew p2
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   266
  $ echo b >> b
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   267
  $ echo d > d
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   268
  $ echo e > e
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   269
  $ hg add d e
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   270
  $ hg rm c
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   271
  $ hg qnew p3
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   272
  $ hg qpop -a
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   273
  popping p3
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   274
  popping p2
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   275
  patch queue now empty
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   276
  $ echo a >> a
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   277
  $ echo b1 >> b
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   278
  $ echo d1 > d
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   279
  $ hg add d
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   280
  $ echo e1 > e
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   281
  $ hg qpush -a --force --verbose
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   282
  applying p2
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   283
  saving current version of a as a.orig
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   284
  patching file a
23749
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 22947
diff changeset
   285
  committing files:
16634
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   286
  a
23749
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 22947
diff changeset
   287
  committing manifest
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 22947
diff changeset
   288
  committing changelog
16634
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   289
  applying p3
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   290
  saving current version of b as b.orig
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   291
  saving current version of d as d.orig
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   292
  patching file b
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   293
  patching file c
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   294
  patching file d
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   295
  file d already exists
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   296
  1 out of 1 hunks FAILED -- saving rejects to file d.rej
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   297
  patching file e
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   298
  file e already exists
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   299
  1 out of 1 hunks FAILED -- saving rejects to file e.rej
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   300
  patch failed to apply
23749
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 22947
diff changeset
   301
  committing files:
16634
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   302
  b
23749
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 22947
diff changeset
   303
  committing manifest
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 22947
diff changeset
   304
  committing changelog
24365
f1eaf03dd608 commands: say "working directory" in full spelling
Yuya Nishihara <yuya@tcha.org>
parents: 23749
diff changeset
   305
  patch failed, rejects left in working directory
26780
bbf544b5f2e9 mq: consistently use qrefresh
timeless@mozdev.org
parents: 26654
diff changeset
   306
  errors during apply, please fix and qrefresh p3
16634
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   307
  [2]
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   308
  $ cat a.orig
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   309
  a
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   310
  a
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   311
  $ cat b.orig
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   312
  b
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   313
  b1
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   314
  $ cat d.orig
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16633
diff changeset
   315
  d1
16635
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   316
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   317
test qpush --force --no-backup
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   318
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   319
  $ hg revert -qa
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   320
  $ hg qpop -a
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   321
  popping p3
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   322
  popping p2
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   323
  patch queue now empty
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   324
  $ echo a >> a
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   325
  $ rm a.orig
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   326
  $ hg qpush --force --no-backup --verbose
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   327
  applying p2
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   328
  patching file a
23749
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 22947
diff changeset
   329
  committing files:
16635
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   330
  a
23749
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 22947
diff changeset
   331
  committing manifest
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 22947
diff changeset
   332
  committing changelog
16635
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   333
  now at: p2
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   334
  $ test -f a.orig && echo 'error: backup with --no-backup'
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   335
  [1]
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   336
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   337
test qgoto --force --no-backup
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   338
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   339
  $ hg qpop
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   340
  popping p2
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   341
  patch queue now empty
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   342
  $ echo a >> a
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   343
  $ hg qgoto --force --no-backup p2 --verbose
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   344
  applying p2
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   345
  patching file a
23749
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 22947
diff changeset
   346
  committing files:
16635
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   347
  a
23749
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 22947
diff changeset
   348
  committing manifest
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 22947
diff changeset
   349
  committing changelog
16635
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   350
  now at: p2
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   351
  $ test -f a.orig && echo 'error: backup with --no-backup'
9d76320d8b99 mq: add --no-backup for qpush/qpop/qgoto
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
   352
  [1]
16654
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   353
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   354
test qpush --keep-changes
16654
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   355
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   356
  $ hg qpush --keep-changes --force
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   357
  abort: cannot use both --force and --keep-changes
16654
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   358
  [255]
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   359
  $ hg qpush --keep-changes --exact
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   360
  abort: cannot use --exact and --keep-changes together
16654
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   361
  [255]
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   362
  $ echo b >> b
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   363
  $ hg qpush --keep-changes
16654
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   364
  applying p3
24826
9b02b678888e mq: avoid silent failure when single patch doesn't apply (issue4604)
Matt Mackall <mpm@selenic.com>
parents: 24365
diff changeset
   365
  abort: conflicting local changes found
9b02b678888e mq: avoid silent failure when single patch doesn't apply (issue4604)
Matt Mackall <mpm@selenic.com>
parents: 24365
diff changeset
   366
  (did you forget to qrefresh?)
9b02b678888e mq: avoid silent failure when single patch doesn't apply (issue4604)
Matt Mackall <mpm@selenic.com>
parents: 24365
diff changeset
   367
  [255]
16654
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   368
  $ rm b
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   369
  $ hg qpush --keep-changes
16654
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   370
  applying p3
24826
9b02b678888e mq: avoid silent failure when single patch doesn't apply (issue4604)
Matt Mackall <mpm@selenic.com>
parents: 24365
diff changeset
   371
  abort: conflicting local changes found
9b02b678888e mq: avoid silent failure when single patch doesn't apply (issue4604)
Matt Mackall <mpm@selenic.com>
parents: 24365
diff changeset
   372
  (did you forget to qrefresh?)
9b02b678888e mq: avoid silent failure when single patch doesn't apply (issue4604)
Matt Mackall <mpm@selenic.com>
parents: 24365
diff changeset
   373
  [255]
16654
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   374
  $ hg rm -A b
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   375
  $ hg qpush --keep-changes
16654
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   376
  applying p3
24826
9b02b678888e mq: avoid silent failure when single patch doesn't apply (issue4604)
Matt Mackall <mpm@selenic.com>
parents: 24365
diff changeset
   377
  abort: conflicting local changes found
9b02b678888e mq: avoid silent failure when single patch doesn't apply (issue4604)
Matt Mackall <mpm@selenic.com>
parents: 24365
diff changeset
   378
  (did you forget to qrefresh?)
9b02b678888e mq: avoid silent failure when single patch doesn't apply (issue4604)
Matt Mackall <mpm@selenic.com>
parents: 24365
diff changeset
   379
  [255]
16654
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   380
  $ hg revert -aq b
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   381
  $ echo d > d
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   382
  $ hg add d
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   383
  $ hg qpush --keep-changes
16654
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   384
  applying p3
24826
9b02b678888e mq: avoid silent failure when single patch doesn't apply (issue4604)
Matt Mackall <mpm@selenic.com>
parents: 24365
diff changeset
   385
  abort: conflicting local changes found
9b02b678888e mq: avoid silent failure when single patch doesn't apply (issue4604)
Matt Mackall <mpm@selenic.com>
parents: 24365
diff changeset
   386
  (did you forget to qrefresh?)
9b02b678888e mq: avoid silent failure when single patch doesn't apply (issue4604)
Matt Mackall <mpm@selenic.com>
parents: 24365
diff changeset
   387
  [255]
16654
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   388
  $ hg forget d
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   389
  $ rm d
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   390
  $ hg qpop
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   391
  popping p2
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   392
  patch queue now empty
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   393
  $ echo b >> b
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   394
  $ hg qpush -a --keep-changes
16654
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   395
  applying p2
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   396
  applying p3
24826
9b02b678888e mq: avoid silent failure when single patch doesn't apply (issue4604)
Matt Mackall <mpm@selenic.com>
parents: 24365
diff changeset
   397
  abort: conflicting local changes found
9b02b678888e mq: avoid silent failure when single patch doesn't apply (issue4604)
Matt Mackall <mpm@selenic.com>
parents: 24365
diff changeset
   398
  (did you forget to qrefresh?)
9b02b678888e mq: avoid silent failure when single patch doesn't apply (issue4604)
Matt Mackall <mpm@selenic.com>
parents: 24365
diff changeset
   399
  [255]
16654
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   400
  $ hg qtop
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   401
  p2
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   402
  $ hg parents --template "{rev} {desc}\n"
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   403
  2 imported patch p2
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   404
  $ hg st b
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   405
  M b
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   406
  $ cat b
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   407
  b
490ed8972f1b mq: introduce qpush --check
Patrick Mezard <patrick@mezard.eu>
parents: 16653
diff changeset
   408
  b
16655
6ca125af882f mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents: 16654
diff changeset
   409
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   410
test qgoto --keep-changes
16655
6ca125af882f mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents: 16654
diff changeset
   411
6ca125af882f mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents: 16654
diff changeset
   412
  $ hg revert -aq b
6ca125af882f mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents: 16654
diff changeset
   413
  $ rm e
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   414
  $ hg qgoto --keep-changes --force p3
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   415
  abort: cannot use both --force and --keep-changes
16655
6ca125af882f mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents: 16654
diff changeset
   416
  [255]
6ca125af882f mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents: 16654
diff changeset
   417
  $ echo a >> a
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   418
  $ hg qgoto --keep-changes p3
16655
6ca125af882f mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents: 16654
diff changeset
   419
  applying p3
6ca125af882f mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents: 16654
diff changeset
   420
  now at: p3
6ca125af882f mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents: 16654
diff changeset
   421
  $ hg st a
6ca125af882f mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents: 16654
diff changeset
   422
  M a
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   423
  $ hg qgoto --keep-changes p2
16655
6ca125af882f mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents: 16654
diff changeset
   424
  popping p3
6ca125af882f mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents: 16654
diff changeset
   425
  now at: p2
6ca125af882f mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents: 16654
diff changeset
   426
  $ hg st a
6ca125af882f mq: introduce qgoto --check
Patrick Mezard <patrick@mezard.eu>
parents: 16654
diff changeset
   427
  M a
16656
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   428
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   429
test mq.keepchanges setting
16656
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   430
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   431
  $ hg --config mq.keepchanges=1 qpush
16656
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   432
  applying p3
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   433
  now at: p3
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   434
  $ hg st a
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   435
  M a
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   436
  $ hg --config mq.keepchanges=1 qpop
16656
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   437
  popping p3
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   438
  now at: p2
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   439
  $ hg st a
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   440
  M a
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   441
  $ hg --config mq.keepchanges=1 qgoto p3
16656
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   442
  applying p3
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   443
  now at: p3
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   444
  $ hg st a
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   445
  M a
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   446
  $ echo b >> b
26943
263edb591b72 mq: let the user choose where .orig files are kept
Christian Delahousse <cdelahousse@fb.com>
parents: 26780
diff changeset
   447
  $ hg --config mq.keepchanges=1 qpop --force --config 'ui.origbackuppath=.hg/origbackups'
16656
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   448
  popping p3
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   449
  now at: p2
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   450
  $ hg st b
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   451
  $ hg --config mq.keepchanges=1 qpush --exact
26780
bbf544b5f2e9 mq: consistently use qrefresh
timeless@mozdev.org
parents: 26654
diff changeset
   452
  abort: local changes found, qrefresh first
16656
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   453
  [255]
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   454
  $ hg revert -qa a
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   455
  $ hg qpop
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   456
  popping p2
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   457
  patch queue now empty
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   458
  $ echo a >> a
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
   459
  $ hg --config mq.keepchanges=1 qpush --force
16656
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   460
  applying p2
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   461
  now at: p2
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16655
diff changeset
   462
  $ hg st a
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
   463
26943
263edb591b72 mq: let the user choose where .orig files are kept
Christian Delahousse <cdelahousse@fb.com>
parents: 26780
diff changeset
   464
test previous qpop (with --force and --config) saved .orig files to where user
263edb591b72 mq: let the user choose where .orig files are kept
Christian Delahousse <cdelahousse@fb.com>
parents: 26780
diff changeset
   465
wants them
263edb591b72 mq: let the user choose where .orig files are kept
Christian Delahousse <cdelahousse@fb.com>
parents: 26780
diff changeset
   466
  $ ls .hg/origbackups
263edb591b72 mq: let the user choose where .orig files are kept
Christian Delahousse <cdelahousse@fb.com>
parents: 26780
diff changeset
   467
  b.orig
263edb591b72 mq: let the user choose where .orig files are kept
Christian Delahousse <cdelahousse@fb.com>
parents: 26780
diff changeset
   468
  $ rm -rf .hg/origbackups
263edb591b72 mq: let the user choose where .orig files are kept
Christian Delahousse <cdelahousse@fb.com>
parents: 26780
diff changeset
   469
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
   470
  $ cd ..