tests/test-mq.t
author Pierre-Yves David <pierre-yves.david@logilab.fr>
Wed, 18 Jan 2012 16:53:49 +0100
changeset 15926 f94513971767
parent 15862 d0f2a89c8cfa
child 15952 ec8a9e06cf05
permissions -rw-r--r--
mq: have mq create secret changeset only
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
15442
db0340f4b507 tests: use 'hghave execbit' for tests that manipulate x bit in file system
Mads Kiilerich <mads@kiilerich.com>
parents: 14732
diff changeset
     1
  $ "$TESTDIR/hghave" execbit || exit 80
db0340f4b507 tests: use 'hghave execbit' for tests that manipulate x bit in file system
Mads Kiilerich <mads@kiilerich.com>
parents: 14732
diff changeset
     2
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
     3
  $ checkundo()
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
     4
  > {
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
     5
  >     if [ -f .hg/store/undo ]; then
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
     6
  >     echo ".hg/store/undo still exists after $1"
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
     7
  >     fi
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
     8
  > }
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     9
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    10
  $ echo "[extensions]" >> $HGRCPATH
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    11
  $ echo "mq=" >> $HGRCPATH
2848
307439d6fede mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2846
diff changeset
    12
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    13
  $ echo "[mq]" >> $HGRCPATH
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    14
  $ echo "plain=true" >> $HGRCPATH
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    15
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    16
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    17
help
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    18
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    19
  $ hg help mq
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    20
  mq extension - manage a stack of patches
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    21
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    22
  This extension lets you work with a stack of patches in a Mercurial
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    23
  repository. It manages two stacks of patches - all known patches, and applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    24
  patches (subset of known patches).
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    25
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    26
  Known patches are represented as patch files in the .hg/patches directory.
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    27
  Applied patches are both patch files and changesets.
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    28
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    29
  Common tasks (use "hg help command" for more details):
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    30
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    31
    create new patch                          qnew
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    32
    import existing patch                     qimport
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    33
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    34
    print patch series                        qseries
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    35
    print applied patches                     qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    36
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    37
    add known patch to applied stack          qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    38
    remove patch from applied stack           qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    39
    refresh contents of top applied patch     qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    40
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    41
  By default, mq will automatically use git patches when required to avoid
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    42
  losing file mode changes, copy records, binary files or empty files creations
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    43
  or deletions. This behaviour can be configured with:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    44
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    45
    [mq]
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    46
    git = auto/keep/yes/no
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    47
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    48
  If set to 'keep', mq will obey the [diff] section configuration while
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    49
  preserving existing git patches upon qrefresh. If set to 'yes' or 'no', mq
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    50
  will override the [diff] section and always generate git or regular patches,
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    51
  possibly losing data in the second case.
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    52
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    53
  You will by default be managing a patch queue named "patches". You can create
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    54
  other, independent patch queues with the "hg qqueue" command.
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    55
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    56
  list of commands:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    57
  
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    58
   qapplied      print the patches already applied
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    59
   qclone        clone main and patch repository at same time
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    60
   qdelete       remove patches from queue
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    61
   qdiff         diff of the current patch and subsequent modifications
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    62
   qfinish       move applied patches into repository history
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    63
   qfold         fold the named patches into the current patch
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    64
   qgoto         push or pop patches until named patch is at top of stack
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    65
   qguard        set or print guards for a patch
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    66
   qheader       print the header of the topmost or specified patch
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    67
   qimport       import a patch
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    68
   qnew          create a new patch
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    69
   qnext         print the name of the next patch
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    70
   qpop          pop the current patch off the stack
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    71
   qprev         print the name of the previous patch
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    72
   qpush         push the next patch onto the stack
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    73
   qqueue        manage multiple patch queues
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    74
   qrefresh      update the current patch
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    75
   qrename       rename a patch
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    76
   qselect       set or print guarded patches to push
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    77
   qseries       print the entire series file
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    78
   qtop          print the name of the current patch
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    79
   qunapplied    print the patches not yet applied
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    80
   strip         strip changesets and all their descendants from the repository
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    81
  
13230
827a1cc127bf commands: clarify which aliases "hg help -v" show (issue2572)
Martin Geisler <mg@aragost.com>
parents: 12942
diff changeset
    82
  use "hg -v help mq" to show builtin aliases and global options
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    83
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    84
  $ hg init a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    85
  $ cd a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    86
  $ echo a > a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    87
  $ hg ci -Ama
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    88
  adding a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    89
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    90
  $ hg clone . ../k
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    91
  updating to branch default
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    92
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    93
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    94
  $ mkdir b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    95
  $ echo z > b/z
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    96
  $ hg ci -Ama
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    97
  adding b/z
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    98
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    99
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   100
qinit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   101
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   102
  $ hg qinit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   103
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   104
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   105
  $ hg init b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   106
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   107
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   108
-R qinit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   109
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   110
  $ hg -R b qinit
4071
165abe554c80 mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4065
diff changeset
   111
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   112
  $ hg init c
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   113
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   114
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   115
qinit -c
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   116
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   117
  $ hg --cwd c qinit -c
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   118
  $ hg -R c/.hg/patches st
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   119
  A .hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   120
  A series
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   121
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   122
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   123
qinit; qinit -c
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   124
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   125
  $ hg init d
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   126
  $ cd d
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   127
  $ hg qinit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   128
  $ hg qinit -c
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   129
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   130
qinit -c should create both files if they don't exist
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   131
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   132
  $ cat .hg/patches/.hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   133
  ^\.hg
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   134
  ^\.mq
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   135
  syntax: glob
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   136
  status
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   137
  guards
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   138
  $ cat .hg/patches/series
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   139
  $ hg qinit -c
15447
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 15442
diff changeset
   140
  abort: repository $TESTTMP/d/.hg/patches already exists! (glob)
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   141
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   142
  $ cd ..
11555
d8d0fc3988ca color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents: 11327
diff changeset
   143
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   144
  $ echo '% qinit; <stuff>; qinit -c'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   145
  % qinit; <stuff>; qinit -c
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   146
  $ hg init e
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   147
  $ cd e
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   148
  $ hg qnew A
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   149
  $ checkundo qnew
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   150
  $ echo foo > foo
15926
f94513971767 mq: have mq create secret changeset only
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15862
diff changeset
   151
  $ hg phase -r qbase
f94513971767 mq: have mq create secret changeset only
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15862
diff changeset
   152
  0: secret
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   153
  $ hg add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   154
  $ hg qrefresh
15926
f94513971767 mq: have mq create secret changeset only
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15862
diff changeset
   155
  $ hg phase -r qbase
f94513971767 mq: have mq create secret changeset only
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15862
diff changeset
   156
  0: secret
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   157
  $ hg qnew B
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   158
  $ echo >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   159
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   160
  $ echo status >> .hg/patches/.hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   161
  $ echo bleh >> .hg/patches/.hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   162
  $ hg qinit -c
15447
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 15442
diff changeset
   163
  adding .hg/patches/A (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 15442
diff changeset
   164
  adding .hg/patches/B (glob)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   165
  $ hg -R .hg/patches status
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   166
  A .hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   167
  A A
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   168
  A B
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   169
  A series
4071
165abe554c80 mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4065
diff changeset
   170
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   171
qinit -c shouldn't touch these files if they already exist
10691
a778a367c20b mq: fix init with nonexistent or non-local repository
Cédric Duval <cedricduval@free.fr>
parents: 10397
diff changeset
   172
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   173
  $ cat .hg/patches/.hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   174
  status
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   175
  bleh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   176
  $ cat .hg/patches/series
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   177
  A
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   178
  B
10710
47fbbc4845ff mq: test for init --mq with a destination argument
Cédric Duval <cedricduval@free.fr>
parents: 10691
diff changeset
   179
12036
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
   180
add an untracked file
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
   181
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
   182
  $ echo >> .hg/patches/flaf
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
   183
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   184
status --mq with color (issue2096)
10691
a778a367c20b mq: fix init with nonexistent or non-local repository
Cédric Duval <cedricduval@free.fr>
parents: 10397
diff changeset
   185
13987
e0f07847f8de color: add support for terminfo-based attributes and color
Danek Duvall <duvall@comfychair.org>
parents: 13507
diff changeset
   186
  $ hg status --mq --config extensions.color= --config color.mode=ansi --color=always
12942
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   187
  \x1b[0;32;1mA .hgignore\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   188
  \x1b[0;32;1mA A\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   189
  \x1b[0;32;1mA B\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   190
  \x1b[0;32;1mA series\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   191
  \x1b[0;35;1;4m? flaf\x1b[0m (esc)
12036
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
   192
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
   193
try the --mq option on a command provided by an extension
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
   194
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
   195
  $ hg purge --mq --verbose --config extensions.purge=
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
   196
  Removing file flaf
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
   197
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   198
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   199
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   200
init --mq without repo
10691
a778a367c20b mq: fix init with nonexistent or non-local repository
Cédric Duval <cedricduval@free.fr>
parents: 10397
diff changeset
   201
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   202
  $ mkdir f
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   203
  $ cd f
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   204
  $ hg init --mq
12070
fddacca3202e Merge with stable
Martin Geisler <mg@lazybytes.net>
parents: 12036
diff changeset
   205
  abort: there is no Mercurial repository here (.hg not found)
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   206
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   207
  $ cd ..
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   208
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   209
init --mq with repo path
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   210
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   211
  $ hg init g
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   212
  $ hg init --mq g
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   213
  $ test -d g/.hg/patches/.hg
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   214
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   215
init --mq with nonexistent directory
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   216
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   217
  $ hg init --mq nonexistentdir
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   218
  abort: repository nonexistentdir not found!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   219
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   220
11715
4f9dfb54c8b5 qpush --move: move the right patch even with comment lines
Gilles Moris <gilles.moris@free.fr>
parents: 11555
diff changeset
   221
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   222
init --mq with bundle (non "local")
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   223
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   224
  $ hg -R a bundle --all a.bundle >/dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   225
  $ hg init --mq a.bundle
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   226
  abort: only a local queue repository may be initialized
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   227
  [255]
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   228
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   229
  $ cd a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   230
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   231
  $ hg qnew -m 'foo bar' test.patch
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   232
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   233
  $ echo '# comment' > .hg/patches/series.tmp
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   234
  $ echo >> .hg/patches/series.tmp # empty line
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   235
  $ cat .hg/patches/series >> .hg/patches/series.tmp
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   236
  $ mv .hg/patches/series.tmp .hg/patches/series
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   237
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   238
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   239
qrefresh
4173
7307d2e98b32 fix qrefresh'ing an empty patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4090
diff changeset
   240
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   241
  $ echo a >> a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   242
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   243
  $ cat .hg/patches/test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   244
  foo bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   245
  
12375
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
   246
  diff -r [a-f0-9]* a (re)
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
   247
  --- a/a\t(?P<date>.*) (re)
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
   248
  \+\+\+ b/a\t(?P<date2>.*) (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   249
  @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   250
   a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   251
  +a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   252
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   253
empty qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   254
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   255
  $ hg qrefresh -X a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   256
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   257
revision:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   258
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   259
  $ hg diff -r -2 -r -1
4173
7307d2e98b32 fix qrefresh'ing an empty patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4090
diff changeset
   260
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   261
patch:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   262
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   263
  $ cat .hg/patches/test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   264
  foo bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   265
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   266
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   267
working dir diff:
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   268
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   269
  $ hg diff --nodates -q
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   270
  --- a/a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   271
  +++ b/a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   272
  @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   273
   a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   274
  +a
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   275
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   276
restore things
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   277
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   278
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   279
  $ checkundo qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   280
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   281
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   282
qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   283
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   284
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   285
  popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   286
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   287
  $ checkundo qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   288
9151
f528d1a93491 tags: implement persistent tag caching (issue548).
Greg Ward <greg-hg@gerg.ca>
parents: 8167
diff changeset
   289
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   290
qpush with dump of tag cache
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   291
Dump the tag cache to ensure that it has exactly one head after qpush.
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   292
13272
5ccdca7df211 move tags.cache and branchheads.cache to a collected cache folder .hg/cache/
jfh <jason@jasonfharris.com>
parents: 13230
diff changeset
   293
  $ rm -f .hg/cache/tags
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   294
  $ hg tags > /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   295
13272
5ccdca7df211 move tags.cache and branchheads.cache to a collected cache folder .hg/cache/
jfh <jason@jasonfharris.com>
parents: 13230
diff changeset
   296
.hg/cache/tags (pre qpush):
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   297
13272
5ccdca7df211 move tags.cache and branchheads.cache to a collected cache folder .hg/cache/
jfh <jason@jasonfharris.com>
parents: 13230
diff changeset
   298
  $ cat .hg/cache/tags
12375
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
   299
  1 [\da-f]{40} (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   300
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   301
  $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   302
  applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   303
  now at: test.patch
15926
f94513971767 mq: have mq create secret changeset only
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15862
diff changeset
   304
  $ hg phase -r qbase
f94513971767 mq: have mq create secret changeset only
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15862
diff changeset
   305
  2: secret
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   306
  $ hg tags > /dev/null
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   307
13272
5ccdca7df211 move tags.cache and branchheads.cache to a collected cache folder .hg/cache/
jfh <jason@jasonfharris.com>
parents: 13230
diff changeset
   308
.hg/cache/tags (post qpush):
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   309
13272
5ccdca7df211 move tags.cache and branchheads.cache to a collected cache folder .hg/cache/
jfh <jason@jasonfharris.com>
parents: 13230
diff changeset
   310
  $ cat .hg/cache/tags
12375
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
   311
  2 [\da-f]{40} (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   312
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   313
  $ checkundo qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   314
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   315
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   316
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   317
pop/push outside repo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   318
  $ hg -R a qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   319
  popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   320
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   321
  $ hg -R a qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   322
  applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   323
  now at: test.patch
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   324
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   325
  $ cd a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   326
  $ hg qnew test2.patch
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   327
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   328
qrefresh in subdir
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   329
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   330
  $ cd b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   331
  $ echo a > a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   332
  $ hg add a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   333
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   334
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   335
pop/push -a in subdir
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   336
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   337
  $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   338
  popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   339
  popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   340
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   341
  $ hg --traceback qpush -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   342
  applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   343
  applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   344
  now at: test2.patch
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   345
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   346
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   347
setting columns & formatted tests truncating (issue1912)
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   348
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   349
  $ COLUMNS=4 hg qseries --config ui.formatted=true
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   350
  test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   351
  test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   352
  $ COLUMNS=20 hg qseries --config ui.formatted=true -vs
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   353
  0 A test.patch: f...
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   354
  1 A test2.patch: 
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   355
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   356
  popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   357
  now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   358
  $ hg qseries -vs
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   359
  0 A test.patch: foo bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   360
  1 U test2.patch: 
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   361
  $ hg sum | grep mq
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   362
  mq:     1 applied, 1 unapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   363
  $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   364
  applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   365
  now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   366
  $ hg sum | grep mq
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   367
  mq:     2 applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   368
  $ hg qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   369
  test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   370
  test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   371
  $ hg qtop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   372
  test2.patch
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   373
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   374
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   375
prev
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   376
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   377
  $ hg qapp -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   378
  test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   379
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   380
next
9439
f2acc0c00bec Backed out premature qprev/qnext removal
Matt Mackall <mpm@selenic.com>
parents: 9365
diff changeset
   381
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   382
  $ hg qunapp -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   383
  all patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   384
  [1]
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   385
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   386
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   387
  popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   388
  now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   389
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   390
commit should fail
9364
c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 9151
diff changeset
   391
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   392
  $ hg commit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   393
  abort: cannot commit over an applied mq patch
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   394
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   395
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   396
push should fail
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   397
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   398
  $ hg push ../../k
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   399
  pushing to ../../k
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   400
  abort: source has mq patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   401
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   402
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   403
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   404
import should fail
2846
b8d587cfa3bb mq: test commit in repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2843
diff changeset
   405
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   406
  $ hg st .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   407
  $ echo foo >> ../a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   408
  $ hg diff > ../../import.diff
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   409
  $ hg revert --no-backup ../a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   410
  $ hg import ../../import.diff
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   411
  abort: cannot import over an applied patch
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   412
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   413
  $ hg st
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   414
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   415
import --no-commit should succeed
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   416
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   417
  $ hg import --no-commit ../../import.diff
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   418
  applying ../../import.diff
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   419
  $ hg st
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   420
  M a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   421
  $ hg revert --no-backup ../a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   422
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   423
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   424
qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   425
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   426
  $ hg qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   427
  test2.patch
2848
307439d6fede mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2846
diff changeset
   428
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   429
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   430
qpush/qpop with index
7142
88f1b8081f1c Prevent import over an applied patch (closes issue795)
Brendan Cully <brendan@kublai.com>
parents: 7048
diff changeset
   431
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   432
  $ hg qnew test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   433
  $ echo 1b > 1b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   434
  $ hg add 1b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   435
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   436
  $ hg qpush 2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   437
  applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   438
  now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   439
  $ hg qpop 0
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   440
  popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   441
  popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   442
  now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   443
  $ hg qpush test.patch+1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   444
  applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   445
  now at: test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   446
  $ hg qpush test.patch+2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   447
  applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   448
  now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   449
  $ hg qpop test2.patch-1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   450
  popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   451
  now at: test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   452
  $ hg qpop test2.patch-2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   453
  popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   454
  now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   455
  $ hg qpush test1b.patch+1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   456
  applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   457
  applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   458
  now at: test2.patch
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   459
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   460
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   461
qpush --move
3081
760414dc7ac6 Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3027
diff changeset
   462
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   463
  $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   464
  popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   465
  popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   466
  popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   467
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   468
  $ hg qguard test1b.patch -- -negguard
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   469
  $ hg qguard test2.patch -- +posguard
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   470
  $ hg qpush --move test2.patch # can't move guarded patch
14464
00256f689f9c mq: print "'foo' 'bar'", not "['foo', 'bar']" when showing guards
Martin Geisler <mg@aragost.com>
parents: 14347
diff changeset
   471
  cannot push 'test2.patch' - guarded by '+posguard'
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   472
  [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   473
  $ hg qselect posguard
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   474
  number of unguarded, unapplied patches has changed from 2 to 3
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   475
  $ hg qpush --move test2.patch # move to front
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   476
  applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   477
  now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   478
  $ hg qpush --move test1b.patch # negative guard unselected
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   479
  applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   480
  now at: test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   481
  $ hg qpush --move test.patch # noop move
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   482
  applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   483
  now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   484
  $ hg qseries -v
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   485
  0 A test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   486
  1 A test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   487
  2 A test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   488
  $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   489
  popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   490
  popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   491
  popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   492
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   493
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   494
cleaning up
11064
590b1d6ef50b mq: qpush --move, reorder patch series and apply only the patch
Mads Kiilerich <mads@kiilerich.com>
parents: 10710
diff changeset
   495
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   496
  $ hg qselect --none
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   497
  guards deactivated
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   498
  number of unguarded, unapplied patches has changed from 3 to 2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   499
  $ hg qguard --none test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   500
  $ hg qguard --none test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   501
  $ hg qpush --move test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   502
  applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   503
  now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   504
  $ hg qpush --move test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   505
  applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   506
  now at: test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   507
  $ hg qpush --move bogus # nonexistent patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   508
  abort: patch bogus not in series
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   509
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   510
  $ hg qpush --move # no patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   511
  abort: please specify the patch to move
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   512
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   513
  $ hg qpush --move test.patch # already applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   514
  abort: cannot push to a previous patch: test.patch
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   515
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   516
  $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   517
  applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   518
  now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   519
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   520
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   521
series after move
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   522
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   523
  $ cat `hg root`/.hg/patches/series
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   524
  test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   525
  test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   526
  test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   527
  # comment
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   528
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   529
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   530
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   531
pop, qapplied, qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   532
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   533
  $ hg qseries -v
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   534
  0 A test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   535
  1 A test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   536
  2 A test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   537
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   538
qapplied -1 test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   539
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   540
  $ hg qapplied -1 test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   541
  only one patch applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   542
  [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   543
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   544
qapplied -1 test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   545
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   546
  $ hg qapplied -1 test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   547
  test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   548
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   549
qapplied -1 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   550
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   551
  $ hg qapplied -1 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   552
  test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   553
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   554
qapplied -1
11715
4f9dfb54c8b5 qpush --move: move the right patch even with comment lines
Gilles Moris <gilles.moris@free.fr>
parents: 11555
diff changeset
   555
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   556
  $ hg qapplied -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   557
  test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   558
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   559
qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   560
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   561
  $ hg qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   562
  test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   563
  test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   564
  test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   565
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   566
qapplied test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   567
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   568
  $ hg qapplied test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   569
  test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   570
  test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   571
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   572
qunapplied -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   573
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   574
  $ hg qunapplied -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   575
  all patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   576
  [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   577
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   578
qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   579
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   580
  $ hg qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   581
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   582
popping
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   583
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   584
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   585
  popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   586
  now at: test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   587
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   588
qunapplied -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   589
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   590
  $ hg qunapplied -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   591
  test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   592
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   593
qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   594
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   595
  $ hg qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   596
  test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   597
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   598
qunapplied test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   599
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   600
  $ hg qunapplied test2.patch
9364
c7c2dd7524dd mq: add options to qapplied/qunapplied to act like qprev/qnext
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 9151
diff changeset
   601
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   602
qunapplied -1 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   603
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   604
  $ hg qunapplied -1 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   605
  all patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   606
  [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   607
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   608
popping -a
2848
307439d6fede mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2846
diff changeset
   609
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   610
  $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   611
  popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   612
  popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   613
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   614
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   615
qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   616
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   617
  $ hg qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   618
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   619
qapplied -1
4101
e2ed92f4c0f7 add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4096
diff changeset
   620
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   621
  $ hg qapplied -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   622
  no patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   623
  [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   624
  $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   625
  applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   626
  now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   627
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   628
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   629
push should succeed
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   630
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   631
  $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   632
  popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   633
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   634
  $ hg push ../../k
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   635
  pushing to ../../k
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   636
  searching for changes
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   637
  adding changesets
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   638
  adding manifests
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   639
  adding file changes
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   640
  added 1 changesets with 1 changes to 1 files
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   641
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   642
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   643
we want to start with some patches applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   644
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   645
  $ hg qpush -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   646
  applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   647
  applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   648
  applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   649
  now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   650
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   651
% pops all patches and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   652
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   653
  $ hg qpop -a
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   654
  popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   655
  popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   656
  popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   657
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   658
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   659
% does nothing and succeeds
2934
2f190e998eb3 Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents: 2848
diff changeset
   660
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   661
  $ hg qpop -a
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   662
  no patches applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   663
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   664
% fails - nothing else to pop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   665
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   666
  $ hg qpop
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   667
  no patches applied
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   668
  [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   669
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   670
% pushes a patch and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   671
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   672
  $ hg qpush
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   673
  applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   674
  now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   675
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   676
% pops a patch and succeeds
6472
8c4cd80afd3e mq: add --force option to strip
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6280
diff changeset
   677
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   678
  $ hg qpop
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   679
  popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   680
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   681
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   682
% pushes up to test1b.patch and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   683
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   684
  $ hg qpush test1b.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   685
  applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   686
  applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   687
  now at: test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   688
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   689
% does nothing and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   690
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   691
  $ hg qpush test1b.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   692
  qpush: test1b.patch is already at the top
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   693
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   694
% does nothing and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   695
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   696
  $ hg qpop test1b.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   697
  qpop: test1b.patch is already at the top
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   698
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   699
% fails - can't push to this patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   700
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   701
  $ hg qpush test.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   702
  abort: cannot push to a previous patch: test.patch
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   703
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   704
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   705
% fails - can't pop to this patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   706
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   707
  $ hg qpop test2.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   708
  abort: patch test2.patch is not applied
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   709
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   710
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   711
% pops up to test.patch and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   712
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   713
  $ hg qpop test.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   714
  popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   715
  now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   716
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   717
% pushes all patches and succeeds
3027
a4374f7331e4 Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents: 2990
diff changeset
   718
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   719
  $ hg qpush -a
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   720
  applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   721
  applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   722
  now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   723
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   724
% does nothing and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   725
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   726
  $ hg qpush -a
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   727
  all patches are currently applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   728
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   729
% fails - nothing else to push
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   730
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   731
  $ hg qpush
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   732
  patch series already fully applied
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   733
  [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   734
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   735
% does nothing and succeeds
3334
534806df5b5a Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com>
parents: 3081
diff changeset
   736
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   737
  $ hg qpush test2.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   738
  qpush: test2.patch is already at the top
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   739
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   740
strip
4219
6cb5be6bd70f mq: add qparent tag (first parent of qbase)
Brendan Cully <brendan@kublai.com>
parents: 4182
diff changeset
   741
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   742
  $ cd ../../b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   743
  $ echo x>x
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   744
  $ hg ci -Ama
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   745
  adding x
11907
863567a1364f tests: use regular expressions instead of helpers
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11894
diff changeset
   746
  $ hg strip tip
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   747
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
   748
  saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   749
  $ hg unbundle .hg/strip-backup/*
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   750
  adding changesets
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   751
  adding manifests
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   752
  adding file changes
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   753
  added 1 changesets with 1 changes to 1 files
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   754
  (run 'hg update' to get a working copy)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   755
5979
b4858eb4b58f mqrepo: don't abort if the status file has an unknown node
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 5534
diff changeset
   756
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   757
strip with local changes, should complain
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   758
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   759
  $ hg up
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   760
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   761
  $ echo y>y
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   762
  $ hg add y
11907
863567a1364f tests: use regular expressions instead of helpers
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11894
diff changeset
   763
  $ hg strip tip
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   764
  abort: local changes found
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   765
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   766
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   767
--force strip with local changes
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   768
11907
863567a1364f tests: use regular expressions instead of helpers
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11894
diff changeset
   769
  $ hg strip -f tip
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   770
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
   771
  saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   772
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   773
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   774
cd b; hg qrefresh
2934
2f190e998eb3 Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents: 2848
diff changeset
   775
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   776
  $ hg init refresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   777
  $ cd refresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   778
  $ echo a > a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   779
  $ hg ci -Ama
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   780
  adding a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   781
  $ hg qnew -mfoo foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   782
  $ echo a >> a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   783
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   784
  $ mkdir b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   785
  $ cd b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   786
  $ echo f > f
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   787
  $ hg add f
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   788
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   789
  $ cat ../.hg/patches/foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   790
  foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   791
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   792
  diff -r cb9a9f314b8b a
12375
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
   793
  --- a/a\t(?P<date>.*) (re)
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
   794
  \+\+\+ b/a\t(?P<date>.*) (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   795
  @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   796
   a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   797
  +a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   798
  diff -r cb9a9f314b8b b/f
12375
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
   799
  --- /dev/null\t(?P<date>.*) (re)
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
   800
  \+\+\+ b/b/f\t(?P<date>.*) (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   801
  @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   802
  +f
2934
2f190e998eb3 Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents: 2848
diff changeset
   803
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   804
hg qrefresh .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   805
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   806
  $ hg qrefresh .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   807
  $ cat ../.hg/patches/foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   808
  foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   809
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   810
  diff -r cb9a9f314b8b b/f
12375
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
   811
  --- /dev/null\t(?P<date>.*) (re)
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
   812
  \+\+\+ b/b/f\t(?P<date>.*) (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   813
  @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   814
  +f
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   815
  $ hg status
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   816
  M a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   817
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   818
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   819
qpush failure
3699
4bafcf7aeb32 qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3697
diff changeset
   820
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   821
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   822
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   823
  $ hg qnew -mbar bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   824
  $ echo foo > foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   825
  $ echo bar > bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   826
  $ hg add foo bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   827
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   828
  $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   829
  popping bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   830
  popping foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   831
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   832
  $ echo bar > foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   833
  $ hg qpush -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   834
  applying foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   835
  applying bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   836
  file foo already exists
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   837
  1 out of 1 hunks FAILED -- saving rejects to file foo.rej
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   838
  patch failed, unable to continue (try -v)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   839
  patch failed, rejects left in working dir
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   840
  errors during apply, please fix and refresh bar
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   841
  [2]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   842
  $ hg st
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   843
  ? foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   844
  ? foo.rej
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   845
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   846
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   847
mq tags
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   848
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   849
  $ hg log --template '{rev} {tags}\n' -r qparent:qtip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   850
  0 qparent
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   851
  1 foo qbase
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   852
  2 bar qtip tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   853
14210
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
   854
mq revset
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
   855
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
   856
  $ hg log -r 'mq()' --template '{rev}\n'
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
   857
  1
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
   858
  2
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
   859
  $ hg help revsets | grep -i mq
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
   860
      "mq()"
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
   861
        Changesets managed by MQ.
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   862
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   863
bad node in status
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   864
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   865
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   866
  popping bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   867
  now at: foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   868
  $ hg strip -qn tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   869
  $ hg tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   870
  changeset:   0:cb9a9f314b8b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   871
  tag:         tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   872
  user:        test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   873
  date:        Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   874
  summary:     a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   875
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   876
  $ hg branches
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   877
  default                        0:cb9a9f314b8b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   878
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   879
  no patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   880
  [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   881
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   882
  $ cat >>$HGRCPATH <<EOF
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   883
  > [diff]
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   884
  > git = True
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   885
  > EOF
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   886
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   887
  $ hg init git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   888
  $ cd git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   889
  $ hg qinit
3699
4bafcf7aeb32 qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3697
diff changeset
   890
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   891
  $ hg qnew -m'new file' new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   892
  $ echo foo > new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   893
  $ chmod +x new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   894
  $ hg add new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   895
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   896
  $ cat .hg/patches/new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   897
  new file
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   898
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   899
  diff --git a/new b/new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   900
  new file mode 100755
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   901
  --- /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   902
  +++ b/new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   903
  @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   904
  +foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   905
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   906
  $ hg qnew -m'copy file' copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   907
  $ hg cp new copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   908
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   909
  $ cat .hg/patches/copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   910
  copy file
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   911
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   912
  diff --git a/new b/copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   913
  copy from new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   914
  copy to copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   915
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   916
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   917
  popping copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   918
  now at: new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   919
  $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   920
  applying copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   921
  now at: copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   922
  $ hg qdiff
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   923
  diff --git a/new b/copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   924
  copy from new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   925
  copy to copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   926
  $ cat >>$HGRCPATH <<EOF
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   927
  > [diff]
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   928
  > git = False
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   929
  > EOF
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   930
  $ hg qdiff --git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   931
  diff --git a/new b/copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   932
  copy from new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   933
  copy to copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   934
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   935
13507
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   936
empty lines in status
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   937
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   938
  $ hg init emptystatus
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   939
  $ cd emptystatus
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   940
  $ hg qinit
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   941
  $ printf '\n\n' > .hg/patches/status
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   942
  $ hg qser
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   943
  $ cd ..
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   944
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   945
bad line in status (without ":")
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   946
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   947
  $ hg init badstatus
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   948
  $ cd badstatus
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   949
  $ hg qinit
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   950
  $ printf 'babar has no colon in this line\n' > .hg/patches/status
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   951
  $ hg qser
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   952
  malformated mq status line: ['babar has no colon in this line']
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   953
  $ cd ..
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   954
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   955
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   956
test file addition in slow path
4065
8ee983e3d461 fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3700
diff changeset
   957
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   958
  $ hg init slow
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   959
  $ cd slow
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   960
  $ hg qinit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   961
  $ echo foo > foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   962
  $ hg add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   963
  $ hg ci -m 'add foo'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   964
  $ hg qnew bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   965
  $ echo bar > bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   966
  $ hg add bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   967
  $ hg mv foo baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   968
  $ hg qrefresh --git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   969
  $ hg up -C 0
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   970
  1 files updated, 0 files merged, 2 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   971
  $ echo >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   972
  $ hg ci -m 'change foo'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   973
  created new head
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   974
  $ hg up -C 1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   975
  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
12101
0096f21c01dc tests: remove useless grep -v in test-mq.t
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12070
diff changeset
   976
  $ hg qrefresh --git
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   977
  $ cat .hg/patches/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   978
  diff --git a/bar b/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   979
  new file mode 100644
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   980
  --- /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   981
  +++ b/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   982
  @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   983
  +bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   984
  diff --git a/foo b/baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   985
  rename from foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   986
  rename to baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   987
  $ hg log -v --template '{rev} {file_copies}\n' -r .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   988
  2 baz (foo)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   989
  $ hg qrefresh --git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   990
  $ cat .hg/patches/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   991
  diff --git a/bar b/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   992
  new file mode 100644
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   993
  --- /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   994
  +++ b/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   995
  @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   996
  +bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   997
  diff --git a/foo b/baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   998
  rename from foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   999
  rename to baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1000
  $ hg log -v --template '{rev} {file_copies}\n' -r .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1001
  2 baz (foo)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1002
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1003
  $ grep 'diff --git' .hg/patches/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1004
  diff --git a/bar b/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1005
  diff --git a/foo b/baz
5026
48ebd6a83994 Test qnew --git
Patrick Mezard <pmezard@gmail.com>
parents: 4890
diff changeset
  1006
48ebd6a83994 Test qnew --git
Patrick Mezard <pmezard@gmail.com>
parents: 4890
diff changeset
  1007
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1008
test file move chains in the slow path
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1009
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1010
  $ hg up -C 1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1011
  1 files updated, 0 files merged, 2 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1012
  $ echo >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1013
  $ hg ci -m 'change foo again'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1014
  $ hg up -C 2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1015
  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1016
  $ hg mv bar quux
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1017
  $ hg mv baz bleh
12101
0096f21c01dc tests: remove useless grep -v in test-mq.t
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12070
diff changeset
  1018
  $ hg qrefresh --git
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1019
  $ cat .hg/patches/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1020
  diff --git a/foo b/bleh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1021
  rename from foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1022
  rename to bleh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1023
  diff --git a/quux b/quux
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1024
  new file mode 100644
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1025
  --- /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1026
  +++ b/quux
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1027
  @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1028
  +bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1029
  $ hg log -v --template '{rev} {file_copies}\n' -r .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1030
  3 bleh (foo)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1031
  $ hg mv quux fred
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1032
  $ hg mv bleh barney
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1033
  $ hg qrefresh --git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1034
  $ cat .hg/patches/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1035
  diff --git a/foo b/barney
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1036
  rename from foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1037
  rename to barney
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1038
  diff --git a/fred b/fred
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1039
  new file mode 100644
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1040
  --- /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1041
  +++ b/fred
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1042
  @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1043
  +bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1044
  $ hg log -v --template '{rev} {file_copies}\n' -r .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1045
  3 barney (foo)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1046
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1047
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1048
refresh omitting an added file
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1049
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1050
  $ hg qnew baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1051
  $ echo newfile > newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1052
  $ hg add newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1053
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1054
  $ hg st -A newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1055
  C newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1056
  $ hg qrefresh -X newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1057
  $ hg st -A newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1058
  A newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1059
  $ hg revert newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1060
  $ rm newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1061
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1062
  popping baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1063
  now at: bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1064
  $ hg qdel baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1065
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1066
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1067
create a git patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1068
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1069
  $ echo a > alexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1070
  $ hg add alexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1071
  $ hg qnew -f --git addalexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1072
  $ grep diff .hg/patches/addalexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1073
  diff --git a/alexander b/alexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1074
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1075
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1076
create a git binary patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1077
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1078
  $ cat > writebin.py <<EOF
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1079
  > import sys
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1080
  > path = sys.argv[1]
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1081
  > open(path, 'wb').write('BIN\x00ARY')
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1082
  > EOF
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1083
  $ python writebin.py bucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1084
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1085
  $ python "$TESTDIR/md5sum.py" bucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1086
  8ba2a2f3e77b55d03051ff9c24ad65e7  bucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1087
  $ hg add bucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1088
  $ hg qnew -f --git addbucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1089
  $ grep diff .hg/patches/addbucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1090
  diff --git a/bucephalus b/bucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1091
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1092
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1093
check binary patches can be popped and pushed
4065
8ee983e3d461 fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3700
diff changeset
  1094
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1095
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1096
  popping addbucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1097
  now at: addalexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1098
  $ test -f bucephalus && echo % bucephalus should not be there
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
  1099
  [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1100
  $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1101
  applying addbucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1102
  now at: addbucephalus
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
  1103
  $ test -f bucephalus
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1104
  $ python "$TESTDIR/md5sum.py" bucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1105
  8ba2a2f3e77b55d03051ff9c24ad65e7  bucephalus
4862
cba10652a901 mq: improve qclone error handling when patch directory is not a repository.
Brendan Cully <brendan@kublai.com>
parents: 4219
diff changeset
  1106
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1107
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1108
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1109
strip again
4862
cba10652a901 mq: improve qclone error handling when patch directory is not a repository.
Brendan Cully <brendan@kublai.com>
parents: 4219
diff changeset
  1110
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1111
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1112
  $ hg init strip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1113
  $ cd strip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1114
  $ touch foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1115
  $ hg add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1116
  $ hg ci -m 'add foo'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1117
  $ echo >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1118
  $ hg ci -m 'change foo 1'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1119
  $ hg up -C 0
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1120
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1121
  $ echo 1 >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1122
  $ hg ci -m 'change foo 2'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1123
  created new head
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1124
  $ HGMERGE=true hg merge
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1125
  merging foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1126
  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1127
  (branch merge, don't forget to commit)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1128
  $ hg ci -m merge
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1129
  $ hg log
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1130
  changeset:   3:99615015637b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1131
  tag:         tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1132
  parent:      2:20cbbe65cff7
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1133
  parent:      1:d2871fc282d4
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1134
  user:        test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1135
  date:        Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1136
  summary:     merge
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1137
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1138
  changeset:   2:20cbbe65cff7
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1139
  parent:      0:53245c60e682
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1140
  user:        test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1141
  date:        Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1142
  summary:     change foo 2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1143
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1144
  changeset:   1:d2871fc282d4
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1145
  user:        test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1146
  date:        Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1147
  summary:     change foo 1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1148
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1149
  changeset:   0:53245c60e682
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1150
  user:        test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1151
  date:        Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1152
  summary:     add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1153
  
11907
863567a1364f tests: use regular expressions instead of helpers
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11894
diff changeset
  1154
  $ hg strip 1
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1155
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1156
  saved backup bundle to $TESTTMP/b/strip/.hg/strip-backup/*-backup.hg (glob)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1157
  $ checkundo strip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1158
  $ hg log
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1159
  changeset:   1:20cbbe65cff7
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1160
  tag:         tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1161
  user:        test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1162
  date:        Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1163
  summary:     change foo 2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1164
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1165
  changeset:   0:53245c60e682
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1166
  user:        test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1167
  date:        Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1168
  summary:     add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1169
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1170
  $ cd ..
4090
785ad8cd1d31 qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4065
diff changeset
  1171
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1172
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1173
qclone
4090
785ad8cd1d31 qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4065
diff changeset
  1174
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1175
  $ qlog()
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1176
  > {
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1177
  >     echo 'main repo:'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1178
  >     hg log --template '    rev {rev}: {desc}\n'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1179
  >     echo 'patch repo:'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1180
  >     hg -R .hg/patches log --template '    rev {rev}: {desc}\n'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1181
  > }
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1182
  $ hg init qclonesource
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1183
  $ cd qclonesource
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1184
  $ echo foo > foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1185
  $ hg add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1186
  $ hg ci -m 'add foo'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1187
  $ hg qinit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1188
  $ hg qnew patch1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1189
  $ echo bar >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1190
  $ hg qrefresh -m 'change foo'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1191
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1192
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1193
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1194
repo with unversioned patch dir
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1195
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1196
  $ hg qclone qclonesource failure
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1197
  abort: versioned patch repository not found (see init --mq)
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
  1198
  [255]
4090
785ad8cd1d31 qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4065
diff changeset
  1199
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1200
  $ cd qclonesource
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1201
  $ hg qinit -c
15447
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 15442
diff changeset
  1202
  adding .hg/patches/patch1 (glob)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1203
  $ hg qci -m checkpoint
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1204
  $ qlog
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1205
  main repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1206
      rev 1: change foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1207
      rev 0: add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1208
  patch repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1209
      rev 0: checkpoint
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1210
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1211
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1212
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1213
repo with patches applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1214
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1215
  $ hg qclone qclonesource qclonedest
15926
f94513971767 mq: have mq create secret changeset only
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15862
diff changeset
  1216
  requesting all changes
f94513971767 mq: have mq create secret changeset only
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15862
diff changeset
  1217
  adding changesets
f94513971767 mq: have mq create secret changeset only
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15862
diff changeset
  1218
  adding manifests
f94513971767 mq: have mq create secret changeset only
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15862
diff changeset
  1219
  adding file changes
f94513971767 mq: have mq create secret changeset only
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15862
diff changeset
  1220
  added 1 changesets with 1 changes to 1 files
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1221
  updating to branch default
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1222
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1223
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1224
  $ cd qclonedest
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1225
  $ qlog
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1226
  main repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1227
      rev 0: add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1228
  patch repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1229
      rev 0: checkpoint
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1230
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1231
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1232
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1233
repo with patches unapplied
6554
3182602fa1fb mq: don't commit local changes on pushing empty patch (issue1087)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6280
diff changeset
  1234
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1235
  $ cd qclonesource
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1236
  $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1237
  popping patch1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1238
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1239
  $ qlog
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1240
  main repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1241
      rev 0: add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1242
  patch repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1243
      rev 0: checkpoint
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1244
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1245
  $ hg qclone qclonesource qclonedest2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1246
  updating to branch default
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1247
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1248
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1249
  $ cd qclonedest2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1250
  $ qlog
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1251
  main repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1252
      rev 0: add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1253
  patch repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1254
      rev 0: checkpoint
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1255
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1256
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1257
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12376
diff changeset
  1258
Issue1033: test applying on an empty file
6554
3182602fa1fb mq: don't commit local changes on pushing empty patch (issue1087)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6280
diff changeset
  1259
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1260
  $ hg init empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1261
  $ cd empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1262
  $ touch a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1263
  $ hg ci -Am addempty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1264
  adding a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1265
  $ echo a > a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1266
  $ hg qnew -f -e changea
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1267
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1268
  popping changea
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1269
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1270
  $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1271
  applying changea
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1272
  now at: changea
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1273
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1274
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1275
test qpush with --force, issue1087
6554
3182602fa1fb mq: don't commit local changes on pushing empty patch (issue1087)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6280
diff changeset
  1276
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1277
  $ hg init forcepush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1278
  $ cd forcepush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1279
  $ echo hello > hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1280
  $ echo bye > bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1281
  $ hg ci -Ama
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1282
  adding bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1283
  adding hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1284
  $ hg qnew -d '0 0' empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1285
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1286
  popping empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1287
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1288
  $ echo world >> hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1289
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1290
14732
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
  1291
qpush should fail, local changes
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1292
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1293
  $ hg qpush
14732
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
  1294
  abort: local changes found
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
  1295
  [255]
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
  1296
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
  1297
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
  1298
apply force, should not discard changes with empty patch
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
  1299
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
  1300
  $ hg qpush -f
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1301
  applying empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1302
  patch empty is empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1303
  now at: empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1304
  $ hg diff --config diff.nodates=True
14162
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 13987
diff changeset
  1305
  diff -r d58265112590 hello.txt
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1306
  --- a/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1307
  +++ b/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1308
  @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1309
   hello
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1310
  +world
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1311
  $ hg qdiff --config diff.nodates=True
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1312
  diff -r 9ecee4f634e3 hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1313
  --- a/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1314
  +++ b/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1315
  @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1316
   hello
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1317
  +world
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1318
  $ hg log -l1 -p
14162
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 13987
diff changeset
  1319
  changeset:   1:d58265112590
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1320
  tag:         empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1321
  tag:         qbase
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1322
  tag:         qtip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1323
  tag:         tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1324
  user:        test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1325
  date:        Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1326
  summary:     imported patch empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1327
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1328
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1329
  $ hg qref -d '0 0'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1330
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1331
  popping empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1332
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1333
  $ echo universe >> hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1334
  $ echo universe >> bye.txt
6554
3182602fa1fb mq: don't commit local changes on pushing empty patch (issue1087)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6280
diff changeset
  1335
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1336
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1337
qpush should fail, local changes
7621
6d891df43a5f mq: allow qpop if popped revisions are not working dir parents
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7296
diff changeset
  1338
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1339
  $ hg qpush
14191
e1c34ce39fae mq: don't suggest to refresh when qpushing with no applied patches
Idan Kamara <idankk86@gmail.com>
parents: 14162
diff changeset
  1340
  abort: local changes found
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
  1341
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1342
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1343
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1344
apply force, should discard changes in hello, but not bye
10048
46de82e50790 mq: qpop: remove added files before re-adding removed files
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9874
diff changeset
  1345
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1346
  $ hg qpush -f
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1347
  applying empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1348
  now at: empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1349
  $ hg st
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1350
  M bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1351
  $ hg diff --config diff.nodates=True
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1352
  diff -r ba252371dbc1 bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1353
  --- a/bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1354
  +++ b/bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1355
  @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1356
   bye
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1357
  +universe
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1358
  $ hg qdiff --config diff.nodates=True
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1359
  diff -r 9ecee4f634e3 bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1360
  --- a/bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1361
  +++ b/bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1362
  @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1363
   bye
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1364
  +universe
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1365
  diff -r 9ecee4f634e3 hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1366
  --- a/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1367
  +++ b/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1368
  @@ -1,1 +1,3 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1369
   hello
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1370
  +world
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1371
  +universe
10048
46de82e50790 mq: qpop: remove added files before re-adding removed files
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9874
diff changeset
  1372
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1373
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1374
test popping revisions not in working dir ancestry
10048
46de82e50790 mq: qpop: remove added files before re-adding removed files
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9874
diff changeset
  1375
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1376
  $ hg qseries -v
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1377
  0 A empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1378
  $ hg up qparent
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1379
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1380
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1381
  popping empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1382
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1383
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1384
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1385
  $ hg init deletion-order
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1386
  $ cd deletion-order
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1387
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1388
  $ touch a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1389
  $ hg ci -Aqm0
10048
46de82e50790 mq: qpop: remove added files before re-adding removed files
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9874
diff changeset
  1390
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1391
  $ hg qnew rename-dir
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1392
  $ hg rm a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1393
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1394
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1395
  $ mkdir a b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1396
  $ touch a/a b/b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1397
  $ hg add -q a b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1398
  $ hg qrefresh
10048
46de82e50790 mq: qpop: remove added files before re-adding removed files
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9874
diff changeset
  1399
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1400
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1401
test popping must remove files added in subdirectories first
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1402
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1403
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1404
  popping rename-dir
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1405
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1406
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1407
15728
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1408
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1409
test case preservation through patch pushing especially on case
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1410
insensitive filesystem
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1411
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1412
  $ hg init casepreserve
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1413
  $ cd casepreserve
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1414
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1415
  $ hg qnew add-file1
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1416
  $ echo a > TeXtFiLe.TxT
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1417
  $ hg add TeXtFiLe.TxT
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1418
  $ hg qrefresh
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1419
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1420
  $ hg qnew add-file2
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1421
  $ echo b > AnOtHeRFiLe.TxT
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1422
  $ hg add AnOtHeRFiLe.TxT
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1423
  $ hg qrefresh
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1424
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1425
  $ hg qnew modify-file
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1426
  $ echo c >> AnOtHeRFiLe.TxT
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1427
  $ hg qrefresh
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1428
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1429
  $ hg qapplied
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1430
  add-file1
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1431
  add-file2
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1432
  modify-file
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1433
  $ hg qpop -a
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1434
  popping modify-file
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1435
  popping add-file2
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1436
  popping add-file1
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1437
  patch queue now empty
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1438
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1439
this qpush causes problems below, if case preservation on case
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1440
insensitive filesystem is not enough:
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1441
(1) unexpected "adding ..." messages are shown
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1442
(2) patching fails in modification of (1) files
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1443
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1444
  $ hg qpush -a
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1445
  applying add-file1
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1446
  applying add-file2
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1447
  applying modify-file
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1448
  now at: modify-file
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1449
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1450
  $ cd ..