hgweb: drop hgwebdir.cgi, now unified with hgweb.cgi

hgweb: simplify hgweb.cgi, add help pointer - move important config to the top - add help pointer - drop encoding hack comment (use web.encoding) - simplify imports - use unified hgweb interface

help: add some help for hgweb.config files

help: config.txt typo

docs: document default for web.encoding

hgweb: make hgweb.hgweb a unified interface to hgweb/hgwebdir

hgweb: always clear report_untrusted and interactive

hgweb: add baseui to hgweb entrypoint

hgweb: make baseui parameter non-positional

hgweb: make top-level prototypes mirror their callees

Merge with stable

test-convert-git: be tolerant to git output variants

color: handle non-standard stdout on win32

Merge with crew-stable

convert/git: check status when reading output stream

convert/git: check status when reading the whole output

convert/git: rename gitcmd() into gitopen() for readability

minirst: support all recommended title adornments

minirst: correctly format sections containing inline markup Before, a section like ``foo`` ------- would be formatted as "foo" ------- We now recompute the length of the underline when formatting the section.

ui: support quotes in configlist (issue2147) Several places that use ui.configlist, predominantly in authentication scenarios need to interface with systems that can contain spaces in usernames (e.g. when client certificates are usernames, or Windows usernames). This changeset introduces a parser that supports quoting of strings, and escape quotation marks that get decoded into a single quotation mark that adopts the usual behavior one would expect from quoting strings. The Python library shlex module is not used, on purpose, as that raises if it cannot match quotation marks in the given input.

Merge with stable

hgrc.5: mention lists as well

Merge with stable

hgrc.5: describe form of config values

minirst: add test for sections

contrib/win32: update build instructions after cbe400a8e217

doc: add links from hgrc.5 to hg.1

doc: make links for hg role The system has a bit of smartness: :hg:`update` -> links to hg.1.html#update :hg:`help diffs` -> links to hg.1.html#diffs

Use hg role in help strings

doc, minirst: support hg interpreted text role

doc: add generic frontend to rst2man and rst2html This will allow us to easily register new roles and directives.

localrepo.commit: use explicit variables, avoid creating new contexts

context: remove parents parameter to workingctx it was needed before the refactor of commit, workingctx always uses the dirstate now.

dirstate: more explicit name, rename normaldirty() to otherparent()

keyword: monkeypatch patch so that optional args can be passed as kwargs

patch: refactor applydiff to allow for mempatching

patch: move mercurial-specific imports after stdlib imports

test-record: add hg summary to verify we update dirstate

log -b: use opts.get() instead of assuming opts is correctly filled

Merge with stable

Respect the DESTDIR variable during 'make install' The DESTDIR variable used to tell 'make install' an alternate system root to install the software to. Since setup.py supports the same via its --root parameter, it's easy to make life easier for many packagers.

commands: add more robust support for 'hg log -b' (issue2078) Fixes issue2078 and adds tests to cover various 'hg log -b' uses. This change adds a localrepo.lookupbranch(key, remote=None) function. This will look up the branch of the revision with the given key. The algorithm works like this: * If a remote repo is given and KEY is the name of a branch in that repo, return KEY. * If no remote repo is given and KEY is the name of a branch in the local repo object, return KEY. * Otherwise look up the revision with the identifier KEY in the local repo and return its branch. This change also makes 'hg log -b' use this new functionality and adds a few tests for it.

highlight: fix to work with caching templater

debugcomplete: don't list deprecated options

commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Switching to --branch makes log consistent with push/pull and make more sense given the actual behavior of the option (you can specify -b multiple times to include multiple branches). This change also adds some tests for 'hg log -b'.

bookmarks: complete the missing references from dda4ad7c9ea9 (issue2121) The fix for issue1611 left one last use of "repo" instead of "self" that has resulted in more memory leaks from push/pull operations.

Added support for 'pretxncommit', so that one can call the ACL hook at pre-commit time too. This is useful because now it's possible to avoid violating ACL permissions much sooner, at commit time, instead of waiting for a PUSH to check if there were any invalid commits.

subrepo: fix repo root path handling in svn subrepo

remoteui: copy http_proxy settings http_proxy settings of current repo's .hg/hgrc should be available on remoteui, so that the httprepo can use them when pulling via http.

dispatch: ignore if signals can not be set This happens if the code is executed in a thread. This patch allows tortoisehg to start the inotify server again.

hgweb: fix attribute error in error response (issue2060)

cvs: skip bad tags If the CVS repo somehow has a symbolic name that references a revision consisting of a single number (e.g. BAD_TAG: 1), convert will fail when attempting to find the branches, preventing the initial import from working. This patch skips those symbolic names--without warning.

document missing template variables

diffstat: use ui.plain() instead of ui.interactive() Previously, a default width of 80 is used for non-interactive sessions. This behaviour was introduced before HGPLAIN was supported.

mq: Remove -f from qnew command syntax. In 1ebba857b371 the -f option was not completely removed from the help message.

mq: toggle truncating using ui.plain() rather than ui.interactive() This enables truncated messages when using `qseries' with the `pager' extension.

merge with stable

filemerge: use working dir parent as ancestor for backward wdir merge I checked the tests, they were bogus in the first place

merge with stable

filectx: _fileid isn't normalized, use _filenode instead _fileid can be anything the lookup accepts (hex(node), node, rev, etc.), we should use something stable for comparisons (like _filenode).

Merge with stable

convert: write "working copy" instead of "wc"

convert: mark strings for translation

convert: write "repository" instead of "repo" We should strive to avoid slang in our messages to the users.