This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6075

[RFC] transplant: append log to commit message before running filter
AbandonedPublic

Authored by Kwan on Mar 5 2019, 6:35 AM.
Tags
None
Subscribers
None

Details

Reviewers
None
Summary

Currently if a user wants to alter the "(transplanted from <hash>)" line in the
commit message, for instance by prepending a repo URL to the hash, they have to
do so manually via -e since the message is passed to the --filter provided
command before the line is appended.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

Kwan created this revision.Mar 5 2019, 6:35 AM
Kwan abandoned this revision.Mar 6 2019, 8:08 AM

Urgh, never mind, just realised I missed the existence of HGREVISION in the documentation.

Kwan removed a reviewer: hg-reviewers.Mar 6 2019, 8:08 AM
Kwan removed a subscriber: mercurial-devel.

Revision Contents
Changeset List

PathPackages
Mhgext/transplant.py (6 lines)

Diff 14355

hgext/transplant.py

return (user, date, msg) return (user, date, msg)
def applyone(self, repo, node, cl, patchfile, merge=False, log=False, def applyone(self, repo, node, cl, patchfile, merge=False, log=False,
filter=None): filter=None):
'''apply the patch in patchfile to the repository as a transplant''' '''apply the patch in patchfile to the repository as a transplant'''
(manifest, user, (time, timezone), files, message) = cl[:5] (manifest, user, (time, timezone), files, message) = cl[:5]
date = "%d %d" % (time, timezone) date = "%d %d" % (time, timezone)
extra = {'transplant_source': node} extra = {'transplant_source': node}
if filter:
(user, date, message) = self.filter(filter, node, cl, patchfile)
if log: if log:
# we don't translate messages inserted into commits # we don't translate messages inserted into commits
message += '\n(transplanted from %s)' % nodemod.hex(node) message += '\n(transplanted from %s)' % nodemod.hex(node)
if filter:
(user, date, message) = self.filter(filter, node, cl, patchfile)
self.ui.status(_('applying %s\n') % nodemod.short(node)) self.ui.status(_('applying %s\n') % nodemod.short(node))
self.ui.note('%s %s\n%s\n' % (user, date, message)) self.ui.note('%s %s\n%s\n' % (user, date, message))
if not patchfile and not merge: if not patchfile and not merge:
raise error.Abort(_('can only omit patchfile if merging')) raise error.Abort(_('can only omit patchfile if merging'))
if patchfile: if patchfile:
try: try:
files = set() files = set()