This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3872

histedit: add --no-backup option (issue5825)
ClosedPublic

Authored by khanchi97 on Jul 1 2018, 12:35 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG7b57b1ed5c0f: histedit: add --no-backup option (issue5825)
Summary

This option provides a functionality to not store a backup
while aborting histedit in between. Also added tests for the
same.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

khanchi97 created this revision.Jul 1 2018, 12:35 PM
durin42 accepted this revision.Jul 3 2018, 2:12 PM
This revision is now accepted and ready to land.Jul 3 2018, 2:12 PM
pulkit accepted this revision.Jul 4 2018, 3:30 PM
pulkit added a subscriber: pulkit.
pulkit added inline comments.
hgext/histedit.py
928

We can definitely improve this help text here. Please follow-up.

Closed by commit rHG7b57b1ed5c0f: histedit: add --no-backup option (issue5825) (authored by khanchi97). · Explain WhyJul 4 2018, 3:43 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (15 lines)
AMtests/test-histedit-no-backup.t (95 lines)

Diff 9438

hgext/histedit.py

[('', 'commands', '', [('', 'commands', '',
_('read history edits from the specified file'), _('FILE')), _('read history edits from the specified file'), _('FILE')),
('c', 'continue', False, _('continue an edit already in progress')), ('c', 'continue', False, _('continue an edit already in progress')),
('', 'edit-plan', False, _('edit remaining actions list')), ('', 'edit-plan', False, _('edit remaining actions list')),
('k', 'keep', False, ('k', 'keep', False,
_("don't strip old nodes after edit is complete")), _("don't strip old nodes after edit is complete")),
('', 'abort', False, _('abort an edit in progress')), ('', 'abort', False, _('abort an edit in progress')),
('o', 'outgoing', False, _('changesets not found in destination')), ('o', 'outgoing', False, _('changesets not found in destination')),
('', 'no-backup', False, _('no backup')),
pulkitUnsubmitted
Not Done

We can definitely improve this help text here. Please follow-up.

pulkit: We can definitely improve this help text here. Please follow-up.
('f', 'force', False, ('f', 'force', False,
_('force outgoing even for unrelated repositories')), _('force outgoing even for unrelated repositories')),
('r', 'rev', [], _('first revision to be edited'), _('REV'))] + ('r', 'rev', [], _('first revision to be edited'), _('REV'))] +
cmdutil.formatteropts, cmdutil.formatteropts,
_("[OPTIONS] ([ANCESTOR] | --outgoing [URL])")) _("[OPTIONS] ([ANCESTOR] | --outgoing [URL])"))
def histedit(ui, repo, *freeargs, **opts): def histedit(ui, repo, *freeargs, **opts):
"""interactively edit changeset history """interactively edit changeset history
_('histedit requires exactly one ancestor revision')) _('histedit requires exactly one ancestor revision'))
def _histedit(ui, repo, state, *freeargs, **opts): def _histedit(ui, repo, state, *freeargs, **opts):
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
fm = ui.formatter('histedit', opts) fm = ui.formatter('histedit', opts)
fm.startitem() fm.startitem()
goal = _getgoal(opts) goal = _getgoal(opts)
revs = opts.get('rev', []) revs = opts.get('rev', [])
nobackup = opts.get('no_backup')
rules = opts.get('commands', '') rules = opts.get('commands', '')
state.keep = opts.get('keep', False) state.keep = opts.get('keep', False)
_validateargs(ui, repo, state, freeargs, opts, goal, rules, revs) _validateargs(ui, repo, state, freeargs, opts, goal, rules, revs)
# rebuild state # rebuild state
if goal == goalcontinue: if goal == goalcontinue:
state.read() state.read()
state = bootstrapcontinue(ui, state, opts) state = bootstrapcontinue(ui, state, opts)
elif goal == goaleditplan: elif goal == goaleditplan:
_edithisteditplan(ui, repo, state, rules) _edithisteditplan(ui, repo, state, rules)
return return
elif goal == goalabort: elif goal == goalabort:
_aborthistedit(ui, repo, state) _aborthistedit(ui, repo, state, nobackup=nobackup)
return return
else: else:
# goal == goalnew # goal == goalnew
_newhistedit(ui, repo, state, revs, freeargs, opts) _newhistedit(ui, repo, state, revs, freeargs, opts)
_continuehistedit(ui, repo, state) _continuehistedit(ui, repo, state)
_finishhistedit(ui, repo, state, fm) _finishhistedit(ui, repo, state, fm)
fm.end() fm.end()
fm.data(nodechanges=nodechanges) fm.data(nodechanges=nodechanges)
state.clear() state.clear()
if os.path.exists(repo.sjoin('undo')): if os.path.exists(repo.sjoin('undo')):
os.unlink(repo.sjoin('undo')) os.unlink(repo.sjoin('undo'))
if repo.vfs.exists('histedit-last-edit.txt'): if repo.vfs.exists('histedit-last-edit.txt'):
repo.vfs.unlink('histedit-last-edit.txt') repo.vfs.unlink('histedit-last-edit.txt')
def _aborthistedit(ui, repo, state): def _aborthistedit(ui, repo, state, nobackup=False):
try: try:
state.read() state.read()
__, leafs, tmpnodes, __ = processreplacement(state) __, leafs, tmpnodes, __ = processreplacement(state)
ui.debug('restore wc to old parent %s\n' ui.debug('restore wc to old parent %s\n'
% node.short(state.topmost)) % node.short(state.topmost))
# Recover our old commits if necessary # Recover our old commits if necessary
if not state.topmost in repo and state.backupfile: if not state.topmost in repo and state.backupfile:
backupfile = repo.vfs.join(state.backupfile) backupfile = repo.vfs.join(state.backupfile)
f = hg.openpath(ui, backupfile) f = hg.openpath(ui, backupfile)
gen = exchange.readbundle(ui, f, backupfile) gen = exchange.readbundle(ui, f, backupfile)
with repo.transaction('histedit.abort') as tr: with repo.transaction('histedit.abort') as tr:
bundle2.applybundle(repo, gen, tr, source='histedit', bundle2.applybundle(repo, gen, tr, source='histedit',
url='bundle:' + backupfile) url='bundle:' + backupfile)
os.remove(backupfile) os.remove(backupfile)
# check whether we should update away # check whether we should update away
if repo.unfiltered().revs('parents() and (%n or %ln::)', if repo.unfiltered().revs('parents() and (%n or %ln::)',
state.parentctxnode, leafs | tmpnodes): state.parentctxnode, leafs | tmpnodes):
hg.clean(repo, state.topmost, show_stats=True, quietempty=True) hg.clean(repo, state.topmost, show_stats=True, quietempty=True)
cleanupnode(ui, repo, tmpnodes) cleanupnode(ui, repo, tmpnodes, nobackup=nobackup)
cleanupnode(ui, repo, leafs) cleanupnode(ui, repo, leafs, nobackup=nobackup)
except Exception: except Exception:
if state.inprogress(): if state.inprogress():
ui.warn(_('warning: encountered an exception during histedit ' ui.warn(_('warning: encountered an exception during histedit '
'--abort; the repository may not have been completely ' '--abort; the repository may not have been completely '
'cleaned up\n')) 'cleaned up\n'))
raise raise
finally: finally:
state.clear() state.clear()
if oldbmarks: if oldbmarks:
with repo.lock(), repo.transaction('histedit') as tr: with repo.lock(), repo.transaction('histedit') as tr:
marks = repo._bookmarks marks = repo._bookmarks
changes = [] changes = []
for name in oldbmarks: for name in oldbmarks:
changes.append((name, newtopmost)) changes.append((name, newtopmost))
marks.applychanges(repo, tr, changes) marks.applychanges(repo, tr, changes)
def cleanupnode(ui, repo, nodes): def cleanupnode(ui, repo, nodes, nobackup=False):
"""strip a group of nodes from the repository """strip a group of nodes from the repository
The set of node to strip may contains unknown nodes.""" The set of node to strip may contains unknown nodes."""
with repo.lock(): with repo.lock():
# do not let filtering get in the way of the cleanse # do not let filtering get in the way of the cleanse
# we should probably get rid of obsolescence marker created during the # we should probably get rid of obsolescence marker created during the
# histedit, but we currently do not have such information. # histedit, but we currently do not have such information.
repo = repo.unfiltered() repo = repo.unfiltered()
# Find all nodes that need to be stripped # Find all nodes that need to be stripped
# (we use %lr instead of %ln to silently ignore unknown items) # (we use %lr instead of %ln to silently ignore unknown items)
nm = repo.changelog.nodemap nm = repo.changelog.nodemap
nodes = sorted(n for n in nodes if n in nm) nodes = sorted(n for n in nodes if n in nm)
roots = [c.node() for c in repo.set("roots(%ln)", nodes)] roots = [c.node() for c in repo.set("roots(%ln)", nodes)]
if roots: if roots:
repair.strip(ui, repo, roots) backup = not nobackup
repair.strip(ui, repo, roots, backup=backup)
def stripwrapper(orig, ui, repo, nodelist, *args, **kwargs): def stripwrapper(orig, ui, repo, nodelist, *args, **kwargs):
if isinstance(nodelist, str): if isinstance(nodelist, str):
nodelist = [nodelist] nodelist = [nodelist]
if os.path.exists(os.path.join(repo.path, 'histedit-state')): if os.path.exists(os.path.join(repo.path, 'histedit-state')):
state = histeditstate(repo) state = histeditstate(repo)
state.read() state.read()
histedit_nodes = {action.node for action histedit_nodes = {action.node for action

tests/test-histedit-no-backup.t

  • This file was added.
$ . "$TESTDIR/histedit-helpers.sh"
Enable extension used by this test
$ cat >>$HGRCPATH <<EOF
> [extensions]
> histedit=
> EOF
Repo setup:
$ hg init foo
$ cd foo
$ echo first>file
$ hg ci -qAm one
$ echo second>>file
$ hg ci -m two
$ echo third>>file
$ hg ci -m three
$ echo forth>>file
$ hg ci -m four
$ hg log -G --style compact
@ 3[tip] 7d5187087c79 1970-01-01 00:00 +0000 test
| four
|
o 2 80d23dfa866d 1970-01-01 00:00 +0000 test
| three
|
o 1 6153eb23e623 1970-01-01 00:00 +0000 test
| two
|
o 0 36b4bdd91f5b 1970-01-01 00:00 +0000 test
one
Check when --no-backup is not passed
$ hg histedit -r '36b4bdd91f5b' --commands - << EOF
> pick 36b4bdd91f5b 0 one
> pick 6153eb23e623 1 two
> roll 80d23dfa866d 2 three
> edit 7d5187087c79 3 four
> EOF
merging file
Editing (7d5187087c79), you may commit or record as needed now.
(hg histedit --continue to resume)
[1]
$ hg histedit --abort
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/foo/.hg/strip-backup/1d8f701c7b35-cf7be322-backup.hg
saved backup bundle to $TESTTMP/foo/.hg/strip-backup/5c0056670bce-b54b65d0-backup.hg
$ hg st
$ hg diff
$ hg log -G --style compact
@ 3[tip] 7d5187087c79 1970-01-01 00:00 +0000 test
| four
|
o 2 80d23dfa866d 1970-01-01 00:00 +0000 test
| three
|
o 1 6153eb23e623 1970-01-01 00:00 +0000 test
| two
|
o 0 36b4bdd91f5b 1970-01-01 00:00 +0000 test
one
Check when --no-backup is passed
$ hg histedit -r '36b4bdd91f5b' --commands - << EOF
> pick 36b4bdd91f5b 0 one
> pick 6153eb23e623 1 two
> roll 80d23dfa866d 2 three
> edit 7d5187087c79 3 four
> EOF
merging file
Editing (7d5187087c79), you may commit or record as needed now.
(hg histedit --continue to resume)
[1]
$ hg histedit --abort --no-backup
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg st
$ hg diff
$ hg log -G --style compact
@ 3[tip] 7d5187087c79 1970-01-01 00:00 +0000 test
| four
|
o 2 80d23dfa866d 1970-01-01 00:00 +0000 test
| three
|
o 1 6153eb23e623 1970-01-01 00:00 +0000 test
| two
|
o 0 36b4bdd91f5b 1970-01-01 00:00 +0000 test
one