error: fix up test-hgrc

error: update test-trusted.py

revset: fix test failure with qfinish

revset: raise ParseError exceptions

error: add new ParseError for various parsing errors

error: change ParseError to CommandError

hgrc: improve docs for the trusted section

rebase: use usual util.abort rather than error.ParseError

revset: sort the predicate list

revset: fix - handling in the optimizer

revset: fix up tests

walkchangerevs: allow empty query sets

revset: add tagged predicate

revset: optimize the parse tree directly Rather than dynamically optimize in methods, we pre-optimize the parse tree directly. This also lets us do some substitution on some of the symbols like - and ::.

revset: add support for prefix and suffix versions of : and ::

revset: hook into revrange

revset: add a debugrevspec command

revset: introduce revset core

revset: introduce basic parser

remoteui: move from cmdutil to hg

mq: better qqueue test for troublesome names

mq: prevent the creation of a queue whose name is already taken Each check is moved under the code handling the relevant option, and a new one is added for --create. This fixes duplicated entries being added to the queues list.

mq: fix naming issues for qqueue directories

win32text: mark this extension as deprecated

Merge with stable

shrink-revlog: preserve mode of the shrunken index and data file. Otherwise, the shrunken index file always has mode 0600 thanks to mkstemp(). This is annoying on a server, where multiple users may need to read/write the manifest. chmod()ing the data file is not strictly necessary, but it's nice for consistency.

Fixed a bashism with the use of $RANDOM in hgeditor. The variable $RANDOM is not POSIX so a portable /bin/sh may not define it. When creating a directory with a random name it's better to use mktemp, which, even though is not POSIX, exists in common Unixes including Linux, OpenBSD, FreeBSD and MacOS X.

churn: add possibility to include/exclude paths

churn: support spaces in aliases (issue2222)

Merge with stable

Merge with i18n

Added signature for changeset 24fe2629c6fd

Added tag 1.5.4 for changeset 24fe2629c6fd

Merge with i18n

merge with i18n stable

i18n-pt_BR: synchronized with 0bb67503ad4b

Merge with stable

clone: save hardlink state of util.copyfiles() When trying to do hardlink-cloning, the os_link() call of the first file tried already fails on Windows, if the source is on a UNC path. This change avoids calling os_link() for the rest of files, leaving us with a *single* failed os_link() call per clone operation, if the source can't do hardlinks.

util.copyfiles: don't try os_link() again if it failed before If the os_link() call on the first file in the directory fails [1], we switch mode to using shutil.copy() for all remaining files. [1] happens for example on Windows for every file when cloning from a UNC path without specifying --pull.

keyword: retrieve added and modified files from commitctx

keyword: force dirstate normal when all changes in a file are recorded Before this bugfix a file whose changes were entirely recorded was still considered modified by "hg status". Note: the test must use hg record -l/--logfile, because this is not reproducible with hg record -m/--message.

clone: print number of linked/copied files on --debug

Merge with stable

eol: extension for managing file EOLs

Merge with stable

Merge with i18n

Merge with i18n

merge with i18n stable