( )⚙ D324 undo: improved --branch handling

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D324

undo: improved --branch handling
ClosedPublic

Authored by felixmerk on Aug 10 2017, 6:39 PM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX418171f302d0: undo: improved --branch handling
Summary

Adds --branch handling to the no argument redo. Also adds better branch testing
and takes a more sensible approach to an undo after an undo --branch.

Redo now restores undoredo.i's --branch field. Undo after a undo --branch is
now an absolute undo. See test cases.

Test Plan

unit

Diff Detail

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

Event Timeline

felixmerk created this revision.Aug 10 2017, 6:39 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptAug 10 2017, 6:39 PM
quark accepted this revision.Aug 11 2017, 8:56 PM
This revision is now accepted and ready to land.Aug 11 2017, 8:56 PM
Closed by commit rFBHGX418171f302d0: undo: improved --branch handling (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 (9 lines)
Mtests/test-undo.t (193 lines)

Diff 746

hgext3rd/undo.py

def redo(ui, repo, *args, **opts): def redo(ui, repo, *args, **opts):
""" perform a redo """ perform a redo
Rolls back the previous undo. Rolls back the previous undo.
""" """
shiftedindex = _computerelative(repo, 0) shiftedindex = _computerelative(repo, 0)
preview = opts.get("preview") preview = opts.get("preview")
branch = ""
reverseindex = 0 reverseindex = 0
redocount = 0 redocount = 0
done = False done = False
while not done: while not done:
# we step back the linear undo log # we step back the linear undo log
# redoes cancel out undoes, if we have one more undo, we should undo # redoes cancel out undoes, if we have one more undo, we should undo
# there, otherwise we continue looking # there, otherwise we continue looking
# we are careful to not redo past absolute undoes (bc we loose undoredo # we are careful to not redo past absolute undoes (bc we loose undoredo
if commandlist[0] == "undo": if commandlist[0] == "undo":
undoopts = {} undoopts = {}
fancyopts.fancyopts(commandlist[1:], cmdtable['undo'][1], undoopts) fancyopts.fancyopts(commandlist[1:], cmdtable['undo'][1], undoopts)
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')
done = True done = True
else: else:
if undoopts['absolute']: if undoopts['absolute']:
raise error.Abort(_("can't redo past absolute undo")) raise error.Abort(_("can't redo past absolute undo"))
reverseindex += 1 reverseindex += 1
redocount -= 1 redocount -= 1
elif commandlist[0] == "redo": elif commandlist[0] == "redo":
redocount += 1 redocount += 1
reverseindex += 1 reverseindex += 1
else: else:
raise error.Abort(_("nothing to redo")) raise error.Abort(_("nothing to redo"))
if preview: if preview:
_preview(ui, repo, reverseindex) _preview(ui, repo, reverseindex)
return return
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) _undoto(ui, repo, reverseindex)
# update undredo by removing what the given undo added # update undredo by removing what the given undo added
_logundoredoindex(repo, shiftedindex) _logundoredoindex(repo, shiftedindex, branch)
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"))
# no shift # no shift
shiftedindex = 0 shiftedindex = 0
oldbranch = "" oldbranch = ""
else: else:
shiftedindex = 0 shiftedindex = 0
oldbranch = "" oldbranch = ""
if not branch: if not branch:
if not oldbranch:
reverseindex = shiftedindex + reverseindex reverseindex = shiftedindex + reverseindex
# else: previous command was branch undo
# perform absolute undo (no shift)
else: else:
# check if relative branch # check if relative branch
if (branch != oldbranch) and (oldbranch != ""): if (branch != oldbranch) and (oldbranch != ""):
rootdelta = revsetlang.formatspec( rootdelta = revsetlang.formatspec(
'roots(_localbranch(%s)) - roots(_localbranch(%s))', 'roots(_localbranch(%s)) - roots(_localbranch(%s))',
branch, oldbranch) branch, oldbranch)
if repo.revs(rootdelta): if repo.revs(rootdelta):
# different group of commits # different group of commits

tests/test-undo.t

|/ b |/ b
| |
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
'Refined branch testing
Specific edge case testing
$ hg up null
0 files updated, 0 files merged, 9 files removed, 0 files unresolved
$ touch b1 && hg add b1 && hg ci -m b1
created new head
$ touch b2 && hg add b2 && hg ci -m b2
$ touch b3 && hg add b3 && hg ci -m b3
$ hg up null
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ touch c1 && hg add c1 && hg ci -m c1
created new head
$ touch c2 && hg add c2 && hg ci -m c2
$ touch c3 && hg add c3 && hg ci -m c3
$ hg log -G -T compact
@ 29[tip] 0963b9e31e70 1970-01-01 00:00 +0000 test
| c3
|
o 28 4e0ac6fa4ca0 1970-01-01 00:00 +0000 test
| c2
|
o 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test
c1
o 26 f57edd138754 1970-01-01 00:00 +0000 test
| b3
|
o 25 0cb4447a10a7 1970-01-01 00:00 +0000 test
| b2
|
o 24:-1 90af9088326b 1970-01-01 00:00 +0000 test
b1
o 23 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 undo -b f57e
2 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ hg undo -b f57e
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg log -G -T compact -l5
o 29[tip] 0963b9e31e70 1970-01-01 00:00 +0000 test
| c3
|
o 28 4e0ac6fa4ca0 1970-01-01 00:00 +0000 test
| c2
|
o 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test
c1
@ 24:-1 90af9088326b 1970-01-01 00:00 +0000 test
b1
o 23 a0b72b3048d6 1970-01-01 00:00 +0000 test
| prev1
~
$ hg redo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -G -T compact -l6
o 29[tip] 0963b9e31e70 1970-01-01 00:00 +0000 test
| c3
|
o 28 4e0ac6fa4ca0 1970-01-01 00:00 +0000 test
| c2
|
o 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test
c1
@ 25 0cb4447a10a7 1970-01-01 00:00 +0000 test
| b2
|
o 24:-1 90af9088326b 1970-01-01 00:00 +0000 test
b1
o 23 a0b72b3048d6 1970-01-01 00:00 +0000 test
| prev1
~
$ hg undo -b 0963
2 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg log -G -T compact -l5
@ 28[tip] 4e0ac6fa4ca0 1970-01-01 00:00 +0000 test
| c2
|
o 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test
c1
o 25 0cb4447a10a7 1970-01-01 00:00 +0000 test
| b2
|
o 24:-1 90af9088326b 1970-01-01 00:00 +0000 test
b1
o 23 a0b72b3048d6 1970-01-01 00:00 +0000 test
| prev1
~
$ hg undo
2 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg log -G -T compact -l6
o 29[tip] 0963b9e31e70 1970-01-01 00:00 +0000 test
| c3
|
o 28 4e0ac6fa4ca0 1970-01-01 00:00 +0000 test
| c2
|
o 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test
c1
@ 25 0cb4447a10a7 1970-01-01 00:00 +0000 test
| b2
|
o 24:-1 90af9088326b 1970-01-01 00:00 +0000 test
b1
o 23 a0b72b3048d6 1970-01-01 00:00 +0000 test
| prev1
~
$ hg redo
2 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg redo
2 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg log -G -T compact -l6
o 29[tip] 0963b9e31e70 1970-01-01 00:00 +0000 test
| c3
|
o 28 4e0ac6fa4ca0 1970-01-01 00:00 +0000 test
| c2
|
o 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test
c1
@ 25 0cb4447a10a7 1970-01-01 00:00 +0000 test
| b2
|
o 24:-1 90af9088326b 1970-01-01 00:00 +0000 test
b1
o 23 a0b72b3048d6 1970-01-01 00:00 +0000 test
| prev1
~
$ hg undo -b f57e
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg log -G -T compact -l5
o 29[tip] 0963b9e31e70 1970-01-01 00:00 +0000 test
| c3
|
o 28 4e0ac6fa4ca0 1970-01-01 00:00 +0000 test
| c2
|
o 27:-1 c54b1b73bb58 1970-01-01 00:00 +0000 test
c1
@ 24:-1 90af9088326b 1970-01-01 00:00 +0000 test
b1
o 23 a0b72b3048d6 1970-01-01 00:00 +0000 test
| prev1
~