##// END OF EJS Templates
tests: test divergence created during interrupted rebase...
tests: test divergence created during interrupted rebase If a rebase runs into conflicts and the user somehow rewrites an unrebased commit in the rebase set while the rebase is interrupted, continuing it might result in divergence. It turns out that we decide to skip the commit. That seems to make sense, but it wasn't obvious to me that that's what we should do. Either way, this patch adds a test case for the current behavior. Differential Revision: https://phab.mercurial-scm.org/D10256

File last commit:

r47575:d4ba4d51 default
r47586:6648307d default
Show More
__init__.py
124 lines | 3.2 KiB | text/x-python | PythonLexer
Eric Hopper
Fixing up comment headers for split up code.
r2391 # hgweb/__init__.py - web interface to a mercurial repository
Eric Hopper
Moving hgweb.py into it's own module in preparation for breaking it up.
r2311 #
# Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
Raphaël Gomès
contributor: change mentions of mpm to olivia...
r47575 # Copyright 2005 Olivia Mackall <olivia@selenic.com>
Eric Hopper
Moving hgweb.py into it's own module in preparation for breaking it up.
r2311 #
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Eric Hopper
Moving hgweb.py into it's own module in preparation for breaking it up.
r2311
Yuya Nishihara
hgweb: use absolute_import
r27046 from __future__ import absolute_import
Matt Mackall
hgweb: make hgweb.hgweb a unified interface to hgweb/hgwebdir
r10996 import os
Yuya Nishihara
hgweb: use absolute_import
r27046
Yuya Nishihara
hgweb: move httpservice object from commands module...
r27138 from ..i18n import _
from .. import (
Yuya Nishihara
hgweb: extract factory function of httpservice object...
r27139 error,
Augie Fackler
hgweb: rewrite most obviously-native-strings to be native strings...
r34705 pycompat,
Yuya Nishihara
procutil: bulk-replace function calls to point to new module
r37138 )
Augie Fackler
formatting: blacken the codebase...
r43346 from ..utils import procutil
Yuya Nishihara
hgweb: move httpservice object from commands module...
r27138
Yuya Nishihara
hgweb: use absolute_import
r27046 from . import (
hgweb_mod,
hgwebdir_mod,
Yuya Nishihara
hgweb: move httpservice object from commands module...
r27138 server,
Yuya Nishihara
hgweb: use absolute_import
r27046 )
Matt Mackall
Replace demandload with new demandimport
r3877
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Mackall
hgweb: make hgweb.hgweb a unified interface to hgweb/hgwebdir
r10996 def hgweb(config, name=None, baseui=None):
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """create an hgweb wsgi object
Matt Mackall
hgweb: make hgweb.hgweb a unified interface to hgweb/hgwebdir
r10996
config can be one of:
- repo object (single repo view)
- path to repo (single repo view)
- path to config file (multi-repo view)
- dict of virtual:real pairs (multi-repo view)
- list of virtual:real tuples (multi-repo view)
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """
Matt Mackall
hgweb: make hgweb.hgweb a unified interface to hgweb/hgwebdir
r10996
Ludovic Chabant
py3: properly reject non-encoded strings given to hgweb
r42395 if isinstance(config, pycompat.unicode):
raise error.ProgrammingError(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'Mercurial only supports encoded strings: %r' % config
Augie Fackler
formatting: blacken the codebase...
r43346 )
if (
(isinstance(config, bytes) and not os.path.isdir(config))
or isinstance(config, dict)
or isinstance(config, list)
):
Matt Mackall
hgweb: make hgweb.hgweb a unified interface to hgweb/hgwebdir
r10996 # create a multi-dir interface
return hgwebdir_mod.hgwebdir(config, baseui=baseui)
return hgweb_mod.hgweb(config, name=name, baseui=baseui)
Matt Mackall
Replace demandload with new demandimport
r3877
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Mackall
hgweb: make top-level prototypes mirror their callees
r10992 def hgwebdir(config, baseui=None):
return hgwebdir_mod.hgwebdir(config, baseui=baseui)
Matt Mackall
Replace demandload with new demandimport
r3877
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
hgweb: move httpservice object from commands module...
r27138 class httpservice(object):
def __init__(self, ui, app, opts):
self.ui = ui
self.app = app
self.opts = opts
def init(self):
Yuya Nishihara
procutil: bulk-replace function calls to point to new module
r37138 procutil.setsignalhandler()
Yuya Nishihara
hgweb: move httpservice object from commands module...
r27138 self.httpd = server.create_server(self.ui, self.app)
Augie Fackler
formatting: blacken the codebase...
r43346 if (
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self.opts[b'port']
Augie Fackler
formatting: blacken the codebase...
r43346 and not self.ui.verbose
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 and not self.opts[b'print_url']
Augie Fackler
formatting: blacken the codebase...
r43346 ):
Yuya Nishihara
hgweb: move httpservice object from commands module...
r27138 return
if self.httpd.prefix:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 prefix = self.httpd.prefix.strip(b'/') + b'/'
Yuya Nishihara
hgweb: move httpservice object from commands module...
r27138 else:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 prefix = b''
Yuya Nishihara
hgweb: move httpservice object from commands module...
r27138
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 port = ':%d' % self.httpd.port
if port == ':80':
port = ''
Yuya Nishihara
hgweb: move httpservice object from commands module...
r27138
bindaddr = self.httpd.addr
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 if bindaddr == '0.0.0.0':
bindaddr = '*'
elif ':' in bindaddr: # IPv6
bindaddr = '[%s]' % bindaddr
Yuya Nishihara
hgweb: move httpservice object from commands module...
r27138
fqaddr = self.httpd.fqaddr
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 if ':' in fqaddr:
fqaddr = '[%s]' % fqaddr
Nicola Spanti
serve: add option print-url...
r38196
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 url = b'http://%s%s/%s' % (
Augie Fackler
formatting: blacken the codebase...
r43346 pycompat.sysbytes(fqaddr),
pycompat.sysbytes(port),
prefix,
)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if self.opts[b'print_url']:
self.ui.write(b'%s\n' % url)
Yuya Nishihara
hgweb: move httpservice object from commands module...
r27138 else:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if self.opts[b'port']:
Nicola Spanti
serve: add option print-url...
r38196 write = self.ui.status
else:
write = self.ui.write
Augie Fackler
formatting: blacken the codebase...
r43346 write(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b'listening at %s (bound to %s:%d)\n')
Augie Fackler
formatting: blacken the codebase...
r43346 % (url, pycompat.sysbytes(bindaddr), self.httpd.port)
)
Yuya Nishihara
hgweb: move httpservice object from commands module...
r27138 self.ui.flush() # avoid buffering of status message
def run(self):
self.httpd.serve_forever()
Yuya Nishihara
hgweb: extract factory function of httpservice object...
r27139
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
hgweb: extract app factory...
r30508 def createapp(baseui, repo, webconf):
Yuya Nishihara
hgweb: eliminate duck-typing to select hgweb or hgwebdir by command option...
r27181 if webconf:
Yuya Nishihara
hgweb: extract app factory...
r30508 return hgwebdir_mod.hgwebdir(webconf, baseui=baseui)
Yuya Nishihara
hgweb: eliminate duck-typing to select hgweb or hgwebdir by command option...
r27181 else:
Yuya Nishihara
hgweb: extract factory function of httpservice object...
r27139 if not repo:
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.RepoError(
Martin von Zweigbergk
cleanup: join string literals that are already on one line...
r43387 _(b"there is no Mercurial repository here (.hg not found)")
Augie Fackler
formatting: blacken the codebase...
r43346 )
Yuya Nishihara
hgweb: extract app factory...
r30508 return hgweb_mod.hgweb(repo, baseui=baseui)