##// END OF EJS Templates
hgweb: support constructing URLs from an alternate base URL...
hgweb: support constructing URLs from an alternate base URL The web.baseurl config option allows server operators to define a custom URL for hosted content. The way it works today is that hgwebdir parses this config option into URL components then updates the appropriate WSGI environment variables so the request "lies" about its details. For example, SERVER_NAME is updated to reflect the alternate base URL's hostname. The WSGI environment should not be modified because WSGI applications may want to know the original request details (for debugging, etc). This commit teaches our request parser about the existence of an alternate base URL. If defined, the advertised URL and other self-reflected paths will take the alternate base URL into account. The hgweb WSGI application didn't use web.baseurl. But hgwebdir did. We update hgwebdir to alter the environment parsing accordingly. The old code around environment manipulation has been removed. With this change, parserequestfromenv() has grown to a bit unwieldy. Now that practically everyone is using it, it is obvious that there is some unused features that can be trimmed. So look for this in follow-up commits. Differential Revision: https://phab.mercurial-scm.org/D2822

File last commit:

r35965:a36d3c8a default
r36916:219b2335 default
Show More
test-annotate.py
104 lines | 3.3 KiB | text/x-python | PythonLexer
Siddharth Agarwal
annotate: move annotatepair unit tests to a separate file...
r34431 from __future__ import absolute_import
from __future__ import print_function
import unittest
from mercurial import (
mdiff,
)
from mercurial.context import (
Siddharth Agarwal
annotate: introduce attr for storing per-line annotate data...
r34433 annotateline,
Siddharth Agarwal
annotate: move annotatepair unit tests to a separate file...
r34431 _annotatepair,
)
class AnnotateTests(unittest.TestCase):
"""Unit tests for annotate code."""
def testannotatepair(self):
self.maxDiff = None # camelcase-required
oldfctx = b'old'
p1fctx, p2fctx, childfctx = b'p1', b'p2', b'c'
olddata = b'a\nb\n'
p1data = b'a\nb\nc\n'
p2data = b'a\nc\nd\n'
childdata = b'a\nb2\nc\nc2\nd\n'
diffopts = mdiff.diffopts()
def decorate(text, rev):
Siddharth Agarwal
annotate: introduce attr for storing per-line annotate data...
r34433 return ([annotateline(fctx=rev, lineno=i)
Pulkit Goyal
py3: use range instead of xrange...
r35964 for i in range(1, text.count(b'\n') + 1)],
Siddharth Agarwal
annotate: introduce attr for storing per-line annotate data...
r34433 text)
Siddharth Agarwal
annotate: move annotatepair unit tests to a separate file...
r34431
# Basic usage
oldann = decorate(olddata, oldfctx)
p1ann = decorate(p1data, p1fctx)
p1ann = _annotatepair([oldann], p1fctx, p1ann, False, diffopts)
Siddharth Agarwal
annotate: introduce attr for storing per-line annotate data...
r34433 self.assertEqual(p1ann[0], [
Pulkit Goyal
py3: add b'' prefixes to string literals in test files...
r35965 annotateline(b'old', 1),
annotateline(b'old', 2),
annotateline(b'p1', 3),
Siddharth Agarwal
annotate: introduce attr for storing per-line annotate data...
r34433 ])
Siddharth Agarwal
annotate: move annotatepair unit tests to a separate file...
r34431
p2ann = decorate(p2data, p2fctx)
p2ann = _annotatepair([oldann], p2fctx, p2ann, False, diffopts)
Siddharth Agarwal
annotate: introduce attr for storing per-line annotate data...
r34433 self.assertEqual(p2ann[0], [
Pulkit Goyal
py3: add b'' prefixes to string literals in test files...
r35965 annotateline(b'old', 1),
annotateline(b'p2', 2),
annotateline(b'p2', 3),
Siddharth Agarwal
annotate: introduce attr for storing per-line annotate data...
r34433 ])
Siddharth Agarwal
annotate: move annotatepair unit tests to a separate file...
r34431
# Test with multiple parents (note the difference caused by ordering)
childann = decorate(childdata, childfctx)
childann = _annotatepair([p1ann, p2ann], childfctx, childann, False,
diffopts)
Siddharth Agarwal
annotate: introduce attr for storing per-line annotate data...
r34433 self.assertEqual(childann[0], [
Pulkit Goyal
py3: add b'' prefixes to string literals in test files...
r35965 annotateline(b'old', 1),
annotateline(b'c', 2),
annotateline(b'p2', 2),
annotateline(b'c', 4),
annotateline(b'p2', 3),
Siddharth Agarwal
annotate: introduce attr for storing per-line annotate data...
r34433 ])
Siddharth Agarwal
annotate: move annotatepair unit tests to a separate file...
r34431
childann = decorate(childdata, childfctx)
childann = _annotatepair([p2ann, p1ann], childfctx, childann, False,
diffopts)
Siddharth Agarwal
annotate: introduce attr for storing per-line annotate data...
r34433 self.assertEqual(childann[0], [
Pulkit Goyal
py3: add b'' prefixes to string literals in test files...
r35965 annotateline(b'old', 1),
annotateline(b'c', 2),
annotateline(b'p1', 3),
annotateline(b'c', 4),
annotateline(b'p2', 3),
Siddharth Agarwal
annotate: introduce attr for storing per-line annotate data...
r34433 ])
Siddharth Agarwal
annotate: move annotatepair unit tests to a separate file...
r34431
# Test with skipchild (note the difference caused by ordering)
childann = decorate(childdata, childfctx)
childann = _annotatepair([p1ann, p2ann], childfctx, childann, True,
diffopts)
Siddharth Agarwal
annotate: introduce attr for storing per-line annotate data...
r34433 self.assertEqual(childann[0], [
Pulkit Goyal
py3: add b'' prefixes to string literals in test files...
r35965 annotateline(b'old', 1),
annotateline(b'old', 2, True),
Siddharth Agarwal
annotate: track whether a particular annotation was the result of a skip...
r34434 # note that this line was carried over from earlier so it is *not*
# marked skipped
Pulkit Goyal
py3: add b'' prefixes to string literals in test files...
r35965 annotateline(b'p2', 2),
annotateline(b'p2', 2, True),
annotateline(b'p2', 3),
Siddharth Agarwal
annotate: introduce attr for storing per-line annotate data...
r34433 ])
Siddharth Agarwal
annotate: move annotatepair unit tests to a separate file...
r34431
childann = decorate(childdata, childfctx)
childann = _annotatepair([p2ann, p1ann], childfctx, childann, True,
diffopts)
Siddharth Agarwal
annotate: introduce attr for storing per-line annotate data...
r34433 self.assertEqual(childann[0], [
Pulkit Goyal
py3: add b'' prefixes to string literals in test files...
r35965 annotateline(b'old', 1),
annotateline(b'old', 2, True),
annotateline(b'p1', 3),
annotateline(b'p1', 3, True),
annotateline(b'p2', 3),
Siddharth Agarwal
annotate: introduce attr for storing per-line annotate data...
r34433 ])
Siddharth Agarwal
annotate: move annotatepair unit tests to a separate file...
r34431
if __name__ == '__main__':
import silenttestrunner
silenttestrunner.main(__name__)