view tests/test-mq-qimport-fail-cleanup.t @ 50179:9e1debbb477e

status: simplify the post status fixup phases

With the wlock automatically discarding changes when applicable, we can
simplify the code a bit.

* we perform the fixup operation before trying to grab the lock to narrow the `try/except`

* we no longer need to explicitly complare dirstate identities. We can trust
  the dirstate internal refresh for that. It would invalidate dirty data when
  needed.

* detect still data invalidation by checking the dirty flag before and after
  taking the lock. Doing this is actually only necessary to issue the debug
  message, we could blindy trust the dirstate internal to ignore the `write`
  call on a non-dirty dirstate.

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 ..