dispatch: properly handle relative path aliases used with -R (issue2376) This ensures the repo config is read relative to the repo root during dispatch.

dispatch: remove superfluous try/except when reading local ui config ui.readconfig() already handles IOError in this case.

test-globalopts: test hg -R file:// and hg -R path-alias

hgk: remember main window position

alias: back up and restore commands.norepo before checking for shell aliases

tests: unify test-check-code

keyword: switch kwtemplater.record in kw_dorecord() Obsoletes the need for a global recordcommands variable.

keyword: specific regular expressions depending on read mode More safeguarding against accidental (un)expansion: Reading filelog: act only on \$(kw1|kw2|..)\$ as keywords are always stored unexpanded. Reading wdir: act only on \$(kw1|kw2|..): [^$\n\r]*? \$ as we only are interested in expanded keywords in this situation. Note: we cannot use ..): [^$\n\r]+? \$ because e.g. the {branch} template might be empty. hg record is a special case as we read from the working directory and need one regex each for modified and added files. Therefore test recording an added file. This way we finally also forbid sequences like $Id: $ being treated as keywords.

test-keyword: remove remaining sed calls

keyword: disable expansion in kwfilelog.read() if file renamed in node Simplifies kwfilelog.cmp() and avoids fiddling with/importing revlog. Reorder imports alphabetically.

keyword: make iskwfile() a weeding method in lieu of a boolean Update iskwfile docstring.

keyword: support copy and rename copy/rename destinations being unversioned and possibly ignored by the extension should not contain expanded keywords. Files copied/renamed from an ignored source are not touched. Add tests covering both of the above cases, plus the corner case of cp symlink foo; hg cp -A symlink foo (where foo becomes a regular file).

keyword: refactor kwtemplater.overwrite() Make kwexpand, kwshrink restricted commands - i.e. read from filelog without expansion for substition in kwtemplater.overwrite, and set/unset restricted mode for overwrite() in in kwcommitctx and the dorecord wrapper. Preselect candidates when working on changed files (rollback, record) outside kwtemplater class, and remove 6th argument from overwrite(). Avoid duplicate substitution/search in overwrite(): Only go into restricted read mode when reading from filelog. rollback and record read from the working directory, where restricted mode would already shrink keywords before overwrite() either expands or shrinks them again. This ensures that the usual automatic operations on keywords are turned off during overwrite() and only overwrite() itself acts on them. Reduce manifest calculation to the cases where it is needed. Move helper function for expansion removal outside kwtemplater class.

revlog.addgroup(): always use _addrevision() to add new revlog entries This makes parentdelta clone support pulling.

revlog._addrevision(): allow text argument to be None, build it lazily

changegroupsubset: use readdelta() fast path when delta is against a parent

run-tests: handle .tst not ending with an LF

minirst: small code cleanup

cat: fix cat without -r, broken by 0ae35296fbf4 The default revision for revsingle() is now '.' instead of None. This preserves the behavior of cat prior to it using revsingle().

revsets: introduce revsingle helper revsingle returns a context for the last revision of the supplied revspec

revsets: make revpair revsets-aware revpair returns the first and last members of the computed revset(s)

revset: lower precedence of minus infix (issue2361)

merge with stable

revset: fix #branch in urls for outgoing() hg log -r 'outgoing(..)' ignored #branch in some cases. This patch fixes it. The cases where it misbehaved are now covered by the added test-revset-outgoing.t

heads: mention STARTREV in synopsis and help for --rev Before this change, "hg help heads" said hg heads [-ac] [-r REV] [REV]... [...] If STARTREV is specified, only those heads that are descendants of STARTREV will be displayed. [...] -r --rev REV show only heads which are descendants of REV [...] which made little sense since there are two things called REV in the synopsis and nothing called STARTREV. A little digging reveals that the "[-r REV]" part of the synopsis was introduced in 8e503fa54d2d, changed to "[-r STARTREV]" in 2bcef677a6c3, and then changed back to "[-r REV]" in 4b02fc71bbba. The last change seems to be based on a patch[1] on our mailinglist that actually *inserted* STARTREV again in the help for the command line option itself. For some reason, the patch was changed to remove STARTREV from the synopsis. This change finally makes the help consistent by putting STARTREV back into the help in all places where it is needed: hg heads [-ac] [-r STARTREV] [REV]... [...] If STARTREV is specified, only those heads that are descendants of STARTREV will be displayed. [...] -r --rev STARTREV show only heads which are descendants of STARTREV [...] This was not possible until 40c06bbf58be, which introduced the possibility of naming the meta variables for each option. [1]: http://mercurial.markmail.org/message/qgc55gd4fam4ogvz

merge with stable

Added signature for changeset 93d8bff78c96

Added tag 1.6.4 for changeset 93d8bff78c96

merge with i18n

tests: unify test-rebase*