Mercurial: hgweb.cgi@20096384754f (annotated)

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).

202 e875a0cf7f3a Call python via env in hgweb.cgi mpm@selenic.com parents: 159 diff changeset	1	#!/usr/bin/env python
159 f9d8620ef469 Add example CGI script mpm@selenic.com parents: diff changeset	2	#
11000 338167735124 hgweb: simplify hgweb.cgi, add help pointer Matt Mackall <mpm@selenic.com> parents: 6142 diff changeset	3	# An example hgweb CGI script, edit as necessary
11503 227b9f13db13 hgweb: add link to wiki Martin Geisler <mg@lazybytes.net> parents: 11000 diff changeset	4	# See also http://mercurial.selenic.com/wiki/PublishingRepositories
159 f9d8620ef469 Add example CGI script mpm@selenic.com parents: diff changeset	5
11000 338167735124 hgweb: simplify hgweb.cgi, add help pointer Matt Mackall <mpm@selenic.com> parents: 6142 diff changeset	6	# Path to repo or hgweb config to serve (see 'hg help hgweb')
338167735124 hgweb: simplify hgweb.cgi, add help pointer Matt Mackall <mpm@selenic.com> parents: 6142 diff changeset	7	config = "/path/to/repo/or/config"
5244 79279b5583c6 cgi: sys.path.insert should be before importing mercurial Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5197 diff changeset	8
15475 85cba926cb59 hgweb: add hint about finding library path with debuginstall Matt Mackall <mpm@selenic.com> parents: 11503 diff changeset	9	# Uncomment and adjust if Mercurial is not installed system-wide
85cba926cb59 hgweb: add hint about finding library path with debuginstall Matt Mackall <mpm@selenic.com> parents: 11503 diff changeset	10	# (consult "installed modules" path from 'hg debuginstall'):
11000 338167735124 hgweb: simplify hgweb.cgi, add help pointer Matt Mackall <mpm@selenic.com> parents: 6142 diff changeset	11	#import sys; sys.path.insert(0, "/path/to/python/lib")
5197 55860a45bbf2 Enable demandimport only in scripts, not in importable modules (issue605) Thomas Arendsen Hein <thomas@intevation.de> parents: 3868 diff changeset	12
6080 4baad19c4801 hgweb: disable cgitb by default Maxim Dounin <mdounin@mdounin.ru> parents: 5995 diff changeset	13	# Uncomment to send python tracebacks to the browser if an error occurs:
11000 338167735124 hgweb: simplify hgweb.cgi, add help pointer Matt Mackall <mpm@selenic.com> parents: 6142 diff changeset	14	#import cgitb; cgitb.enable()
391 5f65a108a559 hgweb: pull cgitb into CGI script example, where it can easily be disabled mpm@selenic.com parents: 202 diff changeset	15
11000 338167735124 hgweb: simplify hgweb.cgi, add help pointer Matt Mackall <mpm@selenic.com> parents: 6142 diff changeset	16	from mercurial import demandimport; demandimport.enable()
338167735124 hgweb: simplify hgweb.cgi, add help pointer Matt Mackall <mpm@selenic.com> parents: 6142 diff changeset	17	from mercurial.hgweb import hgweb, wsgicgi
338167735124 hgweb: simplify hgweb.cgi, add help pointer Matt Mackall <mpm@selenic.com> parents: 6142 diff changeset	18	application = hgweb(config)
6141 90e5c82a3859 Backed out changeset b913d3aacddc (see issue971/msg5317) Thomas Arendsen Hein <thomas@intevation.de> parents: 5995 diff changeset	19	wsgicgi.launch(application)

author	Angel Ezquerra <angel.ezquerra@gmail.com>
	Tue, 13 Aug 2013 01:38:30 +0200
changeset 19638	20096384754f
parent 15475	85cba926cb59
child 26421	4b0fc75f9403
permissions	-rwxr-xr-x