This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9250

rebase: use hard-coded template for one-line commit description
ClosedPublic

Authored by martinvonz on Oct 27 2020, 6:42 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb4c193509cd0: rebase: use hard-coded template for one-line commit description
Summary

This is to prepare for making making the one-line summary
customizable. The template ended up pretty complicated because of the
conditional output of "(<bookmarks etc>)". Maybe we can simplify the
template later.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Oct 27 2020, 6:42 PM
martinvonz added a commit: rHGb4c193509cd0: rebase: use hard-coded template for one-line commit description.Oct 28 2020, 9:49 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGb4c193509cd0: rebase: use hard-coded template for one-line commit description (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (20 lines)

Diff 23308

hgext/rebase.py

bookmarks, bookmarks,
cmdutil, cmdutil,
commands, commands,
copies, copies,
destutil, destutil,
dirstateguard, dirstateguard,
error, error,
extensions, extensions,
formatter,
merge as mergemod, merge as mergemod,
mergestate as mergestatemod, mergestate as mergestatemod,
mergeutil, mergeutil,
node as nodemod, node as nodemod,
obsolete, obsolete,
obsutil, obsutil,
patch, patch,
phases, phases,
pycompat, pycompat,
registrar, registrar,
repair, repair,
revset, revset,
revsetlang, revsetlang,
rewriteutil, rewriteutil,
scmutil, scmutil,
smartset, smartset,
state as statemod, state as statemod,
templatekw,
util, util,
) )
# The following constants are used throughout the rebase module. The ordering of # The following constants are used throughout the rebase module. The ordering of
# their values must be maintained. # their values must be maintained.
# Indicates that a revision needs to be rebased # Indicates that a revision needs to be rebased
revtodo = -1 revtodo = -1
% (src, dests) % (src, dests)
) )
# We have zero or one destination, so we can just return here. # We have zero or one destination, so we can just return here.
return smartset.baseset(dests) return smartset.baseset(dests)
def _ctxdesc(ctx): def _ctxdesc(ctx):
"""short description for a context""" """short description for a context"""
desc = b'%d:%s "%s"' % ( labels_spec = b'join(filter(namespaces % "{ifeq(namespace, "branches", "", join(names, " "))}"), " ")'
ctx.rev(), spec = b'{rev}:{node|short} "{desc|firstline}"{if(%s, " ({%s})")}' % (
ctx, labels_spec,
ctx.description().split(b'\n', 1)[0], labels_spec,
) )
repo = ctx.repo() return cmdutil.rendertemplate(ctx, spec)
names = []
for nsname, ns in pycompat.iteritems(repo.names):
if nsname == b'branches':
continue
names.extend(ns.names(repo, ctx.node()))
if names:
desc += b' (%s)' % b' '.join(names)
return desc
class rebaseruntime(object): class rebaseruntime(object):
"""This class is a container for rebase runtime state""" """This class is a container for rebase runtime state"""
def __init__(self, repo, ui, inmemory=False, dryrun=False, opts=None): def __init__(self, repo, ui, inmemory=False, dryrun=False, opts=None):
if opts is None: if opts is None:
opts = {} opts = {}