Mercurial > hg > mercurial-crew-with-dirclash

diff hgext/transplant.py @ 3726:752884db5037

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
transplant: recover added/removed files after failed application
author Brendan Cully <brendan@kublai.com>
date Thu, 30 Nov 2006 13:51:58 -0800
parents ccc7a9eb0e5e
children f902f409cd81
line wrap: on
line diff
--- a/hgext/transplant.py
+++ b/hgext/transplant.py
@@ -196,12 +196,14 @@ class transplanter:
         if patchfile:
             try:
                 files = {}
-                fuzz = patch.patch(patchfile, self.ui, cwd=repo.root,
-                                   files=files)
-                if not files:
-                    self.ui.warn(_('%s: empty changeset') % revlog.hex(node))
-                    return
-                files = patch.updatedir(self.ui, repo, files, wlock=wlock)
+                try:
+                    fuzz = patch.patch(patchfile, self.ui, cwd=repo.root,
+                                       files=files)
+                    if not files:
+                        self.ui.warn(_('%s: empty changeset') % revlog.hex(node))
+                        return
+                finally:
+                    files = patch.updatedir(self.ui, repo, files, wlock=wlock)
                 if filter:
                     os.unlink(patchfile)
             except Exception, inst: