This is an archive of the discontinued Mercurial Phabricator instance.

Differential D156

uncommit: allow power users to leave an empty commit around
ClosedPublic

Authored by quark on Jul 20 2017, 3:19 PM.
Tags
None
Subscribers
ryanmce

Details

Reviewers
ryanmce
Group Reviewers
Restricted Project
Commits
rFBHGX5c0c83cadae8: uncommit: allow power users to leave an empty commit around
Summary

Some power user workflow requires uncommit to leave an empty commit so
they can run hg amend afterwards. I don't find easy alternatives so let's
allow that if ui.allowemptyconfig is set.

Note: ui.allowemptyconfig is an internal config that is not documented for
end-users. Core Mercurial seems to be trying to prevent the empty commit
case from normal users (like, comment disallows that, rebase will skip a
commit if after rebasing it becomes empty). So it seems better to still use
that undocumented config instead of a more discoverable flag.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Jul 20 2017, 3:19 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 20 2017, 3:19 PM
ryanmce accepted this revision.Jul 21 2017, 8:20 AM
ryanmce added a subscriber: ryanmce.

I'd prefer this to be a little more accessible via a flag to uncommit like --allow-empty. I agree with also looking at the config though, so accepting and letting you decide if you want to add the flag.

This revision is now accepted and ready to land.Jul 21 2017, 8:20 AM
quark added a comment.Jul 21 2017, 10:56 AM
In D156#2462, @ryanmce wrote:

I'd prefer this to be a little more accessible via a flag to uncommit like --allow-empty. I agree with also looking at the config though, so accepting and letting you decide if you want to add the flag.

Since ui.allowemptycommit is an "internal" config (see line 1823 in localrepo.py), I think core Mercurial wants to prevent that from normal users. Basically there is no way to create an empty commit using core Mercurial commands. So I prefer making it less discoverable.

quark edited the summary of this revision. (Show Details)Jul 21 2017, 11:01 AM
Closed by commit rFBHGX5c0c83cadae8: uncommit: allow power users to leave an empty commit around (authored by quark). · Explain WhyJul 21 2017, 11:10 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/uncommit.py (2 lines)
Mtests/test-uncommit.t (21 lines)

Diff 346

hgext3rd/uncommit.py

initialfiles = set(ctx.files()) initialfiles = set(ctx.files())
exclude = set(f for f in initialfiles if match(f)) exclude = set(f for f in initialfiles if match(f))
# No files matched commit, so nothing excluded # No files matched commit, so nothing excluded
if not exclude: if not exclude:
return None return None
files = (initialfiles - exclude) files = (initialfiles - exclude)
if not files: if not files and not repo.ui.configbool('ui', 'allowemptycommit'):
return ctx.parents()[0].node() return ctx.parents()[0].node()
# Filter copies # Filter copies
copied = copies.pathcopies(base, ctx) copied = copies.pathcopies(base, ctx)
copied = dict((dst, src) for dst, src in copied.iteritems() copied = dict((dst, src) for dst, src in copied.iteritems()
if dst in files) if dst in files)
def filectxfn(repo, memctx, path, contentctx=ctx, redirect=()): def filectxfn(repo, memctx, path, contentctx=ctx, redirect=()):
if path not in contentctx: if path not in contentctx:

tests/test-uncommit.t

Test uncommit - set up the config Test uncommit - set up the config
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [experimental] > [experimental]
> evolution=createmarkers > evolution=createmarkers
> [extensions] > [extensions]
> uncommit = $TESTDIR/../hgext3rd/uncommit.py > uncommit = $TESTDIR/../hgext3rd/uncommit.py
> drawdag=$RUNTESTDIR/drawdag.py
> EOF > EOF
Build up a repo Build up a repo
$ hg init repo $ hg init repo
$ cd repo $ cd repo
Uncommit with no commits should fail Uncommit with no commits should fail
| | o 3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd | | o 3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd
| | | | | |
| | x 2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc | | x 2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc
| |/ | |/
| x 1:69a232e754b08d568c4899475faf2eb44b857802 added file-ab | x 1:69a232e754b08d568c4899475faf2eb44b857802 added file-ab
|/ |/
o 0:3004d2d9b50883c1538fc754a3aeb55f1b4084f6 added file-a o 0:3004d2d9b50883c1538fc754a3aeb55f1b4084f6 added file-a
Uncommit leaving an empty changeset
$ cd $TESTTMP
$ hg init repo1
$ cd repo1
$ hg debugdrawdag <<'EOS'
> Q
> |
> P
> EOS
$ hg up Q -q
$ hg uncommit --config ui.allowemptycommit=1
$ hg log -G -T '{desc} FILES: {files}'
@ Q FILES:
|
| x Q FILES: Q
|/
o P FILES: P
$ hg status
A Q