This is an archive of the discontinued Mercurial Phabricator instance.

Differential D448

undo: preview shows command and time output
ClosedPublic

Authored by felixmerk on Aug 18 2017, 7:18 PM.
Tags
None
Subscribers
quark

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX5d49a9e813ae: undo: preview shows command and time output
Summary

Makes hg undo -i and hg undo -p output show an "undo to time, before command"
message and adds directions (left, right, return, q). Also adds pager check as
pager break interactiveui.

Testing: run hg undo -p and hg undo -i and see output

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 18 2017, 7:18 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptAug 18 2017, 7:18 PM
felixmerk updated this revision to Diff 1082.Aug 18 2017, 7:19 PM
quark accepted this revision.Aug 18 2017, 9:34 PM
quark added a subscriber: quark.
quark added inline comments.
hgext3rd/interactiveui.py
26–27

Maybe make 1 as an argument, ex: clearline(n=1) and '\033[%dA\033[K' % n

134–135

Then you can get rid of the for loop:

clearline(s.count('\n'))
hgext3rd/undo.py
656–658

The crecord interface uses key: effect pattern. Maybe use the same:

<-: next  ->: previous  q: abort  enter: confirm
This revision is now accepted and ready to land.Aug 18 2017, 9:34 PM
felixmerk updated this revision to Diff 1127.Aug 21 2017, 2:22 PM
quark added inline comments.Aug 21 2017, 2:29 PM
hgext3rd/interactiveui.py
26–28

I meant this could be simplified to:

w.write('\033[%dA\033[K' % n)

without a for loop. Have you tried that?

felixmerk added inline comments.Aug 21 2017, 2:38 PM
hgext3rd/interactiveui.py
26–28

\033[K clears a single line. I also don't want to clear to the end of the screen.

quark added inline comments.Aug 21 2017, 3:16 PM
hgext3rd/interactiveui.py
26–28

I see. This turns out to be an area that my local Linux terminal behaviors differently (it does not even require \033K to clear lines).

I checked another project. It does \033[%dA first to move up multiple lines. Then change the output string - insert \033[K for each line.

That seems better to avoid flashing. Maybe we can try that?

Closed by commit rFBHGX5d49a9e813ae: undo: preview shows command and time output (authored by felixmerk). · Explain WhyAug 21 2017, 8:17 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/interactiveui.py (20 lines)
Mhgext3rd/undo.py (22 lines)
Mtests/test-undo.t (2 lines)

Diff 1139

hgext3rd/interactiveui.py

# interactiveui.py: display information and allow for left/right control # interactiveui.py: display information and allow for left/right control
# #
# Copyright 2017 Facebook, Inc. # Copyright 2017 Facebook, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import os import os
import sys import sys
import termios import termios
import tty import tty
def clearline(): from mercurial.i18n import _
from mercurial import (
error,
)
def clearline(n=1):
w = sys.stdout w = sys.stdout
# ANSI # ANSI
# ESC[#A : up # lines # ESC[#A : up # lines
# ESC[K : clear to end of line # ESC[K : clear to end of line
for i in range(n):
w.write('\033[1A\033[K') w.write('\033[1A\033[K')
quarkUnsubmitted
Not Done

Maybe make 1 as an argument, ex: clearline(n=1) and '\033[%dA\033[K' % n

quark: Maybe make `1` as an argument, ex: `clearline(n=1)` and `'\033[%dA\033[K' % n`
w.flush() w.flush()
quarkUnsubmitted
Not Done

I meant this could be simplified to:

w.write('\033[%dA\033[K' % n)

without a for loop. Have you tried that?

quark: I meant this could be simplified to: w.write('\033[%dA\033[K' % n) without a `for` loop.
felixmerkAuthorUnsubmitted
Not Done

\033[K clears a single line. I also don't want to clear to the end of the screen.

felixmerk: \033[K clears a single line. I also don't want to clear to the end of the screen.
quarkUnsubmitted
Not Done

I see. This turns out to be an area that my local Linux terminal behaviors differently (it does not even require \033K to clear lines).

I checked another project. It does \033[%dA first to move up multiple lines. Then change the output string - insert \033[K for each line.

That seems better to avoid flashing. Maybe we can try that?

quark: I see. This turns out to be an area that my local Linux terminal behaviors differently (it does…
# From: # From:
# https://github.com/pallets/click/blob/master/click/_termui_impl.py#L534 # https://github.com/pallets/click/blob/master/click/_termui_impl.py#L534
# As per licence: # As per licence:
# Copyright (c) 2014 by Armin Ronacher. # Copyright (c) 2014 by Armin Ronacher.
# #
# Click uses parts of optparse written by Gregory P. Ward and maintained by # Click uses parts of optparse written by Gregory P. Ward and maintained by
# the Python software foundation. This is limited to code in the parser.py # the Python software foundation. This is limited to code in the parser.py
# handle user keypress left arrow # handle user keypress left arrow
pass pass
def rightarrow(): def rightarrow():
# handle user keypress right arrow # handle user keypress right arrow
pass pass
def view(viewobj): def view(viewobj):
done = False done = False
if viewobj.ui.pageractive:
raise error.Abort(_("interactiveui doesn't work with pager"))
s = viewobj.render() s = viewobj.render()
print(s) sys.stdout.write(s)
while not done: while not done:
output = getchar(sys.stdin.fileno()) output = getchar(sys.stdin.fileno())
if repr(output) == '\'q\'': if repr(output) == '\'q\'':
done = True done = True
break break
if repr(output) == '\'\\r\'': if repr(output) == '\'\\r\'':
# \r = return # \r = return
viewobj.enter() viewobj.enter()
done = True done = True
break break
if repr(output) == '\'\\x1b[C\'': if repr(output) == '\'\\x1b[C\'':
viewobj.rightarrow() viewobj.rightarrow()
if repr(output) == '\'\\x1b[D\'': if repr(output) == '\'\\x1b[D\'':
viewobj.leftarrow() viewobj.leftarrow()
for i in range(len(s.split("\n"))): clearline(s.count("\n"))
quarkUnsubmitted
Not Done

Then you can get rid of the for loop:

clearline(s.count('\n'))
quark: Then you can get rid of the `for` loop: clearline(s.count('\n'))
clearline()
s = viewobj.render() s = viewobj.render()
print(s) sys.stdout.write(s)

hgext3rd/undo.py

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)
repo.ui.status(_("<-: next "
"->: previous "
"q: abort "
quarkUnsubmitted
Not Done

The crecord interface uses key: effect pattern. Maybe use the same:

<-: next  ->: previous  q: abort  enter: confirm
quark: The `crecord` interface uses `key: effect` pattern. Maybe use the same: <-: next ->…
"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):
self.index -= 1 self.index -= 1
def enter(self): def enter(self):
del opts["preview"] del opts["preview"]
del opts["interactive"] del opts["interactive"]
# informative output # informative output
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(" ")])
nodedict = _readindex(repo, reverseindex - 1) nodedict = _readindex(repo, reverseindex - 1)
commandstr = _readnode(repo, "command.i", nodedict["command"]) commandstr = _readnode(repo, "command.i", nodedict["command"])
commandlist = commandstr.split("\0")[1:] commandlist = commandstr.split("\0")[1:]
commandstr = " ".join(commandlist) commandstr = " ".join(commandlist)
uimessage = 'undone to %s, before %s\n' % (time, commandstr) uimessage = _('undone to %s, before %s\n') % (time, commandstr)
repo.ui.status(_(uimessage)) repo.ui.status((uimessage))
def _computerelative(repo, reverseindex, absolute=False, branch=""): def _computerelative(repo, reverseindex, absolute=False, branch=""):
# allows for relative undos using # allows for relative undos using
# redonode storage # redonode storage
# allows for branch undos using # allows for branch undos using
# findnextdelta logic # findnextdelta logic
if reverseindex != 0: if reverseindex != 0:
sign = reverseindex / abs(reverseindex) sign = reverseindex / abs(reverseindex)
# Print smartlog like preview of undo # Print smartlog like preview of undo
# Input: # Input:
# ui: # ui:
# repo: mercurial.localrepo # repo: mercurial.localrepo
# Output: # Output:
# None # None
# override "UNDOINDEX" as a variable usable in template # override "UNDOINDEX" as a variable usable in template
if not _gapcheck(ui, repo, reverseindex):
repo.ui.status(_("WARN: missing history between present and this"
" 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)", revstring = revsetlang.formatspec("olddraft(%d) + olddraft(0)",
reverseindex) 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
nodedict = _readindex(repo, reverseindex)
time = _readnode(repo, "date.i", nodedict["date"])
time = util.datestr([float(x) for x in time.split(" ")])
nodedict = _readindex(repo, reverseindex - 1)
commandstr = _readnode(repo, "command.i", nodedict["command"])
commandlist = commandstr.split("\0")[1:]
commandstr = " ".join(commandlist)
uimessage = _('undo to %s, before %s\n') % (time, commandstr)
repo.ui.status((uimessage))
except IndexError: except IndexError:
# don't print anything # don't print anything
pass pass
# Tools # Tools
def _invertindex(rlog, indexorreverseindex): def _invertindex(rlog, indexorreverseindex):
return len(rlog) - 1 - indexorreverseindex return len(rlog) - 1 - indexorreverseindex

tests/test-undo.t

| |
~ ~
o o
| |
~ ~
o o
| |
~ ~
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 o
| |
~ ~
o o
| |
~ ~
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
| prev1 | prev1
| |
o 22:18 3ee6a6880888 1970-01-01 00:00 +0000 test o 22:18 3ee6a6880888 1970-01-01 00:00 +0000 test
| a9 | a9