##// END OF EJS Templates
mq: update subrepos when applying / unapplying patches that change .hgsubstate...
mq: update subrepos when applying / unapplying patches that change .hgsubstate Up until now applying or unapplying a patch that modified .hgsubstate would not work as expected because it would not update the subrepos according to the .hgsubstate change. This made it very easy to lose subrepo changes when using mq. This revision also changes the test-mq-subrepo test so that on the qpop / qpush tests. We no longer use the debugsub command to check the state of the subrepos after the qpop and qpush operations. Instead we directly run the id command on the subrepos that we want to check. The reason is that using the debugsub command is misleading because it does not really check the state of the subrepos on the working directory (it just returns what the change that is specified on a given revision). Because of this the tests did not detect the problem that this revision fixes (i.e. that applying a patch did not update the subrepos to the corresponding revisions). # HG changeset patch # User Angel Ezquerra <angel.ezquerra@gmail.com> # Date 1376350710 -7200 # Tue Aug 13 01:38:30 2013 +0200 # Node ID 60897e264858cdcd46f89e27a702086f08adca02 # Parent 2defb5453f223c3027eb2f7788fbddd52bbb3352 mq: update subrepos when applying / unapplying patches that change .hgsubstate Up until now applying or unapplying a patch that modified .hgsubstate would not work as expected because it would not update the subrepos according to the .hgsubstate change. This made it very easy to lose subrepo changes when using mq. This revision also changes the test-mq-subrepo test so that on the qpop / qpush tests. We no longer use the debugsub command to check the state of the subrepos after the qpop and qpush operations. Instead we directly run the id command on the subrepos that we want to check. The reason is that using the debugsub command is misleading because it does not really check the state of the subrepos on the working directory (it just returns what the change that is specified on a given revision). Because of this the tests did not detect the problem that this revision fixes (i.e. that applying a patch did not update the subrepos to the corresponding revisions).

File last commit:

r17424:e7cfe358 default
r19638:20096384 default
Show More
hgweb.txt
50 lines | 1.9 KiB | text/plain | TextLexer
Matt Mackall
help: add some help for hgweb.config files
r10999 Mercurial's internal web server, hgweb, can serve either a single
Mads Kiilerich
help: improve hgweb help...
r17104 repository, or a tree of repositories. In the second case, repository
paths and global options can be defined using a dedicated
configuration file common to :hg:`serve`, ``hgweb.wsgi``,
``hgweb.cgi`` and ``hgweb.fcgi``.
Matt Mackall
help: add some help for hgweb.config files
r10999
Mads Kiilerich
help: improve hgweb help...
r17104 This file uses the same syntax as other Mercurial configuration files
but recognizes only the following sections:
Matt Mackall
help: add some help for hgweb.config files
r10999
- web
- paths
- collections
Mads Kiilerich
fix trivial spelling errors
r17424 The ``web`` options are thoroughly described in :hg:`help config`.
Mads Kiilerich
help: improve hgweb help...
r17104
The ``paths`` section maps URL paths to paths of repositories in the
filesystem. hgweb will not expose the filesystem directly - only
Mercurial repositories can be published and only according to the
configuration.
Matt Mackall
help: add some help for hgweb.config files
r10999
Mads Kiilerich
help: improve hgweb help...
r17104 The left hand side is the path in the URL. Note that hgweb reserves
subpaths like ``rev`` or ``file``, try using different names for
nested repositories to avoid confusing effects.
The right hand side is the path in the filesystem. If the specified
path ends with ``*`` or ``**`` the filesystem will be searched
recursively for repositories below that point.
With ``*`` it will not recurse into the repositories it finds (except for
``.hg/patches``).
With ``**`` it will also search inside repository working directories
and possibly find subrepositories.
In this example::
Matt Mackall
help: add some help for hgweb.config files
r10999
[paths]
Mads Kiilerich
help: improve hgweb help...
r17104 /projects/a = /srv/tmprepos/a
/projects/b = c:/repos/b
/ = /srv/repos/*
/user/bob = /home/bob/repos/**
Matt Mackall
help: add some help for hgweb.config files
r10999
- The first two entries make two repositories in different directories
appear under the same directory in the web interface
Mads Kiilerich
help: improve hgweb help...
r17104 - The third entry will publish every Mercurial repository found in
``/srv/repos/``, for instance the repository ``/srv/repos/quux/``
will appear as ``http://server/quux/``
- The fourth entry will publish both ``http://server/user/bob/quux/``
and ``http://server/user/bob/quux/testsubrepo/``
Matt Mackall
help: add some help for hgweb.config files
r10999
Javi Merino
help/hgweb: fix spelling error
r17333 The ``collections`` section is deprecated and has been superseded by
Mads Kiilerich
help: improve hgweb help...
r17104 ``paths``.