[thg-dev] [PATCH 1 of 1] shelve: always clean up backups after a failure

[David Wilhelm]

# HG changeset patch
# User David Wilhelm <d...@jumbledpile.com>
# Date 1275000241 25200
# Branch stable
# Node ID 8e317877e52aa3f53ccadab24a61ace24b4225c2
# Parent  6633d55dab397add706c878fea80ca1845e3ac4d
shelve: always clean up backups after a failure

diff --git a/tortoisehg/util/hgshelve.py b/tortoisehg/util/hgshelve.py
--- a/tortoisehg/util/hgshelve.py
+++ b/tortoisehg/util/hgshelve.py
@@ -15,7 +15,6 @@
 import operator
 import os
 import re
-import shutil
 import tempfile
 
 from mercurial import cmdutil, commands, cmdutil, hg, mdiff, patch, revlog
@@ -420,6 +419,29 @@
 
     return backups
 
+
+def delete_backup(ui, repo, backupdir):
+    """remove the shelve backup files and directory"""
+
+    backupdir = os.path.normpath(repo.join(backupdir))
+
+    # Do a sanity check to ensure that unrelated files aren't destroyed.
+    # All shelve file and directory paths must start with "shelve" under
+    # the .hg directory.
+    if backupdir.startswith(repo.join('shelve')):
+        try:
+            backups = os.listdir(backupdir)
+            for filename in backups:
+                ui.debug(_('removing backup file : %r\n') % filename)
+                os.unlink(os.path.join(backupdir, filename))
+            os.rmdir(backupdir)
+        except OSError:
+            ui.warn(_('delete of shelve backup failed'))
+            pass
+    else:
+        ui.warn(_('bad shelve backup directory name'))
+
+
 def get_shelve_filename(repo):
     return repo.join('shelve')
 
@@ -543,13 +565,8 @@
 
             return 0
         finally:
-            try:
-                for realname, tmpname in backups.iteritems():
-                    ui.debug(_('removing backup for %r : %r\n') % (realname, 
tmpname))
-                    os.unlink(tmpname)
-                os.rmdir(backupdir)
-            except OSError:
-                pass
+            delete_backup(ui, repo, backupdir)
+
     fancyopts.fancyopts([], commands.commitopts, opts)
     return cmdutil.commit(ui, repo, shelvefunc, pats, opts)
 
@@ -576,6 +593,7 @@
                 backups = makebackup(ui, repo, backupdir, set(files))
             except:
                 ui.warn(_('unshelve backup aborted\n'))
+                delete_backup(ui, repo, backupdir)
                 raise
 
             ui.debug(_('applying shelved patch\n'))
@@ -597,11 +615,7 @@
                                      (tmpname, realname))
                             util.copyfile(tmpname, repo.wjoin(realname))
             finally:
-                try:
-                    ui.debug(_('removing backup files\n'))
-                    shutil.rmtree(backupdir, True)
-                except OSError:
-                    pass
+                delete_backup(ui, repo, backupdir)
 
             if patchdone:
                 ui.debug(_('removing shelved patches\n'))

------------------------------------------------------------------------------

_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop