tests/test-mq.t
author timeless <timeless@mozdev.org>
Thu, 15 Oct 2015 20:32:01 -0400
changeset 26776 f69c79395fb7
parent 26098 ce26928cbe41
child 26780 bbf544b5f2e9
permissions -rw-r--r--
test-shelve: do not use non-portable pipe-and
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
     1
  $ checkundo()
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
     2
  > {
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
     3
  >     if [ -f .hg/store/undo ]; then
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
     4
  >     echo ".hg/store/undo still exists after $1"
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
     5
  >     fi
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
     6
  > }
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     7
23172
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 23139
diff changeset
     8
  $ cat <<EOF >> $HGRCPATH
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 23139
diff changeset
     9
  > [extensions]
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 23139
diff changeset
    10
  > mq =
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 23139
diff changeset
    11
  > [mq]
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 23139
diff changeset
    12
  > plain = true
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 23139
diff changeset
    13
  > EOF
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    14
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    15
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    16
help
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    17
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    18
  $ hg help mq
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    19
  mq extension - manage a stack of patches
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    20
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    21
  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
    22
  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
    23
  patches (subset of known patches).
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    24
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    25
  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
    26
  Applied patches are both patch files and changesets.
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    27
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    28
  Common tasks (use "hg help command" for more details):
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    29
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    30
    create new patch                          qnew
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    31
    import existing patch                     qimport
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    32
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    33
    print patch series                        qseries
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    34
    print applied patches                     qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    35
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    36
    add known patch to applied stack          qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    37
    remove patch from applied stack           qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    38
    refresh contents of top applied patch     qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    39
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    40
  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
    41
  losing file mode changes, copy records, binary files or empty files creations
26098
ce26928cbe41 spelling: behaviour -> behavior
timeless@mozdev.org
parents: 24763
diff changeset
    42
  or deletions. This behavior can be configured with:
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    43
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    44
    [mq]
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    45
    git = auto/keep/yes/no
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    46
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    47
  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
    48
  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
    49
  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
    50
  possibly losing data in the second case.
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    51
  
16040
c0b2986b37b8 mq: fix secret description in help
Matt Mackall <mpm@selenic.com>
parents: 16029
diff changeset
    52
  It may be desirable for mq changesets to be kept in the secret phase (see "hg
c0b2986b37b8 mq: fix secret description in help
Matt Mackall <mpm@selenic.com>
parents: 16029
diff changeset
    53
  help phases"), which can be enabled with the following setting:
16017
2605fc990725 mq: add secret setting
Matt Mackall <mpm@selenic.com>
parents: 15952
diff changeset
    54
  
2605fc990725 mq: add secret setting
Matt Mackall <mpm@selenic.com>
parents: 15952
diff changeset
    55
    [mq]
2605fc990725 mq: add secret setting
Matt Mackall <mpm@selenic.com>
parents: 15952
diff changeset
    56
    secret = True
2605fc990725 mq: add secret setting
Matt Mackall <mpm@selenic.com>
parents: 15952
diff changeset
    57
  
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    58
  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
    59
  other, independent patch queues with the "hg qqueue" command.
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    60
  
16656
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
    61
  If the working directory contains uncommitted files, qpush, qpop and qgoto
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
    62
  abort immediately. If -f/--force is used, the changes are discarded. Setting:
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
    63
  
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
    64
    [mq]
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
    65
    keepchanges = True
16656
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
    66
  
16733
4da10c00a20c mq: rename --check into --keep-changes
Patrick Mezard <patrick@mezard.eu>
parents: 16656
diff changeset
    67
  make them behave as if --keep-changes were passed, and non-conflicting local
16656
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
    68
  changes will be tolerated and preserved. If incompatible options such as
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
    69
  -f/--force or --exact are passed, this setting is ignored.
4ae3ba9e4d7a mq: introduce mq.check setting
Patrick Mezard <patrick@mezard.eu>
parents: 16634
diff changeset
    70
  
19826
4b1cbcfdabf7 mq: extract strip function as its standalone extension (issue3824)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18733
diff changeset
    71
  This extension used to provide a strip command. This command now lives in the
4b1cbcfdabf7 mq: extract strip function as its standalone extension (issue3824)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18733
diff changeset
    72
  strip extension.
4b1cbcfdabf7 mq: extract strip function as its standalone extension (issue3824)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18733
diff changeset
    73
  
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    74
  list of commands:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    75
  
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    76
   qapplied      print the patches already applied
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    77
   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
    78
   qdelete       remove patches from queue
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    79
   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
    80
   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
    81
   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
    82
   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
    83
   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
    84
   qheader       print the header of the topmost or specified patch
16152
816211dfa3a5 mq: expand qimport summary
Matt Mackall <mpm@selenic.com>
parents: 16064
diff changeset
    85
   qimport       import a patch or existing changeset
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    86
   qnew          create a new patch
16063
c36db39b3fee mq: fix qnext when all remaining patches are guarded
Patrick Mezard <pmezard@gmail.com>
parents: 16058
diff changeset
    87
   qnext         print the name of the next pushable patch
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    88
   qpop          pop the current patch off the stack
16188
6b52963ced73 mq: fix qapplied --last and qprev documentation (issue3282)
Patrick Mezard <patrick@mezard.eu>
parents: 16064
diff changeset
    89
   qprev         print the name of the preceding applied patch
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    90
   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
    91
   qqueue        manage multiple patch queues
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    92
   qrefresh      update the current patch
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    93
   qrename       rename a patch
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    94
   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
    95
   qseries       print the entire series file
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15728
diff changeset
    96
   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
    97
   qunapplied    print the patches not yet applied
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
    98
  
22118
9a299c39de01 help: normalize helplist hints
Matt Mackall <mpm@selenic.com>
parents: 19826
diff changeset
    99
  (use "hg help -v mq" to show built-in aliases and global options)
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   100
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   101
  $ hg init a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   102
  $ cd a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   103
  $ echo a > a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   104
  $ hg ci -Ama
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   105
  adding a
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
  $ hg clone . ../k
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   108
  updating to branch default
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   109
  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
   110
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   111
  $ mkdir b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   112
  $ echo z > b/z
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   113
  $ hg ci -Ama
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   114
  adding b/z
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   115
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
qinit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   118
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   119
  $ hg qinit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   120
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   121
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   122
  $ hg init b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   123
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
-R qinit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   126
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   127
  $ 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
   128
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   129
  $ hg init c
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   130
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
qinit -c
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   133
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   134
  $ hg --cwd c qinit -c
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   135
  $ hg -R c/.hg/patches st
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   136
  A .hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   137
  A series
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   138
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   139
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   140
qinit; qinit -c
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   141
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   142
  $ hg init d
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   143
  $ cd d
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   144
  $ hg qinit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   145
  $ hg qinit -c
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   146
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   147
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
   148
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   149
  $ cat .hg/patches/.hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   150
  ^\.hg
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   151
  ^\.mq
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   152
  syntax: glob
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   153
  status
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   154
  guards
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   155
  $ cat .hg/patches/series
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   156
  $ hg qinit -c
15447
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 15442
diff changeset
   157
  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
   158
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   159
  $ cd ..
11555
d8d0fc3988ca color/progress: subclass ui instead of using wrapfunction (issue2096)
Brodie Rao <brodie@bitheap.org>
parents: 11327
diff changeset
   160
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   161
  $ echo '% qinit; <stuff>; qinit -c'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   162
  % qinit; <stuff>; qinit -c
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   163
  $ hg init e
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   164
  $ cd e
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   165
  $ hg qnew A
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   166
  $ checkundo qnew
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   167
  $ echo foo > foo
15926
f94513971767 mq: have mq create secret changeset only
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15862
diff changeset
   168
  $ hg phase -r qbase
16017
2605fc990725 mq: add secret setting
Matt Mackall <mpm@selenic.com>
parents: 15952
diff changeset
   169
  0: draft
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   170
  $ hg add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   171
  $ hg qrefresh
15926
f94513971767 mq: have mq create secret changeset only
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15862
diff changeset
   172
  $ hg phase -r qbase
16017
2605fc990725 mq: add secret setting
Matt Mackall <mpm@selenic.com>
parents: 15952
diff changeset
   173
  0: draft
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   174
  $ hg qnew B
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   175
  $ echo >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   176
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   177
  $ echo status >> .hg/patches/.hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   178
  $ echo bleh >> .hg/patches/.hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   179
  $ hg qinit -c
15447
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 15442
diff changeset
   180
  adding .hg/patches/A (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 15442
diff changeset
   181
  adding .hg/patches/B (glob)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   182
  $ hg -R .hg/patches status
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   183
  A .hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   184
  A A
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   185
  A B
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   186
  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
   187
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   188
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
   189
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   190
  $ cat .hg/patches/.hgignore
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   191
  status
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   192
  bleh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   193
  $ cat .hg/patches/series
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   194
  A
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   195
  B
10710
47fbbc4845ff mq: test for init --mq with a destination argument
Cédric Duval <cedricduval@free.fr>
parents: 10691
diff changeset
   196
12036
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
   197
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
   198
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
   199
  $ 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
   200
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   201
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
   202
13987
e0f07847f8de color: add support for terminfo-based attributes and color
Danek Duvall <duvall@comfychair.org>
parents: 13507
diff changeset
   203
  $ hg status --mq --config extensions.color= --config color.mode=ansi --color=always
17910
c8709ff57ff2 status: use condwrite to avoid zero-width format string hack
Matt Mackall <mpm@selenic.com>
parents: 17015
diff changeset
   204
  \x1b[0;32;1mA \x1b[0m\x1b[0;32;1m.hgignore\x1b[0m (esc)
c8709ff57ff2 status: use condwrite to avoid zero-width format string hack
Matt Mackall <mpm@selenic.com>
parents: 17015
diff changeset
   205
  \x1b[0;32;1mA \x1b[0m\x1b[0;32;1mA\x1b[0m (esc)
c8709ff57ff2 status: use condwrite to avoid zero-width format string hack
Matt Mackall <mpm@selenic.com>
parents: 17015
diff changeset
   206
  \x1b[0;32;1mA \x1b[0m\x1b[0;32;1mB\x1b[0m (esc)
c8709ff57ff2 status: use condwrite to avoid zero-width format string hack
Matt Mackall <mpm@selenic.com>
parents: 17015
diff changeset
   207
  \x1b[0;32;1mA \x1b[0m\x1b[0;32;1mseries\x1b[0m (esc)
c8709ff57ff2 status: use condwrite to avoid zero-width format string hack
Matt Mackall <mpm@selenic.com>
parents: 17015
diff changeset
   208
  \x1b[0;35;1;4m? \x1b[0m\x1b[0;35;1;4mflaf\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
   209
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
   210
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
   211
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
   212
  $ hg purge --mq --verbose --config extensions.purge=
16930
9efe4a95c099 purge: lowercase messages
Martin Geisler <mg@aragost.com>
parents: 16912
diff changeset
   213
  removing file flaf
12036
31f02288bbc4 mq: extend support for the --mq argument to extension commands
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 11907
diff changeset
   214
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   215
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   216
17015
73d20de5f30b tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16930
diff changeset
   217
#if no-outer-repo
73d20de5f30b tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16930
diff changeset
   218
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   219
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
   220
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   221
  $ mkdir f
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   222
  $ cd f
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   223
  $ hg init --mq
12070
fddacca3202e Merge with stable
Martin Geisler <mg@lazybytes.net>
parents: 12036
diff changeset
   224
  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
   225
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   226
  $ cd ..
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   227
17015
73d20de5f30b tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16930
diff changeset
   228
#endif
73d20de5f30b tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16930
diff changeset
   229
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   230
init --mq with repo path
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   231
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   232
  $ hg init g
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   233
  $ hg init --mq g
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   234
  $ test -d g/.hg/patches/.hg
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   235
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   236
init --mq with nonexistent directory
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
  $ hg init --mq nonexistentdir
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   239
  abort: repository nonexistentdir not found!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   240
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   241
11715
4f9dfb54c8b5 qpush --move: move the right patch even with comment lines
Gilles Moris <gilles.moris@free.fr>
parents: 11555
diff changeset
   242
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   243
init --mq with bundle (non "local")
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   244
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   245
  $ hg -R a bundle --all a.bundle >/dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   246
  $ hg init --mq a.bundle
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   247
  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
   248
  [255]
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   249
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   250
  $ cd a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   251
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   252
  $ hg qnew -m 'foo bar' test.patch
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   253
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   254
  $ echo '# comment' > .hg/patches/series.tmp
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   255
  $ echo >> .hg/patches/series.tmp # empty line
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   256
  $ cat .hg/patches/series >> .hg/patches/series.tmp
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   257
  $ mv .hg/patches/series.tmp .hg/patches/series
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
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   260
qrefresh
4173
7307d2e98b32 fix qrefresh'ing an empty patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4090
diff changeset
   261
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   262
  $ echo a >> a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   263
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   264
  $ cat .hg/patches/test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   265
  foo bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   266
  
12375
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
   267
  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
   268
  --- 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
   269
  \+\+\+ b/a\t(?P<date2>.*) (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   270
  @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   271
   a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   272
  +a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   273
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   274
empty qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   275
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   276
  $ hg qrefresh -X a
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
revision:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   279
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   280
  $ 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
   281
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   282
patch:
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
  $ cat .hg/patches/test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   285
  foo bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   286
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   287
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   288
working dir diff:
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   289
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   290
  $ hg diff --nodates -q
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   291
  --- a/a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   292
  +++ b/a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   293
  @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   294
   a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   295
  +a
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   296
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   297
restore things
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   298
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   299
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   300
  $ checkundo qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   301
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   302
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   303
qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   304
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   305
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   306
  popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   307
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   308
  $ checkundo qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   309
9151
f528d1a93491 tags: implement persistent tag caching (issue548).
Greg Ward <greg-hg@gerg.ca>
parents: 8167
diff changeset
   310
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   311
qpush with dump of tag cache
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   312
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
   313
24763
a698e088ad29 tags: explicitly log which tags cache file is being written
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24760
diff changeset
   314
  $ rm -f .hg/cache/tags2-visible
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   315
  $ hg tags > /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   316
24763
a698e088ad29 tags: explicitly log which tags cache file is being written
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24760
diff changeset
   317
.hg/cache/tags2-visible (pre qpush):
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   318
24763
a698e088ad29 tags: explicitly log which tags cache file is being written
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24760
diff changeset
   319
  $ cat .hg/cache/tags2-visible
12375
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
   320
  1 [\da-f]{40} (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   321
  $ hg 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
15926
f94513971767 mq: have mq create secret changeset only
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15862
diff changeset
   324
  $ hg phase -r qbase
16017
2605fc990725 mq: add secret setting
Matt Mackall <mpm@selenic.com>
parents: 15952
diff changeset
   325
  2: draft
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   326
  $ hg tags > /dev/null
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   327
24763
a698e088ad29 tags: explicitly log which tags cache file is being written
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24760
diff changeset
   328
.hg/cache/tags2-visible (post qpush):
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   329
24763
a698e088ad29 tags: explicitly log which tags cache file is being written
Gregory Szorc <gregory.szorc@gmail.com>
parents: 24760
diff changeset
   330
  $ cat .hg/cache/tags2-visible
12375
02990e22150b tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
   331
  2 [\da-f]{40} (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   332
  $ checkundo qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   333
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   334
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   335
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   336
pop/push outside repo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   337
  $ hg -R a qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   338
  popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   339
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   340
  $ hg -R a qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   341
  applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   342
  now at: test.patch
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   343
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   344
  $ cd a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   345
  $ hg qnew test2.patch
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   346
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   347
qrefresh in subdir
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   348
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   349
  $ cd b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   350
  $ echo a > a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   351
  $ hg add a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   352
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   353
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   354
pop/push -a in subdir
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   355
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   356
  $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   357
  popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   358
  popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   359
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   360
  $ hg --traceback qpush -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   361
  applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   362
  applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   363
  now at: test2.patch
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   364
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   365
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   366
setting columns & formatted tests truncating (issue1912)
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   367
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   368
  $ COLUMNS=4 hg qseries --config ui.formatted=true
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
  $ COLUMNS=20 hg qseries --config ui.formatted=true -vs
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   372
  0 A test.patch: f...
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   373
  1 A test2.patch: 
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   374
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   375
  popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   376
  now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   377
  $ hg qseries -vs
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   378
  0 A test.patch: foo bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   379
  1 U test2.patch: 
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   380
  $ hg sum | grep mq
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   381
  mq:     1 applied, 1 unapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   382
  $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   383
  applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   384
  now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   385
  $ hg sum | grep mq
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   386
  mq:     2 applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   387
  $ hg qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   388
  test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   389
  test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   390
  $ hg qtop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   391
  test2.patch
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   392
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   393
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   394
prev
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   395
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   396
  $ hg qapp -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   397
  test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   398
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   399
next
9439
f2acc0c00bec Backed out premature qprev/qnext removal
Matt Mackall <mpm@selenic.com>
parents: 9365
diff changeset
   400
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   401
  $ hg qunapp -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   402
  all patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   403
  [1]
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   404
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   405
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   406
  popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   407
  now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   408
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   409
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
   410
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   411
  $ hg commit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   412
  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
   413
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   414
15952
ec8a9e06cf05 mq-safety: don't apply safety on non-outgoing changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 15926
diff changeset
   415
push should fail if draft
11894
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 push ../../k
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   418
  pushing to ../../k
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   419
  abort: source has mq patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   420
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   421
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
import should fail
2846
b8d587cfa3bb mq: test commit in repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2843
diff changeset
   424
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   425
  $ hg st .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   426
  $ echo foo >> ../a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   427
  $ hg diff > ../../import.diff
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   428
  $ hg revert --no-backup ../a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   429
  $ hg import ../../import.diff
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   430
  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
   431
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   432
  $ hg st
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   433
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   434
import --no-commit should succeed
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   435
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   436
  $ hg import --no-commit ../../import.diff
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   437
  applying ../../import.diff
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   438
  $ hg st
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   439
  M a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   440
  $ hg revert --no-backup ../a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   441
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   442
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   443
qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   444
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   445
  $ hg qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   446
  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
   447
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   448
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   449
qpush/qpop with index
7142
88f1b8081f1c Prevent import over an applied patch (closes issue795)
Brendan Cully <brendan@kublai.com>
parents: 7048
diff changeset
   450
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   451
  $ hg qnew test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   452
  $ echo 1b > 1b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   453
  $ hg add 1b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   454
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   455
  $ hg qpush 2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   456
  applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   457
  now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   458
  $ hg qpop 0
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   459
  popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   460
  popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   461
  now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   462
  $ hg qpush test.patch+1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   463
  applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   464
  now at: test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   465
  $ hg qpush test.patch+2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   466
  applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   467
  now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   468
  $ hg qpop test2.patch-1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   469
  popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   470
  now at: test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   471
  $ hg qpop test2.patch-2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   472
  popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   473
  now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   474
  $ hg qpush test1b.patch+1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   475
  applying test1b.patch
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
2729
8ce86d2c9737 mq: add basic tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   478
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   479
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   480
qpush --move
3081
760414dc7ac6 Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3027
diff changeset
   481
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   482
  $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   483
  popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   484
  popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   485
  popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   486
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   487
  $ hg qguard test1b.patch -- -negguard
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   488
  $ hg qguard test2.patch -- +posguard
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   489
  $ 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
   490
  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
   491
  [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   492
  $ hg qselect posguard
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   493
  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
   494
  $ hg qpush --move test2.patch # move to front
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   495
  applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   496
  now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   497
  $ hg qpush --move test1b.patch # negative guard unselected
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   498
  applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   499
  now at: test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   500
  $ hg qpush --move test.patch # noop move
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   501
  applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   502
  now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   503
  $ hg qseries -v
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   504
  0 A test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   505
  1 A test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   506
  2 A test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   507
  $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   508
  popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   509
  popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   510
  popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   511
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   512
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   513
cleaning up
11064
590b1d6ef50b mq: qpush --move, reorder patch series and apply only the patch
Mads Kiilerich <mads@kiilerich.com>
parents: 10710
diff changeset
   514
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   515
  $ hg qselect --none
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   516
  guards deactivated
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   517
  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
   518
  $ hg qguard --none test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   519
  $ hg qguard --none test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   520
  $ hg qpush --move test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   521
  applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   522
  now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   523
  $ hg qpush --move test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   524
  applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   525
  now at: test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   526
  $ hg qpush --move bogus # nonexistent patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   527
  abort: patch bogus not in series
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   528
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   529
  $ hg qpush --move # no patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   530
  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
   531
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   532
  $ hg qpush --move test.patch # already applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   533
  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
   534
  [255]
16331
900767dfa80d tests: fix portability of sed usage in test-mq
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16327
diff changeset
   535
  $ sed '2i\
900767dfa80d tests: fix portability of sed usage in test-mq
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16327
diff changeset
   536
  > # make qtip index different in series and fullseries
900767dfa80d tests: fix portability of sed usage in test-mq
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16327
diff changeset
   537
  > ' `hg root`/.hg/patches/series > $TESTTMP/sedtmp
900767dfa80d tests: fix portability of sed usage in test-mq
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16327
diff changeset
   538
  $ cp $TESTTMP/sedtmp `hg root`/.hg/patches/series
16303
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
   539
  $ cat `hg root`/.hg/patches/series
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
   540
  # comment
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
   541
  # make qtip index different in series and fullseries
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
   542
  
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
   543
  test.patch
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
   544
  test1b.patch
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
   545
  test2.patch
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
   546
  $ hg qpush --move test2.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   547
  applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   548
  now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   549
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
series after move
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   552
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   553
  $ cat `hg root`/.hg/patches/series
16303
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
   554
  # comment
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
   555
  # make qtip index different in series and fullseries
7ee8aa662937 mq: fix qpush --move with comments in series file between applied patches
Mads Kiilerich <mads@kiilerich.com>
parents: 16290
diff changeset
   556
  
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   557
  test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   558
  test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   559
  test2.patch
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
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   562
pop, qapplied, qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   563
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   564
  $ hg qseries -v
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   565
  0 A test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   566
  1 A test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   567
  2 A test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   568
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   569
qapplied -1 test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   570
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   571
  $ hg qapplied -1 test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   572
  only one patch applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   573
  [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   574
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   575
qapplied -1 test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   576
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   577
  $ hg qapplied -1 test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   578
  test.patch
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
qapplied -1 test2.patch
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
  $ hg qapplied -1 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   583
  test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   584
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   585
qapplied -1
11715
4f9dfb54c8b5 qpush --move: move the right patch even with comment lines
Gilles Moris <gilles.moris@free.fr>
parents: 11555
diff changeset
   586
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   587
  $ hg qapplied -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   588
  test1b.patch
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
qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   591
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   592
  $ hg qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   593
  test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   594
  test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   595
  test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   596
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   597
qapplied test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   598
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   599
  $ hg qapplied test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   600
  test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   601
  test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   602
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   603
qunapplied -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   604
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   605
  $ hg qunapplied -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   606
  all patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   607
  [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   608
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   609
qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   610
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   611
  $ hg qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   612
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   613
popping
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
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   616
  popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   617
  now at: test1b.patch
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
qunapplied -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   620
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   621
  $ hg qunapplied -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   622
  test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   623
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   624
qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   625
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   626
  $ hg qunapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   627
  test2.patch
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
qunapplied test2.patch
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 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
   632
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   633
qunapplied -1 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   634
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   635
  $ hg qunapplied -1 test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   636
  all patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   637
  [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   638
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   639
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
   640
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   641
  $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   642
  popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   643
  popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   644
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   645
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   646
qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   647
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   648
  $ hg qapplied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   649
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   650
qapplied -1
4101
e2ed92f4c0f7 add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4096
diff changeset
   651
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   652
  $ hg qapplied -1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   653
  no patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   654
  [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   655
  $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   656
  applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   657
  now at: test.patch
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
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   660
push should succeed
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   661
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   662
  $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   663
  popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   664
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   665
  $ hg push ../../k
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   666
  pushing to ../../k
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   667
  searching for changes
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   668
  adding changesets
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   669
  adding manifests
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   670
  adding file changes
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   671
  added 1 changesets with 1 changes to 1 files
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   672
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   673
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   674
we want to start with some patches applied
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
  $ hg qpush -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   677
  applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   678
  applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   679
  applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   680
  now at: test2.patch
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
% pops all patches 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 qpop -a
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   685
  popping test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   686
  popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   687
  popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   688
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   689
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   690
% does nothing and succeeds
2934
2f190e998eb3 Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents: 2848
diff changeset
   691
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   692
  $ hg qpop -a
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   693
  no patches applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   694
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   695
% fails - nothing else to pop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   696
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   697
  $ hg qpop
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   698
  no patches applied
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   699
  [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   700
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   701
% pushes a patch and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   702
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   703
  $ hg qpush
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   704
  applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   705
  now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   706
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   707
% pops a patch and succeeds
6472
8c4cd80afd3e mq: add --force option to strip
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6280
diff changeset
   708
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   709
  $ hg qpop
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   710
  popping test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   711
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   712
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   713
% pushes up to test1b.patch and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   714
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   715
  $ hg qpush test1b.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   716
  applying test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   717
  applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   718
  now at: test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   719
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   720
% does nothing and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   721
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   722
  $ hg qpush test1b.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   723
  qpush: test1b.patch is already at the top
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   724
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   725
% does nothing and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   726
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   727
  $ hg qpop test1b.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   728
  qpop: test1b.patch is already at the top
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   729
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   730
% fails - can't push to this patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   731
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   732
  $ hg qpush test.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   733
  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
   734
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   735
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   736
% fails - can't pop to this patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   737
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   738
  $ hg qpop test2.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   739
  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
   740
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   741
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   742
% pops up to test.patch and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   743
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   744
  $ hg qpop test.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   745
  popping test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   746
  now at: test.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   747
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   748
% 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
   749
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   750
  $ hg qpush -a
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   751
  applying test1b.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   752
  applying test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   753
  now at: test2.patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   754
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   755
% does nothing and succeeds
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   756
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   757
  $ hg qpush -a
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   758
  all patches are currently applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   759
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   760
% fails - nothing else to push
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   761
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   762
  $ hg qpush
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   763
  patch series already fully applied
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   764
  [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   765
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   766
% does nothing and succeeds
3334
534806df5b5a Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com>
parents: 3081
diff changeset
   767
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   768
  $ hg qpush test2.patch
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   769
  qpush: test2.patch is already at the top
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   770
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   771
strip
4219
6cb5be6bd70f mq: add qparent tag (first parent of qbase)
Brendan Cully <brendan@kublai.com>
parents: 4182
diff changeset
   772
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   773
  $ cd ../../b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   774
  $ echo x>x
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   775
  $ hg ci -Ama
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   776
  adding x
11907
863567a1364f tests: use regular expressions instead of helpers
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11894
diff changeset
   777
  $ hg strip tip
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   778
  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
   779
  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
   780
  $ hg unbundle .hg/strip-backup/*
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   781
  adding changesets
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   782
  adding manifests
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   783
  adding file changes
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   784
  added 1 changesets with 1 changes to 1 files
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   785
  (run 'hg update' to get a working copy)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   786
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
   787
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   788
strip with local changes, should complain
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   789
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   790
  $ hg up
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   791
  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
   792
  $ echo y>y
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   793
  $ hg add y
11907
863567a1364f tests: use regular expressions instead of helpers
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11894
diff changeset
   794
  $ hg strip tip
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   795
  abort: local changes found
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   796
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   797
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   798
--force strip with local changes
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   799
11907
863567a1364f tests: use regular expressions instead of helpers
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11894
diff changeset
   800
  $ hg strip -f tip
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   801
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
23835
aa4a1672583e bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents: 23749
diff changeset
   802
  saved backup bundle to $TESTTMP/b/.hg/strip-backup/770eb8fce608-0ddcae0f-backup.hg (glob)
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
   803
  $ cd ..
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   804
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
cd b; hg qrefresh
2934
2f190e998eb3 Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents: 2848
diff changeset
   807
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   808
  $ hg init refresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   809
  $ cd refresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   810
  $ echo a > a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   811
  $ hg ci -Ama
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   812
  adding a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   813
  $ hg qnew -mfoo foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   814
  $ echo a >> a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   815
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   816
  $ mkdir b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   817
  $ cd b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   818
  $ echo f > f
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   819
  $ hg add f
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   820
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   821
  $ cat ../.hg/patches/foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   822
  foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   823
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   824
  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
   825
  --- 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
   826
  \+\+\+ b/a\t(?P<date>.*) (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   827
  @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   828
   a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   829
  +a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   830
  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
   831
  --- /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
   832
  \+\+\+ b/b/f\t(?P<date>.*) (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   833
  @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   834
  +f
2934
2f190e998eb3 Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents: 2848
diff changeset
   835
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   836
hg qrefresh .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   837
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   838
  $ hg qrefresh .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   839
  $ cat ../.hg/patches/foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   840
  foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   841
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   842
  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
   843
  --- /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
   844
  \+\+\+ b/b/f\t(?P<date>.*) (re)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   845
  @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   846
  +f
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   847
  $ hg status
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   848
  M a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   849
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   850
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   851
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
   852
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   853
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   854
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   855
  $ hg qnew -mbar bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   856
  $ echo foo > foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   857
  $ echo bar > bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   858
  $ hg add foo bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   859
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   860
  $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   861
  popping bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   862
  popping foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   863
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   864
  $ echo bar > foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   865
  $ hg qpush -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   866
  applying foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   867
  applying bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   868
  file foo already exists
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   869
  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
   870
  patch failed, unable to continue (try -v)
24365
f1eaf03dd608 commands: say "working directory" in full spelling
Yuya Nishihara <yuya@tcha.org>
parents: 23835
diff changeset
   871
  patch failed, rejects left in working directory
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   872
  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
   873
  [2]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   874
  $ hg st
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   875
  ? foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   876
  ? foo.rej
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   877
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   878
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   879
mq tags
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   880
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   881
  $ hg log --template '{rev} {tags}\n' -r qparent:qtip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   882
  0 qparent
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   883
  1 foo qbase
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   884
  2 bar qtip tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   885
14210
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
   886
mq revset
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
   887
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
   888
  $ 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
   889
  1
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
   890
  2
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
   891
  $ 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
   892
      "mq()"
68ade2a6b30a mq: add a 'mq()' revset predicate that returns applied mq csets
Idan Kamara <idankk86@gmail.com>
parents: 14191
diff changeset
   893
        Changesets managed by MQ.
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   895
bad node in status
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   896
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   897
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   898
  popping bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   899
  now at: foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   900
  $ hg strip -qn tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   901
  $ hg tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   902
  changeset:   0:cb9a9f314b8b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   903
  tag:         tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   904
  user:        test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   905
  date:        Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   906
  summary:     a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   907
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   908
  $ hg branches
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   909
  default                        0:cb9a9f314b8b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   910
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   911
  no patches applied
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
   912
  [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   913
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
   914
  $ cd ..
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
   915
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
   916
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
   917
git patches
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
   918
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   919
  $ cat >>$HGRCPATH <<EOF
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   920
  > [diff]
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   921
  > git = True
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   922
  > EOF
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   923
  $ hg init git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   924
  $ cd git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   925
  $ 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
   926
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   927
  $ hg qnew -m'new file' new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   928
  $ echo foo > new
16899
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
   929
#if execbit
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   930
  $ chmod +x new
16899
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
   931
#endif
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   932
  $ hg add new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   933
  $ hg qrefresh
16899
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
   934
#if execbit
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   935
  $ cat .hg/patches/new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   936
  new file
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   937
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   938
  diff --git a/new b/new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   939
  new file mode 100755
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   940
  --- /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   941
  +++ b/new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   942
  @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   943
  +foo
16899
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
   944
#else
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
   945
  $ cat .hg/patches/new
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
   946
  new file
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
   947
  
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
   948
  diff --git a/new b/new
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
   949
  new file mode 100644
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
   950
  --- /dev/null
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
   951
  +++ b/new
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
   952
  @@ -0,0 +1,1 @@
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
   953
  +foo
8149ff405c78 tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16733
diff changeset
   954
#endif
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
  $ hg qnew -m'copy file' copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   957
  $ hg cp new copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   958
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   959
  $ cat .hg/patches/copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   960
  copy file
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   961
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   962
  diff --git a/new b/copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   963
  copy from new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   964
  copy to copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   965
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   966
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   967
  popping copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   968
  now at: new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   969
  $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   970
  applying copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   971
  now at: copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   972
  $ hg qdiff
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   973
  diff --git a/new b/copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   974
  copy from new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   975
  copy to copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   976
  $ cat >>$HGRCPATH <<EOF
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   977
  > [diff]
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   978
  > git = False
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   979
  > EOF
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   980
  $ hg qdiff --git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   981
  diff --git a/new b/copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   982
  copy from new
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   983
  copy to copy
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   984
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
   985
13507
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   986
empty lines in status
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   987
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   988
  $ hg init emptystatus
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   989
  $ cd emptystatus
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   990
  $ hg qinit
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   991
  $ 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
   992
  $ hg qser
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   993
  $ cd ..
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   994
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   995
bad line in status (without ":")
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   996
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   997
  $ hg init badstatus
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   998
  $ cd badstatus
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
   999
  $ hg qinit
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
  1000
  $ 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
  1001
  $ hg qser
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
  1002
  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
  1003
  $ cd ..
375ba42f3cda mq: gracefully handle malformated status file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13272
diff changeset
  1004
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1005
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1006
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
  1007
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1008
  $ hg init slow
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1009
  $ cd slow
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1010
  $ hg qinit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1011
  $ echo foo > foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1012
  $ hg add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1013
  $ hg ci -m 'add foo'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1014
  $ hg qnew bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1015
  $ echo bar > bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1016
  $ hg add bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1017
  $ hg mv foo baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1018
  $ hg qrefresh --git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1019
  $ hg up -C 0
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1020
  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
  1021
  $ echo >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1022
  $ hg ci -m 'change foo'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1023
  created new head
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1024
  $ hg up -C 1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1025
  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
  1026
  $ hg qrefresh --git
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1027
  $ cat .hg/patches/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1028
  diff --git a/bar b/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1029
  new file mode 100644
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1030
  --- /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1031
  +++ b/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1032
  @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1033
  +bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1034
  diff --git a/foo b/baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1035
  rename from foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1036
  rename to baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1037
  $ hg log -v --template '{rev} {file_copies}\n' -r .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1038
  2 baz (foo)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1039
  $ hg qrefresh --git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1040
  $ cat .hg/patches/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1041
  diff --git a/bar b/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1042
  new file mode 100644
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1043
  --- /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1044
  +++ b/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1045
  @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1046
  +bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1047
  diff --git a/foo b/baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1048
  rename from foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1049
  rename to baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1050
  $ hg log -v --template '{rev} {file_copies}\n' -r .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1051
  2 baz (foo)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1052
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1053
  $ grep 'diff --git' .hg/patches/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1054
  diff --git a/bar b/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1055
  diff --git a/foo b/baz
5026
48ebd6a83994 Test qnew --git
Patrick Mezard <pmezard@gmail.com>
parents: 4890
diff changeset
  1056
48ebd6a83994 Test qnew --git
Patrick Mezard <pmezard@gmail.com>
parents: 4890
diff changeset
  1057
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1058
test file move chains in the slow path
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1059
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1060
  $ hg up -C 1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1061
  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
  1062
  $ echo >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1063
  $ hg ci -m 'change foo again'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1064
  $ hg up -C 2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1065
  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
  1066
  $ hg mv bar quux
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1067
  $ 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
  1068
  $ hg qrefresh --git
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1069
  $ cat .hg/patches/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1070
  diff --git a/foo b/bleh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1071
  rename from foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1072
  rename to bleh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1073
  diff --git a/quux b/quux
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1074
  new file mode 100644
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1075
  --- /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1076
  +++ b/quux
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1077
  @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1078
  +bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1079
  $ hg log -v --template '{rev} {file_copies}\n' -r .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1080
  3 bleh (foo)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1081
  $ hg mv quux fred
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1082
  $ hg mv bleh barney
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1083
  $ hg qrefresh --git
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1084
  $ cat .hg/patches/bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1085
  diff --git a/foo b/barney
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1086
  rename from foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1087
  rename to barney
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1088
  diff --git a/fred b/fred
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1089
  new file mode 100644
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1090
  --- /dev/null
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1091
  +++ b/fred
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1092
  @@ -0,0 +1,1 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1093
  +bar
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1094
  $ hg log -v --template '{rev} {file_copies}\n' -r .
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1095
  3 barney (foo)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1096
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1097
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1098
refresh omitting an added file
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1099
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1100
  $ hg qnew baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1101
  $ echo newfile > newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1102
  $ hg add newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1103
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1104
  $ hg st -A newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1105
  C newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1106
  $ hg qrefresh -X newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1107
  $ hg st -A newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1108
  A newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1109
  $ hg revert newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1110
  $ rm newfile
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1111
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1112
  popping baz
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1113
  now at: bar
18067
6f62e005781d mq: don't fail when removing a patch without patch file from series file
Mads Kiilerich <mads@kiilerich.com>
parents: 17910
diff changeset
  1114
6f62e005781d mq: don't fail when removing a patch without patch file from series file
Mads Kiilerich <mads@kiilerich.com>
parents: 17910
diff changeset
  1115
test qdel/qrm
6f62e005781d mq: don't fail when removing a patch without patch file from series file
Mads Kiilerich <mads@kiilerich.com>
parents: 17910
diff changeset
  1116
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1117
  $ hg qdel baz
18067
6f62e005781d mq: don't fail when removing a patch without patch file from series file
Mads Kiilerich <mads@kiilerich.com>
parents: 17910
diff changeset
  1118
  $ echo p >> .hg/patches/series
6f62e005781d mq: don't fail when removing a patch without patch file from series file
Mads Kiilerich <mads@kiilerich.com>
parents: 17910
diff changeset
  1119
  $ hg qrm p
6f62e005781d mq: don't fail when removing a patch without patch file from series file
Mads Kiilerich <mads@kiilerich.com>
parents: 17910
diff changeset
  1120
  $ hg qser
6f62e005781d mq: don't fail when removing a patch without patch file from series file
Mads Kiilerich <mads@kiilerich.com>
parents: 17910
diff changeset
  1121
  bar
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1122
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1123
create a git patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1124
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1125
  $ echo a > alexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1126
  $ hg add alexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1127
  $ hg qnew -f --git addalexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1128
  $ grep diff .hg/patches/addalexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1129
  diff --git a/alexander b/alexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1130
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1131
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1132
create a git binary patch
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1133
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1134
  $ cat > writebin.py <<EOF
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1135
  > import sys
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1136
  > path = sys.argv[1]
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1137
  > open(path, 'wb').write('BIN\x00ARY')
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1138
  > EOF
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1139
  $ python writebin.py bucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1140
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1141
  $ python "$TESTDIR/md5sum.py" bucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1142
  8ba2a2f3e77b55d03051ff9c24ad65e7  bucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1143
  $ hg add bucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1144
  $ hg qnew -f --git addbucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1145
  $ grep diff .hg/patches/addbucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1146
  diff --git a/bucephalus b/bucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1147
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
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
  1150
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1151
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1152
  popping addbucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1153
  now at: addalexander
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1154
  $ 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
  1155
  [1]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1156
  $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1157
  applying addbucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1158
  now at: addbucephalus
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
  1159
  $ test -f bucephalus
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1160
  $ python "$TESTDIR/md5sum.py" bucephalus
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1161
  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
  1162
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1163
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
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
  1166
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1167
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1168
  $ hg init strip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1169
  $ cd strip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1170
  $ touch foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1171
  $ hg add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1172
  $ hg ci -m 'add foo'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1173
  $ echo >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1174
  $ hg ci -m 'change foo 1'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1175
  $ hg up -C 0
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1176
  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
  1177
  $ echo 1 >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1178
  $ hg ci -m 'change foo 2'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1179
  created new head
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1180
  $ HGMERGE=true hg merge
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1181
  merging foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1182
  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
  1183
  (branch merge, don't forget to commit)
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1184
  $ hg ci -m merge
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1185
  $ hg log
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1186
  changeset:   3:99615015637b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1187
  tag:         tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1188
  parent:      2:20cbbe65cff7
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1189
  parent:      1:d2871fc282d4
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1190
  user:        test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1191
  date:        Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1192
  summary:     merge
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
  changeset:   2:20cbbe65cff7
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1195
  parent:      0:53245c60e682
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1196
  user:        test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1197
  date:        Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1198
  summary:     change foo 2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1199
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1200
  changeset:   1:d2871fc282d4
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1201
  user:        test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1202
  date:        Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1203
  summary:     change foo 1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1204
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1205
  changeset:   0:53245c60e682
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1206
  user:        test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1207
  date:        Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1208
  summary:     add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1209
  
11907
863567a1364f tests: use regular expressions instead of helpers
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11894
diff changeset
  1210
  $ hg strip 1
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1211
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
  1212
  saved backup bundle to $TESTTMP/strip/.hg/strip-backup/*-backup.hg (glob)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1213
  $ checkundo strip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1214
  $ hg log
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1215
  changeset:   1:20cbbe65cff7
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1216
  tag:         tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1217
  user:        test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1218
  date:        Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1219
  summary:     change foo 2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1220
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1221
  changeset:   0:53245c60e682
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1222
  user:        test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1223
  date:        Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1224
  summary:     add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1225
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1226
  $ cd ..
4090
785ad8cd1d31 qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4065
diff changeset
  1227
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1228
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1229
qclone
4090
785ad8cd1d31 qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4065
diff changeset
  1230
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1231
  $ qlog()
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
  >     echo 'main repo:'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1234
  >     hg log --template '    rev {rev}: {desc}\n'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1235
  >     echo 'patch repo:'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1236
  >     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
  1237
  > }
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1238
  $ hg init qclonesource
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1239
  $ cd qclonesource
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1240
  $ echo foo > foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1241
  $ hg add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1242
  $ hg ci -m 'add foo'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1243
  $ hg qinit
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1244
  $ hg qnew patch1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1245
  $ echo bar >> foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1246
  $ hg qrefresh -m 'change foo'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1247
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1248
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1249
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1250
repo with unversioned patch dir
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1251
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1252
  $ hg qclone qclonesource failure
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1253
  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
  1254
  [255]
4090
785ad8cd1d31 qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4065
diff changeset
  1255
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1256
  $ cd qclonesource
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1257
  $ hg qinit -c
15447
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 15442
diff changeset
  1258
  adding .hg/patches/patch1 (glob)
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1259
  $ hg qci -m checkpoint
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1260
  $ qlog
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1261
  main repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1262
      rev 1: change foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1263
      rev 0: add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1264
  patch repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1265
      rev 0: checkpoint
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1266
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1267
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1268
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1269
repo with patches applied
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1270
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1271
  $ hg qclone qclonesource qclonedest
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1272
  updating to branch default
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1273
  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
  1274
  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
  1275
  $ cd qclonedest
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1276
  $ qlog
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1277
  main repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1278
      rev 0: add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1279
  patch repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1280
      rev 0: checkpoint
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1281
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1282
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1283
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1284
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
  1285
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1286
  $ cd qclonesource
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1287
  $ hg qpop -a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1288
  popping patch1
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1289
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1290
  $ qlog
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1291
  main repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1292
      rev 0: add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1293
  patch repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1294
      rev 0: checkpoint
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1295
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1296
  $ hg qclone qclonesource qclonedest2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1297
  updating to branch default
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1298
  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
  1299
  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
  1300
  $ cd qclonedest2
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1301
  $ qlog
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1302
  main repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1303
      rev 0: add foo
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1304
  patch repo:
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1305
      rev 0: checkpoint
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1306
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1307
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1308
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12376
diff changeset
  1309
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
  1310
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1311
  $ hg init empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1312
  $ cd empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1313
  $ touch a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1314
  $ hg ci -Am addempty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1315
  adding a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1316
  $ echo a > a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1317
  $ hg qnew -f -e changea
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1318
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1319
  popping changea
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1320
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1321
  $ hg qpush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1322
  applying changea
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1323
  now at: changea
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1324
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1325
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1326
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
  1327
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1328
  $ hg init forcepush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1329
  $ cd forcepush
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1330
  $ echo hello > hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1331
  $ echo bye > bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1332
  $ hg ci -Ama
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1333
  adding bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1334
  adding hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1335
  $ hg qnew -d '0 0' empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1336
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1337
  popping empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1338
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1339
  $ echo world >> hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1340
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1341
14732
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
  1342
qpush should fail, local changes
11894
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
  $ 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
  1345
  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
  1346
  [255]
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
  1347
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
  1348
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
  1349
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
  1350
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14464
diff changeset
  1351
  $ hg qpush -f
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1352
  applying empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1353
  patch empty is empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1354
  now at: empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1355
  $ 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
  1356
  diff -r d58265112590 hello.txt
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1357
  --- a/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1358
  +++ b/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1359
  @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1360
   hello
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1361
  +world
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1362
  $ hg qdiff --config diff.nodates=True
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1363
  diff -r 9ecee4f634e3 hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1364
  --- a/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1365
  +++ b/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1366
  @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1367
   hello
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1368
  +world
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1369
  $ 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
  1370
  changeset:   1:d58265112590
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1371
  tag:         empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1372
  tag:         qbase
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1373
  tag:         qtip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1374
  tag:         tip
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1375
  user:        test
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1376
  date:        Thu Jan 01 00:00:00 1970 +0000
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1377
  summary:     imported patch empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1378
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1379
  
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1380
  $ hg qref -d '0 0'
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1381
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1382
  popping empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1383
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1384
  $ echo universe >> hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1385
  $ 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
  1386
11894
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
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
  1389
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1390
  $ 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
  1391
  abort: local changes found
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12101
diff changeset
  1392
  [255]
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1393
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
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
  1396
16634
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16337
diff changeset
  1397
  $ hg qpush -f --verbose
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1398
  applying empty
16634
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16337
diff changeset
  1399
  saving current version of hello.txt as hello.txt.orig
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16337
diff changeset
  1400
  patching file hello.txt
23749
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 23172
diff changeset
  1401
  committing files:
16634
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16337
diff changeset
  1402
  hello.txt
23749
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 23172
diff changeset
  1403
  committing manifest
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 23172
diff changeset
  1404
  committing changelog
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1405
  now at: empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1406
  $ hg st
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1407
  M bye.txt
16634
435375cc0ca0 mq: backup local changes in qpush --force
Patrick Mezard <patrick@mezard.eu>
parents: 16337
diff changeset
  1408
  ? hello.txt.orig
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1409
  $ hg diff --config diff.nodates=True
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1410
  diff -r ba252371dbc1 bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1411
  --- a/bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1412
  +++ b/bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1413
  @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1414
   bye
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1415
  +universe
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1416
  $ hg qdiff --config diff.nodates=True
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1417
  diff -r 9ecee4f634e3 bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1418
  --- a/bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1419
  +++ b/bye.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1420
  @@ -1,1 +1,2 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1421
   bye
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1422
  +universe
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1423
  diff -r 9ecee4f634e3 hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1424
  --- a/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1425
  +++ b/hello.txt
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1426
  @@ -1,1 +1,3 @@
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1427
   hello
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1428
  +world
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1429
  +universe
10048
46de82e50790 mq: qpop: remove added files before re-adding removed files
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9874
diff changeset
  1430
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1431
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1432
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
  1433
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1434
  $ hg qseries -v
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1435
  0 A empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1436
  $ hg up qparent
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1437
  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
  1438
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1439
  popping empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1440
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1441
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1442
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1443
  $ hg init deletion-order
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1444
  $ cd deletion-order
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1445
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1446
  $ touch a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1447
  $ 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
  1448
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1449
  $ hg qnew rename-dir
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1450
  $ hg rm a
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1451
  $ hg qrefresh
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1452
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1453
  $ mkdir a b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1454
  $ touch a/a b/b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1455
  $ hg add -q a b
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1456
  $ hg qrefresh
10048
46de82e50790 mq: qpop: remove added files before re-adding removed files
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9874
diff changeset
  1457
11894
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1458
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1459
test popping must remove files added in subdirectories first
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1460
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1461
  $ hg qpop
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1462
  popping rename-dir
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1463
  patch queue now empty
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1464
  $ cd ..
a15936ac7ec5 tests: unify test-mq
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11715
diff changeset
  1465
15728
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1466
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1467
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
  1468
insensitive filesystem
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1469
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1470
  $ 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
  1471
  $ cd casepreserve
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1472
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1473
  $ 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
  1474
  $ 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
  1475
  $ 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
  1476
  $ hg qrefresh
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1477
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1478
  $ 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
  1479
  $ 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
  1480
  $ 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
  1481
  $ hg qrefresh
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1482
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1483
  $ 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
  1484
  $ 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
  1485
  $ hg qrefresh
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1486
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1487
  $ hg qapplied
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1488
  add-file1
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1489
  add-file2
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1490
  modify-file
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1491
  $ 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
  1492
  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
  1493
  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
  1494
  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
  1495
  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
  1496
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1497
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
  1498
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
  1499
(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
  1500
(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
  1501
bc2a22357538 icasefs: add test for case preservation on case insensitive filesystem
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 15447
diff changeset
  1502
  $ 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
  1503
  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
  1504
  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
  1505
  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
  1506
  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
  1507
16028
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
  1508
Proper phase default with mq:
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
  1509
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
  1510
1. mq.secret=false
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
  1511
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
  1512
  $ rm .hg/store/phaseroots
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
  1513
  $ hg phase 'qparent::'
22860
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22118
diff changeset
  1514
  -1: public
16028
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
  1515
  0: draft
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
  1516
  1: draft
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
  1517
  2: draft
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
  1518
  $ echo '[mq]' >> $HGRCPATH
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
  1519
  $ echo 'secret=true' >> $HGRCPATH
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
  1520
  $ rm -f .hg/store/phaseroots
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
  1521
  $ hg phase 'qparent::'
22860
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22118
diff changeset
  1522
  -1: public
16028
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
  1523
  0: secret
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
  1524
  1: secret
922c0e9b40be mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16017
diff changeset
  1525
  2: secret
16029
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
  1526
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
  1527
Test that qfinish change phase when mq.secret=true
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
  1528
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
  1529
  $ hg qfinish qbase
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
  1530
  patch add-file1 finalized without changeset message
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
  1531
  $ hg phase 'all()'
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
  1532
  0: draft
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
  1533
  1: secret
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
  1534
  2: secret
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
  1535
16290
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
  1536
Test that qfinish respect phases.new-commit setting
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
  1537
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
  1538
  $ echo '[phases]' >> $HGRCPATH
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
  1539
  $ echo 'new-commit=secret' >> $HGRCPATH
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
  1540
  $ hg qfinish qbase
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
  1541
  patch add-file2 finalized without changeset message
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
  1542
  $ hg phase 'all()'
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
  1543
  0: draft
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
  1544
  1: secret
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
  1545
  2: secret
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
  1546
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
  1547
(restore env for next test)
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
  1548
16331
900767dfa80d tests: fix portability of sed usage in test-mq
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16327
diff changeset
  1549
  $ sed -e 's/new-commit=secret//' $HGRCPATH > $TESTTMP/sedtmp
900767dfa80d tests: fix portability of sed usage in test-mq
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16327
diff changeset
  1550
  $ cp $TESTTMP/sedtmp $HGRCPATH
16290
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
  1551
  $ hg qimport -r 1 --name  add-file2
9518cb55c822 qfinish: comply with the phases.new-commit option in secret mode (issue3335)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 16188
diff changeset
  1552
16029
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
  1553
Test that qfinish preserve phase when mq.secret=false
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
  1554
16331
900767dfa80d tests: fix portability of sed usage in test-mq
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16327
diff changeset
  1555
  $ sed -e 's/secret=true/secret=false/' $HGRCPATH > $TESTTMP/sedtmp
900767dfa80d tests: fix portability of sed usage in test-mq
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16327
diff changeset
  1556
  $ cp $TESTTMP/sedtmp $HGRCPATH
16029
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
  1557
  $ hg qfinish qbase
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
  1558
  patch add-file2 finalized without changeset message
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
  1559
  $ hg phase 'all()'
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
  1560
  0: draft
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
  1561
  1: secret
ee1c8385e5b0 qfinish: do not set secret changeset to draft if mq.secret=false
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 16028
diff changeset
  1562
  2: secret
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
  1563
18662
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
  1564
Test that secret mq patch does not break hgweb
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
  1565
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
  1566
  $ cat > hgweb.cgi <<HGWEB
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
  1567
  > from mercurial import demandimport; demandimport.enable()
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
  1568
  > from mercurial.hgweb import hgweb
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
  1569
  > from mercurial.hgweb import wsgicgi
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
  1570
  > import cgitb
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
  1571
  > cgitb.enable()
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
  1572
  > app = hgweb('.', 'test')
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
  1573
  > wsgicgi.launch(app)
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
  1574
  > HGWEB
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
  1575
  $ . "$TESTDIR/cgienv"
18733
1663fe10f693 tests: work around msys bash mangling of paths in test-mq.t
Mads Kiilerich <madski@unity3d.com>
parents: 18662
diff changeset
  1576
#if msys
1663fe10f693 tests: work around msys bash mangling of paths in test-mq.t
Mads Kiilerich <madski@unity3d.com>
parents: 18662
diff changeset
  1577
  $ PATH_INFO=//tags; export PATH_INFO
1663fe10f693 tests: work around msys bash mangling of paths in test-mq.t
Mads Kiilerich <madski@unity3d.com>
parents: 18662
diff changeset
  1578
#else
18662
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
  1579
  $ PATH_INFO=/tags; export PATH_INFO
18733
1663fe10f693 tests: work around msys bash mangling of paths in test-mq.t
Mads Kiilerich <madski@unity3d.com>
parents: 18662
diff changeset
  1580
#endif
18662
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
  1581
  $ QUERY_STRING='style=raw'
18733
1663fe10f693 tests: work around msys bash mangling of paths in test-mq.t
Mads Kiilerich <madski@unity3d.com>
parents: 18662
diff changeset
  1582
  $ python hgweb.cgi | grep '^tip'
18662
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
  1583
  tip	[0-9a-f]{40} (re)
c5f7e83d47cd mq: comply with filtering when injecting fake tags (issue3812)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18067
diff changeset
  1584
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16899
diff changeset
  1585
  $ cd ..
23127
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
  1586
23139
e53f6b72a0e4 spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents: 23128
diff changeset
  1587
Test interaction with revset (issue4426)
23127
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
  1588
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
  1589
  $ hg init issue4426
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
  1590
  $ cd issue4426
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
  1591
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
  1592
  $ echo a > a
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
  1593
  $ hg ci -Am a
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
  1594
  adding a
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
  1595
  $ echo a >> a
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
  1596
  $ hg ci -m a
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
  1597
  $ echo a >> a
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
  1598
  $ hg ci -m a
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
  1599
  $ hg qimport -r 0::
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
  1600
23128
b6f7cf47f5d1 mq: do not call [0] on revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23127
diff changeset
  1601
reimport things
b6f7cf47f5d1 mq: do not call [0] on revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23127
diff changeset
  1602
b6f7cf47f5d1 mq: do not call [0] on revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23127
diff changeset
  1603
  $ hg qimport -r 1::
b6f7cf47f5d1 mq: do not call [0] on revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23127
diff changeset
  1604
  abort: revision 2 is already managed
b6f7cf47f5d1 mq: do not call [0] on revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23127
diff changeset
  1605
  [255]
b6f7cf47f5d1 mq: do not call [0] on revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23127
diff changeset
  1606
b6f7cf47f5d1 mq: do not call [0] on revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23127
diff changeset
  1607
23127
7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22860
diff changeset
  1608
  $ cd ..