view tests/test-mq-qdelete @ 10428:e553a425751d stable

convert: differentiate between IOError and OSError on commitctx()

The IOError exception is overloaded to mean 'this file was deleted in
the current commit'.  Separate the code that handles IOError and file
deletion from general OSError exceptions.  The latter are real errors,
but IOError is not always a throwable error.

This solves the accidental marking of files as 'deleted' in commits that
try to write for example in .hg/store/data revlogs that the current user
has no permission to modify (a normal OSError that should abort the
current commit).

Changed by pmezard: use getattr() to be on the safe side.

#!/bin/sh

echo "[extensions]" >> $HGRCPATH
echo "mq=" >> $HGRCPATH

hg init a
cd a

echo 'base' > base
hg ci -Ambase -d '1 0'

hg qnew -d '1 0' a
hg qnew -d '1 0' b
hg qnew -d '1 0' c

hg qdel

hg qdel c
hg qpop
hg qdel c
hg qseries
ls .hg/patches
hg qpop
hg qdel -k b
ls .hg/patches
hg qdel -r a
hg qapplied
hg log --template '{rev} {desc}\n'

hg qnew d
hg qnew e
hg qnew f

hg qdel -r e
hg qdel -r qbase:e
hg qapplied
hg log --template '{rev} {desc}\n'

cd ..
hg init b
cd b

echo 'base' > base
hg ci -Ambase -d '1 0'

hg qfinish
hg qfinish -a

hg qnew -d '1 0' a
hg qnew -d '1 0' b
hg qnew c # XXX fails to apply by /usr/bin/patch if we put a date

hg qfinish 0
hg qfinish b

hg qpop
hg qfinish -a c
hg qpush

hg qfinish qbase:b
hg qapplied
hg log --template '{rev} {desc}\n'

hg qfinish -a c
hg qapplied
hg log --template '{rev} {desc}\n'
ls .hg/patches