| 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 (27 lines) | |||
| M | mercurial/filemerge.py (4 lines) | |||
| M | mercurial/helptext/config.txt (49 lines) | |||
| M | tests/test-conflict.t (37 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| b'command-templates', | b'command-templates', | ||||
| b'graphnode', | b'graphnode', | ||||
| default=None, | default=None, | ||||
| alias=[(b'ui', b'graphnodetemplate')], | alias=[(b'ui', b'graphnodetemplate')], | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| b'command-templates', b'log', default=None, alias=[(b'ui', b'logtemplate')], | b'command-templates', b'log', default=None, alias=[(b'ui', b'logtemplate')], | ||||
| ) | ) | ||||
| coreconfigitem( | |||||
| b'command-templates', | |||||
| b'mergemarker', | |||||
| default=( | |||||
| b'{node|short} ' | |||||
| b'{ifeq(tags, "tip", "", ' | |||||
| b'ifeq(tags, "", "", "{tags} "))}' | |||||
| b'{if(bookmarks, "{bookmarks} ")}' | |||||
| b'{ifeq(branch, "default", "", "{branch} ")}' | |||||
| b'- {author|user}: {desc|firstline}' | |||||
| ), | |||||
| alias=[(b'ui', b'mergemarkertemplate')], | |||||
| ) | |||||
| _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( | ||||
| br'.*\.mergemarkers$', | br'.*\.mergemarkers$', | ||||
| default=b'basic', | default=b'basic', | ||||
| generic=True, | generic=True, | ||||
| priority=-1, | priority=-1, | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| b'merge-tools', | b'merge-tools', | ||||
| br'.*\.mergemarkertemplate$', | br'.*\.mergemarkertemplate$', | ||||
| default=dynamicdefault, # take from ui.mergemarkertemplate | default=dynamicdefault, # take from command-templates.mergemarker | ||||
| generic=True, | generic=True, | ||||
| priority=-1, | priority=-1, | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| b'merge-tools', br'.*\.priority$', default=0, generic=True, priority=-1, | b'merge-tools', br'.*\.priority$', default=0, generic=True, priority=-1, | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| b'merge-tools', | b'merge-tools', | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| b'ui', b'merge', default=None, | b'ui', b'merge', default=None, | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| b'ui', b'mergemarkers', default=b'basic', | b'ui', b'mergemarkers', default=b'basic', | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| b'ui', | |||||
| b'mergemarkertemplate', | |||||
| default=( | |||||
| b'{node|short} ' | |||||
| b'{ifeq(tags, "tip", "", ' | |||||
| b'ifeq(tags, "", "", "{tags} "))}' | |||||
| b'{if(bookmarks, "{bookmarks} ")}' | |||||
| b'{ifeq(branch, "default", "", "{branch} ")}' | |||||
| b'- {author|user}: {desc|firstline}' | |||||
| ), | |||||
| ) | |||||
| coreconfigitem( | |||||
| b'ui', b'message-output', default=b'stdio', | b'ui', b'message-output', default=b'stdio', | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| b'ui', b'nontty', default=False, | b'ui', b'nontty', default=False, | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| b'ui', b'origbackuppath', default=None, | b'ui', b'origbackuppath', default=None, | ||||
| ) | ) | ||||
| Returns a list of formatted labels. | Returns a list of formatted labels. | ||||
| """ | """ | ||||
| cd = fcd.changectx() | cd = fcd.changectx() | ||||
| co = fco.changectx() | co = fco.changectx() | ||||
| ca = fca.changectx() | ca = fca.changectx() | ||||
| ui = repo.ui | ui = repo.ui | ||||
| template = ui.config(b'ui', b'mergemarkertemplate') | template = ui.config(b'command-templates', b'mergemarker') | ||||
| if tool is not None: | if tool is not None: | ||||
| template = _toolstr(ui, tool, b'mergemarkertemplate', template) | template = _toolstr(ui, tool, b'mergemarkertemplate', template) | ||||
| template = templater.unquotestring(template) | template = templater.unquotestring(template) | ||||
| tres = formatter.templateresources(ui, repo) | tres = formatter.templateresources(ui, repo) | ||||
| tmpl = formatter.maketemplater( | tmpl = formatter.maketemplater( | ||||
| ui, template, defaults=templatekw.keywords, resources=tres | ui, template, defaults=templatekw.keywords, resources=tres | ||||
| ) | ) | ||||
| # settings if either ui.mergemarkers or the tool's mergemarkers | # settings if either ui.mergemarkers or the tool's mergemarkers | ||||
| # setting is 'detailed'. This way tools can have basic labels in | # setting is 'detailed'. This way tools can have basic labels in | ||||
| # space-constrained areas of the UI, but still get full information | # space-constrained areas of the UI, but still get full information | ||||
| # in conflict markers if premerge is 'keep' or 'keep-merge3'. | # in conflict markers if premerge is 'keep' or 'keep-merge3'. | ||||
| premergelabels = labels | premergelabels = labels | ||||
| labeltool = None | labeltool = None | ||||
| if markerstyle != b'basic': | if markerstyle != b'basic': | ||||
| # respect 'tool's mergemarkertemplate (which defaults to | # respect 'tool's mergemarkertemplate (which defaults to | ||||
| # ui.mergemarkertemplate) | # command-templates.mergemarker) | ||||
| labeltool = tool | labeltool = tool | ||||
| if internalmarkerstyle != b'basic' or markerstyle != b'basic': | if internalmarkerstyle != b'basic' or markerstyle != b'basic': | ||||
| premergelabels = _formatlabels( | premergelabels = _formatlabels( | ||||
| repo, fcd, fco, fca, premergelabels, tool=labeltool | repo, fcd, fco, fca, premergelabels, tool=labeltool | ||||
| ) | ) | ||||
| r = _premerge( | r = _premerge( | ||||
| repo, fcd, fco, fca, toolconf, files, labels=premergelabels | repo, fcd, fco, fca, toolconf, files, labels=premergelabels | ||||
| Controls whether the labels passed via ``$labellocal``, ``$labelother``, and | Controls whether the labels passed via ``$labellocal``, ``$labelother``, and | ||||
| ``$labelbase`` are ``detailed`` (respecting ``mergemarkertemplate``) or | ``$labelbase`` are ``detailed`` (respecting ``mergemarkertemplate``) or | ||||
| ``basic``. If ``premerge`` is ``keep`` or ``keep-merge3``, the conflict | ``basic``. If ``premerge`` is ``keep`` or ``keep-merge3``, the conflict | ||||
| markers generated during premerge will be ``detailed`` if either this option or | markers generated during premerge will be ``detailed`` if either this option or | ||||
| the corresponding option in the ``[ui]`` section is ``detailed``. | the corresponding option in the ``[ui]`` section is ``detailed``. | ||||
| (default: ``basic``) | (default: ``basic``) | ||||
| ``mergemarkertemplate`` | ``mergemarkertemplate`` | ||||
| This setting can be used to override ``mergemarkertemplate`` from the ``[ui]`` | This setting can be used to override ``mergemarker`` from the | ||||
| section on a per-tool basis; this applies to the ``$label``-prefixed variables | ``[command-templates]`` section on a per-tool basis; this applies to the | ||||
| and to the conflict markers that are generated if ``premerge`` is ``keep` or | ``$label``-prefixed variables and to the conflict markers that are generated | ||||
| ``keep-merge3``. See the corresponding variable in ``[ui]`` for more | if ``premerge`` is ``keep` or ``keep-merge3``. See the corresponding variable | ||||
| information. | in ``[ui]`` for more information. | ||||
| .. container:: windows | .. container:: windows | ||||
| ``regkey`` | ``regkey`` | ||||
| Windows registry key which describes install location of this | Windows registry key which describes install location of this | ||||
| tool. Mercurial will search for this key first under | tool. Mercurial will search for this key first under | ||||
| ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``. | ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``. | ||||
| (default: None) | (default: None) | ||||
| (DEPRECATED) Use ``command-templates.log`` instead. | (DEPRECATED) Use ``command-templates.log`` instead. | ||||
| ``merge`` | ``merge`` | ||||
| The conflict resolution program to use during a manual merge. | The conflict resolution program to use during a manual merge. | ||||
| For more information on merge tools see :hg:`help merge-tools`. | For more information on merge tools see :hg:`help merge-tools`. | ||||
| For configuring merge tools see the ``[merge-tools]`` section. | For configuring merge tools see the ``[merge-tools]`` section. | ||||
| ``mergemarkers`` | ``mergemarkers`` | ||||
| Sets the merge conflict marker label styling. The ``detailed`` | Sets the merge conflict marker label styling. The ``detailed`` style | ||||
| style uses the ``mergemarkertemplate`` setting to style the labels. | uses the ``command-templates.mergemarker`` setting to style the labels. | ||||
| The ``basic`` style just uses 'local' and 'other' as the marker label. | The ``basic`` style just uses 'local' and 'other' as the marker label. | ||||
| One of ``basic`` or ``detailed``. | One of ``basic`` or ``detailed``. | ||||
| (default: ``basic``) | (default: ``basic``) | ||||
| ``mergemarkertemplate`` | ``mergemarkertemplate`` | ||||
| The template used to print the commit description next to each conflict | (DEPRECATED) Use ``command-templates.mergemarker`` instead. | ||||
| marker during merge conflicts. See :hg:`help templates` for the template | |||||
| format. | |||||
| Defaults to showing the hash, tags, branches, bookmarks, author, and | |||||
| the first line of the commit description. | |||||
| If you use non-ASCII characters in names for tags, branches, bookmarks, | |||||
| authors, and/or commit descriptions, you must pay attention to encodings of | |||||
| managed files. At template expansion, non-ASCII characters use the encoding | |||||
| specified by the ``--encoding`` global option, ``HGENCODING`` or other | |||||
| environment variables that govern your locale. If the encoding of the merge | |||||
| markers is different from the encoding of the merged files, | |||||
| serious problems may occur. | |||||
| Can be overridden per-merge-tool, see the ``[merge-tools]`` section. | |||||
| ``message-output`` | ``message-output`` | ||||
| Where to write status and error messages. (default: ``stdio``) | Where to write status and error messages. (default: ``stdio``) | ||||
| ``channel`` | ``channel`` | ||||
| Use separate channel for structured output. (Command-server only) | Use separate channel for structured output. (Command-server only) | ||||
| ``stderr`` | ``stderr`` | ||||
| Everything to stderr. | Everything to stderr. | ||||
| ``graphnode`` | ``graphnode`` | ||||
| The template used to print changeset nodes in an ASCII revision graph. | The template used to print changeset nodes in an ASCII revision graph. | ||||
| (default: ``{graphnode}``) | (default: ``{graphnode}``) | ||||
| ``log`` | ``log`` | ||||
| Template string for commands that print changesets. | Template string for commands that print changesets. | ||||
| ``mergemarker`` | |||||
| The template used to print the commit description next to each conflict | |||||
| marker during merge conflicts. See :hg:`help templates` for the template | |||||
| format. | |||||
| Defaults to showing the hash, tags, branches, bookmarks, author, and | |||||
| the first line of the commit description. | |||||
| If you use non-ASCII characters in names for tags, branches, bookmarks, | |||||
| authors, and/or commit descriptions, you must pay attention to encodings of | |||||
| managed files. At template expansion, non-ASCII characters use the encoding | |||||
| specified by the ``--encoding`` global option, ``HGENCODING`` or other | |||||
| environment variables that govern your locale. If the encoding of the merge | |||||
| markers is different from the encoding of the merged files, | |||||
| serious problems may occur. | |||||
| Can be overridden per-merge-tool, see the ``[merge-tools]`` section. | |||||
| ``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). | ||||
| $ hg status --config commands.status.verbose=0 | $ hg status --config commands.status.verbose=0 | ||||
| M a | M a | ||||
| ? a.orig | ? a.orig | ||||
| Verify custom conflict markers | Verify custom conflict markers | ||||
| $ hg up -q --clean . | $ hg up -q --clean . | ||||
| $ cat <<EOF >> .hg/hgrc | $ cat <<EOF >> .hg/hgrc | ||||
| > [command-templates] | |||||
| > mergemarker = '{author} {rev}' | |||||
| > EOF | |||||
| $ hg merge 1 | |||||
| merging a | |||||
| warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | |||||
| 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |||||
| use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | |||||
| [1] | |||||
| $ cat a | |||||
| Small Mathematical Series. | |||||
| 1 | |||||
| 2 | |||||
| 3 | |||||
| <<<<<<< working copy: test 2 | |||||
| 6 | |||||
| 8 | |||||
| ======= | |||||
| 4 | |||||
| 5 | |||||
| >>>>>>> merge rev: test 1 | |||||
| Hop we are done. | |||||
| Verify custom conflict markers with legacy config name | |||||
| $ hg up -q --clean . | |||||
| $ cat <<EOF >> .hg/hgrc | |||||
| > [ui] | > [ui] | ||||
| > mergemarkertemplate = '{author} {rev}' | > mergemarkertemplate = '{author} {rev}' | ||||
| > EOF | > EOF | ||||
| $ hg merge 1 | $ hg merge 1 | ||||
| merging a | merging a | ||||
| warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | ||||
| 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||||
| 5 | 5 | ||||
| >>>>>>> merge rev: test 1 | >>>>>>> merge rev: test 1 | ||||
| Hop we are done. | Hop we are done. | ||||
| Verify line splitting of custom conflict marker which causes multiple lines | Verify line splitting of custom conflict marker which causes multiple lines | ||||
| $ hg up -q --clean . | $ hg up -q --clean . | ||||
| $ cat >> .hg/hgrc <<EOF | $ cat >> .hg/hgrc <<EOF | ||||
| > [ui] | > [command-templates] | ||||
| > mergemarkertemplate={author} {rev}\nfoo\nbar\nbaz | > mergemarker={author} {rev}\nfoo\nbar\nbaz | ||||
| > EOF | > EOF | ||||
| $ hg -q merge 1 | $ hg -q merge 1 | ||||
| warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | ||||
| [1] | [1] | ||||
| $ cat a | $ cat a | ||||
| Small Mathematical Series. | Small Mathematical Series. | ||||
| > fp.write(u'\u3042\u3044\u3046\u3048'.encode('utf-8')) | > fp.write(u'\u3042\u3044\u3046\u3048'.encode('utf-8')) | ||||
| > | > | ||||
| > fp.close() | > fp.close() | ||||
| > EOF | > EOF | ||||
| $ hg add logfile | $ hg add logfile | ||||
| $ hg --encoding utf-8 commit --logfile logfile | $ hg --encoding utf-8 commit --logfile logfile | ||||
| $ cat >> .hg/hgrc <<EOF | $ cat >> .hg/hgrc <<EOF | ||||
| > [ui] | > [command-templates] | ||||
| > mergemarkertemplate={desc|firstline} | > mergemarker={desc|firstline} | ||||
| > EOF | > EOF | ||||
| $ hg -q --encoding utf-8 merge 1 | $ hg -q --encoding utf-8 merge 1 | ||||
| warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | ||||
| [1] | [1] | ||||
| $ cat a | $ cat a | ||||
| Small Mathematical Series. | Small Mathematical Series. | ||||