setup.py: subprocess instead of os.popen, sys.stderr.write instead of print Also check that .hg is a directory.

gendoc: add missing space in command synopsis

merge: give hint as to how to discover uncommitted changes Many users will try 'hg diff' here, and it will not show them missing files.

commands: standardize parents command meta data

i18n-da: synchronized

i18n: accurately generate hg.pot

hgcia, convert: escape backslashes in docstrings

commands: remove unnecessary quotes in backout help

test-merge-tools: windows fixes - /bin/cat does not exist, expect 'cat' - non-interactive mode is not correctly detected in pysh, force it

ui: honor interactive=off even if isatty()

Merge with crew-stable

hgwebdir: fix [collections] evaluation under Windows Virtual and real path separators are not the same under Windows.

cmdutil: mark string for translation

util: use "is" for True/False/None comparisons

remove: warn if unversionned files are specified (issue1454)

fetch: allow -r for remote repos

filelog encoding: move the encoding/decoding into store the escaping of directories ending with .i or .d doesn't really belong to filelog. we put the encoding/decoding in store instead, for backwards compat, streamclone and the fncache file format still uses the partially encoded filenames.

store: refactor the fncache handling put all the fncache file writing and reading in the same place.

hgweb: make hgwebdir handle dict/list paths the same as config paths Before this patch, the only way to get hgwebdir to honor the recursive paths was to create a config object or a config file with the recursive paths in it. This patch makes hgwebdir treat paths the same whether passed in as a list, tuple, config or however hgwebdir supports passing paths.

workingfilectx: always use the same filelog, even for renames workingfilectx() was using the "src" filelog in case the file was renamed in the working copy. For consistency, stop special-casing it. This allows us to remove some duplication between filectx and workingfilectx.

use 'x is None' instead of 'x == None' The built-in None object is a singleton and it is therefore safe to compare memory addresses with is. It is also faster, how much depends on the object being compared. For a simple type like str I get: | s = "foo" | s = None ----------+-----------+---------- s == None | 0.25 usec | 0.21 usec s is None | 0.17 usec | 0.17 usec

patch: simplify Boolean expression slightly The context variable is either True, False or None. Abbreviate it as C and we get the following truth table where the second column is the original expression and the third column is the new expression: C | C or C == None | C is not False True | True | True False | False | False None | True | True

mq: new method invalidate Introduce method invalidate (similar to dirstate and repo).

mq: only read files when needed use util.propertycache as in dirstate

tests: replace #...# syntax with {...}

match: use self.exact instead of lambda self.exact uses a set and does not need an extra copy of the files

dirstate: use quicker matchfn() instead of match() everywhere matchfn does the same as match(), but a direct "link"

patchbomb: don't localize Date headers

alias: a0104303f400 did not correctly handle whitespace in the args

update --clean: do not unlink added files (issue575)