##// END OF EJS Templates
merge: do the trivial resolution after updating sparse checkout...
merge: do the trivial resolution after updating sparse checkout In merge, we do trivial resolution for files which were deleted on one side and changed on other. When sparse extension in involved that file might not be present in wdir and trivial resolution can lead to file not found error. This patch make sure we updates the sparse checkout before doing the trivial resolution. This fixes the test failure demonstrated in previous patch. Differential Revision: https://phab.mercurial-scm.org/D3984

File last commit:

r26421:4b0fc75f default
r38780:d49e490a @94 stable
Show More
hgweb.cgi
19 lines | 680 B | text/plain | TextLexer
mpm@selenic.com
Call python via env in hgweb.cgi
r202 #!/usr/bin/env python
mpm@selenic.com
Add example CGI script...
r159 #
Matt Mackall
hgweb: simplify hgweb.cgi, add help pointer...
r11000 # An example hgweb CGI script, edit as necessary
Matt Mackall
urls: bulk-change primary website URLs
r26421 # See also https://mercurial-scm.org/wiki/PublishingRepositories
mpm@selenic.com
Add example CGI script...
r159
Matt Mackall
hgweb: simplify hgweb.cgi, add help pointer...
r11000 # Path to repo or hgweb config to serve (see 'hg help hgweb')
config = "/path/to/repo/or/config"
Benoit Boissinot
cgi: sys.path.insert should be before importing mercurial...
r5244
Matt Mackall
hgweb: add hint about finding library path with debuginstall
r15475 # Uncomment and adjust if Mercurial is not installed system-wide
# (consult "installed modules" path from 'hg debuginstall'):
Matt Mackall
hgweb: simplify hgweb.cgi, add help pointer...
r11000 #import sys; sys.path.insert(0, "/path/to/python/lib")
Thomas Arendsen Hein
Enable demandimport only in scripts, not in importable modules (issue605)...
r5197
Maxim Dounin
hgweb: disable cgitb by default
r6080 # Uncomment to send python tracebacks to the browser if an error occurs:
Matt Mackall
hgweb: simplify hgweb.cgi, add help pointer...
r11000 #import cgitb; cgitb.enable()
mpm@selenic.com
hgweb: pull cgitb into CGI script example, where it can easily be disabled...
r391
Matt Mackall
hgweb: simplify hgweb.cgi, add help pointer...
r11000 from mercurial import demandimport; demandimport.enable()
from mercurial.hgweb import hgweb, wsgicgi
application = hgweb(config)
Thomas Arendsen Hein
Backed out changeset b913d3aacddc (see issue971/msg5317)
r6141 wsgicgi.launch(application)