Merge with stable

dispatch: don't mangle ImportError abort messages Previously, Mercurial assumed that the last word of the string representation was the name of the moduled that was imported. This assmption is incorrect, despite being true for the common case of an exception raised by the Python VM. For example, hgsubversion raises an ImportError with a helpful message if the Subversion bindings were not found. The final word of this message is not meaningful on its own, and is never the name of a module. This patch changes the output printed to be a simple stringification of the exception instance. In most cases, this will be `abort: No module named X!' rather than `abort: could not import module X!'. No functionality change; all tests pass.

relink/progress: correctly handle the no file to relink case

Merge with stable

commands: refactor diff --stat and qdiff --stat `opts['unified'] = '0'` can be replaced by `diffopts.context = 0`.

mq: fix opts['unified'] = '0' to take effect when qdiff --stat `opts['unified'] = '0'` tries to reduce the number of lines to be processed by patch.diffstat, but here it does not affect diffopts, thus it does not make sense. Instead, we can change `diffopts.context` directly. Added test case for qdiff --stat.

showconfig: show rc paths with --debug

tags: return tags in sorted order This makes log and summary have less arbitrary tag ordering and also groups similar tags together, such as the mq tags.

keyword: test recording

keyword: support (q)record Monkeypatch hgext.dorecord to trigger keyword expansion. Read data from working directory, not from filelog. Prevent keyword expansion from within record's commitfunc, thereby fixing a bug/inconsistency where files which are clean after recording were overwritten twice.

keyword: remove mq commands from restricted list Monkeypatching patch.diff takes care of this since 911f5be5d159. Test mq more thoroughly by loosening [keywordmaps] and comparing the output of hg cat with keyword expansion enabled and disabled.

acl: add tests for asterisk and for OS-level groups

acl: updated doc string to reflect recent changes

acl: add support for OS-level groups using @group syntax

run-tests: add --view switch to use external diff viewer

run-tests: sort options

run-tests: add -l short option for --local

Merge with main

ui: fix check-code error

schemes: fix // breakage with Python 2.6.5 (issue2111) Recent Pythons (e.g. 2.6.5 and 3.1) introduce a change that causes urlparse.urlunparse(urlparse.urlparse('x://')) to return 'x:' instead of 'x://'i and urlparse.urlunparse(urlparse.urlparse('x:///y')) to return 'x:/y' instead of 'x:///y'. Fix url.hidepassword() and url.removeauth() to handle these cases.

log: document the new xml style

Merge with stable

Merge with i18n

Merge with i18n

merge with i18n stable

merge with i18n

i18n-pt_BR: synchronized with ede19417c3c4

merge with i18n stable

i18n-sv: synchronized with latest development code

Merge with stable

i18n-sv: translated a few messages

i18n-sv: syncronized with e3396b218e10

patch: strip paths in leaked git patchmeta objects

patch: minor cleanup of _applydiff

patch: git delete mode shouldn't be used at all

patch: make "unable to strip away" message less confusing

patch: descriptive patchmeta.__repr__ to help debugging

log: remove useless condition for "copied" to be not None, it requires follow=True

help config: update windows documentation to match implementation This shows how confusing the current implementation is on Windows.

wix: new GUID for contrib.guid to comply with the component GUID rules of Windows Installer, applied to the change 6d9ff3374a81

contrib/mercurial.spec: drop git-viz Follow-up to 9258228639ad

tags: delete unnecessary close() of atomictempfile cachefile.rename() implies cachefile.close().

win32: detect console width on Windows Original version by anatoly techtonik <techtonik@gmail.com> Following advices from similar bzr code.

Merge with crew-stable

util: fix default termwidth() under Windows sys.stdout.write('-'*80 + '\n') or sys.stdout.write('-'*80 + '\r') do not work on Windows as they do on unix. On a 80 columns Windows console, the extra CR or LF are interpreted as if belonging to the next line, so the first command displays 2 lines (only one on unix) and the second one leave the line visible and move back to the following line. To avoid this, we sacrifice one column under Windows.

commands: better markup in "hg help paths"

Merge with stable

commands: revised documentation of 'default' and 'default-push' This patch was a collaborative effort between faheem, mg, timeless and ilowe.

wix: hgweb file renames

zeroconf: handle string hgweb config args

hgweb: unify hgweb calls in serve

serve: webdir_conf -> webconf

hgweb: synchronize fcgi and wsgi scripts

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.

minirst: removed unnecessary initindent variable

minirst: add margin around definition items This greatly improves the output of 'hg help env'.

dirstate: remove unused variable