# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2018-06-20 16:27:30
# Node ID c1f4364f9336d3bf1166aa44b38c8043b3d97492
# Parent  6dea017eb6ba434507180d107182b24c80ea54df

fix: include cleanupnodes() in transaction

As pointed out by Yuya, we need a transaction to make sure the state
before the call to cleanupnodes() is not observable.

Differential Revision: https://phab.mercurial-scm.org/D3823

diff --git a/hgext/fix.py b/hgext/fix.py
--- a/hgext/fix.py
+++ b/hgext/fix.py
@@ -133,7 +133,7 @@ def fix(ui, repo, *pats, **opts):
             raise error.Abort(_('cannot specify both "--rev" and "--all"'))
         opts['rev'] = ['not public() and not obsolete()']
         opts['working_dir'] = True
-    with repo.wlock(), repo.lock():
+    with repo.wlock(), repo.lock(), repo.transaction('fix'):
         revstofix = getrevstofix(ui, repo, opts)
         basectxs = getbasectxs(repo, opts, revstofix)
         workqueue, numitems = getworkqueue(ui, repo, pats, opts, revstofix,
diff --git a/tests/test-fix-topology.t b/tests/test-fix-topology.t
--- a/tests/test-fix-topology.t
+++ b/tests/test-fix-topology.t
@@ -322,7 +322,6 @@ replacing anything that isn't public.
   
 
   $ hg fix --all
-  1 new orphan changesets
 
   $ hg log --graph --template '{rev} {desc}\n' -r 'sort(all(), topo)' --hidden
   o  11 fifth