This is an archive of the discontinued Mercurial Phabricator instance.

Differential D286

undo: no argument redo
ClosedPublic

Authored by felixmerk on Aug 8 2017, 6:15 PM.
Tags
None
Subscribers
quark, stash

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX916de186acdc: undo: no argument redo
Summary

Changes redo to straight up undo the previous undo. This is a bit trickier than
it may seem. The previous redo capabilities are still covered in hg undo as
--index accepts negative numbers allowing you to step both forward and
backwards one step at a time. The new redo reads the linear undo log to find
out where to undo to while updating the undo/redo index allowing you to continue
from where you left off.

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 8 2017, 6:15 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptAug 8 2017, 6:15 PM
stash added a subscriber: stash.Aug 9 2017, 11:10 AM

Sorry, only nits so far. Will look more closely later

hgext3rd/undo.py
585

Second and reverseindex != -1 is not necessary

672–692

() are not necessary

697

Same here

felixmerk added inline comments.Aug 9 2017, 1:50 PM
hgext3rd/undo.py
585

I want to allow hg undo --index -1 --branch #. Not only is this somewhat useful for the user, it allows for interactive branch undoes if I ever want to add that. (--index -1 is stepping one repo state forward)

felixmerk updated this revision to Diff 710.Aug 9 2017, 2:10 PM
quark requested changes to this revision.EditedAug 9 2017, 6:46 PM
quark added a subscriber: quark.

The test looks solid. Great!

Parsing the undo command line flags manually could easily miss corner cases. I'd suggest use what Mercurial actually uses:

opts = {}
mercurial.fancyopts.fancyopts(['--ind=4', '-fa'], cmdtable['undo'][1], opts)
opts # {'absolute': True, 'branch': '', 'force': True, 'index': 4, 'keep': False}
hgext3rd/undo.py
677–686

--index=4 is also a valid way to provide the flag.

692–695

Could be simplify to if i in ('-a', '--absolute'):

This revision now requires changes to proceed.Aug 9 2017, 6:46 PM
felixmerk edited edge metadata.Aug 10 2017, 1:55 PM
felixmerk updated this revision to Diff 741.
felixmerk updated this revision to Diff 814.Aug 11 2017, 5:39 PM
quark accepted this revision.Aug 11 2017, 8:57 PM
This revision is now accepted and ready to land.Aug 11 2017, 8:57 PM
Closed by commit rFBHGX916de186acdc: undo: no argument redo (authored by felixmerk). · Explain WhyAug 14 2017, 5:19 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/undo.py (65 lines)
Mtests/test-undo.t (169 lines)

Diff 884

hgext3rd/undo.py

# undo.py: records data in revlog for future undo functionality # undo.py: records data in revlog for future undo functionality
# #
# 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
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
cmdutil, cmdutil,
commands,
dispatch, dispatch,
error, error,
extensions, extensions,
fancyopts,
hg, hg,
localrepo, localrepo,
lock as lockmod, lock as lockmod,
obsolete, obsolete,
obsutil, obsutil,
phases, phases,
registrar, registrar,
revlog, revlog,
relativeundo = not opts.get("absolute") relativeundo = not opts.get("absolute")
keep = opts.get("keep") keep = opts.get("keep")
branch = opts.get("branch") branch = opts.get("branch")
preview = opts.get("preview") preview = opts.get("preview")
interactive = opts.get("interactive") interactive = opts.get("interactive")
if interactive: if interactive:
preview = True preview = True
if branch and reverseindex != 1: repo = repo.unfiltered()
if branch and reverseindex != 1 and reverseindex != -1:
stashUnsubmitted
Not Done

Second and reverseindex != -1 is not necessary

stash: Second `and reverseindex != -1` is not necessary
felixmerkAuthorUnsubmitted
Not Done

I want to allow hg undo --index -1 --branch #. Not only is this somewhat useful for the user, it allows for interactive branch undoes if I ever want to add that. (--index -1 is stepping one repo state forward)

felixmerk: I want to allow `hg undo --index -1 --branch #`. Not only is this somewhat useful for the user…
raise error.Abort(_("--branch with --index not supported")) raise error.Abort(_("--branch with --index not supported"))
if relativeundo: if relativeundo:
reverseindex = _computerelative(repo, reverseindex, reverseindex = _computerelative(repo, reverseindex,
absolute = not relativeundo, absolute = not relativeundo,
branch = branch) branch = branch)
if branch and preview: if branch and preview:
raise error.Abort(_("--branch with --preview not supported")) raise error.Abort(_("--branch with --preview not supported"))
return return
elif preview: elif preview:
_preview(ui, repo, reverseindex) _preview(ui, repo, reverseindex)
return return
with repo.wlock(), repo.lock(), repo.transaction("undo"): with repo.wlock(), repo.lock(), repo.transaction("undo"):
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
repo = repo.unfiltered()
if not (opts.get("force") or _gapcheck(repo, reverseindex)): if not (opts.get("force") or _gapcheck(repo, reverseindex)):
raise error.Abort(_("attempted risky undo across" raise error.Abort(_("attempted risky undo across"
" missing history")) " missing history"))
_undoto(ui, repo, reverseindex, keep=keep, branch=branch) _undoto(ui, repo, reverseindex, keep=keep, branch=branch)
# store undo data # store undo data
# for absolute undos, think of this as a reset # for absolute undos, think of this as a reset
# for relative undos, think of this as an update # for relative undos, think of this as an update
_logundoredoindex(repo, reverseindex, branch) _logundoredoindex(repo, reverseindex, branch)
@command('redo', [ @command('redo', [
('b', 'branch', "", _("single branch undo, accepts commit hash "
"(ADVANCED)")),
('n', 'index', 1, _("how many commands to redo")),
('p', 'preview', False, _("see smartlog like preview of future redo " ('p', 'preview', False, _("see smartlog like preview of future redo "
"state")), "state")),
]) ])
def redo(ui, repo, *args, **opts): def redo(ui, repo, *args, **opts):
""" perform a redo """ perform a redo
Performs a redo. Specifically, redo moves forward a repo state relative to Rolls back the previous undo.
the previous undo or redo command. If you run hg undo -n 10, you can redo
each of the 10 repo states one by one all the way back to the state from
which you ran undo. You can use --index to redo across more states at once,
and you can use any number of undos/redos up to the current state or back to
when the undo extension was first active.
""" """
branch = opts.get("branch") shiftedindex = _computerelative(repo, 0)
reverseindex = -1 * abs(opts.get("index"))
preview = opts.get("preview") preview = opts.get("preview")
if branch and reverseindex != -1: reverseindex = 0
raise error.Abort(_("--branch with --index not supported")) redocount = 0
done = False
while not done:
# we step back the linear undo log
# redoes cancel out undoes, if we have one more undo, we should undo
# there, otherwise we continue looking
# we are careful to not redo past absolute undoes (bc we loose undoredo
# log info)
# if we run into something that isn't undo or redo, we Abort (including
# gaps in the log)
# we extract the --index arguments out of undoes to make sure we update
# the undoredo index correctly
nodedict = _readindex(repo, reverseindex)
commandstr = _readnode(repo, 'command.i', nodedict['command'])
commandlist = commandstr.split("\0")
reverseindex = _computerelative(repo, reverseindex) if commandlist[0] == "undo":
undoopts = {}
fancyopts.fancyopts(commandlist[1:],
cmdtable['undo'][1] + commands.globalopts,
undoopts)
if redocount == 0:
# want to go to state before the undo (not after)
toshift = undoopts['index']
shiftedindex -= toshift
reverseindex += 1
done = True
else:
if undoopts['absolute']:
raise error.Abort(_("can't redo past absolute undo"))
reverseindex += 1
quarkUnsubmitted
Not Done

--index=4 is also a valid way to provide the flag.

quark: `--index=4` is also a valid way to provide the flag.
redocount -= 1
elif commandlist[0] == "redo":
redocount += 1
reverseindex += 1
else:
raise error.Abort(_("nothing to redo"))
stashUnsubmitted
Not Done

() are not necessary

stash: `()` are not necessary
if preview: if preview:
_preview(ui, repo, reverseindex) _preview(ui, repo, reverseindex)
quarkUnsubmitted
Not Done

Could be simplify to if i in ('-a', '--absolute'):

quark: Could be simplify to `if i in ('-a', '--absolute'):`
return return
stashUnsubmitted
Not Done

Same here

stash: Same here
with repo.wlock(), repo.lock(), repo.transaction("redo"): with repo.wlock(), repo.lock(), repo.transaction("redo"):
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
repo = repo.unfiltered() repo = repo.unfiltered()
_undoto(ui, repo, reverseindex, branch=branch) _undoto(ui, repo, reverseindex)
_logundoredoindex(repo, reverseindex, branch=branch) # update undredo by removing what the given undo added
_logundoredoindex(repo, shiftedindex)
def _undoto(ui, repo, reverseindex, keep=False, branch=None): def _undoto(ui, repo, reverseindex, keep=False, branch=None):
# undo to specific reverseindex # undo to specific reverseindex
# requires inhibit extension # requires inhibit extension
# branch is a changectx hash (potentially short form) # branch is a changectx hash (potentially short form)
# which identifies its branch via localbranch revset # which identifies its branch via localbranch revset
if repo != repo.unfiltered(): if repo != repo.unfiltered():
raise error.ProgrammingError(_("_undoto expects unfilterd repo")) raise error.ProgrammingError(_("_undoto expects unfilterd repo"))

tests/test-undo.t

$ hg undo $ hg undo
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark test) (leaving bookmark test)
$ hg bookmarks $ hg bookmarks
feature1 2:49cdb4091aca feature1 2:49cdb4091aca
feature2 7:296fda51a303 feature2 7:296fda51a303
master 9:1dafc0b43612 master 9:1dafc0b43612
hg redo test hg undo with negative index
$ hg redo $ hg undo -n -1
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -G -T compact -l1 $ hg log -G -T compact -l1
@ 9[tip][master,test] 1dafc0b43612 1970-01-01 00:00 +0000 test @ 9[tip][master,test] 1dafc0b43612 1970-01-01 00:00 +0000 test
| cmiss | cmiss
~ ~
$ hg undo $ hg undo
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ 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 5 $ hg undo -n 5
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg redo -n 5 $ hg undo -n -5
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ 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 redo -n 100 $ hg undo -n -100
abort: index out of bounds abort: index out of bounds
[255] [255]
hg undo --absolute tests hg undo --absolute tests
$ hg undo -a $ hg undo -a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg redo $ hg undo -n -1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg undo -a $ hg undo -a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg redo $ hg undo -n -1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg undo -n 5 $ hg undo -n 5
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -G -T compact -l1 $ hg log -G -T compact -l1
@ 9[tip][master,test] 1dafc0b43612 1970-01-01 00:00 +0000 test @ 9[tip][master,test] 1dafc0b43612 1970-01-01 00:00 +0000 test
| cmiss | cmiss
~ ~
$ hg undo -a $ hg undo -a
$ hg debugobsolete | tail -5 $ hg debugobsolete | tail -5
db3723da827c373768d500ab4e3a9c59a78314a6 0 {1dafc0b436123cab96f82a8e9e8d1d42c0301aaa} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} db3723da827c373768d500ab4e3a9c59a78314a6 0 {1dafc0b436123cab96f82a8e9e8d1d42c0301aaa} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
c9476255bc2a68672c844021397838ff4eeefcda 1dafc0b436123cab96f82a8e9e8d1d42c0301aaa 0 (Thu Jan 01 00:00:04 1970 +0000) {'user': 'test'} c9476255bc2a68672c844021397838ff4eeefcda 1dafc0b436123cab96f82a8e9e8d1d42c0301aaa 0 (Thu Jan 01 00:00:04 1970 +0000) {'user': 'test'}
1dafc0b436123cab96f82a8e9e8d1d42c0301aaa c9476255bc2a68672c844021397838ff4eeefcda 0 (Thu Jan 01 00:00:05 1970 +0000) {'user': 'test'} 1dafc0b436123cab96f82a8e9e8d1d42c0301aaa c9476255bc2a68672c844021397838ff4eeefcda 0 (Thu Jan 01 00:00:05 1970 +0000) {'user': 'test'}
c9476255bc2a68672c844021397838ff4eeefcda 1dafc0b436123cab96f82a8e9e8d1d42c0301aaa 0 (Thu Jan 01 00:00:06 1970 +0000) {'operation': 'undo', 'user': 'test'} c9476255bc2a68672c844021397838ff4eeefcda 1dafc0b436123cab96f82a8e9e8d1d42c0301aaa 0 (Thu Jan 01 00:00:06 1970 +0000) {'operation': 'undo', 'user': 'test'}
f86734247df6db66a810e549cc938a72cd5c6d1a d0fdb9510dbf78c1a7e62c3e6628ff1f978f87ea 75f63379f12bf02d40fe7444587ad67be9ae81b8 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'split', 'user': 'test'} f86734247df6db66a810e549cc938a72cd5c6d1a d0fdb9510dbf78c1a7e62c3e6628ff1f978f87ea 75f63379f12bf02d40fe7444587ad67be9ae81b8 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'split', 'user': 'test'}
$ hg undo $ hg undo
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg redo $ hg undo -n -1
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg debugobsolete | tail -5 $ hg debugobsolete | tail -5
d0fdb9510dbf78c1a7e62c3e6628ff1f978f87ea f86734247df6db66a810e549cc938a72cd5c6d1a 0 (Thu Jan 01 00:00:01 1970 +0000) {'operation': 'undo', 'user': 'test'} d0fdb9510dbf78c1a7e62c3e6628ff1f978f87ea f86734247df6db66a810e549cc938a72cd5c6d1a 0 (Thu Jan 01 00:00:01 1970 +0000) {'operation': 'undo', 'user': 'test'}
75f63379f12bf02d40fe7444587ad67be9ae81b8 0 {d0fdb9510dbf78c1a7e62c3e6628ff1f978f87ea} (Thu Jan 01 00:00:01 1970 +0000) {'operation': 'undo', 'user': 'test'} 75f63379f12bf02d40fe7444587ad67be9ae81b8 0 {d0fdb9510dbf78c1a7e62c3e6628ff1f978f87ea} (Thu Jan 01 00:00:01 1970 +0000) {'operation': 'undo', 'user': 'test'}
f86734247df6db66a810e549cc938a72cd5c6d1a 0 {1dafc0b436123cab96f82a8e9e8d1d42c0301aaa} (Thu Jan 01 00:00:02 1970 +0000) {'operation': 'undo', 'user': 'test'} f86734247df6db66a810e549cc938a72cd5c6d1a 0 {1dafc0b436123cab96f82a8e9e8d1d42c0301aaa} (Thu Jan 01 00:00:02 1970 +0000) {'operation': 'undo', 'user': 'test'}
d0fdb9510dbf78c1a7e62c3e6628ff1f978f87ea d0fdb9510dbf78c1a7e62c3e6628ff1f978f87ea 0 (Thu Jan 01 00:00:01 1970 +0000) {'operation': 'revive', 'user': 'test'} d0fdb9510dbf78c1a7e62c3e6628ff1f978f87ea d0fdb9510dbf78c1a7e62c3e6628ff1f978f87ea 0 (Thu Jan 01 00:00:01 1970 +0000) {'operation': 'revive', 'user': 'test'}
75f63379f12bf02d40fe7444587ad67be9ae81b8 75f63379f12bf02d40fe7444587ad67be9ae81b8 0 (Thu Jan 01 00:00:01 1970 +0000) {'operation': 'revive', 'user': 'test'} 75f63379f12bf02d40fe7444587ad67be9ae81b8 75f63379f12bf02d40fe7444587ad67be9ae81b8 0 (Thu Jan 01 00:00:01 1970 +0000) {'operation': 'revive', 'user': 'test'}
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: newfiles summary: newfiles
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> rebase = ! > rebase = !
> EOF > EOF
Check local redo works Check local undo works forward
Simple test should be sufficient, as per usual, redo is an undo with some index $ hg undo -n -1 -b 3532
logic
$ hg redo -b 3532
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -l 2 $ hg log -l 2
changeset: 21:35324a911c0d changeset: 21:35324a911c0d
bookmark: newbook bookmark: newbook
tag: tip tag: tip
parent: 18:75f63379f12b parent: 18:75f63379f12b
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: newbranch summary: newbranch
changeset: 18:75f63379f12b changeset: 18:75f63379f12b
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: newfiles summary: newfiles
$ touch a9 && hg add a9 && hg ci -m a9 $ touch a9 && hg add a9 && hg ci -m a9
created new head created new head
$ hg log -r . -T {node} $ hg log -r . -T {node}
3ee6a6880888df9e48cdc568b5e835bd3087f8cb (no-eol) 3ee6a6880888df9e48cdc568b5e835bd3087f8cb (no-eol)
$ hg undo -b 3532 $ hg undo -b 3532
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg undo -b 3532 $ hg undo -b 3532
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg redo -b 75f6 $ hg undo -n -1 -b 75f6
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg redo -b 75f6 $ hg undo -n -1 -b 75f6
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -l 2 $ hg log -l 2
changeset: 22:3ee6a6880888 changeset: 22:3ee6a6880888
tag: tip tag: tip
parent: 18:75f63379f12b parent: 18:75f63379f12b
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: a9 summary: a9
| |
~ ~
o o
| |
~ ~
o o
| |
~ ~
hg redo tests
$ hg log -G -T compact
@ 23[tip] a0b72b3048d6 1970-01-01 00:00 +0000 test
| prev1
|
o 22:18 3ee6a6880888 1970-01-01 00:00 +0000 test
| a9
|
| o 21[newbook]:18 35324a911c0d 1970-01-01 00:00 +0000 test
|/ newbranch
|
o 18 75f63379f12b 1970-01-01 00:00 +0000 test
| newfiles
|
o 17:9 d0fdb9510dbf 1970-01-01 00:00 +0000 test
| newfiles
|
o 9[master] 1dafc0b43612 1970-01-01 00:00 +0000 test
| cmiss
|
o 8:4 0a3dd3e15e65 1970-01-01 00:00 +0000 test
| words
|
| o 7[feature2]:4 296fda51a303 1970-01-01 00:00 +0000 test
|/ d
|
o 4 38d85b506754 1970-01-01 00:00 +0000 test
| c2
|
o 3:1 ec7553f7b382 1970-01-01 00:00 +0000 test
| c1
|
| o 2[feature1] 49cdb4091aca 1970-01-01 00:00 +0000 test
|/ b
|
o 1 b68836a6e2ca 1970-01-01 00:00 +0000 test
| a2
|
o 0 df4fd610a3d6 1970-01-01 00:00 +0000 test
a1
$ hg log -r . -T {node}
a0b72b3048d6d07b35b1d79c8e5c46b159d21cc9 (no-eol)
$ hg undo -n 2
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg redo
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -r . -T {node}
a0b72b3048d6d07b35b1d79c8e5c46b159d21cc9 (no-eol)
$ hg undo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg undo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg log -r . -T {node}
75f63379f12bf02d40fe7444587ad67be9ae81b8 (no-eol)
$ hg undo -n 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg redo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg log -r . -T {node}
75f63379f12bf02d40fe7444587ad67be9ae81b8 (no-eol)
$ hg undo -n 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg redo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg redo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg redo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -r . -T {node}
a0b72b3048d6d07b35b1d79c8e5c46b159d21cc9 (no-eol)
$ hg undo -fn 3
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg undo --force --index -1
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg debugundohistory -l
0: undo --force --index -1
1: undo -fn 3
2: redo
3: redo
4: redo
$ hg redo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg undo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg log -r . -T {node}
75f63379f12bf02d40fe7444587ad67be9ae81b8 (no-eol)
$ hg redo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg redo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -r . -T {node}
a0b72b3048d6d07b35b1d79c8e5c46b159d21cc9 (no-eol)
$ hg undo --traceback
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg undo -an1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg redo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg redo
abort: can't redo past absolute undo
[255]
$ hg undo -n -1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -G -T compact
@ 23[tip] a0b72b3048d6 1970-01-01 00:00 +0000 test
| prev1
|
o 22:18 3ee6a6880888 1970-01-01 00:00 +0000 test
| a9
|
| o 21[newbook]:18 35324a911c0d 1970-01-01 00:00 +0000 test
|/ newbranch
|
o 18 75f63379f12b 1970-01-01 00:00 +0000 test
| newfiles
|
o 17:9 d0fdb9510dbf 1970-01-01 00:00 +0000 test
| newfiles
|
o 9[master] 1dafc0b43612 1970-01-01 00:00 +0000 test
| cmiss
|
o 8:4 0a3dd3e15e65 1970-01-01 00:00 +0000 test
| words
|
| o 7[feature2]:4 296fda51a303 1970-01-01 00:00 +0000 test
|/ d
|
o 4 38d85b506754 1970-01-01 00:00 +0000 test
| c2
|
o 3:1 ec7553f7b382 1970-01-01 00:00 +0000 test
| c1
|
| o 2[feature1] 49cdb4091aca 1970-01-01 00:00 +0000 test
|/ b
|
o 1 b68836a6e2ca 1970-01-01 00:00 +0000 test
| a2
|
o 0 df4fd610a3d6 1970-01-01 00:00 +0000 test
a1