Patchwork [6,of,9] repair: clarify in comment that caller must take lock, but not transaction

login
register
mail settings
Submitter via Mercurial-devel
Date June 19, 2017, 8:47 p.m.
Message ID <35e3c0300b35a93ce3ac.1497905278@martinvonz.svl.corp.google.com>
Download mbox | patch
Permalink /patch/21512/
State Accepted
Headers show

Comments

via Mercurial-devel - June 19, 2017, 8:47 p.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1497896661 25200
#      Mon Jun 19 11:24:21 2017 -0700
# Node ID 35e3c0300b35a93ce3acfd7234135144ebd2d9f4
# Parent  ff0a5f83ee622acdc1f1ed5f9323211044bfa78d
repair: clarify in comment that caller must take lock, but not transaction

I have checked that all callers have already taken the lock (and if
they hadn't, we should have seen tests fail thanks to the 'transaction
requires locking' devel warning in localrepo.transaction()).

Patch

diff --git a/mercurial/repair.py b/mercurial/repair.py
--- a/mercurial/repair.py
+++ b/mercurial/repair.py
@@ -76,8 +76,9 @@ 
     return s
 
 def strip(ui, repo, nodelist, backup=True, topic='backup'):
-    # This function operates within a transaction of its own, but does
-    # not take any lock on the repo.
+    # This function requires the caller to lock the repo, but it operates
+    # within a transaction of its own, and thus requires there to be no current
+    # transaction when it is called.
     # Simple way to maintain backwards compatibility for this
     # argument.
     if backup in ['none', 'strip']: