comparison mercurial/help/config.txt @ 17202:1ae119269ddc

hgweb: side-by-side comparison functionality Adds new web command to the core, ``comparison``, which enables colorful side-by-side change display, which for some might be much easier to work with than the standard line diff output. The idea how to implement comes from the SonicHq extension. The web interface gets a new link to call the comparison functionality. It lets users configure the amount of context lines around change blocks, or to show full files - check help (also in this changeset) for details and defaults. The setting in hgrc can be overridden by adding ``context=<value>`` to the request query string. The comparison creates addressable lines, so as to enable sharing links to specific lines, just as standard diff does. Incorporates updates to all web related styles. Known limitations: * the column diff is done against the first parent, just as the standard diff * this change allows examining diffs for single files only (as I am not sure if examining the whole changeset in this way would be helpful) * syntax highlighting of the output changes is not performed (enabling the highlight extension has no influence on it)
author wujek srujek
date Sun, 08 Jul 2012 17:17:02 +0200
parents 0c35bb01a119
children 98166640b356
comparison
equal deleted inserted replaced
17201:afd75476939e 17202:1ae119269ddc
1375 Example: "UTF-8" 1375 Example: "UTF-8"
1376 1376
1377 ``errorlog`` 1377 ``errorlog``
1378 Where to output the error log. Default is stderr. 1378 Where to output the error log. Default is stderr.
1379 1379
1380 ``comparisoncontext``
1381 Number of lines of context to show in side-by-side file comparison. If
1382 negative or the value ``full``, whole files are shown. Default is 5.
1383 This setting can be overridden by a ``context`` request parameter to the
1384 ``comparison`` command, taking the same values.
1385
1380 ``hidden`` 1386 ``hidden``
1381 Whether to hide the repository in the hgwebdir index. 1387 Whether to hide the repository in the hgwebdir index.
1382 Default is False. 1388 Default is False.
1383 1389
1384 ``ipv6`` 1390 ``ipv6``