# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1338612147 18000
# Node ID 6403fdd716fe64939b6606ec25e636a517cc56fd
# Parent  8abee656e14c3d995adbc00420266fcc7c0db2c5
strip: move bookmark deletion before strip to deal with filecache invalidation

diff -r 8abee656e14c -r 6403fdd716fe hgext/mq.py
--- a/hgext/mq.py	Fri Jun 01 15:14:29 2012 -0500
+++ b/hgext/mq.py	Fri Jun 01 23:42:27 2012 -0500
@@ -3005,14 +3005,14 @@
         finally:
             wlock.release()
 
-    repo.mq.strip(repo, revs, backup=backup, update=update,
-                  force=opts.get('force'))
-
     if opts.get('bookmark'):
         del marks[mark]
         repo._writebookmarks(marks)
         ui.write(_("bookmark '%s' deleted\n") % mark)
 
+    repo.mq.strip(repo, revs, backup=backup, update=update,
+                  force=opts.get('force'))
+
     return 0
 
 @command("qselect",
diff -r 8abee656e14c -r 6403fdd716fe tests/test-mq-strip.t
--- a/tests/test-mq-strip.t	Fri Jun 01 15:14:29 2012 -0500
+++ b/tests/test-mq-strip.t	Fri Jun 01 23:42:27 2012 -0500
@@ -447,9 +447,9 @@
   abort: empty revision set
   [255]
   $ hg strip -B todelete
+  bookmark 'todelete' deleted
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob)
-  bookmark 'todelete' deleted
   $ hg id -ir dcbb326fdec2
   abort: unknown revision 'dcbb326fdec2'!
   [255]
@@ -459,8 +459,8 @@
      B                         9:ff43616e5d0f
      delete                    6:2702dd0c91e7
   $ hg strip -B delete
+  bookmark 'delete' deleted
   saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob)
-  bookmark 'delete' deleted
   $ hg id -ir 6:2702dd0c91e7
   abort: unknown revision '2702dd0c91e7'!
   [255]