##// END OF EJS Templates
mergestate: don't pop stateextras when there are no conflicts on filemerge...
mergestate: don't pop stateextras when there are no conflicts on filemerge Even if `filemerge.filemerge()` didn't result in conflicts, we should not remove stateextras for a file since we now use that for more things than just merge time information. We use stateextras to store information which is required to be used by commit. I tracked this down while finding why a patch of mine which adds more commit related information does not work as expected and looses the extras in mergestate. Differential Revision: https://phab.mercurial-scm.org/D10148

File last commit:

r46434:c102b704 default
r47539:1099ca17 default
Show More
hgweb.fcgi
22 lines | 669 B | text/plain | TextLexer
Gregory Szorc
global: use python3 in shebangs...
r46434 #!/usr/bin/env python3
Matt Mackall
hgweb: synchronize fcgi and wsgi scripts
r11002 #
# An example FastCGI script for use with flup, edit as necessary
# Path to repo or hgweb config to serve (see 'hg help hgweb')
Harald Klimach
hgweb: compatibility of hgweb.cgi template with Python 3...
r45964 config = b"/path/to/repo/or/config"
Matt Mackall
hgweb: synchronize fcgi and wsgi scripts
r11002
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'):
Gregory Szorc
black: blacken scripts...
r44058 # import sys; sys.path.insert(0, "/path/to/python/lib")
Matt Mackall
hgweb: synchronize fcgi and wsgi scripts
r11002
# Uncomment to send python tracebacks to the browser if an error occurs:
Gregory Szorc
black: blacken scripts...
r44058 # import cgitb; cgitb.enable()
Matt Mackall
hgweb: synchronize fcgi and wsgi scripts
r11002
Gregory Szorc
black: blacken scripts...
r44058 from mercurial import demandimport
demandimport.enable()
Matt Mackall
hgweb: synchronize fcgi and wsgi scripts
r11002 from mercurial.hgweb import hgweb
from flup.server.fcgi import WSGIServer
Gregory Szorc
black: blacken scripts...
r44058
Matt Mackall
hgweb: synchronize fcgi and wsgi scripts
r11002 application = hgweb(config)
WSGIServer(application).run()