This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3968

amend: support "history-editing-backup" config option
ClosedPublic

Authored by khanchi97 on Jul 20 2018, 4:04 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG32ece991955c: amend: support "history-editing-backup" config option
Summary

Now, amend is in the list of those history editing commands
which support history-editing-backup config option.
If you don't want to store any backup then just use this config.
[ui]
hisotry-editing-backup = False

Current status of list of history editing commands which support
this config:

  1. histedit
  2. rebase
  3. amend

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 20 2018, 4:04 PM
yuja added a subscriber: yuja.Aug 2 2018, 9:49 AM
  • a/mercurial/cmdutil.py

+++ b/mercurial/cmdutil.py
@@ -2556,8 +2556,10 @@

obsmetadata = None
if opts.get('note'):
    obsmetadata = {'note': encoding.fromlocal(opts['note'])}

+ backup = opts.get('backup')

scmutil.cleanupnodes(repo, mapping, 'amend', metadata=obsmetadata,
  • fixphase=True, targetphase=commitphase)

+ fixphase=True, targetphase=commitphase,
+ backup=backup)

  1. Fixing the dirstate because localrepo.commitctx does not update
  2. it. This is rather convenient because we did not need to update

diff --git a/hgext/amend.py b/hgext/amend.py

  • a/hgext/amend.py

+++ b/hgext/amend.py
@@ -54,4 +54,6 @@

if not opts.get('logfile'):
    opts['message'] = opts.get('message') or repo['.'].description()
opts['amend'] = True

+ backup = ui.configbool('ui', 'history-editing-backup')
+ opts['backup'] = backup

return commands._docommit(ui, repo, *pats, **pycompat.strkwargs(opts))

No need to pass by opts since cmdutil.amend() can read ui.config.

khanchi97 updated this revision to Diff 9794.Aug 2 2018, 2:59 PM
Closed by commit rHG32ece991955c: amend: support "history-editing-backup" config option (authored by khanchi97). · Explain WhyAug 3 2018, 9:44 AM
This revision was automatically updated to reflect the committed changes.
khanchi97 added a comment.Aug 7 2018, 5:30 PM

@yuja Is there any command left which we can consider to add
'history-editing-backup' config option?

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (4 lines)
Mtests/test-amend.t (34 lines)

Diff 9818

mercurial/cmdutil.py

newid = repo.commitctx(new) newid = repo.commitctx(new)
# Reroute the working copy parent to the new changeset # Reroute the working copy parent to the new changeset
repo.setparents(newid, nullid) repo.setparents(newid, nullid)
mapping = {old.node(): (newid,)} mapping = {old.node(): (newid,)}
obsmetadata = None obsmetadata = None
if opts.get('note'): if opts.get('note'):
obsmetadata = {'note': encoding.fromlocal(opts['note'])} obsmetadata = {'note': encoding.fromlocal(opts['note'])}
backup = ui.configbool('ui', 'history-editing-backup')
scmutil.cleanupnodes(repo, mapping, 'amend', metadata=obsmetadata, scmutil.cleanupnodes(repo, mapping, 'amend', metadata=obsmetadata,
fixphase=True, targetphase=commitphase) fixphase=True, targetphase=commitphase,
backup=backup)
# Fixing the dirstate because localrepo.commitctx does not update # Fixing the dirstate because localrepo.commitctx does not update
# it. This is rather convenient because we did not need to update # it. This is rather convenient because we did not need to update
# the dirstate for all the files in the new commit which commitctx # the dirstate for all the files in the new commit which commitctx
# could have done if it updated the dirstate. Now, we can # could have done if it updated the dirstate. Now, we can
# selectively update the dirstate only for the amended files. # selectively update the dirstate only for the amended files.
dirstate = repo.dirstate dirstate = repo.dirstate

tests/test-amend.t

? content1_content2_content1-untracked ? content1_content2_content1-untracked
? content1_content2_content2-untracked ? content1_content2_content2-untracked
? content1_content2_content3-untracked ? content1_content2_content3-untracked
? content1_missing_content1-untracked ? content1_missing_content1-untracked
? content1_missing_content3-untracked ? content1_missing_content3-untracked
? missing_content2_content2-untracked ? missing_content2_content2-untracked
? missing_content2_content3-untracked ? missing_content2_content3-untracked
? missing_missing_content3-untracked ? missing_missing_content3-untracked
==========================================
Test history-editing-backup config option|
==========================================
$ hg init $TESTTMP/repo4
$ cd $TESTTMP/repo4
$ echo a>a
$ hg ci -Aqma
$ echo oops>b
$ hg ci -Aqm "b"
$ echo partiallyfixed > b
#if obsstore-off
$ hg amend
saved backup bundle to $TESTTMP/repo4/.hg/strip-backup/95e899acf2ce-f11cb050-amend.hg
When history-editing-backup config option is set:
$ cat << EOF >> $HGRCPATH
> [ui]
> history-editing-backup = False
> EOF
$ echo fixed > b
$ hg amend
#else
$ hg amend
When history-editing-backup config option is set:
$ cat << EOF >> $HGRCPATH
> [ui]
> history-editing-backup = False
> EOF
$ echo fixed > b
$ hg amend
#endif