view tests/test-mq-qimport-fail-cleanup.t @ 48998:91a60031aba2 stable

dispatch: fix silly blackbox entries when hg is interrupted

When hg is interrupted, it creates ui.log like this:

1970/01/01 00:00:00 user @0000000000000000000000000000000000000000 (62488)> killed!
 exited 255 after 1.78 seconds

This is due to a scoping problem: two different uses of the name "msg"
collide. So rename one of them.

Differential Revision: https://phab.mercurial-scm.org/D12427

Failed qimport of patches from files should cleanup by recording successfully
imported patches in series file.

  $ echo "[extensions]" >> $HGRCPATH
  $ echo "mq=" >> $HGRCPATH
  $ hg init repo
  $ cd repo
  $ echo a > a
  $ hg ci -Am'add a'
  adding a
  $ cat >b.patch<<EOF
  > diff --git a/a b/a
  > --- a/a
  > +++ b/a
  > @@ -1,1 +1,2 @@
  >  a
  > +b
  > EOF

empty series

  $ hg qseries

qimport valid patch followed by invalid patch

  $ hg qimport b.patch fakepatch
  adding b.patch to series file
  abort: unable to read file fakepatch
  [255]

valid patches before fail added to series

  $ hg qseries
  b.patch

  $ hg pull -q -r 0 . # update phase
  $ hg qimport -r 0
  abort: revision 0 is not mutable
  (see 'hg help phases' for details)
  [255]

  $ cd ..