Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fakemergerecord: take wlock to write the merge state
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Mon, 08 Aug 2016 17:33:45 +0200
changeset 29754 b303b3817d0e
parent 29753 e93408080646
child 29755 b37f65b047c7
fakemergerecord: take wlock to write the merge state The merge state is supposed to be covered by the wlock. We fix the test extensions to comply to that.
tests/fakemergerecord.py file | annotate | diff | comparison | revisions 
--- a/tests/fakemergerecord.py	Sun Aug 07 17:10:47 2016 +0200
+++ b/tests/fakemergerecord.py	Mon Aug 08 17:33:45 2016 +0200
@@ -16,10 +16,11 @@
          [('X', 'mandatory', None, 'add a fake mandatory record'),
           ('x', 'advisory', None, 'add a fake advisory record')], '')
 def fakemergerecord(ui, repo, *pats, **opts):
-    ms = merge.mergestate.read(repo)
-    records = ms._makerecords()
-    if opts.get('mandatory'):
-        records.append(('X', 'mandatory record'))
-    if opts.get('advisory'):
-        records.append(('x', 'advisory record'))
-    ms._writerecords(records)
+    with repo.wlock():
+        ms = merge.mergestate.read(repo)
+        records = ms._makerecords()
+        if opts.get('mandatory'):
+            records.append(('X', 'mandatory record'))
+        if opts.get('advisory'):
+            records.append(('x', 'advisory record'))
+        ms._writerecords(records)
Mercurial