( )⚙ D396 undo: don't break when undo isn't first argument

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D396

undo: don't break when undo isn't first argument
ClosedPublic

Authored by felixmerk on Aug 14 2017, 10:29 PM.
Tags
None
Subscribers
quark

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX6908f308daeb: undo: don't break when undo isn't first argument
Summary

Undo commands where undo wasn't first, for example hg --pager=off undo break
multiple things, including hg redo. This change fixes this.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

felixmerk created this revision.Aug 14 2017, 10:29 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptAug 14 2017, 10:29 PM
quark accepted this revision.Aug 15 2017, 2:48 PM
quark added a subscriber: quark.
quark added inline comments.
hgext3rd/undo.py
676–677

This might be fragile if there are aliases. I found a better solution.

680

Append , gnu=True here. fancyopts will ignore undo in commandlist automatically.

This revision is now accepted and ready to land.Aug 15 2017, 2:48 PM
felixmerk updated this revision to Diff 965.Aug 15 2017, 7:54 PM
Closed by commit rFBHGX6908f308daeb: undo: don't break when undo isn't first argument (authored by felixmerk). · Explain WhyAug 16 2017, 11:18 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/undo.py (17 lines)
Mtests/test-undo.t (30 lines)

Diff 902

hgext3rd/undo.py

localrepo.localrepository._wlockfreeprefix.add('undolog/') localrepo.localrepository._wlockfreeprefix.add('undolog/')
# Wrappers # Wrappers
def _runcommandwrapper(orig, lui, repo, cmd, fullargs, *args): def _runcommandwrapper(orig, lui, repo, cmd, fullargs, *args):
# This wrapper executes whenever a command is run. # This wrapper executes whenever a command is run.
# Some commands (eg hg sl) don't actually modify anything # Some commands (eg hg sl) don't actually modify anything
# ie can't be undone, but the command doesn't know this. # ie can't be undone, but the command doesn't know this.
command = fullargs command = [cmd] + fullargs
# Check wether undolog is consistent # Check wether undolog is consistent
# ie check wether the undo ext was # ie check wether the undo ext was
# off before this command # off before this command
if '_undologactive' not in os.environ: if '_undologactive' not in os.environ:
changes = safelog(repo, [""]) changes = safelog(repo, [""])
if changes: if changes:
_recordnewgap(repo) _recordnewgap(repo)
if 0 == recentrange: if 0 == recentrange:
fm.startitem() fm.startitem()
fm.write('undo', '%s', "None") fm.write('undo', '%s', "None")
for i in range(recentrange): for i in range(recentrange):
nodedict = _readindex(repo, i + offset, prefetchedrevlog) nodedict = _readindex(repo, i + offset, prefetchedrevlog)
commandstr = _readnode(repo, 'command.i', nodedict['command']) commandstr = _readnode(repo, 'command.i', nodedict['command'])
if "" == commandstr: if "" == commandstr:
commandstr = " -- gap in log -- " commandstr = " -- gap in log -- "
else:
commandstr = commandstr.split("\0", 1)[1]
fm.startitem() fm.startitem()
fm.write('undo', '%s', str(i + offset) + ": " + commandstr) fm.write('undo', '%s', str(i + offset) + ": " + commandstr)
fm.end() fm.end()
def _debugundoindex(ui, repo, reverseindex): def _debugundoindex(ui, repo, reverseindex):
try: try:
nodedict = _readindex(repo, reverseindex) nodedict = _readindex(repo, reverseindex)
except IndexError: except IndexError:
content = "ADDED:\n\t" + "\n\t".join(sorted( content = "ADDED:\n\t" + "\n\t".join(sorted(
set(rawcontent.split("\n")) set(rawcontent.split("\n"))
- set(oldheads.split("\n")) - set(oldheads.split("\n"))
)) ))
content += "\nREMOVED:\n\t" + "\n\t".join(sorted( content += "\nREMOVED:\n\t" + "\n\t".join(sorted(
set(oldheads.split("\n")) set(oldheads.split("\n"))
- set(rawcontent.split("\n")) - set(rawcontent.split("\n"))
)) ))
elif "command.i" == filename and "" == rawcontent: elif "command.i" == filename:
if "" == rawcontent:
content = "unkown command(s) run, gap in log" content = "unkown command(s) run, gap in log"
else: else:
content = rawcontent.split("\0", 1)[1]
else:
content = rawcontent content = rawcontent
fm.startitem() fm.startitem()
fm.write('content', '%s', header + content) fm.write('content', '%s', header + content)
fm.end() fm.end()
# Revset logic # Revset logic
def _getolddrafts(repo, reverseindex): def _getolddrafts(repo, reverseindex):
# we extract the --index arguments out of undoes to make sure we update # we extract the --index arguments out of undoes to make sure we update
# the undoredo index correctly # the undoredo index correctly
nodedict = _readindex(repo, reverseindex) nodedict = _readindex(repo, reverseindex)
commandstr = _readnode(repo, 'command.i', nodedict['command']) commandstr = _readnode(repo, 'command.i', nodedict['command'])
commandlist = commandstr.split("\0") commandlist = commandstr.split("\0")
if commandlist[0] == "undo": if commandlist[0] == "undo":
undoopts = {} undoopts = {}
fancyopts.fancyopts(commandlist[1:], # remove both cases of "undo": it appears as an element of fullargs
# and as the cmd. See runcommand wrapper
commandlist.remove("undo")
commandlist.remove("undo")
quarkUnsubmitted
Not Done

This might be fragile if there are aliases. I found a better solution.

quark: This might be fragile if there are aliases. I found a better solution.
fancyopts.fancyopts(commandlist,
cmdtable['undo'][1] + commands.globalopts, cmdtable['undo'][1] + commands.globalopts,
undoopts) undoopts)
quarkUnsubmitted
Not Done

Append , gnu=True here. fancyopts will ignore undo in commandlist automatically.

quark: Append `, gnu=True` here. fancyopts will ignore `undo` in `commandlist` automatically.
if redocount == 0: if redocount == 0:
# want to go to state before the undo (not after) # want to go to state before the undo (not after)
toshift = undoopts['step'] toshift = undoopts['step']
shiftedindex -= toshift shiftedindex -= toshift
reverseindex += 1 reverseindex += 1
branch = undoopts.get('branch') branch = undoopts.get('branch')
done = True done = True
else: else:

tests/test-undo.t

$ touch c1 && hg add c1 && hg ci -mc1 $ touch c1 && hg add c1 && hg ci -mc1
created new head created new head
$ touch c2 && hg add c2 && hg ci -mc2 $ touch c2 && hg add c2 && hg ci -mc2
$ hg book feature2 $ hg book feature2
$ touch d && hg add d && hg ci -md $ touch d && hg add d && hg ci -md
$ hg debugindex .hg/undolog/command.i $ hg debugindex .hg/undolog/command.i
rev offset length base linkrev nodeid p1 p2 rev offset length base linkrev nodeid p1 p2
0 0 0 0 1 b80de5d13875 000000000000 000000000000 0 0 0 0 1 b80de5d13875 000000000000 000000000000
1 0 12 1 1 440cdcef588f 000000000000 000000000000 1 0 22 1 1 bae41a9d0ae9 000000000000 000000000000
2 12 8 2 1 86fddc37572c 000000000000 000000000000 2 22 15 2 1 6086ecd42962 000000000000 000000000000
3 20 8 3 1 388d40a434df 000000000000 000000000000 3 37 15 3 1 5cc3b22d9c65 000000000000 000000000000
4 28 14 4 1 1cafbfad488a 000000000000 000000000000 4 52 24 4 1 efaf8be657bb 000000000000 000000000000
5 42 7 5 1 8879b3bd818b 000000000000 000000000000 5 76 14 5 1 fe69d6bf5432 000000000000 000000000000
6 49 13 6 1 b0f66da09921 000000000000 000000000000 6 90 20 6 1 720b2d7eb02b 000000000000 000000000000
7 62 8 7 1 004b7198dafe 000000000000 000000000000 7 110 15 7 1 0595892db30f 000000000000 000000000000
8 70 8 8 1 60920018c706 000000000000 000000000000 8 125 15 8 1 c8265ade52fa 000000000000 000000000000
9 78 14 9 1 c3e212568400 000000000000 000000000000 9 140 24 9 1 0d8f98a931b9 000000000000 000000000000
10 92 7 10 1 9d609b5b001c 000000000000 000000000000 10 164 14 10 1 fded10d93e92 000000000000 000000000000
$ hg debugdata .hg/undolog/command.i 0 $ hg debugdata .hg/undolog/command.i 0
$ hg debugdata .hg/undolog/command.i 1 $ hg debugdata .hg/undolog/command.i 1
book\x00master (no-eol) (esc) bookmarks\x00book\x00master (no-eol) (esc)
$ hg debugdata .hg/undolog/command.i 2 $ hg debugdata .hg/undolog/command.i 2
ci\x00-ma1 (no-eol) (esc) commit\x00ci\x00-ma1 (no-eol) (esc)
$ hg debugdata .hg/undolog/command.i 3 $ hg debugdata .hg/undolog/command.i 3
ci\x00-ma2 (no-eol) (esc) commit\x00ci\x00-ma2 (no-eol) (esc)
$ hg debugdata .hg/undolog/bookmarks.i 0 $ hg debugdata .hg/undolog/bookmarks.i 0
$ hg debugdata .hg/undolog/bookmarks.i 1 $ hg debugdata .hg/undolog/bookmarks.i 1
master 0000000000000000000000000000000000000000 (no-eol) master 0000000000000000000000000000000000000000 (no-eol)
$ hg debugdata .hg/undolog/bookmarks.i 2 $ hg debugdata .hg/undolog/bookmarks.i 2
master df4fd610a3d6ca792281e7576587fa18f940d37a (no-eol) master df4fd610a3d6ca792281e7576587fa18f940d37a (no-eol)
$ hg debugdata .hg/undolog/workingparent.i 0 $ hg debugdata .hg/undolog/workingparent.i 0
0000000000000000000000000000000000000000 (no-eol) 0000000000000000000000000000000000000000 (no-eol)
$ hg debugdata .hg/undolog/workingparent.i 1 $ hg debugdata .hg/undolog/workingparent.i 1
df4fd610a3d6ca792281e7576587fa18f940d37a (no-eol) df4fd610a3d6ca792281e7576587fa18f940d37a (no-eol)
$ hg debugdata .hg/undolog/draftheads.i 1 $ hg debugdata .hg/undolog/draftheads.i 1
df4fd610a3d6ca792281e7576587fa18f940d37a (no-eol) df4fd610a3d6ca792281e7576587fa18f940d37a (no-eol)
$ hg debugdata .hg/undolog/draftheads.i 2 $ hg debugdata .hg/undolog/draftheads.i 2
b68836a6e2cac33ba33a20249b85a486eec78186 (no-eol) b68836a6e2cac33ba33a20249b85a486eec78186 (no-eol)
$ hg debugdata .hg/undolog/index.i 1 $ hg debugdata .hg/undolog/index.i 1
bookmarks 8153d44860d076e9c328951c8f36cf8daebe695a bookmarks 8153d44860d076e9c328951c8f36cf8daebe695a
command 440cdcef588f9a594c5530a5b6dede39a96d930d command bae41a9d0ae9614fc3aa843a0f5cbdf47bc98c43
date * (glob) date * (glob)
draftheads b80de5d138758541c5f05265ad144ab9fa86d1db draftheads b80de5d138758541c5f05265ad144ab9fa86d1db
workingparent fcb754f6a51eaf982f66d0637b39f3d2e6b520d5 (no-eol) workingparent fcb754f6a51eaf982f66d0637b39f3d2e6b520d5 (no-eol)
$ touch a3 && hg add a3 $ touch a3 && hg add a3
$ hg commit --amend $ hg commit --amend
$ hg debugdata .hg/undolog/command.i 11 $ hg debugdata .hg/undolog/command.i 11
commit\x00--amend (no-eol) (esc) commit\x00commit\x00--amend (no-eol) (esc)
Test debugundohistory Test debugundohistory
$ hg debugundohistory -l $ hg debugundohistory -l
0: commit --amend 0: commit --amend
1: ci -md 1: ci -md
2: book feature2 2: book feature2
3: ci -mc2 3: ci -mc2
4: ci -mc1 4: ci -mc1