tests/test-mq-qimport-fail-cleanup.t
author Gregory Szorc <gregory.szorc@gmail.com>
Wed, 07 Feb 2018 20:17:05 -0800
changeset 36065 bf676267f64f
parent 29968 0342bf292f73
permissions -rw-r--r--
wireprotoserver: split ssh protocol handler and server We want to formalize the interface for protocol handlers. Today, server functionality (which is domain specific) is interleaved with protocol handling functionality (which conforms to a generic interface) in the sshserver class. This commit splits the ssh protocol handling code out of the sshserver class. Differential Revision: https://phab.mercurial-scm.org/D2080
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12465
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
     1
Failed qimport of patches from files should cleanup by recording successfully
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
     2
imported patches in series file.
11462
1b82a26635d7 mq: qimport cleanup on fail (issue2214)
Vishakh H <vsh426@gmail.com>
parents:
diff changeset
     3
12465
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
     4
  $ echo "[extensions]" >> $HGRCPATH
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
     5
  $ echo "mq=" >> $HGRCPATH
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
     6
  $ hg init repo
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
     7
  $ cd repo
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
     8
  $ echo a > a
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
     9
  $ hg ci -Am'add a'
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
    10
  adding a
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
    11
  $ cat >b.patch<<EOF
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
    12
  > diff --git a/a b/a
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
    13
  > --- a/a
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
    14
  > +++ b/a
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
    15
  > @@ -1,1 +1,2 @@
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
    16
  >  a
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
    17
  > +b
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
    18
  > EOF
11462
1b82a26635d7 mq: qimport cleanup on fail (issue2214)
Vishakh H <vsh426@gmail.com>
parents:
diff changeset
    19
12465
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
    20
empty series
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
    21
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
    22
  $ hg qseries
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
    23
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
    24
qimport valid patch followed by invalid patch
11462
1b82a26635d7 mq: qimport cleanup on fail (issue2214)
Vishakh H <vsh426@gmail.com>
parents:
diff changeset
    25
12465
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
    26
  $ hg qimport b.patch fakepatch
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
    27
  adding b.patch to series file
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
    28
  abort: unable to read file fakepatch
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
    29
  [255]
11462
1b82a26635d7 mq: qimport cleanup on fail (issue2214)
Vishakh H <vsh426@gmail.com>
parents:
diff changeset
    30
12465
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
    31
valid patches before fail added to series
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
    32
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
    33
  $ hg qseries
8b12768b15e2 tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents: 11462
diff changeset
    34
  b.patch
15704
8857e150bec0 phases: prevent mq to qimport immutable change.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15243
diff changeset
    35
8857e150bec0 phases: prevent mq to qimport immutable change.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15243
diff changeset
    36
  $ hg pull -q -r 0 . # update phase
8857e150bec0 phases: prevent mq to qimport immutable change.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15243
diff changeset
    37
  $ hg qimport -r 0
8857e150bec0 phases: prevent mq to qimport immutable change.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15243
diff changeset
    38
  abort: revision 0 is not mutable
29968
0342bf292f73 mq: use single quotes in use warning
timeless <timeless@mozdev.org>
parents: 16913
diff changeset
    39
  (see 'hg help phases' for details)
15704
8857e150bec0 phases: prevent mq to qimport immutable change.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15243
diff changeset
    40
  [255]
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
    41
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
    42
  $ cd ..