This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1576

amend: extract function for calculating changeset extras
ClosedPublic

Authored by martinvonz on Dec 1 2017, 5:43 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGd3bba59a70e1: amend: extract function for calculating changeset extras
Summary

We (Google) have extensions that would like to put their own entries
in the extras. Some of these don't make sense to keep on amend
(e.g. an entry saying "this corresponds to snaphot X of review unit
Y"). So this patch extracts a function for calculating the extras so
our extension can more easily override it.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Dec 1 2017, 5:43 PM
yuja accepted this revision.Dec 1 2017, 9:46 PM
This revision is now accepted and ready to land.Dec 1 2017, 9:46 PM
yuja added a comment.Dec 1 2017, 9:48 PM

Queued, but I doubt if pureextra == old.extra() would work with your extension.

Closed by commit rHGd3bba59a70e1: amend: extract function for calculating changeset extras (authored by martinvonz). · Explain WhyDec 1 2017, 10:11 PM
This revision was automatically updated to reflect the committed changes.
martinvonz added a comment.Dec 2 2017, 12:15 AM
In D1576#26799, @yuja wrote:

Queued, but I doubt if pureextra == old.extra() would work with your extension.

I did think about that and then I forgot it before I sent the patch :( We don't need this that urgently, so I'll just drop the patch and think of a better way of dealing with it. We should perhaps instead have some way of just indicating which extras can be carried over.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (25 lines)

Diff 4066

mercurial/cmdutil.py

b = ctx2.filectx(f) b = ctx2.filectx(f)
return (not a.cmp(b) return (not a.cmp(b)
and a.flags() == b.flags()) and a.flags() == b.flags())
else: else:
return False return False
else: else:
return f not in ctx2.manifest() return f not in ctx2.manifest()
def _amendextras(extra, old, wctx):
"""Calculated extras for amended changeset.
This is a separate function so extensions can override it and filter out
(or add) certain entries.
"""
# Copy to avoid mutating input
extra = extra.copy()
# Update extra dict from amended commit (e.g. to preserve graft
# source)
extra.update(old.extra())
# Also update it from the from the wctx
extra.update(wctx.extra())
return extra
def amend(ui, repo, old, extra, pats, opts): def amend(ui, repo, old, extra, pats, opts):
# avoid cycle context -> subrepo -> cmdutil # avoid cycle context -> subrepo -> cmdutil
from . import context from . import context
# amend will reuse the existing user if not specified, but the obsolete # amend will reuse the existing user if not specified, but the obsolete
# marker creation requires that the current user's name is specified. # marker creation requires that the current user's name is specified.
if obsolete.isenabled(repo, obsolete.createmarkersopt): if obsolete.isenabled(repo, obsolete.createmarkersopt):
ui.username() # raise exception if username not set ui.username() # raise exception if username not set
ui.note(_('amending changeset %s\n') % old) ui.note(_('amending changeset %s\n') % old)
base = old.p1() base = old.p1()
with repo.wlock(), repo.lock(), repo.transaction('amend'): with repo.wlock(), repo.lock(), repo.transaction('amend'):
# Participating changesets: # Participating changesets:
# #
# wctx o - workingctx that contains changes from working copy # wctx o - workingctx that contains changes from working copy
# | to go into amending commit # | to go into amending commit
# | # |
# old o - changeset to amend # old o - changeset to amend
# | # |
# base o - first parent of the changeset to amend # base o - first parent of the changeset to amend
wctx = repo[None] wctx = repo[None]
# Copy to avoid mutating input extra = _amendextras(extra, old, wctx)
extra = extra.copy()
# Update extra dict from amended commit (e.g. to preserve graft
# source)
extra.update(old.extra())
# Also update it from the from the wctx
extra.update(wctx.extra())
user = opts.get('user') or old.user() user = opts.get('user') or old.user()
date = opts.get('date') or old.date() date = opts.get('date') or old.date()
# Parse the date to allow comparison between date and old.date() # Parse the date to allow comparison between date and old.date()
date = util.parsedate(date) date = util.parsedate(date)
if len(old.parents()) > 1: if len(old.parents()) > 1: