mercurial: comparison hgext/histedit.py

equal deleted inserted replaced

-:e8ea403b1c46
+:288de6f5d724
 [histedit]
 singletransaction = True
 """
-from __future__ import absolute_import
 # chistedit dependencies that are not available everywhere
 try:
 import fcntl
 import termios
 except ImportError:
 fcntl = None
 termios = None
+import binascii
 import functools
 import os
+import pickle
 import struct
 from mercurial.i18n import _
 from mercurial.pycompat import (
 getattr,
 dateutil,
 stringutil,
 urlutil,
 )
-pickle = util.pickle
 cmdtable = {}
 command = registrar.command(cmdtable)
 configtable = {}
 configitem = registrar.configitem(configtable)
 lines = (intro % (first, last)).split(b'\n') + actions + hints
 return b''.join([b'# %s\n' % l if l else b'#\n' for l in lines])
-class histeditstate(object):
+class histeditstate:
 def __init__(self, repo):
 self.repo = repo
 self.actions = None
 self.keep = None
 self.topmost = None
 # Rules
 rules = []
 rulelen = int(lines[index])
 index += 1
-for i in pycompat.xrange(rulelen):
+for i in range(rulelen):
 ruleaction = lines[index]
 index += 1
 rule = lines[index]
 index += 1
 rules.append((ruleaction, rule))
 # Replacements
 replacements = []
 replacementlen = int(lines[index])
 index += 1
-for i in pycompat.xrange(replacementlen):
+for i in range(replacementlen):
 replacement = lines[index]
 original = bin(replacement[:40])
 succ = [
 bin(replacement[i : i + 40])
 for i in range(40, len(replacement), 40)
 def inprogress(self):
 return self.repo.vfs.exists(b'histedit-state')
-class histeditaction(object):
+class histeditaction:
 def __init__(self, state, node):
 self.state = state
 self.repo = state.repo
 self.node = node
 ruleid = rule.strip().split(b' ', 1)[0]
 # ruleid can be anything from rev numbers, hashes, "bookmarks" etc
 # Check for validation of rule ids and get the rulehash
 try:
 rev = bin(ruleid)
-except TypeError:
+except binascii.Error:
 try:
 _ctx = scmutil.revsingle(state.repo, ruleid)
 rulehash = _ctx.hex()
 rev = bin(rulehash)
 except error.RepoLookupError:
 {(b'templatealias', b'label(l,x)'): b"x"}, b'histedit'
 ):
 summary = cmdutil.rendertemplate(
 ctx, ui.config(b'histedit', b'summary-template')
 )
-# Handle the fact that `''.splitlines() => []`
+line = b'%s %s %s' % (self.verb, ctx, stringutil.firstline(summary))
-summary = summary.splitlines()[0] if summary else b''
-line = b'%s %s %s' % (self.verb, ctx, summary)
 # trim to 75 columns by default so it's not stupidly wide in my editor
 # (the 5 more are left for verb)
 maxlen = self.repo.ui.configint(b'histedit', b'linelen')
 maxlen = max(maxlen, 22)  # avoid truncating hash
 return stringutil.ellipsis(line, maxlen)
 def screen_size():
 return struct.unpack(b'hh', fcntl.ioctl(1, termios.TIOCGWINSZ, b'    '))
-class histeditrule(object):
+class histeditrule:
 def __init__(self, ui, ctx, pos, action=b'pick'):
 self.ui = ui
 self.ctx = ctx
 self.action = action
 self.origpos = pos
 if summary:
 return summary
 # This is split off from the prefix property so that we can
 # separately make the description for 'roll' red (since it
 # will get discarded).
-return self.ctx.description().splitlines()[0].strip()
+return stringutil.firstline(self.ctx.description())
 def checkconflicts(self, other):
 if other.pos > self.pos and other.origpos <= self.origpos:
 if set(other.ctx.files()) & set(self.ctx.files()) != set():
 self.conflicts.append(other)
 if len(line) <= n:
 return line
 return line[: n - 2] + b' >'
-class _chistedit_state(object):
+class _chistedit_state:
 def __init__(
 self,
 repo,
 rules,
 stdscr,
 bms = self.repo.nodebookmarks(ctx.node())
 line = b"bookmark:  %s" % b' '.join(bms)
 win.addstr(3, 1, line[:length])
-line = b"summary:   %s" % (ctx.description().splitlines()[0])
+line = b"summary:   %s" % stringutil.firstline(ctx.description())
 win.addstr(4, 1, line[:length])
 line = b"files:     "
 win.addstr(5, 1, line)
 fnx = 1 + len(line)
 rules[new_rule_pos].pos = new_rule_pos
 rules[old_rule_pos].pos = old_rule_pos
 start = min(old_rule_pos, new_rule_pos)
 end = max(old_rule_pos, new_rule_pos)
-for r in pycompat.xrange(start, end + 1):
+for r in range(start, end + 1):
 rules[new_rule_pos].checkconflicts(rules[r])
 rules[old_rule_pos].checkconflicts(rules[r])
 if self.selected:
 self.make_selection(newpos)
 """This action runs when histedit is finishing its session"""
 mergemod.update(repo[state.parentctxnode])
 mapping, tmpnodes, created, ntm = processreplacement(state)
 if mapping:
-for prec, succs in pycompat.iteritems(mapping):
+for prec, succs in mapping.items():
 if not succs:
 ui.debug(b'histedit: %s is dropped\n' % short(prec))
 else:
 ui.debug(
 b'histedit: %s is replaced by %s\n'
 fl = fm.formatlist
 fd = fm.formatdict
 nodechanges = fd(
 {
 hf(oldn): fl([hf(n) for n in newn], name=b'node')
-for oldn, newn in pycompat.iteritems(mapping)
+for oldn, newn in mapping.items()
 },
 key=b"oldnode",
 value=b"newnodes",
 )
 fm.data(nodechanges=nodechanges)
 )
 state.backupfile = backupfile
 def _getsummary(ctx):
-# a common pattern is to extract the summary but default to the empty
+return stringutil.firstline(ctx.description())
-# string
-summary = ctx.description() or b''
-if summary:
-summary = summary.splitlines()[0]
-return summary
 def bootstrapcontinue(ui, state, opts):
 repo = state.repo
 act.verb = fword
 # get the target summary
 tsum = summary[len(fword) + 1 :].lstrip()
 # safe but slow: reverse iterate over the actions so we
 # don't clash on two commits having the same summary
-for na, l in reversed(list(pycompat.iteritems(newact))):
+for na, l in reversed(list(newact.items())):
 actx = repo[na.node]
 asum = _getsummary(actx)
 if asum == tsum:
 added = True
 l.append(act)
 if not added:
 newact[act] = []
 # copy over and flatten the new list
 actions = []
-for na, l in pycompat.iteritems(newact):
+for na, l in newact.items():
 actions.append(na)
 actions += l
 rules = b'\n'.join([act.torule() for act in actions])
 rules += b'\n\n'

branch	stable
changeset 49366	288de6f5d724
parent 49284	d44e3c45f0e4
child 49703	b8385bbeefdc
child 49891	e90767a71dc0