test-help: improve test coverage Adds a test for displaying the short list of commands with the verbose option i.e. 'hg -v help shortlist'. Extends test coverage of commands.help_ by 2 lines.

bookmarks: move parse() and current() into property definitions

bookmarks: refactor code responsible for updates of bookmarks introduce _bookmarksupdate for common parts from commitctx and addchangegroup

bookmarks: repo._bookmarkcurrent should be a propertycache

bookmarks: write() can simply access repo._bookmarks

bookmarks: turn repo._bookmarks into a propertycache

Merge with stable

hook: fix bug (reuse of variable) introduced in 872d49dd577a For binary installs, the 'name' argument would be reused as a local variable, destroying its original value. The patch fixes that, and also avoids copying sys.path when it's not necessary.

patch: implement patch.eol=auto mode EOLs in patched files are restored to their original value after patching. We use the first EOL found in the file, files with inconsistent EOLs will thus be normalized during this process.

patch: propagate eolmode down to patchfile The old code mapped the value of eolmode ('strict', 'crlf' or 'lf') to eol (None, '\r\n' or '\n') at the entry point in internalpatch. The value of eol was then used directly as the desired EOL in patchfile. We now delay the mapping and let patchfile do it instead. This allows for more complicated behavior where it does not make sense to map eolmode directly to the target EOLs.

Merge with stable

share: use defaultdest to compute unspecified destination This harmonizes with clone, and avoids creating a .hg in the current directory if the source ends with a /

Merge with stable

glog: fix "incompatible option" error message. Options like 'only_branch' should be presented to the user as '--only-branch'.

Merge with crew

convert: implement two hooks in builtin cvsps

Merge with crew

Merge with stable

doc/Makefile: Fix rst2html detection Displaying the output from the failing call to "which" didn't prevent make from doing stupid things later. We now only search for "rst2html" and fallback to "rst2html.py". If neither name is found, make will eventually abort when we try to use $(RST2HTML).

inotify: completely ignore events on the repository root They can only be events on the top directory object. Those events are meaningless for us: permission changes, repository-wide moves... And they break the assertion that all events happen in repo/*. Just ignore them. Fixes one of the failures of run-test.py --inotify test-permissions

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