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)

templater: lowercase error message Changing this messages should be safe: automated scripts ought to have debugged their templates and wont grep for this error message.

util: use set instead of dict

localrepo: update commit*() docstrings

patchbomb: with --in-reply-to, still thread message under first in series When specifying --in-reply-to for a message M, have [M] [0/2] [1/2] [2/2] instead of [M] [0/2] [1/2] [2/2] which is more consistent with the way messages are being threaded when --in-reply-to is not used.

merge with mpm

patchbomb: minor typo and language fixes

patchbomb: clarify diffstat usage

patchbomb: fix inexact description of the messages threading Each message refers only to the first of the series.

coal/paper: minimize whitespace differences in CSS files

coal/paper: equal heights for file and annotate views

spartan: ensure equal heights for file and annotate views The display used to jump up and down when switching from the file view to the annotate view. It now stays still: when switching from the file view to the annotate view it looks like the file content is simply right-shifted to make room for the author names.

coal/paper: simplify margin and padding CSS rules

spartan: simplify CSS colors (#xxxxxx -> #xxx)

coal/paper/spartan: remove extra line break in annotate view

commit: tidy up mergestate slightly

commit: drop unneeded dirstate invalidate logic We no longer touch the dirstate in the middle of a commit, so a failing commit doesn't require invalidating the dirstate.

commit: some tidying - simplify handling of 'close' - kill silly wlock=None - sort/uniq files later

commit: remove unused lock var

commit: move description trimming into changelog

commit: simplify manifest commit

commit: explain how to abort commit in editor

commit: move editor outside transaction The commit editor is now invoked before files and manifest are committed. The editor is now run with only the wlock held and aborting an edit no longer requires rolling back a transaction. Changes to files during a commit still result in undefined behavior. (This is preliminary work for committing subrepositories)

convert: directly use nullid

Merge with stable

Fix how setup.py identifies the Mercurial version. There is a problem with setup.py where it will not identify the Mercurial version properly when not being ran in within a repository even if mercurial/__version__.py exists. To fix, use mercurial.__version__.version when available before defaulting to "unknown". (Using mercurial.util.version() is not an option due to a dependency issue where osutil can be referenced before it is built.)

templater: replace eval with closure

win32mbcs: remove silly eval

merge with crew

addremove/findrenames: find renames according to the match object (issue1527) Instead of only finding similarities in the added/removed files found by the addremove step, follow the match object: hg addremove -s80 foo -> add and removes files in foo + find similarities between files in foo hg addremove -s80 -> add and removes files in the whole repo + find similarities between files in the whole repo hg import --similarity will still work correctly (only find similarities between files found in the patch).

addremove: mapping isn't really needed, simplify

gitweb, monoblue: break long line in map file