From patchwork Thu Jun 21 12:44:49 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D3823: fix: include cleanupnodes() in transaction
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 32357
Message-Id: <2c49afe193e30cc3a700b3400230726b@localhost.localdomain>
To: mercurial-devel@mercurial-scm.org
Date: Thu, 21 Jun 2018 12:44:49 +0000

This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc1f4364f9336: fix: include cleanupnodes() in transaction (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3823?vs=9239&id=9244

REVISION DETAIL
  https://phab.mercurial-scm.org/D3823

AFFECTED FILES
  hgext/fix.py
  tests/test-fix-topology.t

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

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 @@
   
 
   $ hg fix --all
-  1 new orphan changesets
 
   $ hg log --graph --template '{rev} {desc}\n' -r 'sort(all(), topo)' --hidden
   o  11 fifth
diff --git a/hgext/fix.py b/hgext/fix.py
--- a/hgext/fix.py
+++ b/hgext/fix.py
@@ -133,7 +133,7 @@
             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,