##// 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.wsgi
18 lines | 677 B | text/plain | TextLexer
Matt Mackall
hgweb: synchronize fcgi and wsgi scripts
r11002 # An example WSGI for use with mod_wsgi, edit as necessary
Matt Mackall
urls: bulk-change primary website URLs
r26421 # See https://mercurial-scm.org/wiki/modwsgi for more information
Matt Mackall
hgweb: synchronize fcgi and wsgi scripts
r11002
# Path to repo or hgweb config to serve (see 'hg help hgweb')
config = "/path/to/repo/or/config"
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: synchronize fcgi and wsgi scripts
r11002 #import sys; sys.path.insert(0, "/path/to/python/lib")
# Uncomment to send python tracebacks to the browser if an error occurs:
#import cgitb; cgitb.enable()
# enable demandloading to reduce startup time
from mercurial import demandimport; demandimport.enable()
from mercurial.hgweb import hgweb
application = hgweb(config)