inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate stat() is not reliable when several events happen quickly. Which means that if two hg actions occur in the same second, stat() result will not reflect the second change. And only _one_ invalidate() call was done. Also ignore the events that occur when wlock is held, since wlock release will trigger a full rescan anyway. Fixes 17 run-tests.py --inotify tests.

inotify: follow new files if they are regular or a symlink. Fixes run-tests.py --inotify symlink-basic

run-tests.py: Show paths to failing tests, .err and .out I think this is very convenient when investigating and fixing test failures, but perhaps it must be tweaked further to show paths if and only if it is appropriate.

Merge with stable

convert: make hg sink cleanup safer

Merge with stable

graphlog: fix output when both a limit and a path are provided Limit was interpreted as absolute, from the topmost revision, without counting the number of revisions matching a given file. Which caused "glog -lN file" to show sometimes less than N csets if the file was not modified in all of the N previous csets. glog will now match the behavior of log.

mercurial.iss: update locale location

test-share: Solaris sed can't handle never-ending lines

test-rollback: Ignore hook exit code Failing hooks returned 255 on Solaris

Merge with crew-stable

test-hook: Don't use extended regular expressions with grep Using egrep fixes failure on Solaris

hgweb: Make get_mtime use repository to find store path. It was calculating it directly, which is redundant and caused it to break with shared repositories.

make ui.interactive() return false in case stdin lacks isatty

Merge with stable

Merge with crew

Merge -stable heads

Makefile: update "make clean" target after f91e5630ce7e

Merge with crew-stable

convert/svn: better handling of hg recursive call failure

schemes: url parts are counted from 1

Merge with -stable

subrepo: add default path to new clones

win32mbcs: fix typos and reST syntax

help/templates: use hanging indent for field list Now that the field list indentation is computed automatically, we no longer need to align all fields the same. Using a simple hanging indent makes it easy to edit the text in an editor like Emacs, which will automatically recognized the hang and keep it. The fields are still output with no blank lines between them.

minirst: improve layout of field lists Before, we used the padding following the key to compute where to wrap the text. Long keys would thus give a big indentation. It also required careful alignment of the source text, making it cumbersome to items to the list. We now compute the maximum key length and use that for all items in the list. We also put a cap on the indentation: keys longer than 10 characters are put on their own line. This is similar to how rst2html handles large keys: it uses 14 as the cutoff point, but I felt that 10 was better for monospaced text in the console.

minirst: don't test regexps twice We know the regexps match since splitparagraphs used them too.

minirst: run inlineliterals too in debug mode

test-share: handle sed/GNU-sed discrepancies

Make {file_copies} usable as a --template key Before this, to display file copies in templates, you had to write something like {file_copies%filecopy}. For some reason, the {file_copy} subtemplate was used by default but not defined by default in changeset_templater, while styles were already using it. Here we define {file_copy} in changeset_templater, and change the templater to handle formatting strings like {file_copies%filecopy} with already expanded keys (in this case {file_copies}), for backward compatibility.