This is an archive of the discontinued Mercurial Phabricator instance.

Differential D726

uncommit: rename the flag 'empty' to 'keep' which retains empty changeset
ClosedPublic

Authored by pulkit on Sep 18 2017, 11:47 AM.

Details

Reviewers
krbullock
durin42
Group Reviewers
hg-reviewers
Commits
rHGf94442d46984: uncommit: rename the flag 'empty' to 'keep' which retains empty changeset
Summary

This patch renames the flag 'empty' which retains the empty changeset if all
the files are uncommitted to 'keep'.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Sep 18 2017, 11:47 AM
krbullock accepted this revision as: krbullock.Sep 18 2017, 4:36 PM
krbullock added a subscriber: krbullock.

LGTM, but leaving it for others to review because I know this was a subject of IRC discussion recently.

durin42 accepted this revision.Sep 20 2017, 11:57 AM
This revision is now accepted and ready to land.Sep 20 2017, 11:57 AM
Closed by commit rHGf94442d46984: uncommit: rename the flag 'empty' to 'keep' which retains empty changeset (authored by pulkit). · Explain WhySep 20 2017, 12:26 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 1864

hgext/uncommit.py

for dst, src in oldcopies.iteritems()) for dst, src in oldcopies.iteritems())
# 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',
[('', 'empty', False, _('allow an empty commit after uncommiting')), [('', 'keep', False, _('allow an empty commit after uncommiting')),
] + commands.walkopts, ] + commands.walkopts,
_('[OPTION]... [FILE]...')) _('[OPTION]... [FILE]...'))
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
deleted in the changeset will be left unchanged, and so will remain deleted in the changeset will be left unchanged, and so will remain
if len(old.parents()) > 1: if len(old.parents()) > 1:
raise error.Abort(_("cannot uncommit merge changeset")) raise error.Abort(_("cannot uncommit merge changeset"))
allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt) allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
if not allowunstable and old.children(): if not allowunstable and old.children():
raise error.Abort(_('cannot uncommit changeset with children')) raise error.Abort(_('cannot uncommit changeset with children'))
with repo.transaction('uncommit'): with repo.transaction('uncommit'):
match = scmutil.match(old, pats, opts) match = scmutil.match(old, pats, opts)
newid = _commitfiltered(repo, old, match, opts.get('empty')) newid = _commitfiltered(repo, old, match, opts.get('keep'))
if newid is None: if newid is None:
ui.status(_("nothing to uncommit\n")) ui.status(_("nothing to uncommit\n"))
return 1 return 1
mapping = {} mapping = {}
if newid != old.p1().node(): if newid != old.p1().node():
# Move local changes on filtered changeset # Move local changes on filtered changeset
mapping[old.node()] = (newid,) mapping[old.node()] = (newid,)

tests/test-uncommit.t

files to their uncommitted state. This means that files modified or files to their uncommitted state. This means that files modified or
deleted in the changeset will be left unchanged, and so will remain deleted in the changeset will be left unchanged, and so will remain
modified in the working directory. modified in the working directory.
(use 'hg help -e uncommit' to show help for the uncommit extension) (use 'hg help -e uncommit' to show help for the uncommit extension)
options ([+] can be repeated): options ([+] can be repeated):
--empty allow an empty commit after uncommiting --keep allow an empty commit after uncommiting
-I --include PATTERN [+] include names matching the given patterns -I --include PATTERN [+] include names matching the given patterns
-X --exclude PATTERN [+] exclude names matching the given patterns -X --exclude PATTERN [+] exclude names matching the given patterns
(some details hidden, use --verbose to show complete help) (some details hidden, use --verbose to show complete help)
Uncommit with no commits should fail Uncommit with no commits should fail
$ hg uncommit $ hg uncommit
$ 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 --empty $ hg uncommit --keep
$ 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
$ hg status $ hg status