( )⚙ D9245 config: add a new [command-templates] section for templates defined by hg

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9245

config: add a new [command-templates] section for templates defined by hg
ClosedPublic

Authored by martinvonz on Oct 23 2020, 2:28 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGed84a4d48910: config: add a new [command-templates] section for templates defined by hg
Summary

The existing [templates] section lets the user define their own keys
and then refer to them on the command line with -T. There are many
cases where hg wants to use a user-defined template with a given name,
such as ui.logtemplate and ui.mergemarkertemplate. This patch
starts moving such configs in a common section by moving
ui.logtemplate to command-templates.log (with an alias from the
old name, of course).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Oct 23 2020, 2:28 PM
martinvonz updated this revision to Diff 23300.Oct 23 2020, 4:29 PM
martinvonz edited the summary of this revision. (Show Details)Oct 23 2020, 4:39 PM
martinvonz added a commit: rHGed84a4d48910: config: add a new [command-templates] section for templates defined by hg.Oct 28 2020, 9:49 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGed84a4d48910: config: add a new [command-templates] section for templates defined by hg (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 23319

mercurial/commands.py

See :hg:`help dates` for a list of formats valid for -d/--date. See :hg:`help dates` for a list of formats valid for -d/--date.
See :hg:`help revisions` for more about specifying and ordering See :hg:`help revisions` for more about specifying and ordering
revisions. revisions.
See :hg:`help templates` for more about pre-packaged styles and See :hg:`help templates` for more about pre-packaged styles and
specifying custom templates. The default template used by the log specifying custom templates. The default template used by the log
command can be customized via the ``ui.logtemplate`` configuration command can be customized via the ``command-templates.log`` configuration
setting. setting.
Returns 0 on success. Returns 0 on success.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
linerange = opts.get(b'line_range') linerange = opts.get(b'line_range')

mercurial/configitems.py

b'color', b'.*', default=None, generic=True, b'color', b'.*', default=None, generic=True,
) )
coreconfigitem( coreconfigitem(
b'color', b'mode', default=b'auto', b'color', b'mode', default=b'auto',
) )
coreconfigitem( coreconfigitem(
b'color', b'pagermode', default=dynamicdefault, b'color', b'pagermode', default=dynamicdefault,
) )
coreconfigitem(
b'command-templates', b'log', default=None, alias=[(b'ui', b'logtemplate')],
)
_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'large-file-limit', default=10000000, b'ui', b'large-file-limit', default=10000000,
) )
coreconfigitem( coreconfigitem(
b'ui', b'logblockedtimes', default=False, b'ui', b'logblockedtimes', default=False,
) )
coreconfigitem( coreconfigitem(
b'ui', b'logtemplate', default=None,
)
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'ui',
b'mergemarkertemplate', b'mergemarkertemplate',

mercurial/helptext/config.txt

This config overrides the interface specified by ui.interface. This config overrides the interface specified by ui.interface.
``large-file-limit`` ``large-file-limit``
Largest file size that gives no memory use warning. Largest file size that gives no memory use warning.
Possible values are integers or 0 to disable the check. Possible values are integers or 0 to disable the check.
(default: 10000000) (default: 10000000)
``logtemplate`` ``logtemplate``
Template string for commands that print changesets. (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``
hgrc is empty, e.g. if the system admin set ``username =`` in the hgrc is empty, e.g. if the system admin set ``username =`` in the
system hgrc, it has to be specified manually or in a different system hgrc, it has to be specified manually or in a different
hgrc file) hgrc file)
``verbose`` ``verbose``
Increase the amount of output printed. (default: False) Increase the amount of output printed. (default: False)
``command-templates``
---------------------
Templates used for customizing the output of commands.
``log``
Template string for commands that print changesets.
``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).

mercurial/logcmdutil.py

def _lookuptemplate(ui, tmpl, style): def _lookuptemplate(ui, tmpl, style):
"""Find the template matching the given template spec or style """Find the template matching the given template spec or style
See formatter.lookuptemplate() for details. See formatter.lookuptemplate() for details.
""" """
# ui settings # ui settings
if not tmpl and not style: # template are stronger than style if not tmpl and not style: # template are stronger than style
tmpl = ui.config(b'ui', b'logtemplate') tmpl = ui.config(b'command-templates', b'log')
if tmpl: if tmpl:
return formatter.literal_templatespec(templater.unquotestring(tmpl)) return formatter.literal_templatespec(templater.unquotestring(tmpl))
else: else:
style = util.expandpath(ui.config(b'ui', b'style')) style = util.expandpath(ui.config(b'ui', b'style'))
if not tmpl and style: if not tmpl and style:
mapfile = style mapfile = style
fp = None fp = None
def changesetdisplayer(ui, repo, opts, differ=None, buffered=False): def changesetdisplayer(ui, repo, opts, differ=None, buffered=False):
"""show one changeset using template or regular display. """show one changeset using template or regular display.
Display format will be the first non-empty hit of: Display format will be the first non-empty hit of:
1. option 'template' 1. option 'template'
2. option 'style' 2. option 'style'
3. [ui] setting 'logtemplate' 3. [command-templates] setting 'log'
4. [ui] setting 'style' 4. [ui] setting 'style'
If all of these values are either the unset or the empty string, If all of these values are either the unset or the empty string,
regular display via changesetprinter() is done. regular display via changesetprinter() is done.
""" """
postargs = (differ, opts, buffered) postargs = (differ, opts, buffered)
spec = _lookuptemplate(ui, opts.get(b'template'), opts.get(b'style')) spec = _lookuptemplate(ui, opts.get(b'template'), opts.get(b'style'))
# machine-readable formats have slightly different keyword set than # machine-readable formats have slightly different keyword set than

mercurial/ui.py

b'verbose', b'verbose',
): ):
if k in cfg[b'ui']: if k in cfg[b'ui']:
del cfg[b'ui'][k] del cfg[b'ui'][k]
for k, v in cfg.items(b'defaults'): for k, v in cfg.items(b'defaults'):
del cfg[b'defaults'][k] del cfg[b'defaults'][k]
for k, v in cfg.items(b'commands'): for k, v in cfg.items(b'commands'):
del cfg[b'commands'][k] del cfg[b'commands'][k]
for k, v in cfg.items(b'command-templates'):
del cfg[b'command-templates'][k]
# Don't remove aliases from the configuration if in the exceptionlist # Don't remove aliases from the configuration if in the exceptionlist
if self.plain(b'alias'): if self.plain(b'alias'):
for k, v in cfg.items(b'alias'): for k, v in cfg.items(b'alias'):
del cfg[b'alias'][k] del cfg[b'alias'][k]
if self.plain(b'revsetalias'): if self.plain(b'revsetalias'):
for k, v in cfg.items(b'revsetalias'): for k, v in cfg.items(b'revsetalias'):
del cfg[b'revsetalias'][k] del cfg[b'revsetalias'][k]
if self.plain(b'templatealias'): if self.plain(b'templatealias'):

tests/test-amend.t

> [extensions] > [extensions]
> amend= > amend=
> mockmakedate = $TESTDIR/mockmakedate.py > mockmakedate = $TESTDIR/mockmakedate.py
> EOF > EOF
$ hg init $TESTTMP/repo5 $ hg init $TESTTMP/repo5
$ cd $TESTTMP/repo5 $ cd $TESTTMP/repo5
$ cat <<'EOF' >> .hg/hgrc $ cat <<'EOF' >> .hg/hgrc
> [ui] > [command-templates]
> logtemplate = 'user: {user} > log = 'user: {user}
> date: {date|date} > date: {date|date}
> summary: {desc|firstline}\n' > summary: {desc|firstline}\n'
> EOF > EOF
$ echo a>a $ echo a>a
$ hg ci -Am 'commit 1' $ hg ci -Am 'commit 1'
adding a adding a
When updatetimestamp is False When updatetimestamp is False

tests/test-bookmarks-pushpull.t

#testcases b2-pushkey b2-binary #testcases b2-pushkey b2-binary
#if b2-pushkey #if b2-pushkey
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [devel] > [devel]
> legacy.exchange=bookmarks > legacy.exchange=bookmarks
> EOF > EOF
#endif #endif
#require serve #require serve
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [ui] > [command-templates]
> logtemplate={rev}:{node|short} {desc|firstline} > log={rev}:{node|short} {desc|firstline}
> [phases] > [phases]
> publish=False > publish=False
> [experimental] > [experimental]
> evolution.createmarkers=True > evolution.createmarkers=True
> evolution.exchange=True > evolution.exchange=True
> EOF > EOF
$ cat > $TESTTMP/hook.sh <<'EOF' $ cat > $TESTTMP/hook.sh <<'EOF'

tests/test-bundle2-exchange.t

$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> evolution.createmarkers=True > evolution.createmarkers=True
> evolution.exchange=True > evolution.exchange=True
> bundle2-output-capture=True > bundle2-output-capture=True
> [ui] > [ui]
> ssh="$PYTHON" "$TESTDIR/dummyssh" > ssh="$PYTHON" "$TESTDIR/dummyssh"
> logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} > [command-templates]
> log={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
> [web] > [web]
> push_ssl = false > push_ssl = false
> allow_push = * > allow_push = *
> [phases] > [phases]
> publish=False > publish=False
> [hooks] > [hooks]
> pretxnclose.tip = hg log -r tip -T "pre-close-tip:{node|short} {phase} {bookmarks}\n" > pretxnclose.tip = hg log -r tip -T "pre-close-tip:{node|short} {phase} {bookmarks}\n"
> txnclose.tip = hg log -r tip -T "postclose-tip:{node|short} {phase} {bookmarks}\n" > txnclose.tip = hg log -r tip -T "postclose-tip:{node|short} {phase} {bookmarks}\n"

tests/test-bundle2-format.t

> EOF > EOF
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> bundle2=$TESTTMP/bundle2.py > bundle2=$TESTTMP/bundle2.py
> [experimental] > [experimental]
> evolution.createmarkers=True > evolution.createmarkers=True
> [ui] > [ui]
> ssh="$PYTHON" "$TESTDIR/dummyssh" > ssh="$PYTHON" "$TESTDIR/dummyssh"
> logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} > [command-templates]
> log={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
> [web] > [web]
> push_ssl = false > push_ssl = false
> allow_push = * > allow_push = *
> [phases] > [phases]
> publish=False > publish=False
> EOF > EOF
The extension requires a repo (currently unused) The extension requires a repo (currently unused)

tests/test-bundle2-multiple-changegroups.t

> return pullop > return pullop
> >
> _orig_pull = exchange.pull > _orig_pull = exchange.pull
> exchange.pull = _pull > exchange.pull = _pull
> exchange.getbundle2partsmapping[b'changegroup'] = _getbundlechangegrouppart > exchange.getbundle2partsmapping[b'changegroup'] = _getbundlechangegrouppart
> EOF > EOF
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [ui] > [command-templates]
> logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} > log={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
> EOF > EOF
Start with a simple repository with a single commit Start with a simple repository with a single commit
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ cat > .hg/hgrc << EOF $ cat > .hg/hgrc << EOF
> [extensions] > [extensions]

tests/test-bundle2-remote-changegroup.t

Start a simple HTTP server to serve bundles Start a simple HTTP server to serve bundles
$ "$PYTHON" "$TESTDIR/dumbhttp.py" -p $HGPORT --pid dumb.pid $ "$PYTHON" "$TESTDIR/dumbhttp.py" -p $HGPORT --pid dumb.pid
$ cat dumb.pid >> $DAEMON_PIDS $ cat dumb.pid >> $DAEMON_PIDS
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [ui] > [ui]
> ssh="$PYTHON" "$TESTDIR/dummyssh" > ssh="$PYTHON" "$TESTDIR/dummyssh"
> logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} > [command-templates]
> log={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
> EOF > EOF
$ hg init repo $ hg init repo
$ hg -R repo unbundle $TESTDIR/bundles/rebase.hg $ hg -R repo unbundle $TESTDIR/bundles/rebase.hg
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes

tests/test-commandserver.t

> return super(failrepo, self).commitctx(ctx, error, origctx) > return super(failrepo, self).commitctx(ctx, error, origctx)
> repo.__class__ = failrepo > repo.__class__ = failrepo
> EOF > EOF
$ hg init repo3 $ hg init repo3
$ cd repo3 $ cd repo3
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [ui] > [command-templates]
> logtemplate = {rev} {desc|firstline} ({files})\n > log = {rev} {desc|firstline} ({files})\n
> >
> [extensions] > [extensions]
> failafterfinalize = $TESTTMP/failafterfinalize.py > failafterfinalize = $TESTTMP/failafterfinalize.py
> EOF > EOF
- test failure with "empty changelog" - test failure with "empty changelog"
$ echo foo > foo $ echo foo > foo

tests/test-copies-chain-merge.t

Setup Setup
===== =====
use git diff to see rename use git diff to see rename
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [diff] > [diff]
> git=yes > git=yes
> [ui] > [command-templates]
> logtemplate={rev} {desc}\n > log={rev} {desc}\n
> EOF > EOF
#if compatibility #if compatibility
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> copies.read-from = compatibility > copies.read-from = compatibility
> EOF > EOF
#endif #endif

tests/test-dirstate-nonnormalset.t

$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [ui] > [command-templates]
> logtemplate="{rev}:{node|short} ({phase}) [{tags} {bookmarks}] {desc|firstline}\n" > log="{rev}:{node|short} ({phase}) [{tags} {bookmarks}] {desc|firstline}\n"
> [extensions] > [extensions]
> dirstateparanoidcheck = $TESTDIR/../contrib/dirstatenonnormalcheck.py > dirstateparanoidcheck = $TESTDIR/../contrib/dirstatenonnormalcheck.py
> [experimental] > [experimental]
> nonnormalparanoidcheck = True > nonnormalparanoidcheck = True
> [devel] > [devel]
> all-warnings=True > all-warnings=True
> EOF > EOF
$ mkcommit() { $ mkcommit() {

tests/test-glog-beautifygraph.t

$ cd .. $ cd ..
Multiple roots (issue5440): Multiple roots (issue5440):
$ hg init multiroots $ hg init multiroots
$ cd multiroots $ cd multiroots
$ cat <<EOF > .hg/hgrc $ cat <<EOF > .hg/hgrc
> [ui] > [command-templates]
> logtemplate = '{rev} {desc}\n\n' > log = '{rev} {desc}\n\n'
> EOF > EOF
$ touch foo $ touch foo
$ hg ci -Aqm foo $ hg ci -Aqm foo
$ hg co -q null $ hg co -q null
$ touch bar $ touch bar
$ hg ci -Aqm bar $ hg ci -Aqm bar

tests/test-glog-topological.t

This test file aims at test topological iteration and the various configuration it can has. This test file aims at test topological iteration and the various configuration it can has.
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [ui] > [command-templates]
> logtemplate={rev}\n > log={rev}\n
> EOF > EOF
On this simple example, all topological branch are displayed in turn until we On this simple example, all topological branch are displayed in turn until we
can finally display 0. this implies skipping from 8 to 3 and coming back to 7 can finally display 0. this implies skipping from 8 to 3 and coming back to 7
later. later.
$ hg init test01 $ hg init test01
$ cd test01 $ cd test01

tests/test-glog.t

$ cd .. $ cd ..
Multiple roots (issue5440): Multiple roots (issue5440):
$ hg init multiroots $ hg init multiroots
$ cd multiroots $ cd multiroots
$ cat <<EOF > .hg/hgrc $ cat <<EOF > .hg/hgrc
> [ui] > [command-templates]
> logtemplate = '{rev} {desc}\n\n' > log = '{rev} {desc}\n\n'
> EOF > EOF
$ touch foo $ touch foo
$ hg ci -Aqm foo $ hg ci -Aqm foo
$ hg co -q null $ hg co -q null
$ touch bar $ touch bar
$ hg ci -Aqm bar $ hg ci -Aqm bar

tests/test-grep.t

"hg grep --diff" should traverse the log in the same way as "hg log". "hg grep --diff" should traverse the log in the same way as "hg log".
"hg grep" (--all-files) is slightly different in that it includes "hg grep" (--all-files) is slightly different in that it includes
unmodified changes. unmodified changes.
$ hg init follow $ hg init follow
$ cd follow $ cd follow
$ cat <<'EOF' >> .hg/hgrc $ cat <<'EOF' >> .hg/hgrc
> [ui] > [command-templates]
> logtemplate = '{rev}: {join(files % "{status} {path}", ", ")}\n' > log = '{rev}: {join(files % "{status} {path}", ", ")}\n'
> EOF > EOF
$ for f in add0 add0-mod1 add0-rm1 add0-mod2 add0-rm2 add0-mod3 add0-mod4 add0-rm4; do $ for f in add0 add0-mod1 add0-rm1 add0-mod2 add0-rm2 add0-mod3 add0-mod4 add0-rm4; do
> echo data0 >> $f > echo data0 >> $f
> done > done
$ hg ci -qAm0 $ hg ci -qAm0
$ hg cp add0 add0-cp1 $ hg cp add0 add0-cp1

tests/test-histedit-obsolete.t

Test phases support Test phases support
=========================================== ===========================================
Check that histedit respect immutability Check that histedit respect immutability
------------------------------------------- -------------------------------------------
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [ui] > [command-templates]
> logtemplate= {rev}:{node|short} ({phase}) {desc|firstline}\n > log = {rev}:{node|short} ({phase}) {desc|firstline}\n
> EOF > EOF
$ hg ph -pv '.^' $ hg ph -pv '.^'
phase changed for 2 changesets phase changed for 2 changesets
$ hg log -G $ hg log -G
@ 13:b449568bf7fc (draft) f @ 13:b449568bf7fc (draft) f
| |
o 12:40db8afa467b (public) c o 12:40db8afa467b (public) c

tests/test-log.t

changeset: 0:9161b9aeaf16 changeset: 0:9161b9aeaf16
user: test user: test
date: Thu Jan 01 00:00:01 1970 +0000 date: Thu Jan 01 00:00:01 1970 +0000
files: a f files: a f
description: description:
a a
Respects ui.logtemplate and command-templates.log configs (the latter takes
precedence)
$ hg log -r 0 --config ui.logtemplate="foo {rev}\n"
foo 0
$ hg log -r 0 --config command-templates.log="bar {rev}\n"
bar 0
$ hg log -r 0 --config ui.logtemplate="foo {rev}\n" \
> --config command-templates.log="bar {rev}\n"
bar 0
-f and multiple filelog heads -f and multiple filelog heads
$ hg up -q 2 $ hg up -q 2
$ hg log -f g --template '{rev}\n' $ hg log -f g --template '{rev}\n'
2 2
1 1
$ cd .. $ cd ..
log --follow --patch FILE in repository where linkrev isn't trustworthy log --follow --patch FILE in repository where linkrev isn't trustworthy
(issue5376, issue6124) (issue5376, issue6124)
$ hg init follow-dup $ hg init follow-dup
$ cd follow-dup $ cd follow-dup
$ cat <<EOF >> .hg/hgrc $ cat <<EOF >> .hg/hgrc
> [ui] > [command-templates]
> logtemplate = '=== {rev}: {desc}\n' > log = '=== {rev}: {desc}\n'
> [diff] > [diff]
> nodates = True > nodates = True
> EOF > EOF
$ echo 0 >> a $ echo 0 >> a
$ hg ci -qAm 'a0' $ hg ci -qAm 'a0'
$ echo 1 >> a $ echo 1 >> a
$ hg ci -m 'a1' $ hg ci -m 'a1'
$ hg up -q 0 $ hg up -q 0

tests/test-obsmarker-template.t

$ hg fatelogkw $ hg fatelogkw
o d004c8f274b9 o d004c8f274b9
| |
| @ 471f378eab4c | @ 471f378eab4c
|/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2
o ea207398892e o ea207398892e
$ hg log -G --config ui.logtemplate= $ hg log -G --config command-templates.log=
o changeset: 3:d004c8f274b9 o changeset: 3:d004c8f274b9
| tag: tip | tag: tip
| parent: 0:ea207398892e | parent: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: A2 | summary: A2
| |
| @ changeset: 1:471f378eab4c | @ changeset: 1:471f378eab4c

tests/test-obsolete-bundle-strip.t

================================================== ==================================================
Test obsmarkers interaction with bundle and strip Test obsmarkers interaction with bundle and strip
================================================== ==================================================
Setup a repository with various case Setup a repository with various case
==================================== ====================================
Config setup Config setup
------------ ------------
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [ui] > [command-templates]
> # simpler log output > # simpler log output
> logtemplate = "{node|short}: {desc}\n" > log = "{node|short}: {desc}\n"
> >
> [experimental] > [experimental]
> # enable evolution > # enable evolution
> evolution=true > evolution=true
> >
> # include obsmarkers in bundle > # include obsmarkers in bundle
> evolution.bundle-obsmarker = yes > evolution.bundle-obsmarker = yes
> >

tests/test-obsolete-checkheads.t

Check that obsolete properly strip heads Check that obsolete properly strip heads
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [phases] > [phases]
> # public changeset are not obsolete > # public changeset are not obsolete
> publish=false > publish=false
> [ui] > [command-templates]
> logtemplate='{node|short} ({phase}) {desc|firstline}\n' > log='{node|short} ({phase}) {desc|firstline}\n'
> [experimental] > [experimental]
> evolution.createmarkers=True > evolution.createmarkers=True
> EOF > EOF
$ mkcommit() { $ mkcommit() {
> echo "$1" > "$1" > echo "$1" > "$1"
> hg add "$1" > hg add "$1"
> hg ci -m "add $1" > hg ci -m "add $1"
> } > }

tests/test-obsolete-distributed.t

$ . $TESTDIR/testlib/obsmarker-common.sh $ . $TESTDIR/testlib/obsmarker-common.sh
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> rebase = > rebase =
> [experimental] > [experimental]
> evolution = all > evolution = all
> [phases] > [phases]
> publish = False > publish = False
> [ui] > [command-templates]
> logtemplate= {rev}:{node|short} {desc}{if(obsfate, " [{join(obsfate, "; ")}]")}\n > log = {rev}:{node|short} {desc}{if(obsfate, " [{join(obsfate, "; ")}]")}\n
> EOF > EOF
Check distributed chain building Check distributed chain building
================================ ================================
Test case where a changeset is marked as a successor of another local Test case where a changeset is marked as a successor of another local
changeset while the successor has already been obsoleted remotely. changeset while the successor has already been obsoleted remotely.

tests/test-rebase-obsolete.t

========================== ==========================
Test rebase with obsolete Test rebase with obsolete
========================== ==========================
Enable obsolete Enable obsolete
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [ui] > [command-templates]
> logtemplate= {rev}:{node|short} {desc|firstline}{if(obsolete,' ({obsfate})')} > log= {rev}:{node|short} {desc|firstline}{if(obsolete,' ({obsfate})')}
> [experimental] > [experimental]
> evolution.createmarkers=True > evolution.createmarkers=True
> evolution.allowunstable=True > evolution.allowunstable=True
> [phases] > [phases]
> publish=False > publish=False
> [extensions] > [extensions]
> rebase= > rebase=
> drawdag=$TESTDIR/drawdag.py > drawdag=$TESTDIR/drawdag.py

tests/test-revset-legacy-lookup.t

$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [ui] > [command-templates]
> logtemplate="{rev}:{node|short} {desc} [{tags}]\n" > log="{rev}:{node|short} {desc} [{tags}]\n"
> EOF > EOF
$ hg init legacy-lookup $ hg init legacy-lookup
$ cd legacy-lookup $ cd legacy-lookup
$ echo a > a $ echo a > a
$ hg add a $ hg add a
$ hg commit -m 'first' $ hg commit -m 'first'
$ echo aa > a $ echo aa > a

tests/test-template-map.t

$ echo third > third $ echo third > third
$ hg add third $ hg add third
$ hg mv second fourth $ hg mv second fourth
$ hg commit -m third -d "2020-01-01 10:01" $ hg commit -m third -d "2020-01-01 10:01"
Make sure user/global hgrc does not affect tests Make sure user/global hgrc does not affect tests
$ echo '[command-templates]' > .hg/hgrc
$ echo 'log =' >> .hg/hgrc
$ echo '[ui]' > .hg/hgrc $ echo '[ui]' > .hg/hgrc
$ echo 'logtemplate =' >> .hg/hgrc
$ echo 'style =' >> .hg/hgrc $ echo 'style =' >> .hg/hgrc
Add some simple styles to settings Add some simple styles to settings
$ cat <<'EOF' >> .hg/hgrc $ cat <<'EOF' >> .hg/hgrc
> [templates] > [templates]
> simple = "{rev}\n" > simple = "{rev}\n"
> simple2 = {rev}\n > simple2 = {rev}\n

tests/test-treediscovery.t

Tests discovery against servers without getbundle support: Tests discovery against servers without getbundle support:
$ CAP="getbundle bundle2" $ CAP="getbundle bundle2"
$ . "$TESTDIR/notcapable" $ . "$TESTDIR/notcapable"
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [ui] > [command-templates]
> logtemplate="{rev} {node|short}: {desc} {branches}\n" > log="{rev} {node|short}: {desc} {branches}\n"
> EOF > EOF
Setup HTTP server control: Setup HTTP server control:
$ remote=http://localhost:$HGPORT/ $ remote=http://localhost:$HGPORT/
$ export remote $ export remote
$ tstart() { $ tstart() {
> echo '[web]' > $1/.hg/hgrc > echo '[web]' > $1/.hg/hgrc

tests/testlib/exchange-obsmarker-util.sh

#!/bin/sh #!/bin/sh
# setup config and various utility to test obsolescence marker exchanges tests # setup config and various utility to test obsolescence marker exchanges tests
cat >> $TESTTMP/prune.sh << EOF cat >> $TESTTMP/prune.sh << EOF
rev=\`hg log --hidden --template '{node}\n' --rev "\$3"\` rev=\`hg log --hidden --template '{node}\n' --rev "\$3"\`
hg debugobsolete --record-parents \$1 "\$2" \$rev \ hg debugobsolete --record-parents \$1 "\$2" \$rev \
&& hg up --quiet 'max((::.) - obsolete())' && hg up --quiet 'max((::.) - obsolete())'
EOF EOF
cat >> $HGRCPATH <<EOF cat >> $HGRCPATH <<EOF
[web] [web]
# We test http pull and push, drop authentication requirement # We test http pull and push, drop authentication requirement
push_ssl = false push_ssl = false
allow_push = * allow_push = *
[ui] [command-templates]
# simpler log output # simpler log output
logtemplate ="{node|short} ({phase}): {desc}\n" log ="{node|short} ({phase}): {desc}\n"
[phases] [phases]
# non publishing server # non publishing server
publish=False publish=False
[experimental] [experimental]
# reduce output changes # reduce output changes
bundle2-output-capture=True bundle2-output-capture=True

tests/testlib/push-checkheads-util.sh

# setup config and various utility to test new heads checks on push # setup config and various utility to test new heads checks on push
cat >> $HGRCPATH <<EOF cat >> $HGRCPATH <<EOF
[ui] [command-templates]
# simpler log output # simpler log output
logtemplate ="{node|short} ({phase}): {desc}\n" log ="{node|short} ({phase}): {desc}\n"
[phases] [phases]
# non publishing server # non publishing server
publish=False publish=False
[extensions] [extensions]
# we need to strip some changeset for some test cases # we need to strip some changeset for some test cases
strip= strip=