| durin42 |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/configitems.py (9 lines) | |||
| M | mercurial/filemerge.py (2 lines) | |||
| M | mercurial/helptext/config.txt (19 lines) | |||
| M | tests/test-histedit-merge-tools.t (30 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| b'{ifeq(tags, "tip", "", ' | b'{ifeq(tags, "tip", "", ' | ||||
| b'ifeq(tags, "", "", "{tags} "))}' | b'ifeq(tags, "", "", "{tags} "))}' | ||||
| b'{if(bookmarks, "{bookmarks} ")}' | b'{if(bookmarks, "{bookmarks} ")}' | ||||
| b'{ifeq(branch, "default", "", "{branch} ")}' | b'{ifeq(branch, "default", "", "{branch} ")}' | ||||
| b'- {author|user}: {desc|firstline}' | b'- {author|user}: {desc|firstline}' | ||||
| ), | ), | ||||
| alias=[(b'ui', b'mergemarkertemplate')], | alias=[(b'ui', b'mergemarkertemplate')], | ||||
| ) | ) | ||||
| coreconfigitem( | |||||
| b'command-templates', | |||||
| b'pre-merge-tool-output', | |||||
| default=None, | |||||
| alias=[(b'ui', b'pre-merge-tool-output-template')], | |||||
| ) | |||||
| _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( | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| b'ui', b'paginate', default=True, | b'ui', b'paginate', default=True, | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| b'ui', b'patch', default=None, | b'ui', b'patch', default=None, | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| b'ui', b'pre-merge-tool-output-template', default=None, | |||||
| ) | |||||
| coreconfigitem( | |||||
| b'ui', b'portablefilenames', default=b'warn', | b'ui', b'portablefilenames', default=b'warn', | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| b'ui', b'promptecho', default=False, | b'ui', b'promptecho', default=False, | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| b'ui', b'quiet', default=False, | b'ui', b'quiet', default=False, | ||||
| ) | ) | ||||
| # directory and tell the user how to get it is my best idea, but it's | # directory and tell the user how to get it is my best idea, but it's | ||||
| # clunky.) | # clunky.) | ||||
| raise error.InMemoryMergeConflictsError( | raise error.InMemoryMergeConflictsError( | ||||
| b'in-memory merge does not support external merge tools' | b'in-memory merge does not support external merge tools' | ||||
| ) | ) | ||||
| def _describemerge(ui, repo, mynode, fcl, fcb, fco, env, toolpath, args): | def _describemerge(ui, repo, mynode, fcl, fcb, fco, env, toolpath, args): | ||||
| tmpl = ui.config(b'ui', b'pre-merge-tool-output-template') | tmpl = ui.config(b'command-templates', b'pre-merge-tool-output') | ||||
| if not tmpl: | if not tmpl: | ||||
| return | return | ||||
| mappingdict = templateutil.mappingdict | mappingdict = templateutil.mappingdict | ||||
| props = { | props = { | ||||
| b'ctx': fcl.changectx(), | b'ctx': fcl.changectx(), | ||||
| b'node': hex(mynode), | b'node': hex(mynode), | ||||
| b'path': fcl.path(), | b'path': fcl.path(), | ||||
| ``false`` | ``false`` | ||||
| Alias for ``ignore``. | Alias for ``ignore``. | ||||
| .. container:: windows | .. container:: windows | ||||
| On Windows, this configuration option is ignored and the command aborted. | On Windows, this configuration option is ignored and the command aborted. | ||||
| ``pre-merge-tool-output-template`` | ``pre-merge-tool-output-template`` | ||||
| A template that is printed before executing an external merge tool. This can | (DEPRECATED) Use ``command-template.pre-merge-tool-output`` instead. | ||||
| be used to print out additional context that might be useful to have during | |||||
| the conflict resolution, such as the description of the various commits | |||||
| involved or bookmarks/tags. | |||||
| Additional information is available in the ``local`, ``base``, and ``other`` | |||||
| dicts. For example: ``{local.label}``, ``{base.name}``, or | |||||
| ``{other.islink}``. | |||||
| ``quiet`` | ``quiet`` | ||||
| Reduce the amount of output printed. | Reduce the amount of output printed. | ||||
| (default: False) | (default: False) | ||||
| ``relative-paths`` | ``relative-paths`` | ||||
| Prefer relative paths in the UI. | Prefer relative paths in the UI. | ||||
| managed files. At template expansion, non-ASCII characters use the encoding | managed files. At template expansion, non-ASCII characters use the encoding | ||||
| specified by the ``--encoding`` global option, ``HGENCODING`` or other | specified by the ``--encoding`` global option, ``HGENCODING`` or other | ||||
| environment variables that govern your locale. If the encoding of the merge | environment variables that govern your locale. If the encoding of the merge | ||||
| markers is different from the encoding of the merged files, | markers is different from the encoding of the merged files, | ||||
| serious problems may occur. | serious problems may occur. | ||||
| Can be overridden per-merge-tool, see the ``[merge-tools]`` section. | Can be overridden per-merge-tool, see the ``[merge-tools]`` section. | ||||
| ``pre-merge-tool-output`` | |||||
| A template that is printed before executing an external merge tool. This can | |||||
| be used to print out additional context that might be useful to have during | |||||
| the conflict resolution, such as the description of the various commits | |||||
| involved or bookmarks/tags. | |||||
| Additional information is available in the ``local`, ``base``, and ``other`` | |||||
| dicts. For example: ``{local.label}``, ``{base.name}``, or | |||||
| ``{other.islink}``. | |||||
| ``web`` | ``web`` | ||||
| ------- | ------- | ||||
| Web interface configuration. The settings in this section apply to | Web interface configuration. The settings in this section apply to | ||||
| both the builtin webserver (started by :hg:`serve`) and the script you | both the builtin webserver (started by :hg:`serve`) and the script you | ||||
| run through a webserver (``hgweb.cgi`` and the derivatives for FastCGI | run through a webserver (``hgweb.cgi`` and the derivatives for FastCGI | ||||
| and WSGI). | and WSGI). | ||||
| Test histedit extension: Merge tools | Test histedit extension: Merge tools | ||||
| ==================================== | ==================================== | ||||
| Initialization | Initialization | ||||
| --------------- | --------------- | ||||
| $ . "$TESTDIR/histedit-helpers.sh" | $ . "$TESTDIR/histedit-helpers.sh" | ||||
| $ cat >> $HGRCPATH <<EOF | $ cat >> $HGRCPATH <<EOF | ||||
| > [alias] | > [alias] | ||||
| > logt = log --template '{rev}:{node|short} {desc|firstline}\n' | > logt = log --template '{rev}:{node|short} {desc|firstline}\n' | ||||
| > [extensions] | > [extensions] | ||||
| > histedit= | > histedit= | ||||
| > mockmakedate = $TESTDIR/mockmakedate.py | > mockmakedate = $TESTDIR/mockmakedate.py | ||||
| > [ui] | |||||
| > pre-merge-tool-output-template='pre-merge message for {node}\n' | |||||
| > EOF | > EOF | ||||
| Merge conflict | Merge conflict | ||||
| -------------- | -------------- | ||||
| $ hg init r | $ hg init r | ||||
| $ cd r | $ cd r | ||||
| $ cat >> .hg/hgrc <<EOF | |||||
| > [command-templates] | |||||
| > pre-merge-tool-output='pre-merge message for {node}\n' | |||||
| > EOF | |||||
| $ echo foo > file | $ echo foo > file | ||||
| $ hg add file | $ hg add file | ||||
| $ hg ci -m "First" -d "1 0" | $ hg ci -m "First" -d "1 0" | ||||
| $ echo bar > file | $ echo bar > file | ||||
| $ hg ci -m "Second" -d "2 0" | $ hg ci -m "Second" -d "2 0" | ||||
| $ hg logt --graph | $ hg logt --graph | ||||
| @ 1:2aa920f62fb9 Second | @ 1:2aa920f62fb9 Second | ||||
| Invert the order of the commits, and pretend the merge succeeded. | Invert the order of the commits, and pretend the merge succeeded. | ||||
| $ hg histedit --config ui.merge=true --commands - 2>&1 <<EOF | fixbundle | $ hg histedit --config ui.merge=true --commands - 2>&1 <<EOF | fixbundle | ||||
| > pick 2aa920f62fb9 Second | > pick 2aa920f62fb9 Second | ||||
| > pick 7181f42b8fca First | > pick 7181f42b8fca First | ||||
| > EOF | > EOF | ||||
| merging file | merging file | ||||
| pre-merge message for b90fa2e91a6d11013945a5f684be45b84a8ca6ec | pre-merge message for b90fa2e91a6d11013945a5f684be45b84a8ca6ec | ||||
| 7181f42b8fca: skipping changeset (no changes) | 7181f42b8fca: skipping changeset (no changes) | ||||
| $ hg histedit --abort | |||||
| abort: no histedit in progress | |||||
| [255] | |||||
| $ cd .. | |||||
| Test legacy config name | |||||
| $ hg init r2 | |||||
| $ cd r2 | |||||
| $ echo foo > file | |||||
| $ hg add file | |||||
| $ hg ci -m "First" | |||||
| $ echo bar > file | |||||
| $ hg ci -m "Second" | |||||
| $ echo conflict > file | |||||
| $ hg co -m 0 --config ui.merge=false \ | |||||
| > --config ui.pre-merge-tool-output-template='legacy config: {node}\n' | |||||
| merging file | |||||
| legacy config: 889c9c4d58bd4ce74815efd04a01e0f2bf6765a7 | |||||
| merging file failed! | |||||
| 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |||||
| use 'hg resolve' to retry unresolved file merges | |||||
| [1] | |||||