This is an archive of the discontinued Mercurial Phabricator instance.

Differential D502

undo: better error messaging and hiding hg serve commands
ClosedPublic

Authored by felixmerk on Aug 24 2017, 2:34 PM.
Tags
None
Subscribers
quark

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGXf332427aef2b: undo: better error messaging and hiding hg serve commands
Summary

In interactive mode, disables out of bounds <-,-> notifying the user with text
and a '\a' sound. Friendlier ui messages for when the user selects the current
state with the arrow keys or when trying to undo to a state before we recorded
anything. Hg serve commands generally aren't user executed and simply should be
skipped across when undoing (like unfinished states). The user can always use
--absolute to see them in preview and to undo to them.

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 24 2017, 2:34 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptAug 24 2017, 2:34 PM
quark accepted this revision.Aug 24 2017, 3:19 PM
quark added a subscriber: quark.
quark added inline comments.
hgext3rd/undo.py
696–697

Maybe explain why "cannot":

cannot undo that far - undo extension was not enabled
This revision is now accepted and ready to land.Aug 24 2017, 3:19 PM
quark added inline comments.Aug 24 2017, 3:22 PM
hgext3rd/undo.py
714

nit: Already

s/newest repo state/the newest state/?

felixmerk updated this revision to Diff 1252.Aug 24 2017, 3:25 PM
Closed by commit rFBHGXf332427aef2b: undo: better error messaging and hiding hg serve commands (authored by felixmerk). · Explain WhyAug 24 2017, 6:07 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/undo.py (37 lines)
Mtests/test-undo.t (2 lines)

Diff 1263

hgext3rd/undo.py

existingnodes = {} existingnodes = {}
if all(newnodes.get(x) == existingnodes.get(x) for x in newnodes.keys()): if all(newnodes.get(x) == existingnodes.get(x) for x in newnodes.keys()):
# no changes to record # no changes to record
return False return False
else: else:
newnodes.update({ newnodes.update({
'date': _logdate(repo, tr), 'date': _logdate(repo, tr),
'command': _logcommand(repo, tr, command), 'command': _logcommand(repo, tr, command),
'unfinished': unfinished(repo), 'unfinished': unfinished(repo, command=command),
}) })
_logindex(repo, tr, newnodes) _logindex(repo, tr, newnodes)
# changes have been recorded # changes have been recorded
return True return True
def unfinished(repo, commit=False): def unfinished(repo, commit=False, command=None):
'''like cmdutil.checkunfinished without raising an Abort''' '''like cmdutil.checkunfinished without raising an Abort'''
# "hg serve" usually does not make sense to undo to. hide it from undolog
if command and command[0] == 'serve':
return True
for f, clearable, allowcommit, msg, hint in cmdutil.unfinishedstates: for f, clearable, allowcommit, msg, hint in cmdutil.unfinishedstates:
if commit and allowcommit: if commit and allowcommit:
continue continue
if repo.vfs.exists(f): if repo.vfs.exists(f):
return True return True
return False return False
# Write: Logs # Write: Logs
if branch and reverseindex != 1 and reverseindex != -1: if branch and reverseindex != 1 and reverseindex != -1:
raise error.Abort(_("--branch with --index not supported")) raise error.Abort(_("--branch with --index not supported"))
if relativeundo: if relativeundo:
try: try:
reverseindex = _computerelative(repo, reverseindex, reverseindex = _computerelative(repo, reverseindex,
absolute = not relativeundo, absolute = not relativeundo,
branch = branch) branch = branch)
except IndexError: except IndexError:
raise error.Abort(_("index out of bounds")) raise error.Abort(_("cannot undo this far - undo extension was not"
" enabled"))
quarkUnsubmitted
Not Done

Maybe explain why "cannot":

cannot undo that far - undo extension was not enabled
quark: Maybe explain why "cannot": cannot undo that far - undo extension was not enabled
if branch and preview: if branch and preview:
raise error.Abort(_("--branch with --preview not supported")) raise error.Abort(_("--branch with --preview not supported"))
if interactive: if interactive:
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
class undopreview(interactiveui.viewframe): class undopreview(interactiveui.viewframe):
def render(self): def render(self):
ui = self.ui ui = self.ui
ui.pushbuffer() ui.pushbuffer()
return_code = _preview(ui, self.repo, self.index)
if return_code == 1:
if self.index < 0:
self.index += 1
repo.ui.status(_("Already at newest repo state\a\n"))
quarkUnsubmitted
Not Done

nit: Already

s/newest repo state/the newest state/?

quark: nit: Already s/newest repo state/the newest state/?
elif self.index > 0:
self.index -= 1
repo.ui.status(_("Already at oldest repo state\a\n"))
_preview(ui, self.repo, self.index) _preview(ui, self.repo, self.index)
text = ui.config('undo', 'interactivehelptext', text = ui.config('undo', 'interactivehelptext',
"legend: red - to hide; green - to revive\n") "legend: red - to hide; green - to revive\n")
repo.ui.status(text) repo.ui.status(text)
repo.ui.status(_("<-: next " repo.ui.status(_("<-: newer "
"->: previous " "->: older "
"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):
self.index -= 1 self.index -= 1
def enter(self): def enter(self):
inhibit.revive(ctxts) inhibit.revive(ctxts)
def _preview(ui, repo, reverseindex): def _preview(ui, repo, 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 # returns 1 on index error, 0 otherwise
# override "UNDOINDEX" as a variable usable in template # override "UNDOINDEX" as a variable usable in template
if not _gapcheck(ui, repo, reverseindex): if not _gapcheck(ui, repo, reverseindex):
repo.ui.status(_("WARN: missing history between present and this" repo.ui.status(_("WARN: missing history between present and this"
" 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()
try: try:
nodedict = _readindex(repo, reverseindex) nodedict = _readindex(repo, reverseindex)
curdict = _readindex(repo, reverseindex) curdict = _readindex(repo, reverseindex)
except IndexError: except IndexError:
return return 1
bookstring = _readnode(repo, "bookmarks.i", nodedict["bookmarks"]) bookstring = _readnode(repo, "bookmarks.i", nodedict["bookmarks"])
oldmarks = bookstring.split("\n") oldmarks = bookstring.split("\n")
oldpairs = set() oldpairs = set()
for mark in oldmarks: for mark in oldmarks:
kv = mark.rsplit(" ", 1) kv = mark.rsplit(" ", 1)
if len(kv) == 2: if len(kv) == 2:
oldpairs.update(kv) oldpairs.update(kv)
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(" ")])
except IndexError:
# don't print anything
return 1
try:
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 = _('undo to %s, before %s\n') % (time, commandstr) uimessage = _('undo to %s, before %s\n') % (time, commandstr)
repo.ui.status((uimessage)) repo.ui.status((uimessage))
except IndexError: except IndexError:
# don't print anything repo.ui.status(_("most recent state: undoing here won't change"
pass " anything\n"))
return 0
# Tools # Tools
def _invertindex(rlog, indexorreverseindex): def _invertindex(rlog, indexorreverseindex):
return len(rlog) - 1 - indexorreverseindex return len(rlog) - 1 - indexorreverseindex
def _getrevlog(repo, filename): def _getrevlog(repo, filename):
path = 'undolog/' + filename path = 'undolog/' + filename

tests/test-undo.t

undone to *, before undo (glob) undone to *, before undo (glob)
$ hg undo -n -5 $ hg undo -n -5
undone to *, before book test (glob) undone to *, before book test (glob)
$ hg log -G -T compact -l1 $ hg log -G -T compact -l1
@ 9[tip][master] 1dafc0b43612 1970-01-01 00:00 +0000 test @ 9[tip][master] 1dafc0b43612 1970-01-01 00:00 +0000 test
| cmiss | cmiss
~ ~
$ hg undo -n -100 $ hg undo -n -100
abort: index out of bounds abort: cannot undo this far - undo extension was not enabled
[255] [255]
hg undo --absolute tests hg undo --absolute tests
$ hg undo -a $ hg undo -a
undone to *, before undo -n -5 (glob) undone to *, before undo -n -5 (glob)
$ hg undo -n -1 $ hg undo -n -1
undone to *, before undo -a (glob) undone to *, before undo -a (glob)
$ hg undo -a $ hg undo -a