view tests/test-bookmarks-strip @ 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 "bookmarks=" >> $HGRCPATH
echo "mq=" >> $HGRCPATH

hg init

echo qqq>qqq.txt

echo % add file
hg add

echo % commit first revision
hg ci -m 1 -u user -d "1 0"

echo % set bookmark
hg book test

echo www>>qqq.txt

echo % commit second revision
hg ci -m 2 -u usr -d "1 0"

echo % set bookmark
hg book test2

echo % update to -2
hg update -r -2

echo eee>>qqq.txt

echo % commit new head
hg ci -m 3 -u user -d "1 0"

echo % bookmarks updated?
hg book

echo % strip to revision 1
hg strip 1 2>&1 | sed 's/\(saving bundle to \).*/\1/'

echo % list bookmarks
hg book