This is an archive of the discontinued Mercurial Phabricator instance.

Differential D467

undo: preview change - just show delta
ClosedPublic

Authored by felixmerk on Aug 21 2017, 8:13 PM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGXec24da696482: undo: preview change - just show delta
Summary

Change preview to just show the delta and connected commits. This means we need
to calculate oldworkingcopyparent and bookmarks diffs. This output will be
cleaner especially for people with a lot of commits in their repo.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

felixmerk created this revision.Aug 21 2017, 8:13 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptAug 21 2017, 8:13 PM
felixmerk updated this revision to Diff 1145.Aug 21 2017, 9:45 PM
quark accepted this revision.Aug 21 2017, 9:48 PM
This revision is now accepted and ready to land.Aug 21 2017, 9:48 PM
Closed by commit rFBHGXec24da696482: undo: preview change - just show delta (authored by felixmerk). · Explain WhyAug 22 2017, 10:20 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/undo.py (91 lines)
Mtests/test-undo.t (16 lines)

Diff 1169

hgext3rd/undo.py

# we assume that there is only a single rev # we assume that there is only a single rev
if repo[revs.first()].phase() == phases.public: if repo[revs.first()].phase() == phases.public:
querystring = revsetlang.formatspec('(children(%d) & draft())::', querystring = revsetlang.formatspec('(children(%d) & draft())::',
revs.first()) revs.first())
else: else:
querystring = revsetlang.formatspec('((::%ld) & draft())::', revs) querystring = revsetlang.formatspec('((::%ld) & draft())::', revs)
return subset & smartset.baseset(repo.revs(querystring)) return subset & smartset.baseset(repo.revs(querystring))
def _getoldworkingcopyparent(repo, reverseindex):
# convert reverseindex to node
# this makes cacheing guaranteed correct
# bc immutable history
nodedict = _readindex(repo, reverseindex)
return _cachedgetoldworkingcopyparent(repo, nodedict["workingparent"])
def _cachedgetoldworkingcopyparent(repo, wkpnode):
if not util.safehasattr(repo, '_undooldworkingparentcache'):
repo._undooldworkingparentcache = {}
cache = repo._undooldworkingparentcache
key = wkpnode
if key not in cache:
oldworkingparent = _readnode(repo, "workingparent.i", wkpnode)
oldworkingparent = filter(None, oldworkingparent.split("\n"))
oldwkprevstring = revsetlang.formatspec('%ls', oldworkingparent)
urepo = repo.unfiltered()
cache[key] = smartset.baseset(urepo.revs(oldwkprevstring))
return cache[key]
@revsetpredicate('oldworkingcopyparent')
def _oldworkingcopyparent(repo, subset, x):
"""``oldworkingcopyparent([index])``
previous working copy parent
'index' is how many undoable commands you want to look back. See 'hg undo'.
"""
args = revset.getargsdict(x, 'oldoworkingcopyrevset', 'reverseindex')
reverseindex = revsetlang.getinteger(args.get('reverseindex'),
_('index must be a positive interger'), 1)
revs = _getoldworkingcopyparent(repo, reverseindex)
return subset & smartset.baseset(revs)
# Templates # Templates
templatefunc = registrar.templatefunc() templatefunc = registrar.templatefunc()
def _undonehexnodes(repo, reverseindex): def _undonehexnodes(repo, reverseindex):
revstring = revsetlang.formatspec('olddraft(0) - olddraft(%d)', revstring = revsetlang.formatspec('olddraft(0) - olddraft(%d)',
reverseindex) reverseindex)
revs = repo.revs(revstring) revs = repo.revs(revstring)
tonode = repo.changelog.node tonode = repo.changelog.node
if kv[1] == ctxhex: if kv[1] == ctxhex:
oldbookmarks.append(kv[0]) oldbookmarks.append(kv[0])
bookmarks = list(set(currentbookmarks) - set(oldbookmarks)) bookmarks = list(set(currentbookmarks) - set(oldbookmarks))
active = repo._activebookmark active = repo._activebookmark
makemap = lambda v: {'bookmark': v, 'active': active, 'current': active} makemap = lambda v: {'bookmark': v, 'active': active, 'current': active}
f = templatekw._showlist('bookmark', bookmarks, mapping) f = templatekw._showlist('bookmark', bookmarks, mapping)
return templatekw._hybrid(f, bookmarks, makemap, lambda x: x['bookmark']) return templatekw._hybrid(f, bookmarks, makemap, lambda x: x['bookmark'])
@templatefunc('oldworkingcopyparent(reverseindex)')
def oldworkingparenttemplate(context, mapping, args):
"""String. Workingcopyparent reverseindex repo states ago."""
reverseindex = templater.evalinteger(context, mapping, args[0],
_('undonecommits needs an integer argument'))
repo = mapping['ctx']._repo
ctx = mapping['ctx']
repo = repo.unfiltered()
revstring = revsetlang.formatspec('oldworkingcopyparent(%d)', reverseindex)
revs = repo.revs(revstring)
tonode = repo.changelog.node
nodes = [tonode(x) for x in revs]
if ctx.node() in nodes:
result = ctx.hex()
else:
result = None
return result
# Undo: # Undo:
@command('undo', [ @command('undo', [
('a', 'absolute', False, _("absolute based on command index instead of " ('a', 'absolute', False, _("absolute based on command index instead of "
"relative undo")), "relative undo")),
('b', 'branch', "", _("local branch undo, accepts commit hash " ('b', 'branch', "", _("local branch undo, accepts commit hash "
"(ADVANCED)")), "(ADVANCED)")),
('f', 'force', False, _("undo across missing undo history (ADVANCED)")), ('f', 'force', False, _("undo across missing undo history (ADVANCED)")),
def init(self, repo, ui, index): def init(self, repo, ui, index):
self.repo = repo self.repo = repo
self.ui = ui self.ui = ui
self.index = index self.index = index
def render(self): def render(self):
ui = self.ui ui = self.ui
ui.pushbuffer() ui.pushbuffer()
_preview(ui, self.repo, self.index) _preview(ui, self.repo, self.index)
text = ui.config('undo', 'interactivehelptext',
"legend: red - to hide; green - to revive\n")
repo.ui.status(text)
repo.ui.status(_("<-: next " repo.ui.status(_("<-: next "
"->: previous " "->: previous "
"q: abort " "q: abort "
"enter: confirm\n")) "enter: confirm\n"))
return ui.popbuffer() return ui.popbuffer()
def rightarrow(self): def rightarrow(self):
self.index += 1 self.index += 1
def leftarrow(self): def leftarrow(self):
" state\n")) " state\n"))
overrides = { overrides = {
('templates', 'UNDOINDEX'): str(reverseindex), ('templates', 'UNDOINDEX'): str(reverseindex),
} }
opts = {} opts = {}
opts["template"] = "{undopreview}" opts["template"] = "{undopreview}"
repo = repo.unfiltered() repo = repo.unfiltered()
revstring = revsetlang.formatspec("olddraft(%d) + olddraft(0)",
reverseindex) try:
nodedict = _readindex(repo, reverseindex)
curdict = _readindex(repo, reverseindex)
except IndexError:
return
bookstring = _readnode(repo, "bookmarks.i", nodedict["bookmarks"])
oldmarks = bookstring.split("\n")
oldpairs = set()
for mark in oldmarks:
kv = mark.rsplit(" ", 1)
if len(kv) == 2:
oldpairs.update(kv)
bookstring = _readnode(repo, "bookmarks.i", curdict["bookmarks"])
curmarks = bookstring.split("\n")
curpairs = set()
for mark in curmarks:
kv = mark.rsplit(" ", 1)
if len(kv) == 2:
curpairs.update(kv)
diffpairs = oldpairs.symmetric_difference(curpairs)
# extract hashes from diffpairs
bookdiffs = []
for kv in diffpairs:
bookdiffs += kv[0]
revstring = revsetlang.formatspec(
"draft() & ::((olddraft(0) - olddraft(%s)) + "
"(olddraft(%s) - olddraft(0)) + %ls + '.' + "
"oldworkingcopyparent(%s))",
reverseindex, reverseindex, bookdiffs, reverseindex)
opts['rev'] = [revstring] opts['rev'] = [revstring]
try: try:
with ui.configoverride(overrides): with ui.configoverride(overrides):
cmdutil.graphlog(ui, repo, None, opts) cmdutil.graphlog(ui, repo, None, opts)
# informative output # informative output
nodedict = _readindex(repo, reverseindex) nodedict = _readindex(repo, reverseindex)
time = _readnode(repo, "date.i", nodedict["date"]) time = _readnode(repo, "date.i", nodedict["date"])
time = util.datestr([float(x) for x in time.split(" ")]) time = util.datestr([float(x) for x in time.split(" ")])

tests/test-undo.t

> [templatealias] > [templatealias]
> undopreview = '{if(undonecommits(UNDOINDEX), "Undone")}' > undopreview = '{if(undonecommits(UNDOINDEX), "Undone")}'
> EOF > EOF
$ hg undo -p $ hg undo -p
@ Undone @ Undone
| |
o o
| |
| o
|/
o
|
o o
| |
o o
| |
~
o
|
~
o o
| |
~ ~
undo to *, before ci -m prev1 (glob) undo to *, before ci -m prev1 (glob)
$ hg undo -p -n 2 $ hg undo -p -n 2
@ Undone @ Undone
| |
o Undone o Undone
| |
| o
|/
o
|
o o
| |
o o
| |
~
o
|
~
o o
| |
~ ~
undo to *, before undo -b 3532 (glob) undo to *, before undo -b 3532 (glob)
hg redo tests hg redo tests
$ hg log -G -T compact $ hg log -G -T compact
@ 23[tip] a0b72b3048d6 1970-01-01 00:00 +0000 test @ 23[tip] a0b72b3048d6 1970-01-01 00:00 +0000 test