hgwebdir: read 'web.template' untrusted The 'hgweb_mod.py' version of this read it untrusted. For consistency we align the two versions of this code.

configitems: register the 'web.templates' config

configitems: register the 'web.style' config

configitems: register the 'web.stripes' config

configitems: register the 'web.refreshinterval' config

configitems: register the 'web.prefix' config

configitems: register the 'web.port' config

configitems: register the 'web.ipv6' config

configitems: register the 'web.errorlog' config

configitems: register the 'web.encoding' config

configitems: register the 'web.description' config

configitems: register the 'web.descend' config

configitems: register the 'web.deny_read' config

configitems: register the 'web.csp' config

configitems: register the 'web.collapse' config

configitems: register the 'web.certificate' config

configitems: register the 'web.cacerts' config

configitems: register the 'web.baseurl' config

configitems: register the 'web.allow_read' config

configitems: register the 'web.allow_archive' config

configitems: register the 'web.address' config

configitems: register the 'web.accesslog' config

web: use '_unset' default value for proxy config method This special value is needed to make sure registered default value are taken in account.

tests: use int() instead of long() in test-pathencode.py

tests: add xrange alias for test-pathencode.py

python3: another 3 tests whitelisted

repair: reliably obtain bytestr of node ids

bundles: turn nbchanges int into a bytestr using pycompat.bytestr Fixes some python 3 failures.

exchange: hit opargs with pycompat.strkwargs before **-ing it Fixes Python 3 problems.

revlog: update signature of dummy addgroup() in bundlerepo and unionrepo Per c8b6ed51386b, 2f5c45fe3a3b and 00e3f909907f.

py3: use 'surrogatepass' error handler to process U+DCxx transparently It's disallowed by default on Python 3. https://docs.python.org/3/library/codecs.html#error-handlers

py3: don't pass bytes to array.array()

py3: wrap bytes in encoding.from/toutf8b() with bytestr

py3: iterate bytes as a byte string in store.lowerencode()

py3: use bytechr() in store._buildlowerencodefun()

store: give name to lowerencode function lambda function isn't easy to track in traceback.

py3: iterate bytes as a byte string in dagparser.py

py3: wrap string constants in dagparser.py with bytestr()

py3: drop use of str() in dagparser.py

dagparser: fix variable name in error message There's no variable named 'type'.

py3: convert function name to bytes in ui.configwith()

drawdag: port to python 3

drawdag: add a couple of doctests to help with python3 porting

drawdag: tagsmod.tag() takes a list of names, not a single name We were getting lucky on Python 2 since we have only one-byte names, but on Python 3 badness was happening.

bruterebase: port to python 3

exchange: use '%d' % x instead of str(x) to encode ints Recommended by Yuya instead of using pycompat.bytestr() in this case.

posix: always pass a native str to unicodedata.normalize's first arg

posix: use slicing to grab a single byte out of a bytes in HFS+ normcase code

encoding: ensure getutf8char always returns a bytestr, never an int

posix: fix HFS+ normcase doctest to produce valid bytes literals in Python 3 We were previously getting lucky on Python 2.

tests: add and remove some (glob) markers I have no idea if these changes are reasonable, but they look like they'd help on the Windows buildbot.

Added signature for changeset 920977f72c7b

Added tag 4.3.2 for changeset 920977f72c7b

merge with i18n

i18n-pt_BR: synchronized with 850d2ec2cf6a

hgwebdir: read 'web.template' untrusted The 'hgweb_mod.py' version of this read it untrusted. For consistency we align the two versions of this code.

uncommit: move fb-extension to core which uncommits a changeset uncommit extension in fb-hgext adds a uncommit command which by default uncommits a changeset and move all the changes to the working directory. If file names are passed, uncommit moves the changes from those files to the working directory and left the changeset with remaining committed files. The uncommit extension in fb-hgext does not creates an empty commit like the one in evolve extension unless user has specified ui.alllowemptycommit to True. The test file added is a combination of tests from test-uncommit.t, test-uncommit-merge.t and test-uncommit-bookmark.t from fb-hgext. .. feature:: A new uncommit extension which provides `hg uncommit` using which one can uncommit part or all of the changeset. This command undoes the effect of a local commit, returning the affected files to their uncommitted state. Differential Revision: https://phab.mercurial-scm.org/D529

show: use consistent (and possibly shorter) node lengths `hg show` makes heavy use of shortest() to limit the length of the node hash. For the "stack" and "work" views, you are often looking at multiple lines of similar output for "lines" of work. It is visually appeasing for things to vertically align. A naive use of {shortest(node, N)} could result in variable length nodes and for the first character of the description to vary by a column or two. We implement a function to determine the longest shortest prefix for a set of revisions. The new function is used to determine the printed node length for all `hg show` views. .. feature:: show: use consistent node length in views Our previous shortest node length of 5 was arbitrarily chosen. shortest() already does the work of ensuring that a partial node isn't ambiguous with an integer revision, which is our primary risk of a collision for very short nodes. It should be safe to go with the shortest node possible. Existing code is also optimized to handle nodes as short as 4. So, we decrease the minimum hash length from 5 to 4. We also add a test demonstrating that prefix collisions increase the node length. .. feature:: show: decrease minimum displayed hash length from 5 to 4 Differential Revision: https://phab.mercurial-scm.org/D558

show: pass the minimum length for nodes as a template keyword This will allow us to make the displayed length configurable and/or dynamic. Differential Revision: https://phab.mercurial-scm.org/D556

cmdutil: allow extra properties to be added to each context The changeset displayer allows setting extra keywords to be available to the templating layer. This patch adds an argument to displaygraph() to pass a dict of extra properties to be available to every changeset. Differential Revision: https://phab.mercurial-scm.org/D555