Patchwork [2,of,9] histedit: use state object where necessary

login
register
mail settings
Submitter David Soria Parra
Date Oct. 16, 2014, 5:34 p.m.
Message ID <e62396e33ac6418fc070.1413480878@davidsp-mbp.dhcp.thefacebook.com>
Download mbox | patch
Permalink /patch/6336/
State Accepted
Commit 29ae3b190ec59adbb64bc8422122ae4cc7498d3c
Headers show

Comments

David Soria Parra - Oct. 16, 2014, 5:34 p.m.
# HG changeset patch
# User David Soria Parra <davidsp@fb.com>
# Date 1413344117 25200
#      Tue Oct 14 20:35:17 2014 -0700
# Node ID e62396e33ac6418fc0704e2d45c2afa0467c9672
# Parent  edad9c65c45a5ba8094321d8fc69705fb98bbfa1
histedit: use state object where necessary

We are using the properties from the state object where necessary and
ensure that the state is set correctly.

Patch

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -560,20 +560,27 @@ 
                     _('histedit requires exactly one ancestor revision'))
 
 
+    replacements = []
+    keep = opts.get('keep', False)
+
+    # rebuild state
     if goal == 'continue':
-        (parentctxnode, rules, keep, topmost, replacements) = readstate(repo)
-        parentctx = repo[parentctxnode]
-        parentctx, repl = bootstrapcontinue(ui, repo, parentctx, rules, opts)
-        replacements.extend(repl)
+        state = readstate(repo)
+        parentctx = repo[state.parentctxnode]
+        parentctx, repl = bootstrapcontinue(ui, repo, parentctx, state.rules,
+                opts)
+        state.replacements.extend(repl)
+        state.parentctxnode = parentctx.node()
     elif goal == 'abort':
-        (parentctxnode, rules, keep, topmost, replacements) = readstate(repo)
-        mapping, tmpnodes, leafs, _ntm = processreplacement(repo, replacements)
-        ui.debug('restore wc to old parent %s\n' % node.short(topmost))
+        state = readstate(repo)
+        mapping, tmpnodes, leafs, _ntm = processreplacement(repo,
+                state.replacements)
+        ui.debug('restore wc to old parent %s\n' % node.short(state.topmost))
         # check whether we should update away
         parentnodes = [c.node() for c in repo[None].parents()]
-        for n in leafs | set([parentctxnode]):
+        for n in leafs | set([state.parentctxnode]):
             if n in parentnodes:
-                hg.clean(repo, topmost)
+                hg.clean(repo, state.topmost)
                 break
         else:
             pass
@@ -599,7 +606,6 @@ 
                     'exactly one common root'))
             root = rr[0].node()
 
-        keep = opts.get('keep', False)
         revs = between(repo, root, topmost, keep)
         if not revs:
             raise util.Abort(_('%s is not an ancestor of working directory') %
@@ -629,20 +635,25 @@ 
         rules = verifyrules(rules, repo, ctxs)
 
         parentctx = repo[root].parents()[0]
-        replacements = []
 
+        state = histeditstate(repo, parentctx.node(), rules, keep,
+                    topmost, replacements)
 
-    while rules:
-        writestate(repo, parentctx.node(), rules, keep, topmost, replacements)
-        action, ha = rules.pop(0)
+    while state.rules:
+        state.write()
+        action, ha = state.rules.pop(0)
         ui.debug('histedit: processing %s %s\n' % (action, ha))
         actfunc = actiontable[action]
-        parentctx, replacement_ = actfunc(ui, repo, parentctx, ha, opts)
-        replacements.extend(replacement_)
+        parentctx = repo[state.parentctxnode]
+        parentctx, replacement_ = actfunc(ui, repo, parentctx,
+                ha, opts)
+        state.parentctxnode = parentctx.node()
+        state.replacements.extend(replacement_)
 
-    hg.update(repo, parentctx.node())
+    hg.update(repo, state.parentctxnode)
 
-    mapping, tmpnodes, created, ntm = processreplacement(repo, replacements)
+    mapping, tmpnodes, created, ntm = processreplacement(repo,
+            state.replacements)
     if mapping:
         for prec, succs in mapping.iteritems():
             if not succs:
@@ -657,7 +668,7 @@ 
 
     if not keep:
         if mapping:
-            movebookmarks(ui, repo, mapping, topmost, ntm)
+            movebookmarks(ui, repo, mapping, state.topmost, ntm)
             # TODO update mq state
         if obsolete._enabled:
             markers = []
@@ -767,23 +778,20 @@ 
             raise util.Abort(_('cannot edit immutable changeset: %s') % root)
     return [c.node() for c in ctxs]
 
-
-def writestate(repo, parentnode, rules, keep, topmost, replacements):
-    fp = open(os.path.join(repo.path, 'histedit-state'), 'w')
-    pickle.dump((parentnode, rules, keep, topmost, replacements), fp)
-    fp.close()
-
 def readstate(repo):
-    """Returns a tuple of (parentnode, rules, keep, topmost, replacements).
+    """Reads a state from file and returns a histeditstate object
     """
     try:
-        fp = open(os.path.join(repo.path, 'histedit-state'))
+        fp = repo.vfs('histedit-state', 'r')
     except IOError, err:
         if err.errno != errno.ENOENT:
             raise
         raise util.Abort(_('no histedit in progress'))
-    return pickle.load(fp)
 
+    (parentctxnode, rules, keep, topmost, replacements) = pickle.load(fp)
+
+    return histeditstate(repo, parentctxnode, rules,
+        keep, topmost, replacements)
 
 def makedesc(c):
     """build a initial action line for a ctx `c`
@@ -950,12 +958,12 @@ 
 def summaryhook(ui, repo):
     if not os.path.exists(repo.join('histedit-state')):
         return
-    (parentctxnode, rules, keep, topmost, replacements) = readstate(repo)
-    if rules:
+    state = readstate(repo)
+    if state.rules:
         # i18n: column positioning for "hg summary"
         ui.write(_('hist:   %s (histedit --continue)\n') %
                  (ui.label(_('%d remaining'), 'histedit.remaining') %
-                  len(rules)))
+                  len(state.rules)))
 
 def extsetup(ui):
     cmdutil.summaryhooks.add('histedit', summaryhook)