Mercurial > hgsubversion

diff hgsubversion/wrappers.py @ 1516:fbc22592f4fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
push: lock repo before calling createmarkers Previously, when devel.all-warnings is set to True, hg subversion will crash when pushing with the error: ProgrammingError: transaction requires locking Tracking that down, that is because "createmarkers" was called without locking. A comprehensive test was added to run test_push_command with obsstore turned on to cover the code paths.
author Jun Wu <quark@fb.com>
date Mon, 07 Aug 2017 18:12:16 -0700
parents 07c38eee3954
children aec176db232c
line wrap: on
line diff
--- a/hgsubversion/wrappers.py
+++ b/hgsubversion/wrappers.py
@@ -351,17 +351,18 @@ def push(repo, dest, force, revs):
         finally:
             util.swap_out_encoding()
 
-        if hasobsolete:
-            for marker in obsmarkers:
-                obsolete.createmarkers(repo, marker)
-                beforepush = marker[0][0]
-                afterpush = marker[0][1][0]
-                ui.note('marking %s as obsoleted by %s\n' %
-                        (beforepush.hex(), afterpush.hex()))
-        else:
-            # strip the original changesets since the push was
-            # successful and changeset obsolescence is unavailable
-            util.strip(ui, repo, outgoing, "all")
+        with repo.lock():
+            if hasobsolete:
+                for marker in obsmarkers:
+                    obsolete.createmarkers(repo, marker)
+                    beforepush = marker[0][0]
+                    afterpush = marker[0][1][0]
+                    ui.note('marking %s as obsoleted by %s\n' %
+                            (beforepush.hex(), afterpush.hex()))
+            else:
+                # strip the original changesets since the push was
+                # successful and changeset obsolescence is unavailable
+                util.strip(ui, repo, outgoing, "all")
     finally:
         try:
             # It's always safe to delete the temporary commits.
@@ -373,11 +374,12 @@ def push(repo, dest, force, revs):
                 parent = repo[None].p1()
                 if parent.node() in temporary_commits:
                     hg.update(repo, parent.p1().node())
-                if hasobsolete:
-                    relations = ((repo[n], ()) for n in temporary_commits)
-                    obsolete.createmarkers(repo, relations)
-                else:
-                    util.strip(ui, repo, temporary_commits, backup=None)
+                with repo.lock():
+                    if hasobsolete:
+                        relations = ((repo[n], ()) for n in temporary_commits)
+                        obsolete.createmarkers(repo, relations)
+                    else:
+                        util.strip(ui, repo, temporary_commits, backup=None)
 
         finally:
             util.swap_out_encoding(old_encoding)