| Submitter | phabricator |
|---|---|
| Date | July 11, 2018, 1:12 p.m. |
| Message ID | <7962ebf0d348ced81277f6adb16b6bde@localhost.localdomain> |
| Download | mbox | patch |
| Permalink | /patch/32772/ |
| State | Not Applicable |
| Headers | show |
Comments
> +coreconfigitem('ui', 'historyediting_backup', > + default=True, > +) > coreconfigitem('ui', 'interactive', > default=None, > ) > diff --git a/hgext/histedit.py b/hgext/histedit.py > --- a/hgext/histedit.py > +++ b/hgext/histedit.py > @@ -1111,7 +1111,8 @@ > fm.startitem() > goal = _getgoal(opts) > revs = opts.get('rev', []) > - nobackup = opts.get('no_backup') > + nobackup = (opts.get('no_backup') or > + not ui.configbool('ui', 'historyediting_backup')) `history-editing-backup` per new rule. https://www.mercurial-scm.org/wiki/UIGuideline#config Can you add `# experimental config: ui.history-editing-backup` to silence check-config? It's probably too late to add full support for this option and make it documented. And, should we drop the --no-backup option? @pulkit what do you think?
yuja added a subscriber: pulkit. yuja added a comment. > +coreconfigitem('ui', 'historyediting_backup', > + default=True, > +) > > coreconfigitem('ui', 'interactive', > default=None, > ) > > diff --git a/hgext/histedit.py b/hgext/histedit.py > > - a/hgext/histedit.py +++ b/hgext/histedit.py @@ -1111,7 +1111,8 @@ fm.startitem() goal = _getgoal(opts) revs = opts.get('rev', []) > - nobackup = opts.get('no_backup') + nobackup = (opts.get('no_backup') or + not ui.configbool('ui', 'historyediting_backup')) `history-editing-backup` per new rule. https://www.mercurial-scm.org/wiki/UIGuideline#config Can you add `# experimental config: ui.history-editing-backup` to silence check-config? It's probably too late to add full support for this option and make it documented. And, should we drop the --no-backup option? @pulkit what do you think? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3901 To: khanchi97, durin42, #hg-reviewers Cc: pulkit, yuja, mercurial-devel
Patch
diff --git a/tests/test-histedit-no-backup.t b/tests/test-histedit-no-backup.t --- a/tests/test-histedit-no-backup.t +++ b/tests/test-histedit-no-backup.t @@ -93,3 +93,41 @@ o 0 36b4bdd91f5b 1970-01-01 00:00 +0000 test one +====================================== +Test histediting_backup config option| +====================================== +Test when `histediting_backup` config option is not enabled: + $ 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 + +Test when `histediting_backup` config option is enabled +Enable config option: + $ cat >>$HGRCPATH <<EOF + > [ui] + > historyediting_backup=False + > EOF + + $ 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 diff --git a/mercurial/configitems.py b/mercurial/configitems.py --- a/mercurial/configitems.py +++ b/mercurial/configitems.py @@ -1081,6 +1081,9 @@ coreconfigitem('ui', 'graphnodetemplate', default=None, ) +coreconfigitem('ui', 'historyediting_backup', + default=True, +) coreconfigitem('ui', 'interactive', default=None, ) diff --git a/hgext/histedit.py b/hgext/histedit.py --- a/hgext/histedit.py +++ b/hgext/histedit.py @@ -1111,7 +1111,8 @@ fm.startitem() goal = _getgoal(opts) revs = opts.get('rev', []) - nobackup = opts.get('no_backup') + nobackup = (opts.get('no_backup') or + not ui.configbool('ui', 'historyediting_backup')) rules = opts.get('commands', '') state.keep = opts.get('keep', False)