revlog: fix reading of larger revlog indices on Windows

inotify: Removing the unnecessary "inotifyserver" class variable.

inotify: set a flag so a failed inotify query doesn't get repeated. If, for some reason, we can't get the inotify server to start, it's better to disable inotify queries for the instance to avoid trying over and over to start the server, which takes time. Just fall back on repo.status()

inotify: introduce debuginotify, which lists which paths are under watch

inotify: put STAT-specific query answer generation part in its own method

inotify: change protocol so that different query types can be supported.

inotify: Separate query sending logic from Server starting. Use a decorator around the public statusquery method of Client: start_server(query_to_server): try: query_to_server() except QueryFailed: [error recovery, inotify Server (re)starting] query_to_server() This way, introducing a new xxxquery Client method is easy: one has only to code the protocol part of xxxquery, ignoring errors, and decorating it using start_server to handle server recovery and (re)starts

inotify: modular architecture for inotify clients Put the socket init, query generation and response analysis in a more generic client class.

setup: another newline if version could not be established.

setup: add missing newline in warning

setup: read .hg_archival.txt for version info (issue1670) Previously, setup.py was enhanced to identify the Mercurial version from either .hg/ or mercurial/__version__.py. When archives are created using 'hg archive' or via hgweb, neither of those options are available. However, there is a .hg_archival.txt file in the root of the archive that has the information. This patch enhances setup.py to identify the Mercurial version from the .hg_archival.txt file when there is no .hg/ or mercurial/__version__.py available.

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)

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