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.

keyword: make kwdemo more translation friendly

commands: wrap short descriptions in 'hg help' The code for wrapping a single line of text with a hanging indent was duplicated in commands and help -- it's now moved to a new function called wrap in util. The function defaults to a line width is 78 chars, and this un-wraps some command line flag descriptions, hence the test output changes.

commands: add "--" to command line flag in branches docstring

change wiki/bts URLs to point to new hostname

extensions: change descriptions for hook-providing extensions Thanks to timeless and Dave Townsend for advice!

extensions: change descriptions for extensions providing a few commands

help: rewrap extension description line length at 78 instead of 70

extensions: fix up description lines some more

commands: add note about import retrieving patches from URLs

windows: import WinIOError from win32 module (issue1707) Quick fix pending further refactoring of windows error handling.

mq: compact & rewrap documentation for qdelete command

test-globalopts: broken by output change in 62e3b9466700

Merge with i18n

i18n-pt_BR: synchronized with 3ad0b5ddae58

merged with crew

i18n-pt_BR: minor rewording and formatting fixes

i18n-pt_BR: synchronized with d9f4c182aeca

i18n-pt_BR: synchronized with 708938509732

i18n-pt_BR: synchronized with fccdf5ca5065

merged Greek translation

Add the start of a new translation of Mercurial to Greek (UTF-8)

i18n-da: sync with hg.pot - translated fuzzy strings - removed old unused strings

commands: removed redundant line from push docstring

merged with crew

i18n-da: merged translation with TortoiseHg

i18n-da: translate fuzzy strings

i18n-da: sync with hg.pot

i18n-da: add missing newline

translated a bunch of strings to danish

interhg: escape backslashes in docstring

interhg: remove unnecessary escaping

Fix warning: Seen unexpected token "%"

Add (pre)outgoing hooks for local clones.

contrib/buildrpm: force en_US locale during changelog's creation Running this script using a different locale (i.e., Italian) returns an error: $ ./contrib/buildrpm sto aggiornando la directory di lavoro 1060 file aggiornati, 0 file merge, 0 file rimossi, 0 file non risolti errore: data errata in %changelog: mar giu 23 2009 Stefano Tortarolo <stefano.tortarolo@gmail.com> 1.2.1-1034

contrib/buildrpm: set python requirement to 2.4

mq: no longer mention the deprecated qdelete's --revision option The option will no longer show up in the list, unless --verbose is used. 'qdel -r' has been deprecated in favor of qfinish since the 1.1 release. It is still fully functional, but new users need not learn about it.

help: describe bundle compression methods (issue1523)

Add a forget command for easily untracking files. This command does exactly what 'hg remove -Af [FILES]' does. The reason for creating a new command is that the options for 'hg remove' are confusing (-A removes only deleted files, -f forces deletion, and using both means *the exact opposite of both*). [mpm: simplified help text, code, and updated tests]

test merge-tools internal:dump and internal:prompt

hgrc.5: remove reference to DEFAULT section

hgrc.5: mark more literal strings

hgrc.5: markup compromis compatible with 7.1.2 and 8.4.5

test-grep: fixed comment

extensions: remove import rendered unnecessary by e4e22a310b62

help: fixing non-matching example texts

extensions: improve the consistency of synopses Trying as much as possible to consistently: - use a present tense predicate followed by a direct object - verb referring directly to the functionality provided (ie. not "add command that does this" but simple "do that") - keep simple and to the point, leaving details for the long help (width is tight, possibly even more so for translations) Thanks to timeless, Martin Geisler, Rafael Villar Burke, Dan Villiom Podlaski Christiansen and others for the helpful suggestions.

acl: help improvements Thanks to timeless for the review.

bookmarks: help improvements - bookmarks are obviously Mercurial's, no need to specify it - more explicit about the behavior without track.current - typos Note: the extension's help is shadowed by that of the command of the same name and as such will never appear to the user. Thanks to timeless for the fixes.

patch: use new style class in linereader

convert: fix builtin cvsps when no branchpoints are present

help: wrap extension descriptions

convert/svn: drop undocumented and untested revision 'blacklist'

convert/svn: test svn tags encoding