dirstate: fix in memory dirstate entries for 1-second race Only the on-disk file was modified, we need to modify the in-memory dirstate as well.

commands: leftover from d7b601f1e02c

commands: small refactoring in summary

commands: retrieve tags from context object

summary: make use of output labeling The individual pieces of information use the same labels as the commands they summarize for better cohesion of commands.

color: concatenate effects correctly and avoid printing empty effects

commands: fix typo

cmdutil: do not translate trivial string

wix: refactor and new guids.wxi

color: don't split colors across lines (which confuses less -R) Currently, less -R doesn't support colors spanning multiple lines; only the first line will be colorized. Instead of allowing colors to span multiple lines, the color extension now applies colors to each line it receives, even when ui.write() is given multiple lines in one call.

color: colorize based on output labels instead of parsing output By overriding ui.write(), ui.write_err(), ui.popbuffer(), and ui.label(), the color extension can avoid parsing command output and simply colorize output based on labels. As before, the color extension provides a list of default colors for core commands/labels. Other extensions can provide their own defaults by specifying a colortable dict (similar to cmdtable). In this process, --color is promoted to a global option and the deprecated --no-color option is removed.

record: make use of output labeling

qseries: make use of output labeling

qdiff: make use of output labeling

qguard: make use of output labeling

churn: make use of output labeling

bookmark: make use of output labeling

cmdutil: make use of output labeling in changeset_printer

diff: make use of output labeling

status: make use of output labeling

grep: make use of output labeling

ui: add ui.write() output labeling API This adds output labeling support with the following methods: - ui.write(..., label='topic.name topic2.name2 ...') - ui.write_err(.., label=...) - ui.popbuffer(labeled=False) - ui.label(msg, label) By adding an API to label output directly, the color extension can forgo parsing command output and instead override the above methods to insert ANSI color codes. GUI tools can also override the above methods and use the labels to do GUI-specific styling. popbuffer gains a labeled argument that, when set to True, returns its buffered output with labels handled. In the case of the color extension, this would return output with color codes embedded. For existing users that use this method to capture and parse output, labels are discarded and output returned as normal when labeled is False (the default). Existing wrappers of ui.write() and ui.write_err() should make sure to accept its new **opts argument.

Merge with stable

Merge with i18n

Added signature for changeset 2b01dab59416

Added tag 1.5.1 for changeset 2b01dab59416

i18n-pt_BR: update qnew help text

Merge with i18n

mq: remove reference for deprecated -f option -f is the default behaviour since 27d542bc0f5b

merge with i18n stable

i18n-pt_BR: synchronized with e46c19c586fa

l10n: Updates to French (fr) translation Transmitted-via: Transifex (www.transifex.net)

merge with i18n stable

i18n-pt_BR: synchronized with ca6ba6cac6cd

check-code.py: Check for bare ^ Solaris sh interprets ^ as some kind of piping symbol.

Added support for 'everybody ' (using an asterisk) in user list.

convert.cvs: Initialize state variable and abort on cvs error Fix as proposed by Frank Kingswood. Avoids UnboundLocalError: local variable 'mode' referenced before assignment when cvs fails. This alsa partially fixes issue1592.

Merge with stable

share: drop experimental label As per mail from Matt: http://selenic.com/pipermail/mercurial/2010-March/030774.html

Merge with stable

Add missing --mq option to hg log. Since norepo is a string, not a list, the norepo check was matching command names against any substring in norepo. This fix splits norepo into a list of commands.

Merge with stable

url: expand path in auth filenames

expand paths in aliases

merge with stable

test-subrepo-svn: properly escape the url, make it work for svn 1.5 again

Merge with stable

util.termwidth: check stderr first as it's least likely to be redirected

progress: use stderr instead of stdout; check stderr.isatty() This means that progress bars will continue to show on the terminal when both stdin and stdout are redirected.

templatefilters: fix check-code warning

Merge with stable

Merge with i18n

Merge with i18n

Merge stable heads

i18n-sv: translated the 'patterns' command

merge with stable

merge with i18n stable

i18n-pt_BR: synchronized with 9f6e30a89f11

i18n-sv: synchronized with a1cb8ca051c0 Some simpler translations done too

schemes: add Kiln On Demand to default schemes