transaction: fix uncaught ENOENT (issue1724) The opener raises an IOError on errors where transaction expects an OSError.

branch heads: fix regression introduced in e67e5b60e55f (issue1726) For merge nodes it is not adequate to only check a single possible branch head for whether it is an ancestor of the latest head, but it needs to be done for each possible branch head.

subrepo: use hg.repository instead of creating localrepo directly this way, extensions' reposetup will be called, which allows for git subrepos to be handled by hg-git (and I believe the same goes for svn and hgsubversion)

ignore: separate pattern extraction from match compilation hgignore files have slightly different syntax from match objects, e.g. syntax: foo headers, regexp: forms, and re being relre. Put conversion from hgignore syntax into match syntax into a standalone function so that it is easier to validate hgignore hunks externally.

merge with crew-stable

util: remove unused bufsize argument Removed it correctly this time: the subprocess default is 0, not -1 and so we must pass -1 explicitly. Added a comment to that effect.

convert/cvs: improve error message on unexpected server output.

typos: "it's" -> "its"

convert: fixed typo in docstring

Merge OS X performance regression fix

Merge backed out change

Backed out changeset fce065538bcf: it caused a 5x performance regression on OS X

help: wrapped help strings at 78 characters

keyword: collect kwmaps using a generator expression Allowed for Python 2.4.

commands: avoid bad linebreak in addremove docstring

Makefile: wrap hg.pot strings at 82 chars By default, xgettext will wrap strings at 79 characters. This width includes the two double-quotes and the '\n' added. Our strings are now wrapped at 78 characters and a line can therefore be up to 82 characters wide in the .po file. Setting the width to 82 characters ensures that xgettext does no silly wrapping on our already-wrapped strings while still wrapping long one-liners at 82 characters.

zeroconf: wrapped docstrings at 78 characters

win32mbcs: wrapped docstrings at 78 characters

transplant: wrapped docstrings at 78 characters

share: wrapped docstrings at 78 characters

record: wrapped docstrings at 78 characters

rebase: wrapped docstrings at 78 characters

purge: wrapped docstrings at 78 characters

patchbomb: wrapped docstrings at 78 characters

parentrevspec: wrapped docstrings at 78 characters

pager: wrapped docstrings at 78 characters

notify: wrapped docstrings at 78 characters

mq: wrapped docstrings at 78 characters

keyword: wrapped docstrings at 78 characters

interhg: wrapped docstrings at 78 characters

highlight: wrapped docstrings at 78 characters

hgk: wrapped docstrings at 78 characters

hgcia: wrapped docstrings at 78 characters

graphlog: wrapped docstrings at 78 characters

fetch: wrapped docstrings at 78 characters

extdiff: wrapped docstrings at 78 characters

convert: wrapped docstrings at 78 characters

color: wrapped docstrings at 78 characters

churn: wrapped docstrings at 78 characters

children: wrapped docstrings at 78 characters

bugzilla: wrapped docstrings at 78 characters

bookmarks: wrapped docstrings at 78 characters

acl: wrapped docstrings at 78 characters

commands: wrapped docstrings at 78 characters We have always had a left margin of 4 characters -- probably just because that's how docstrings for top-level functions turn out by default, but it also looks nice in the built-in help. The docstrings were wrapped at 70 characters, which is the default for Emacs. However, this gives a right margin of 10 characters in a standard 80 character terminal. I've now wrapped the relevant docstrings at 78 characters, effectively killing the right margin. The asymmetric margins looked a bit odd and some of the text looked cramped with a right margin, so Dirkjan and I felt that it was best to remove it entirely. The two character gap was kept to have some space between the border of the terminal -- it will also make diffs involving the docstrings fit in a 80 character line.

extdiff: fix indentation and use gettext

filemerge, subrepo: correct indention

ui: extract choice from prompt avoid translating single characters (as l for _local or sym_link)

patchbomb: use local time for the Date: header

patchbomb: fix From_ in the message's envelope Localized date in the From_ prevents MUAs like mutt from parsing mbox files generated by patchbomb. Using a 24 characters date in asctime format instead.

merge with crew-stable

Bourne shells do not maintain $PWD; update tests accordingly

tests: remove more instances of export FOO=bar bashism

tests: remove more instances of export FOO=bar bashism

test-gpg: suppress secure memory warning Some platforms (Solaris for one) does not support secure memory and would give a warning.

test: fix for compatibilty with true Bourne /bin/sh 'export foo=bar' is an extension, replaced with 'foo=bar; export foo'

p4: simplify sort key

localrepo: removed unnecessary revkey sort helper

compat: remove unnecessary diamond-shaped multiple inheritance

split local and stdlib module imports (eases migration issues)

compat: don't reference an exception var inside a lambda

compat: use email in favor of mimetools

verify: fix scope issues with del statement

compat: use 'key' argument instead of 'cmp' when sorting a list

compat: use open() instead of file() everywhere

compat: can't compare two values of unequal datatypes

compat: use // for integer division

tests: add -3 switch to run-tests.py

keyword: remove unused import

merge with crew-stable

help: add #revision syntax to the example valid URLs.

context: improve arg-checking assert.

help: add #revision syntax to the example valid URLs.

merge wtih crew-stable

gendoc: fix localization of help topic When a topic provides a callable method for its text, most likely this text will be generated from different parts, so it does not make sense to apply gettext on the whole result, rather the method should provide translation by itself. This is the case with the extensions topic, which triggers a double gettext call, making the ASCII codec fail when it encounters 8 bit characters, and prevents the documentation from being built.

extensions: remove dead code enabled used to be a boolean, and somehow that bit of code inadvertently slipped through during a refactoring. Effectively dead code, as the condition can never be triggered.

merge with crew-stable

acl: read correct index into url for username (issue298) The index was inadvertedly off-by-one causing the username to be the remote host rather than the remote user when hosted in a http(s) session.

color: don't highlight the summary part of the qseries command

mq: align columns in verbose qseries output.

extensions: remove unused imports

test python hook configured with python:[file]:[hook] syntax Adds a test for python hooks configured with python:[file]:[hook] syntax in .hgrc. Increases the test coverage for mercurial/hook from 92% (79/85) to 96% (82/85).

keyword: break overlong line

bisect: fix format specifiers for integers

Added signature for changeset 196d40e7c885

Added tag 1.3 for changeset 196d40e7c885

Merge with i18n

i18n-pt_BR: synchronized with 59bb11a97fe5

i18n-jp: translation update for 09c6735e3880

i18n-fr: translation of part of the mq extension

i18n-fr: translation of the zeroconf extension

i18n-fr: translation of the purge extension

i18n-fr: translation of the parentrevspec extension

i18n-fr: synchronized with 7d39c76be4ee

i18n-da: synchronized with 09c6735e3880

Merge with mpm

i18n-da: use "lap" instead of "rettelse"

i18n-da: translated many one-liners

subrepo: audit subrepo paths

keyword: make repo.commit use a custom commitctx wrapper This avoids forcing the dirstate of overwritten files to normal during a commit. Thanks to Dan Villiom Podlaski Christiansen for the idea of a "double wrapper", so other extensions can still wrap repo.commitctx safely.

commit: lose some pointless 'nothing changed' messages Move message from localrepo to commands. This drops confusing messages in subrepo, import, and rebase.

commit: report modified subrepos in commit editor

verify: demote warning about nullid in copy to note

help: add more pointers to commit --close-branch

branches: add --closed flag for consistency with heads

addremove: build lists of already added and removed files too (issue1696)

addremove: pass unknown and deleted to findrenames directly again

addremove: normalize some variable names

findrenames: drop unused argument defaults

zsh completion: update bisect for builtin syntax

zsh completion: add hg branch

zsh completion: add hg branches

zsh completion: basic merge support

zsh completion: disable defaults and verbose output when completing If ui.verbose is set to True in hgrc, commands used to provide completions would yield bad results. For example, qpush completion would include the patch numbers and statuses as returned by qunapplied -v, instead of just the patch names. Defaults are also disabled when completing to prevent similar issues when an option is set that changes a command's output.

Merge with mpm

zsh completion: include guarded patches in qdelete

Merge with i18n

i18n-pt_BR: synchronized with eac360045ba4

i18n-fr: translation of the extensions help topic

i18n-fr: translation of help screen strings

i18n-fr: translation of the patchbomb extension