This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3965

histedit: drop --no-backup option
ClosedPublic

Authored by khanchi97 on Jul 19 2018, 1:52 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGfaea9b1980d9: histedit: drop --no-backup option
Summary

Dropping this option because now we have a better option
than passing --no-backup flag every time, now user can
set a config in hgrc:

[ui]
history-editing-backup = False

This config aims to operate on every history editing command and
it is still work in progress. As yuya suggessted it probably to
late to add full support this config, so making this as
an experimental config.

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 19 2018, 1:52 PM
durin42 accepted this revision.Jul 19 2018, 1:55 PM
This revision is now accepted and ready to land.Jul 19 2018, 1:55 PM
Closed by commit rHGfaea9b1980d9: histedit: drop --no-backup option (authored by khanchi97). · Explain WhyJul 19 2018, 2:13 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (4 lines)
Mtests/test-histedit-no-backup.t (69 lines)

Diff 9636

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, _('do not save backup copies of files')),
('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
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', [])
# experimental config: ui.history-editing-backup # experimental config: ui.history-editing-backup
nobackup = (opts.get('no_backup') or nobackup = not ui.configbool('ui', 'history-editing-backup')
not ui.configbool('ui', 'history-editing-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()

tests/test-histedit-no-backup.t

$ . "$TESTDIR/histedit-helpers.sh" $ . "$TESTDIR/histedit-helpers.sh"
Enable extension used by this test Enable extension used by this test
$ cat >>$HGRCPATH <<EOF $ cat >>$HGRCPATH <<EOF
> [extensions] > [extensions]
> histedit= > histedit=
> EOF > EOF
==========================================
Test history-editing-backup config option|
==========================================
Repo setup: Repo setup:
$ hg init foo $ hg init foo
$ cd foo $ cd foo
$ echo first>file $ echo first>file
$ hg ci -qAm one $ hg ci -qAm one
$ echo second>>file $ echo second>>file
$ hg ci -m two $ hg ci -m two
$ echo third>>file $ echo third>>file
$ hg ci -m three $ hg ci -m three
$ echo forth>>file $ echo forth>>file
$ hg ci -m four $ hg ci -m four
$ hg log -G --style compact $ hg log -G --style compact
@ 3[tip] 7d5187087c79 1970-01-01 00:00 +0000 test @ 3[tip] 7d5187087c79 1970-01-01 00:00 +0000 test
| four | four
| |
o 2 80d23dfa866d 1970-01-01 00:00 +0000 test o 2 80d23dfa866d 1970-01-01 00:00 +0000 test
| three | three
| |
o 1 6153eb23e623 1970-01-01 00:00 +0000 test o 1 6153eb23e623 1970-01-01 00:00 +0000 test
| two | two
| |
o 0 36b4bdd91f5b 1970-01-01 00:00 +0000 test o 0 36b4bdd91f5b 1970-01-01 00:00 +0000 test
one 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
==========================================
Test history-editing-backup config option|
==========================================
Test when `history-editing-backup` config option is enabled: Test when `history-editing-backup` config option is enabled:
$ hg histedit -r '36b4bdd91f5b' --commands - << EOF $ hg histedit -r '36b4bdd91f5b' --commands - << EOF
> pick 36b4bdd91f5b 0 one > pick 36b4bdd91f5b 0 one
> pick 6153eb23e623 1 two > pick 6153eb23e623 1 two
> roll 80d23dfa866d 2 three > roll 80d23dfa866d 2 three
> edit 7d5187087c79 3 four > edit 7d5187087c79 3 four
> EOF > EOF
merging file merging file