This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5970

uncommit: add config option to keep commit by default
ClosedPublic

Authored by martinvonz on Feb 15 2019, 2:12 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1040d54eb7eb: uncommit: add config option to keep commit by default
rHG8980b5d6d9d9: uncommit: add config option to keep commit by default
Summary

We have a Google-internal extension that keeps track of "review units"
(like Phabricator reviews, or Gerrit's Change-Id). This information is
stored outside of the commit. It is updated with rewrites. Every now
and then we get reports from users who are confused because `hg
uncommit` lost track of their review. Keeping the empty commit by
default would reduce this confusion. It may also cause confusion about
the empty commit. This patch adds a config option that lets us easily
test both behaviors on our users.

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

martinvonz created this revision.Feb 15 2019, 2:12 PM
martinvonz updated this revision to Diff 14109.Feb 15 2019, 3:19 PM
martinvonz updated this revision to Diff 14148.Feb 20 2019, 3:23 PM
Closed by commit rHG8980b5d6d9d9: uncommit: add config option to keep commit by default (authored by martinvonz). · Explain WhyFeb 20 2019, 3:31 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/uncommit.py (12 lines)
Mtests/test-uncommit.t (26 lines)

Diff 14153

hgext/uncommit.py

command = registrar.command(cmdtable) command = registrar.command(cmdtable)
configtable = {} configtable = {}
configitem = registrar.configitem(configtable) configitem = registrar.configitem(configtable)
configitem('experimental', 'uncommitondirtywdir', configitem('experimental', 'uncommitondirtywdir',
default=False, default=False,
) )
configitem('experimental', 'uncommit.keep',
default=False,
)
stringio = util.stringio stringio = util.stringio
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or # be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified. # leave the attribute unspecified.
testedwith = 'ships-with-hg-core' testedwith = 'ships-with-hg-core'
# Adjust the dirstate copies # Adjust the dirstate copies
for dst, src in copies.iteritems(): for dst, src in copies.iteritems():
if (src not in ctx or dst in ctx or ds[dst] != 'a'): if (src not in ctx or dst in ctx or ds[dst] != 'a'):
src = None src = None
ds.copy(src, dst) ds.copy(src, dst)
@command('uncommit', @command('uncommit',
[('i', 'interactive', False, _('interactive mode to uncommit')), [('i', 'interactive', False, _('interactive mode to uncommit')),
('', 'keep', False, _('allow an empty commit after uncommiting')), ('', 'keep', None, _('allow an empty commit after uncommiting')),
] + commands.walkopts, ] + commands.walkopts,
_('[OPTION]... [FILE]...'), _('[OPTION]... [FILE]...'),
helpcategory=command.CATEGORY_CHANGE_MANAGEMENT) helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
def uncommit(ui, repo, *pats, **opts): def uncommit(ui, repo, *pats, **opts):
"""uncommit part or all of a local changeset """uncommit part or all of a local changeset
This command undoes the effect of a local commit, returning the affected This command undoes the effect of a local commit, returning the affected
files to their uncommitted state. This means that files modified or files to their uncommitted state. This means that files modified or
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
old = repo['.'] old = repo['.']
rewriteutil.precheck(repo, [old.rev()], 'uncommit') rewriteutil.precheck(repo, [old.rev()], 'uncommit')
if len(old.parents()) > 1: if len(old.parents()) > 1:
raise error.Abort(_("cannot uncommit merge changeset")) raise error.Abort(_("cannot uncommit merge changeset"))
with repo.transaction('uncommit'): with repo.transaction('uncommit'):
match = scmutil.match(old, pats, opts) match = scmutil.match(old, pats, opts)
keepcommit = opts.get('keep') or pats keepcommit = pats
if not keepcommit:
if opts.get('keep') is not None:
keepcommit = opts.get('keep')
else:
keepcommit = ui.configbool('experimental', 'uncommit.keep')
newid = _commitfiltered(repo, old, match, keepcommit) newid = _commitfiltered(repo, old, match, keepcommit)
if interactive: if interactive:
match = scmutil.match(old, pats, opts) match = scmutil.match(old, pats, opts)
newid = _interactiveuncommit(ui, repo, old, match) newid = _interactiveuncommit(ui, repo, old, match)
if newid is None: if newid is None:
ui.status(_("nothing to uncommit\n")) ui.status(_("nothing to uncommit\n"))
return 1 return 1

tests/test-uncommit.t

$ hg uncommit xyz $ hg uncommit xyz
$ hg status $ hg status
A xyz A xyz
$ hg phase -r . $ hg phase -r .
18: draft 18: draft
$ hg phase -r ".^" $ hg phase -r ".^"
12: public 12: public
Uncommit leaving an empty changeset Uncommit with --keep or experimental.uncommit.keep leaves an empty changeset
$ cd $TESTTMP $ cd $TESTTMP
$ hg init repo1 $ hg init repo1
$ cd repo1 $ cd repo1
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> Q > Q
> | > |
> P > P
> EOS > EOS
$ hg up Q -q $ hg up Q -q
$ hg uncommit --keep $ hg uncommit --keep
note: keeping empty commit note: keeping empty commit
$ hg log -G -T '{desc} FILES: {files}' $ hg log -G -T '{desc} FILES: {files}'
@ Q FILES: @ Q FILES:
| |
| x Q FILES: Q | x Q FILES: Q
|/ |/
o P FILES: P o P FILES: P
$ cat >> .hg/hgrc <<EOF
> [experimental]
> uncommit.keep=True
> EOF
$ hg ci --amend
$ hg uncommit
note: keeping empty commit
$ hg log -G -T '{desc} FILES: {files}'
@ Q FILES:
|
| x Q FILES: Q
|/
o P FILES: P
$ hg status $ hg status
A Q A Q
$ hg ci --amend
$ hg uncommit --no-keep
$ hg log -G -T '{desc} FILES: {files}'
x Q FILES: Q
|
@ P FILES: P
$ hg status
A Q
$ cd .. $ cd ..
$ rm -rf repo1 $ rm -rf repo1
Testing uncommit while merge Testing uncommit while merge
$ hg init repo2 $ hg init repo2
$ cd repo2 $ cd repo2