Mercurial > hg
view tests/test-bookmarks-strip.t @ 14007:d764463b433e
atomictempfile: avoid infinite recursion in __del__().
The problem is that a programmer using atomictempfile directly can
make an innocent everyday mistake -- not enough args to the
constructor -- which escalates badly. You would expect a simple
TypeError crash in that case, but you actually get an infinite
recursion that is surprisingly difficult to kill: it happens between
__del__() and __getattr__(), and Python does not handle infinite
recursion from __del__() well.
The fix is to not implement __getattr__(), but instead assign instance
attributes for the methods we wish to delegate to the builtin file
type: write() and fileno(). I've audited mercurial.* and hgext.* and
found no users of atomictempfile using methods other than write() and
rename(). I audited third-party extensions and found one (snap)
passing an atomictempfile to util.fstat(), so I also threw in
fileno().
The last time I submitted a similar patch, Matt proposed that we make
atomictempfile a subclass of file instead of wrapping it. Rejected on
grounds of unnecessary complexity: for one thing, it would make the
Windows implementation of posixfile quite a bit more complex. It would
have to become a subclass of file rather than a simple function -- but
since it's written in C, this is non-obvious and non-trivial.
Furthermore, there's nothing wrong with wrapping objects and
delegating methods: it's a well-established pattern that works just
fine in many cases. Subclassing is not the answer to all of life's
problems.
author | Greg Ward <greg@gerg.ca> |
---|---|
date | Sun, 24 Apr 2011 19:25:10 -0400 |
parents | 71a96f6c205d |
children | 7c75924a6926 |
line wrap: on
line source
$ echo "[extensions]" >> $HGRCPATH $ echo "mq=" >> $HGRCPATH $ hg init $ echo qqq>qqq.txt rollback dry run without rollback information $ hg rollback no rollback information available [1] add file $ hg add adding qqq.txt commit first revision $ hg ci -m 1 set bookmark $ hg book test $ echo www>>qqq.txt commit second revision $ hg ci -m 2 set bookmark $ hg book test2 update to -2 $ hg update -r -2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo eee>>qqq.txt commit new head $ hg ci -m 3 created new head bookmarks updated? $ hg book test 1:25e1ee7a0081 test2 1:25e1ee7a0081 strip to revision 1 $ hg strip 1 saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob) list bookmarks $ hg book test 1:8cf31af87a2b * test2 1:8cf31af87a2b immediate rollback and reentrancy issue $ echo "mq=!" >> $HGRCPATH $ hg init repo $ cd repo $ echo a > a $ hg ci -Am adda adding a $ echo b > b $ hg ci -Am addb adding b $ hg bookmarks markb $ hg rollback repository tip rolled back to revision 0 (undo commit) working directory now based on revision 0 are you there? $ hg bookmarks no bookmarks set can we commit? (issue2692) $ echo c > c $ hg ci -Am rockon adding c can you be added again? $ hg bookmarks markb $ hg bookmarks * markb 1:fdb34407462c rollback dry run with rollback information $ hg rollback -n repository tip rolled back to revision 0 (undo commit) $ hg bookmarks * markb 1:fdb34407462c rollback dry run with rollback information and no commit undo $ rm .hg/store/undo $ hg rollback -n no rollback information available [1] $ hg bookmarks * markb 1:fdb34407462c $ cd ..