| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/rebase.py (6 lines) | |||
| M | mercurial/cmdutil.py (18 lines) | |||
| M | mercurial/configitems.py (9 lines) | |||
| M | tests/test-rebase-templates.t (18 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| 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 | ||||
| def _ctxdesc(ctx): | def _ctxdesc(ctx): | ||||
| """short description for a context""" | """short description for a context""" | ||||
| labels_spec = b'join(filter(namespaces % "{ifeq(namespace, "branches", "", join(names, " "))}"), " ")' | labels_spec = b'join(filter(namespaces % "{ifeq(namespace, "branches", "", join(names, " "))}"), " ")' | ||||
| spec = b'{rev}:{node|short} "{desc|firstline}"{if(%s, " ({%s})")}' % ( | spec = b'{rev}:{node|short} "{desc|firstline}"{if(%s, " ({%s})")}' % ( | ||||
| labels_spec, | labels_spec, | ||||
| labels_spec, | labels_spec, | ||||
| ) | ) | ||||
| return cmdutil.rendertemplate(ctx, spec) | return cmdutil.format_changeset_summary( | ||||
| ctx.repo().ui, ctx, command=b'rebase', default_spec=spec | |||||
| ) | |||||
| 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 = {} | ||||
| repo.ui, tmpl, defaults=templatekw.keywords, resources=tres | repo.ui, tmpl, defaults=templatekw.keywords, resources=tres | ||||
| ) | ) | ||||
| mapping = {b'ctx': ctx} | mapping = {b'ctx': ctx} | ||||
| if props: | if props: | ||||
| mapping.update(props) | mapping.update(props) | ||||
| return t.renderdefault(mapping) | return t.renderdefault(mapping) | ||||
| def format_changeset_summary(ui, ctx, command=None, default_spec=None): | |||||
| """Format a changeset summary (one line).""" | |||||
| spec = None | |||||
| if command: | |||||
| spec = ui.config( | |||||
| b'command-templates', b'oneline-summary.%s' % command, None | |||||
| ) | |||||
| if not spec: | |||||
| spec = ui.config(b'command-templates', b'oneline-summary') | |||||
| if not spec: | |||||
| spec = default_spec | |||||
| if not spec: | |||||
| # TODO: Pick a default we can agree on. This isn't used yet. | |||||
| raise error.ProgrammingError(b"no default one-line summary defined yet") | |||||
| text = rendertemplate(ctx, spec) | |||||
| return text.split(b'\n')[0] | |||||
| def _buildfntemplate(pat, total=None, seqno=None, revwidth=None, pathname=None): | def _buildfntemplate(pat, total=None, seqno=None, revwidth=None, pathname=None): | ||||
| r"""Convert old-style filename format string to template string | r"""Convert old-style filename format string to template string | ||||
| >>> _buildfntemplate(b'foo-%b-%n.patch', seqno=0) | >>> _buildfntemplate(b'foo-%b-%n.patch', seqno=0) | ||||
| 'foo-{reporoot|basename}-{seqno}.patch' | 'foo-{reporoot|basename}-{seqno}.patch' | ||||
| >>> _buildfntemplate(b'%R{tags % "{tag}"}%H') | >>> _buildfntemplate(b'%R{tags % "{tag}"}%H') | ||||
| '{rev}{tags % "{tag}"}{node}' | '{rev}{tags % "{tag}"}{node}' | ||||
| alias=[(b'ui', b'mergemarkertemplate')], | alias=[(b'ui', b'mergemarkertemplate')], | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| b'command-templates', | b'command-templates', | ||||
| b'pre-merge-tool-output', | b'pre-merge-tool-output', | ||||
| default=None, | default=None, | ||||
| alias=[(b'ui', b'pre-merge-tool-output-template')], | alias=[(b'ui', b'pre-merge-tool-output-template')], | ||||
| ) | ) | ||||
| coreconfigitem( | |||||
| b'command-templates', b'oneline-summary', default=None, | |||||
| ) | |||||
| coreconfigitem( | |||||
| b'command-templates', | |||||
| b'oneline-summary.*', | |||||
| default=dynamicdefault, | |||||
| generic=True, | |||||
| ) | |||||
| _registerdiffopts(section=b'commands', configprefix=b'commit.interactive.') | _registerdiffopts(section=b'commands', configprefix=b'commit.interactive.') | ||||
| coreconfigitem( | coreconfigitem( | ||||
| b'commands', b'commit.post-status', default=False, | b'commands', b'commit.post-status', default=False, | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| b'commands', b'grep.all-files', default=False, experimental=True, | b'commands', b'grep.all-files', default=False, experimental=True, | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| | | | | | | ||||
| @ | 5:df21b32134ba Added d | @ | 5:df21b32134ba Added d | ||||
| |/ | |/ | ||||
| o 4:849767420fd5 Added c | o 4:849767420fd5 Added c | ||||
| | | | | ||||
| o 0:18d04c59bb5d Added a | o 0:18d04c59bb5d Added a | ||||
| Respects command-templates.oneline-summary | |||||
| $ hg rebase -r 7 -d 8 -n --config command-templates.oneline-summary='rev: {rev}' | |||||
| starting dry-run rebase; repository will not be changed | |||||
| rebasing rev: 7 | |||||
| note: not rebasing rev: 7, its destination already has all its changes | |||||
| dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase | |||||
| command-templates.oneline-summary.rebase overrides | |||||
| $ hg rebase -r 7 -d 8 -n \ | |||||
| > --config command-templates.oneline-summary='global: {rev}' \ | |||||
| > --config command-templates.oneline-summary.rebase='override: {rev}' | |||||
| starting dry-run rebase; repository will not be changed | |||||
| rebasing override: 7 | |||||
| note: not rebasing override: 7, its destination already has all its changes | |||||
| dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase | |||||