This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2891

uncommit: simplify condition for keeping commit
ClosedPublic

Authored by martinvonz on Mar 17 2018, 1:14 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG435b8b05affd: uncommit: simplify condition for keeping commit
rHG6c263f319e89: uncommit: simplify condition for keeping commit
Summary

We used to keep the commit if it would have become empty and --keep
was not passed. Since we just changed it so we also keep it if any
patterns were passed on the command line, the only remaining case
where we prune the commit is when no arguments were passed and --keep
was not passed either, we can simplify the "not files and not
allowempty" to just "not allowempty". Let's also rename "allowempty"
to "keepcommit" since it's no longer about allowing an empty commit.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Mar 17 2018, 1:14 PM
pulkit accepted this revision.Mar 17 2018, 1:22 PM
Closed by commit rHG6c263f319e89: uncommit: simplify condition for keeping commit (authored by martinvonz). · Explain WhyMar 17 2018, 1:36 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/uncommit.py (8 lines)

Diff 7090

hgext/uncommit.py

) )
# 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'
def _commitfiltered(repo, ctx, match, allowempty): def _commitfiltered(repo, ctx, match, keepcommit):
"""Recommit ctx with changed files not in match. Return the new """Recommit ctx with changed files not in match. Return the new
node identifier, or None if nothing changed. node identifier, or None if nothing changed.
""" """
base = ctx.p1() base = ctx.p1()
# ctx # ctx
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)
# return the p1 so that we don't create an obsmarker later # return the p1 so that we don't create an obsmarker later
if not files and not allowempty: if not keepcommit:
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:
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)
allowempty = opts.get('keep') or pats keepcommit = opts.get('keep') or pats
newid = _commitfiltered(repo, old, match, allowempty) newid = _commitfiltered(repo, old, match, keepcommit)
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,)