view tests/test-mq-qimport-fail-cleanup.t @ 13624:78cc35e75ecc stable

eol: do not abort when win32text is found, only warn

The win32text extension does not break eol or vice-versa, so it is not a fatal
error to have both of them enabled.  It's just folly.  So spewing warnings in
this condition is preferrable to aborting.  When both extensions are enabled,
the user now sees:

% hg st
the eol extension is incompatible with the win32text extension
win32text is deprecated: http://mercurial.selenic.com/wiki/Win32TextExtension
M hgext/eol.py

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
  $ echo
  

empty series

  $ hg qseries
  $ echo
  

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]
  $ echo
  

valid patches before fail added to series

  $ hg qseries
  b.patch