This is an archive of the discontinued Mercurial Phabricator instance.

Differential D412

undo: informative output
ClosedPublic

Authored by felixmerk on Aug 15 2017, 9:06 PM.
Tags
None
Subscribers
quark

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGXfb0eda1a7127: undo: informative output
Summary

Instead of the _showstats output from hg.py, we now output the args and time of
the mercurial command we are undoing.

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 15 2017, 9:06 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptAug 15 2017, 9:06 PM
quark requested changes to this revision.Aug 15 2017, 9:51 PM
quark added a subscriber: quark.
quark added inline comments.
hgext3rd/undo.py
762

This might swallow other important messages. There is a better way to silent "update" output.

793–795

hg.clean seems cleaner:

hg.clean(repo, workingcopyparent, show_stats=False)

Since we have cmdutil.bailifchanged() checked before, it should not drop uncommitted changes.

846

Maybe say something here, like:

undone to TIME, just after COMMAND

We probably want to avoid the detailed output if -b is used.

This revision now requires changes to proceed.Aug 15 2017, 9:51 PM
felixmerk edited edge metadata.Aug 16 2017, 4:38 PM
felixmerk updated this revision to Diff 1014.
quark accepted this revision.Aug 16 2017, 5:24 PM
This revision is now accepted and ready to land.Aug 16 2017, 5:24 PM
felixmerk added a comment.Aug 16 2017, 8:22 PM

With this change I'm leaving in the -b as it now makes sense. The command that is posted as output is the (first) one of the commands that affected that branch and were undone.

quark added a comment.Aug 18 2017, 2:47 PM

The "before" change is smart. I like it!

Closed by commit rFBHGXfb0eda1a7127: undo: informative 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/undo.py (15 lines)
Mtests/test-fold-undo.t (2 lines)
Mtests/test-undo.t (128 lines)

Diff 1136

hgext3rd/undo.py

if repo != repo.unfiltered(): if repo != repo.unfiltered():
raise error.ProgrammingError(_("_undoto expects unfilterd repo")) raise error.ProgrammingError(_("_undoto expects unfilterd repo"))
try: try:
nodedict = _readindex(repo, reverseindex) nodedict = _readindex(repo, reverseindex)
except IndexError: except IndexError:
raise error.Abort(_("index out of bounds")) raise error.Abort(_("index out of bounds"))
# bookmarks # bookmarks
bookstring = _readnode(repo, "bookmarks.i", nodedict["bookmarks"]) bookstring = _readnode(repo, "bookmarks.i", nodedict["bookmarks"])
quarkUnsubmitted
Not Done

This might swallow other important messages. There is a better way to silent "update" output.

quark: This might swallow other important messages. There is a better way to silent "update" output.
booklist = bookstring.split("\n") booklist = bookstring.split("\n")
if branch: if branch:
spec = revsetlang.formatspec('_localbranch(%s)', branch) spec = revsetlang.formatspec('_localbranch(%s)', branch)
branchcommits = tohexnode(repo, spec) branchcommits = tohexnode(repo, spec)
else: else:
branchcommits = False branchcommits = False
# copy implementation for bookmarks # copy implementation for bookmarks
(kv[0], None) in bmremove: (kv[0], None) in bmremove:
bmchanges.append((kv[0], bin(kv[1]))) bmchanges.append((kv[0], bin(kv[1])))
repo._bookmarks.applychanges(repo, repo.currenttransaction(), bmchanges) repo._bookmarks.applychanges(repo, repo.currenttransaction(), bmchanges)
# working copy parent # working copy parent
workingcopyparent = _readnode(repo, "workingparent.i", workingcopyparent = _readnode(repo, "workingparent.i",
nodedict["workingparent"]) nodedict["workingparent"])
if not keep: if not keep:
if not branchcommits or workingcopyparent in branchcommits: if not branchcommits or workingcopyparent in branchcommits:
hg.updatetotally(ui, repo, workingcopyparent, workingcopyparent, # bailifchanged is run, so this should be safe
clean=False, updatecheck='abort') hg.clean(repo, workingcopyparent, show_stats=False)
quarkUnsubmitted
Not Done

hg.clean seems cleaner:

hg.clean(repo, workingcopyparent, show_stats=False)

Since we have cmdutil.bailifchanged() checked before, it should not drop uncommitted changes.

quark: `hg.clean` seems cleaner: hg.clean(repo, workingcopyparent, show_stats=False) Since we have…
elif not branchcommits or workingcopyparent in branchcommits: elif not branchcommits or workingcopyparent in branchcommits:
# keeps working copy files # keeps working copy files
prednode = bin(workingcopyparent) prednode = bin(workingcopyparent)
predctx = repo[prednode] predctx = repo[prednode]
changedfiles = [] changedfiles = []
wctx = repo[None] wctx = repo[None]
wctxmanifest = wctx.manifest() wctxmanifest = wctx.manifest()
reverseindex, branch) reverseindex, branch)
localremoves = revsetlang.formatspec('(olddraft(%d) - olddraft(0)) and' localremoves = revsetlang.formatspec('(olddraft(%d) - olddraft(0)) and'
' _localbranch(%s)', ' _localbranch(%s)',
reverseindex, branch) reverseindex, branch)
smarthide(repo, localadds, removedrevs) smarthide(repo, localadds, removedrevs)
smarthide(repo, addedrevs, localremoves, local=True) smarthide(repo, addedrevs, localremoves, local=True)
revealcommits(repo, localremoves) revealcommits(repo, localremoves)
# informative output
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 = 'undone to %s, before %s\n' % (time, commandstr)
quarkUnsubmitted
Not Done

Maybe say something here, like:

undone to TIME, just after COMMAND

We probably want to avoid the detailed output if -b is used.

quark: Maybe say something here, like: undone to TIME, just after COMMAND We probably want to…
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)
else: else:

tests/test-fold-undo.t

| o 2 r2 | o 2 r2
|/ |/
o 1 r1 o 1 r1
| |
o 0 r0 o 0 r0
Do an undo Do an undo
$ hg undo $ hg undo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before fold --exact 7 6 (glob)
$ showgraph $ showgraph
@ 7 r7 @ 7 r7
| |
o 6 r6 o 6 r6
| |
o 5 r5 o 5 r5
| |
| o 4 r4 | o 4 r4
| | | |
| o 3 r3 | o 3 r3
| | | |
| o 2 r2 | o 2 r2
|/ |/
o 1 r1 o 1 r1
| |
o 0 r0 o 0 r0

tests/test-undo.t

Test undolog lock Test undolog lock
$ hg log --config hooks.duringundologlock="sleep 1" > /dev/null & $ hg log --config hooks.duringundologlock="sleep 1" > /dev/null &
$ sleep 0.1 $ sleep 0.1
$ hg st --time $ hg st --time
time: real [1-9]*\..* (re) time: real [1-9]*\..* (re)
hg undo command tests hg undo command tests
$ hg undo $ hg undo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved undone to *, before ci -ma5 (glob)
(leaving bookmark master)
$ hg log -G -T compact -l2 $ hg log -G -T compact -l2
@ 9[tip][master] 1dafc0b43612 1970-01-01 00:00 +0000 test @ 9[tip][master] 1dafc0b43612 1970-01-01 00:00 +0000 test
| cmiss | cmiss
| |
o 8:4 0a3dd3e15e65 1970-01-01 00:00 +0000 test o 8:4 0a3dd3e15e65 1970-01-01 00:00 +0000 test
| words | words
~ ~
$ hg update 0a3dd3e15e65 $ hg update 0a3dd3e15e65
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(leaving bookmark master)
$ hg undo $ hg undo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before update 0a3dd3e15e65 (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
~ ~
$ touch c11 && hg add c11 $ touch c11 && hg add c11
$ hg commit --amend $ hg commit --amend
$ hg log -G -T compact -l1 $ hg log -G -T compact -l1
@ 12[tip][master]:8 2dca609174c2 1970-01-01 00:00 +0000 test @ 12[tip][master]:8 2dca609174c2 1970-01-01 00:00 +0000 test
| cmiss | cmiss
~ ~
$ hg undo $ hg undo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved undone to *, before commit --amend (glob)
$ hg log -G -T compact -l4 $ hg log -G -T compact -l4
@ 9[tip][master] 1dafc0b43612 1970-01-01 00:00 +0000 test @ 9[tip][master] 1dafc0b43612 1970-01-01 00:00 +0000 test
| cmiss | cmiss
| |
o 8:4 0a3dd3e15e65 1970-01-01 00:00 +0000 test o 8:4 0a3dd3e15e65 1970-01-01 00:00 +0000 test
| words | words
| |
| o 7[feature2]:4 296fda51a303 1970-01-01 00:00 +0000 test | o 7[feature2]:4 296fda51a303 1970-01-01 00:00 +0000 test
|/ d |/ d
| |
o 4 38d85b506754 1970-01-01 00:00 +0000 test o 4 38d85b506754 1970-01-01 00:00 +0000 test
| c2 | c2
~ ~
$ hg graft 296fda51a303 $ hg graft 296fda51a303
grafting 7:296fda51a303 "d" (feature2) grafting 7:296fda51a303 "d" (feature2)
$ hg log -G -T compact -l2 $ hg log -G -T compact -l2
@ 13[tip]:9 f007a7cf4c3d 1970-01-01 00:00 +0000 test @ 13[tip]:9 f007a7cf4c3d 1970-01-01 00:00 +0000 test
| d | d
| |
o 9[master] 1dafc0b43612 1970-01-01 00:00 +0000 test o 9[master] 1dafc0b43612 1970-01-01 00:00 +0000 test
| cmiss | cmiss
~ ~
$ hg undo $ hg undo
0 files updated, 0 files merged, 2 files removed, 0 files unresolved undone to *, before graft 296fda51a303 (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 book test $ hg book test
$ hg undo $ hg undo
0 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before book test (glob)
(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 undo with negative step hg undo with negative step
$ hg undo -n -1 $ hg undo -n -1
0 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before undo (glob)
$ 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 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 5 $ hg undo -n 5
0 files updated, 0 files merged, 1 files removed, 0 files unresolved undone to *, before undo (glob)
$ hg undo -n -5 $ hg undo -n -5
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 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: 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 undone to *, before undo -n -5 (glob)
$ hg undo -n -1 $ hg undo -n -1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before undo -a (glob)
$ hg undo -a $ hg undo -a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved undone to *, before undo -n -1 (glob)
$ hg undo -n -1 $ hg undo -n -1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before undo -a (glob)
$ hg undo -n 5 $ hg undo -n 5
0 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before undo (glob)
$ 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
0 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before undo -n 5 (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 --force tests hg undo --force tests
$ hg debugundohistory -l 18 $ hg debugundohistory -l 18
18: undo 18: undo
19: ci -ma5 19: ci -ma5
20: -- gap in log -- 20: -- gap in log --
21: commit -m words 21: commit -m words
22: update master 22: update master
$ hg undo -a -n 25 $ hg undo -a -n 25
abort: attempted risky undo across missing history abort: attempted risky undo across missing history
[255] [255]
$ hg undo -a -n 25 -f $ hg undo -a -n 25 -f
1 files updated, 0 files merged, 1 files removed, 0 files unresolved undone to *, before ci -md (glob)
$ hg undo -a $ hg undo -a
2 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before undo -a -n 25 -f (glob)
hg undo --keep tests hg undo --keep tests
$ touch kfl1 && hg add kfl1 $ touch kfl1 && hg add kfl1
$ hg st $ hg st
A kfl1 A kfl1
$ hg commit --amend $ hg commit --amend
$ hg st $ hg st
$ hg undo --keep $ hg undo --keep
undone to *, before commit --amend (glob)
$ hg st $ hg st
A kfl1 A kfl1
$ hg commit --amend $ hg commit --amend
hg undo informative obsmarkers hg undo informative obsmarkers
check 1 to 1 undos have informative obsmarker check 1 to 1 undos have informative obsmarker
check 1 to many undos (generally a redo of split or divergence) do not connect check 1 to many undos (generally a redo of split or divergence) do not connect
the changesets with obsmarkers as we do not differentiate between split and the changesets with obsmarkers as we do not differentiate between split and
divergence cases in undo. The original split/divergence obsmarkers suffice for divergence cases in undo. The original split/divergence obsmarkers suffice for
checking split/divergence. checking split/divergence.
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> smartlog = $TESTDIR/../hgext3rd/smartlog.py > smartlog = $TESTDIR/../hgext3rd/smartlog.py
> tweakdefaults = $TESTDIR/../hgext3rd/tweakdefaults.py > tweakdefaults = $TESTDIR/../hgext3rd/tweakdefaults.py
> fbamend = $TESTDIR/../hgext3rd/fbamend/ > fbamend = $TESTDIR/../hgext3rd/fbamend/
> EOF > EOF
$ hg undo $ hg undo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved undone to *, before commit --amend (glob)
$ hg sl --all --hidden -T "{node|short} {if(undosuccessors, label('sl.undo', '(Undone as {join(undosuccessors% \'{shortest(undosuccessor, 6)}\', ', ')})'))}" $ hg sl --all --hidden -T "{node|short} {if(undosuccessors, label('sl.undo', '(Undone as {join(undosuccessors% \'{shortest(undosuccessor, 6)}\', ', ')})'))}"
x db3723da827c x db3723da827c
| |
| x f007a7cf4c3d | x f007a7cf4c3d
|/ |/
| x 128fe7e6098d | x 128fe7e6098d
|/ |/
| x aa430c8afedf | x aa430c8afedf
Done splitting? [yN] y Done splitting? [yN] y
$ 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 undone to *, before split --quiet (glob)
$ hg undo -n -1 $ hg undo -n -1
0 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before undo (glob)
$ 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
> [extensions] > [extensions]
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: oldbranch summary: oldbranch
$ hg up 75f63379f12b $ hg up 75f63379f12b
7 files updated, 0 files merged, 1 files removed, 0 files unresolved 7 files updated, 0 files merged, 1 files removed, 0 files unresolved
(leaving bookmark newbook) (leaving bookmark newbook)
3 changes within local scope: commit, book, update 3 changes within local scope: commit, book, update
$ hg undo -b 75f63379f12b $ hg undo -b 75f63379f12b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before update null (glob)
$ hg undo -b 75f63379f12b $ hg undo -b 75f63379f12b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved undone to *, before ci -moldbranch (glob)
$ hg undo -b 75f63379f12b $ hg undo -b 75f63379f12b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before book oldbook (glob)
$ hg log -l 2 $ hg log -l 2
changeset: 20:805791ba4bcd changeset: 20:805791ba4bcd
bookmark: newbook bookmark: newbook
tag: tip tag: tip
parent: -1:000000000000 parent: -1:000000000000
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
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
$ hg undo -b 3532 $ hg undo -b 3532
0 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before rebase -s 8057 -d 75f6 (glob)
$ hg log -l 2 $ hg log -l 2
changeset: 20:805791ba4bcd changeset: 20:805791ba4bcd
bookmark: newbook bookmark: newbook
tag: tip tag: tip
parent: -1:000000000000 parent: -1:000000000000
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
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> rebase = ! > rebase = !
> EOF > EOF
Check local undo works forward Check local undo works forward
$ hg undo -n -1 -b 3532 $ hg undo -n -1 -b 3532
0 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before undo -b 3532 (glob)
$ 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 undone to *, before ci -m a9 (glob)
$ hg undo -b 3532 $ hg undo -b 3532
0 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before undo -n -1 -b 3532 (glob)
$ hg undo -n -1 -b 75f6 $ hg undo -n -1 -b 75f6
0 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before ci -m a9 (glob)
$ hg undo -n -1 -b 75f6 $ hg undo -n -1 -b 75f6
1 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before undo -b 3532 (glob)
$ 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
> strip = > strip =
> fbamend = $TESTDIR/../hgext3rd/fbamend/ > fbamend = $TESTDIR/../hgext3rd/fbamend/
> EOF > EOF
$ hg strip 3ee6 $ hg strip 3ee6
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 75f63379f12b working directory now at 75f63379f12b
1 changesets pruned 1 changesets pruned
$ hg undo -b 3532 $ hg undo -b 3532
1 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before strip 3ee6 (glob)
$ hg log -r . -T {node} $ hg log -r . -T {node}
3ee6a6880888df9e48cdc568b5e835bd3087f8cb (no-eol) 3ee6a6880888df9e48cdc568b5e835bd3087f8cb (no-eol)
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> strip =! > strip =!
> fbamend =! > fbamend =!
> EOF > EOF
| a2 | a2
| |
o 0 df4fd610a3d6 1970-01-01 00:00 +0000 test o 0 df4fd610a3d6 1970-01-01 00:00 +0000 test
a1 a1
$ hg log -r . -T {node} $ hg log -r . -T {node}
a0b72b3048d6d07b35b1d79c8e5c46b159d21cc9 (no-eol) a0b72b3048d6d07b35b1d79c8e5c46b159d21cc9 (no-eol)
$ hg undo -n 2 $ hg undo -n 2
0 files updated, 0 files merged, 2 files removed, 0 files unresolved undone to *, before undo -b 3532 (glob)
$ hg redo $ hg redo
2 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before undo -n 2 (glob)
$ hg log -r . -T {node} $ hg log -r . -T {node}
a0b72b3048d6d07b35b1d79c8e5c46b159d21cc9 (no-eol) a0b72b3048d6d07b35b1d79c8e5c46b159d21cc9 (no-eol)
$ hg undo $ hg undo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved undone to *, before ci -m prev1 (glob)
$ hg undo $ hg undo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved undone to *, before undo -b 3532 (glob)
$ hg log -r . -T {node} $ hg log -r . -T {node}
75f63379f12bf02d40fe7444587ad67be9ae81b8 (no-eol) 75f63379f12bf02d40fe7444587ad67be9ae81b8 (no-eol)
$ hg undo -n 1 $ hg undo -n 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before strip 3ee6 (glob)
$ hg redo $ hg redo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved undone to *, before undo -n 1 (glob)
$ hg log -r . -T {node} $ hg log -r . -T {node}
75f63379f12bf02d40fe7444587ad67be9ae81b8 (no-eol) 75f63379f12bf02d40fe7444587ad67be9ae81b8 (no-eol)
$ hg undo -n 1 $ hg undo -n 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before strip 3ee6 (glob)
$ hg redo $ hg redo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved undone to *, before undo -n 1 (glob)
$ hg redo $ hg redo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before undo (glob)
$ hg redo $ hg redo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before undo (glob)
$ hg log -r . -T {node} $ hg log -r . -T {node}
a0b72b3048d6d07b35b1d79c8e5c46b159d21cc9 (no-eol) a0b72b3048d6d07b35b1d79c8e5c46b159d21cc9 (no-eol)
$ hg undo -fn 3 $ hg undo -fn 3
0 files updated, 0 files merged, 1 files removed, 0 files unresolved undone to *, before strip 3ee6 (glob)
$ hg undo --force --step -1 $ hg undo --force --step -1
0 files updated, 0 files merged, 1 files removed, 0 files unresolved undone to *, before undo -b 3532 (glob)
$ hg debugundohistory -l $ hg debugundohistory -l
0: undo --force --step -1 0: undo --force --step -1
1: undo -fn 3 1: undo -fn 3
2: redo 2: redo
3: redo 3: redo
4: redo 4: redo
$ hg redo $ hg redo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before undo --force --step -1 (glob)
$ hg undo $ hg undo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved undone to *, before undo -n -1 -b 75f6 (glob)
$ hg log -r . -T {node} $ hg log -r . -T {node}
75f63379f12bf02d40fe7444587ad67be9ae81b8 (no-eol) 75f63379f12bf02d40fe7444587ad67be9ae81b8 (no-eol)
$ hg redo $ hg redo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before undo (glob)
$ hg redo $ hg redo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before undo -fn 3 (glob)
$ hg log -r . -T {node} $ hg log -r . -T {node}
a0b72b3048d6d07b35b1d79c8e5c46b159d21cc9 (no-eol) a0b72b3048d6d07b35b1d79c8e5c46b159d21cc9 (no-eol)
$ hg undo --traceback $ hg undo --traceback
0 files updated, 0 files merged, 1 files removed, 0 files unresolved undone to *, before ci -m prev1 (glob)
$ hg undo -an1 $ hg undo -an1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before undo --traceback (glob)
$ hg redo $ hg redo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved undone to *, before undo -an1 (glob)
$ hg redo $ hg redo
abort: can't redo past absolute undo abort: can't redo past absolute undo
[255] [255]
$ hg undo -n -1 $ hg undo -n -1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before redo (glob)
$ 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
| |
| o 21[newbook]:18 35324a911c0d 1970-01-01 00:00 +0000 test | o 21[newbook]:18 35324a911c0d 1970-01-01 00:00 +0000 test
| |
o 1 b68836a6e2ca 1970-01-01 00:00 +0000 test o 1 b68836a6e2ca 1970-01-01 00:00 +0000 test
| a2 | a2
| |
o 0 df4fd610a3d6 1970-01-01 00:00 +0000 test o 0 df4fd610a3d6 1970-01-01 00:00 +0000 test
a1 a1
$ hg undo -b f57e $ hg undo -b f57e
2 files updated, 0 files merged, 3 files removed, 0 files unresolved undone to *, before ci -m b3 (glob)
$ hg undo -b f57e $ hg undo -b f57e
0 files updated, 0 files merged, 1 files removed, 0 files unresolved undone to *, before ci -m b2 (glob)
$ hg log -G -T compact -l5 $ hg log -G -T compact -l5
o 29[tip] 0963b9e31e70 1970-01-01 00:00 +0000 test o 29[tip] 0963b9e31e70 1970-01-01 00:00 +0000 test
| c3 | c3
| |
o 28 4e0ac6fa4ca0 1970-01-01 00:00 +0000 test o 28 4e0ac6fa4ca0 1970-01-01 00:00 +0000 test
| c2 | c2
| |
o 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test o 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test
c1 c1
@ 24:-1 90af9088326b 1970-01-01 00:00 +0000 test @ 24:-1 90af9088326b 1970-01-01 00:00 +0000 test
b1 b1
o 23 a0b72b3048d6 1970-01-01 00:00 +0000 test o 23 a0b72b3048d6 1970-01-01 00:00 +0000 test
| prev1 | prev1
~ ~
$ hg redo $ hg redo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before undo -b f57e (glob)
$ hg log -G -T compact -l6 $ hg log -G -T compact -l6
o 29[tip] 0963b9e31e70 1970-01-01 00:00 +0000 test o 29[tip] 0963b9e31e70 1970-01-01 00:00 +0000 test
| c3 | c3
| |
o 28 4e0ac6fa4ca0 1970-01-01 00:00 +0000 test o 28 4e0ac6fa4ca0 1970-01-01 00:00 +0000 test
| c2 | c2
| |
o 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test o 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test
c1 c1
@ 25 0cb4447a10a7 1970-01-01 00:00 +0000 test @ 25 0cb4447a10a7 1970-01-01 00:00 +0000 test
| b2 | b2
| |
o 24:-1 90af9088326b 1970-01-01 00:00 +0000 test o 24:-1 90af9088326b 1970-01-01 00:00 +0000 test
b1 b1
o 23 a0b72b3048d6 1970-01-01 00:00 +0000 test o 23 a0b72b3048d6 1970-01-01 00:00 +0000 test
| prev1 | prev1
~ ~
$ hg undo -b 0963 $ hg undo -b 0963
2 files updated, 0 files merged, 2 files removed, 0 files unresolved undone to *, before ci -m c3 (glob)
$ hg log -G -T compact -l5 $ hg log -G -T compact -l5
@ 28[tip] 4e0ac6fa4ca0 1970-01-01 00:00 +0000 test @ 28[tip] 4e0ac6fa4ca0 1970-01-01 00:00 +0000 test
| c2 | c2
| |
o 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test o 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test
c1 c1
o 25 0cb4447a10a7 1970-01-01 00:00 +0000 test o 25 0cb4447a10a7 1970-01-01 00:00 +0000 test
| b2 | b2
| |
o 24:-1 90af9088326b 1970-01-01 00:00 +0000 test o 24:-1 90af9088326b 1970-01-01 00:00 +0000 test
b1 b1
o 23 a0b72b3048d6 1970-01-01 00:00 +0000 test o 23 a0b72b3048d6 1970-01-01 00:00 +0000 test
| prev1 | prev1
~ ~
$ hg undo $ hg undo
2 files updated, 0 files merged, 2 files removed, 0 files unresolved undone to *, before undo -b 0963 (glob)
$ hg log -G -T compact -l6 $ hg log -G -T compact -l6
o 29[tip] 0963b9e31e70 1970-01-01 00:00 +0000 test o 29[tip] 0963b9e31e70 1970-01-01 00:00 +0000 test
| c3 | c3
| |
o 28 4e0ac6fa4ca0 1970-01-01 00:00 +0000 test o 28 4e0ac6fa4ca0 1970-01-01 00:00 +0000 test
| c2 | c2
| |
o 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test o 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test
c1 c1
@ 25 0cb4447a10a7 1970-01-01 00:00 +0000 test @ 25 0cb4447a10a7 1970-01-01 00:00 +0000 test
| b2 | b2
| |
o 24:-1 90af9088326b 1970-01-01 00:00 +0000 test o 24:-1 90af9088326b 1970-01-01 00:00 +0000 test
b1 b1
o 23 a0b72b3048d6 1970-01-01 00:00 +0000 test o 23 a0b72b3048d6 1970-01-01 00:00 +0000 test
| prev1 | prev1
~ ~
$ hg redo $ hg redo
2 files updated, 0 files merged, 2 files removed, 0 files unresolved undone to *, before undo (glob)
$ hg redo $ hg redo
2 files updated, 0 files merged, 2 files removed, 0 files unresolved undone to *, before undo -b 0963 (glob)
$ hg log -G -T compact -l6 $ hg log -G -T compact -l6
o 29[tip] 0963b9e31e70 1970-01-01 00:00 +0000 test o 29[tip] 0963b9e31e70 1970-01-01 00:00 +0000 test
| c3 | c3
| |
o 28 4e0ac6fa4ca0 1970-01-01 00:00 +0000 test o 28 4e0ac6fa4ca0 1970-01-01 00:00 +0000 test
| c2 | c2
| |
o 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test o 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test
c1 c1
@ 25 0cb4447a10a7 1970-01-01 00:00 +0000 test @ 25 0cb4447a10a7 1970-01-01 00:00 +0000 test
| b2 | b2
| |
o 24:-1 90af9088326b 1970-01-01 00:00 +0000 test o 24:-1 90af9088326b 1970-01-01 00:00 +0000 test
b1 b1
o 23 a0b72b3048d6 1970-01-01 00:00 +0000 test o 23 a0b72b3048d6 1970-01-01 00:00 +0000 test
| prev1 | prev1
~ ~
$ hg undo -b f57e $ hg undo -b f57e
0 files updated, 0 files merged, 1 files removed, 0 files unresolved undone to *, before redo (glob)
$ hg log -G -T compact -l5 $ hg log -G -T compact -l5
o 29[tip] 0963b9e31e70 1970-01-01 00:00 +0000 test o 29[tip] 0963b9e31e70 1970-01-01 00:00 +0000 test
| c3 | c3
| |
o 28 4e0ac6fa4ca0 1970-01-01 00:00 +0000 test o 28 4e0ac6fa4ca0 1970-01-01 00:00 +0000 test
| c2 | c2
| |
o 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test o 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test
| | | |
| o 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test | o 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test
| c1 | c1
| |
o 24:-1 90af9088326b 1970-01-01 00:00 +0000 test o 24:-1 90af9088326b 1970-01-01 00:00 +0000 test
b1 b1
$ hg undo $ hg undo
4 files updated, 0 files merged, 1 files removed, 0 files unresolved undone to *, before rebase -r 00617 -d 28dfc (glob)
$ hg log -G -T compact -l6 $ hg log -G -T compact -l6
@ 31[tip]:29 00617a57f780 1970-01-01 00:00 +0000 test @ 31[tip]:29 00617a57f780 1970-01-01 00:00 +0000 test
| bfile | bfile
| |
| o 30:24 28dfc398cab7 1970-01-01 00:00 +0000 test | o 30:24 28dfc398cab7 1970-01-01 00:00 +0000 test
| | afile | | afile
| | | |
o | 29 0963b9e31e70 1970-01-01 00:00 +0000 test o | 29 0963b9e31e70 1970-01-01 00:00 +0000 test
| | c3 | | c3
| | | |
o | 28 4e0ac6fa4ca0 1970-01-01 00:00 +0000 test o | 28 4e0ac6fa4ca0 1970-01-01 00:00 +0000 test
| | c2 | | c2
| | | |
o | 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test o | 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test
/ c1 / c1
| |
o 24:-1 90af9088326b 1970-01-01 00:00 +0000 test o 24:-1 90af9088326b 1970-01-01 00:00 +0000 test
b1 b1
$ hg redo $ hg redo
2 files updated, 0 files merged, 3 files removed, 0 files unresolved undone to *, before undo (glob)
$ hg log -G -T compact -l6 $ hg log -G -T compact -l6
@ 32[tip]:30 e642892c5cb0 1970-01-01 00:00 +0000 test @ 32[tip]:30 e642892c5cb0 1970-01-01 00:00 +0000 test
| bfile | bfile
| |
o 30:24 28dfc398cab7 1970-01-01 00:00 +0000 test o 30:24 28dfc398cab7 1970-01-01 00:00 +0000 test
| afile | afile
| |
| o 29 0963b9e31e70 1970-01-01 00:00 +0000 test | o 29 0963b9e31e70 1970-01-01 00:00 +0000 test
| | c3 | | c3
| | | |
| o 28 4e0ac6fa4ca0 1970-01-01 00:00 +0000 test | o 28 4e0ac6fa4ca0 1970-01-01 00:00 +0000 test
| | c2 | | c2
| | | |
| o 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test | o 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test
| c1 | c1
| |
o 24:-1 90af9088326b 1970-01-01 00:00 +0000 test o 24:-1 90af9088326b 1970-01-01 00:00 +0000 test
b1 b1
$ hg undo $ hg undo
4 files updated, 0 files merged, 1 files removed, 0 files unresolved undone to *, before rebase -r 00617 -d 28dfc (glob)
$ hg rebase -r 00617 -d 28dfc $ hg rebase -r 00617 -d 28dfc
rebasing 31:00617a57f780 "bfile" (tip) rebasing 31:00617a57f780 "bfile" (tip)
merging afile merging afile
warning: conflicts while merging afile! (edit, then use 'hg resolve --mark') warning: conflicts while merging afile! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
$ hg undo $ hg undo
0 files updated, 0 files merged, 0 files removed, 0 files unresolved undone to *, before rebase -r 00617 -d 28dfc (glob)
$ hg log -G -T compact -l6 $ hg log -G -T compact -l6
@ 31[tip]:29 00617a57f780 1970-01-01 00:00 +0000 test @ 31[tip]:29 00617a57f780 1970-01-01 00:00 +0000 test
| bfile | bfile
| |
| o 30:24 28dfc398cab7 1970-01-01 00:00 +0000 test | o 30:24 28dfc398cab7 1970-01-01 00:00 +0000 test
| | afile | | afile
| | | |
o | 29 0963b9e31e70 1970-01-01 00:00 +0000 test o | 29 0963b9e31e70 1970-01-01 00:00 +0000 test