Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
del transaction before lock before wlock
authorAlexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 02 Aug 2007 01:56:08 -0300
changeset 5053 47a8ea1eb2c3
parent 5052 a11e8a181bd5
child 5054 ec70fd08e16c
del transaction before lock before wlock This way rollbacks happen while the repo is still locked. Deleting lock before wlock is not strictly necessary, but is more consistent with the locking order.
hgext/mq.py file | annotate | diff | comparison | revisions
mercurial/commands.py file | annotate | diff | comparison | revisions
mercurial/localrepo.py file | annotate | diff | comparison | revisions 
--- a/hgext/mq.py	Thu Aug 02 01:56:08 2007 -0300
+++ b/hgext/mq.py	Thu Aug 02 01:56:08 2007 -0300
@@ -455,7 +455,7 @@
                     repo.dirstate.invalidate()
                 raise
         finally:
-            del lock, wlock, tr
+            del tr, lock, wlock
 
     def _apply(self, repo, series, list=False, update_status=True,
                strict=False, patchdir=None, merge=None, all_files={}):
--- a/mercurial/commands.py	Thu Aug 02 01:56:08 2007 -0300
+++ b/mercurial/commands.py	Thu Aug 02 01:56:08 2007 -0300
@@ -1623,7 +1623,7 @@
             finally:
                 os.unlink(tmpname)
     finally:
-        del wlock, lock
+        del lock, wlock
 
 def incoming(ui, repo, source="default", **opts):
     """show new changesets found in source
--- a/mercurial/localrepo.py	Thu Aug 02 01:56:08 2007 -0300
+++ b/mercurial/localrepo.py	Thu Aug 02 01:56:08 2007 -0300
@@ -544,7 +544,7 @@
             else:
                 self.ui.warn(_("no rollback information available\n"))
         finally:
-            del wlock, lock
+            del lock, wlock
 
     def invalidate(self):
         for a in "changelog manifest".split():
@@ -820,7 +820,7 @@
             self.hook("commit", node=hex(n), parent1=xp1, parent2=xp2)
             return n
         finally:
-            del lock, wlock, tr
+            del tr, lock, wlock
 
     def walk(self, node=None, files=[], match=util.always, badmatch=None):
         '''
mercurial