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

i18n-fr: add a glossary and recommendations

i18n: add French translation file

i18n-jp: translation update for 288ba6d6c5c7 this revision consists of contribution by: Muraoka Yusuke<yusuke.muraoka@gmail.com> Tadashi Jokagi <elf@elf.no-ip.org> UENISHI Kota <kuenishi@gmail.com> Yuki KODAMA <endflow.net@gmail.com> FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

i18n-da: translated 50% This change translates many of the strings from the convert, inotify, fetch, gpg, and transplant extensions.

convert: do not ask for translation of "%s %s"

i18n-da: translated cmdline help strings

i18n-da: translated log and some mq commands

i18n-da: change "arkiv" to "depot"

i18n-da: sync with 288ba6d6c5c7

i18n-zh: sync with 288ba6d6c5c7(2009-06-24 04:43:09+08:00)

extensions: catch OSError when hgext is not accessible (issue1708) Temporary workaround for issue1708: on win32 with py2exe, hgext is distributed inside a zipped file (which anyway does not contain the py files from which we ought to extract the documentation strings), which raises a WindowsError (subclasses OSError). This means that on such platforms the list of disabled extensions won't be available. Real fix postponed for after Mercurial 1.3.

color: wrap qdiff/qseries after all extensions are loaded

atom: use urlescape in filelog's file link

Relicense zsh completion script under zsh license. Steve agreed some time ago.

Merge with crew

Update test output for e67e5b60e55f

commands: improve bundle compression methods description

keyword: improve help for kwfiles - just use "files" instead of "filenames" (analogous to "hg status -h") - reference the extension help wrt pattern configuration Kudos to timeless for helpful suggestions.

keyword: lowercase status flags of untracked files in kwfile output Document the flags and their meanings in the command help (thanks to timeless for bringing this to my attention).

help: branch heads have no descendants, not no children

Branch heads should not include "heads" that are ancestors of other heads. For example, given 1 (branch a) -> 2 (branch b) -> 3 (branch a) I expect "hg heads a" to show only 3. Discovered by running hg heads HEAD on the mutt repo, where older clients committed default on top of HEAD.

inotify: server: remove wpath method Only called once. And can be simplified to an easy oneliner.

inotify: return version to client even when not matching Old clients are expecting a version string even in case of mismatch, otherwise they get stuck.

windows: fix use of undefined exception (issue1707) This fixes the implied reliance on pywin32 and the win32 module. This also fixes a regression in ae275ad46bd0 that made Mercurial unusable without pywin32.

keyword: improve help for kwfiles

highlight: remove author name from docstring I don't feel this should be part of the documentation. The name of the original author can of course still be found with 'hg log'.

mq: standardize qfinish cmdline help string

inotify: OPT -> OPTION in cmdline help string

hgk: standardize cmdline help strings

color: don't blow up if configured with unknown color (just warn).

bookmarks: Change references to "repo" by references to "self" (issue1611) Using "repo" instead of "self" inside bookmark_repo methods was causing a circular reference and, thus, a memory leak. It has been detected because the method bundlerepository.__del__ is never called, therefore leaving dangling uncompressed bundles inside .hg subdirectory.

run-tests: use os.path.realpath() to find hg's setup.py. Needed for running out-of-tree test suites without --with-hg/--local.

Make RPM spec in contrib more aligned with the one from Fedora This is mostly syntactical changes which make the real differences more obvious when looking at a diff. contrib/mergetools.rc is now also installed and enabled by default.

addremove: drop some silly variable assignments

ui.prompt: Show prompt and selection in non-interactive mode ui.prompt was completely silent in non-interactive mode, unless in verbose mode. It is fine that it chooses the default automatically, but it is confusing that the message and prompt shown interactively can't be found in scripted tests. The prompt and selection is now .write'ed instead of .note'ed.