Patchwork [03,of,10,layering] rebase: refer to dirstateguard by its new name

login
register
mail settings
Submitter Augie Fackler
Date Nov. 22, 2016, 3:05 a.m.
Message ID <88fc0975fe25d18346a3.1479783918@imladris.local>
Download mbox | patch
Permalink /patch/17679/
State Accepted
Headers show

Comments

Augie Fackler - Nov. 22, 2016, 3:05 a.m.
# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1479781632 18000
#      Mon Nov 21 21:27:12 2016 -0500
# Node ID 88fc0975fe25d18346a368cddfd1a0eaab8b6473
# Parent  68b751b930e60a4d3d9f37b34bc31ee0a4467f72
rebase: refer to dirstateguard by its new name

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -32,6 +32,7 @@  from mercurial import (
     commands,
     copies,
     destutil,
+    dirstateguard,
     error,
     extensions,
     hg,
@@ -797,7 +798,7 @@  def concludenode(repo, rev, p1, p2, comm
     '''Commit the wd changes with parents p1 and p2. Reuse commit info from rev
     but also store useful information in extra.
     Return node of committed revision.'''
-    dsguard = cmdutil.dirstateguard(repo, 'rebase')
+    dsguard = dirstateguard.dirstateguard(repo, 'rebase')
     try:
         repo.setparents(repo[p1].node(), repo[p2].node())
         ctx = repo[rev]