merge: handle no file parent in backwards merge (issue2364)

merge with crew

ui.paths: expand paths directly in fixconfig (issue2373) var and home expansion should be done first.

setup/hg: always load Mercurial from where it was installed. This provides two new features: - Mercurial may be installed into a non-standard location without having to set PYTHONPATH. - Multiple installations can use Mercurial from different locations.

revsets: add a sample query to the help for getting active branches

revsets: add descriptions for sample queries in the help

mq: silence spurious output. When using a versioned patch repository, you would get a spurious warning when deleting and adding the same patch. Before: $ hg qdelete --keep 3.diff $ hg qimport --existing 3.diff adding 3.diff to series file 3.diff already tracked! After: $ hg qdelete --keep 3.diff $ hg qimport --existing 3.diff adding 3.diff to series file

revsets: clarify in the help that head() returns named branch heads

tests: add testcase for 208fc9ad6a48 to test-alias.t The testsuite lacks a testcase for the bug introduced in 208fc9ad6a48. This patch amends 301d7626e0ff (which fixed 208fc9ad6a48) by adding a testcase for that bug. With 208fc9ad6a48, test-alias.t (as modified by this patch) fails with "hg tglog: invalid arguments".

mq: handle deleting the same patch twice in one command (issue2427)

progress: make sure stderr has isatty before calling (issue2191)

windows: handle spaces in path to Python (issue2074)

minirst: pull admonition titles out formatblock function

minirst: refactor/simplify findblocks

inotify: raise correct error if server is already started in a deep repository When path is too long to be an Unix socket address, we create a socket in a temporary directory and link from the long path to the shorter one. But checks in server code at startup were insufficient in this case, and used to raise an unclear "tried linking .hg/inotify.sock to a temporary socket but .hg/inotify.sock already exists"

setup: user-friendly error message if Python headers are missing

test-keyword: ignore subject in notify hook mails Long tmpdir names caused truncation of subject anyway, and that made $TESTTMP replacement fail.

test-keyword: fix test glob to ACL/SELinux flag

test-notify: fix fix for line continuation in long mail header lines Continued lines can also start with space. Note that this hack also incorrectly patches the diff output.

import: don't strip '#' lines from patch descriptions (issue 2417) Previously no '# ' lines came through the parser. Now only the first '# ' lines are processed, from '# HG changeset patch' and to the first line not starting with '# '.

test-notify: stabilize output test-notify is made a bit more stable by stripping "all" folders away instead of just 3.

tests: reintroduce ":$HGPORT" in test output This reduces the number of patterns that must be adjusted when writing tests.

tests: remove the last traces of $HGTMP $HGTMP isn't needed - and if we need something like that then $TESTTMP is more appropriate.

tests: remove filtertmp.py and helpers.sh These nice starts ended up being replaced with globs.

tests: remove redundant globs Many globs now just match $TESTTMP and is no longer needed.

tests: replace test tmp directory with $TESTTMP in test output This reduces the number of patterns that must be adjusted when writing tests.

keyword: fix test glob

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*

merge with stable

test-url: refactor with shorter lines

keyword: use workingctx to detect modified and added files after rollback

keyword: rename variable "cfiles" to "changed" for clarity

tests: unify test-casefolding

url: mark certificate error string for translation

i18n-pt_BR: synchronized with f2937d6492c5

merge with i18n stable

i18n-ja: synchronized with e356c5c21b15

merge with stable

merge with i18n

i18n-pt_BR: synchronized with 552e0cfbddbd

merge with stable

test-doctest: test the modules that contains doctests

doc: clarify that https cert verification requires web.cacerts

url: verify correctness of https server certificates (issue2407) Pythons SSL module verifies that certificates received for HTTPS are valid according to the specified cacerts, but it doesn't verify that the certificate is for the host we connect to. We now explicitly verify that the commonName in the received certificate matches the requested hostname and is valid for the time being. This is a minimal patch where we try to fail to the safe side, but we do still rely on Python's SSL functionality and do not try to implement the standards fully and correctly. CRLs and subjectAltName are not handled and proxies haven't been considered. This change might break connections to some sites if cacerts is specified and the certificates (by our definition) isn't correct. The workaround is to disable cacerts which in most cases isn't much worse than it was before with cacerts.

test-subrepo-recursion: remove empty defaults section

mq: Removed extra ... in short help for qdelete Update to 57ad5c4e4213, which left a ... too much, after removing -r [REV]

mq: removed short option in help for deprecated options Removed help for deprecated short option for: -n NAME for qpush -n NAME for qpop -r REV for qdelete|qremove|qrm

test-subrepo-recursion: deleted default arguments Deleted default arguments from test-sub-repo-recursion. Rationale is that it is confusing to read, when the arguments aren't at each command in the test

tests: removed test names in tests The name of the test files is replaced with a glob * expression, thereby the tests does not depend on the filename of the file they are in.

tests: fix 05210e955bef merge error in test-git-import.t

test-convert-cvs-detectmerge: add sleep so cvs notices changes

init: expand destination url as a configured paths Most commands expands configured paths when repositories are specified, just as the urls help says. Clone also expands the destination path. Clone is morally equivalent to init + push/pull, so init should also expand the destination path - and that is what this patch makes it do. There is no really good usecases for this and in most cases it doesn't matter, but consistency is nice, and otherwise we would have to document the exception.

mq: explain qpush -f better

serve: let --web-conf help reference hgweb

transplant: add the transplanted revset predicate This adds support to identify a particular transplanted changeset or set of changesets. The argument is optional. Examples: hg log -r 'transplanted(1234 or 2345)' hg log -r 'transplanted()'

test-convert-cvs-branch: add sleep so cvs notices changes

graphlog: style with header and footer (issue2395) The glog command didn't emit header and footer from the style, as demonstrated by "hg glog --style xml". Asciiart combined with xml markup hardly makes sense, but header and footer might however be useful for adding for example html pre tags around the graph.

test-serve: use service that works on more platforms Follow-up to ba8850911703: echo is ambiguous on OS/X, and Solaris have neither http nor gopher. daytime seems to be available everywhere.

Merge with stable

patch: test and document a bit binary to regular file upgrade

patch: upgrade to git patch when removing binary file Otherwise it may cause data loss when removing binary files in mq with --git=auto.

patch: fix rename text to binary file (issue2400)

tests: show skip reason instead of "irrelevant" with unified tests, too parsehghaveoutput expects just the test output, not the merged test/output, so for skipped unified tests e.g.: Skipped test-convert-darcs.t: missing feature: irrelevant was shown instead of: Skipped test-convert-darcs.t: missing feature: darcs client

merge with stable

merge with iin

Correct Content-Type header values for archive downloads. The content type for both .tar.gz and .tar.bz2 downloads was application/x-tar, which is correct for .tar files when no Content-Encoding is present, but is not correct for .tar.gz and .tar.bz2 files unless Content-Encoding is set to gzip or x-bzip2, respectively. However, setting Content-Encoding causes browsers to undo that encoding during download, when a .gz or .bz2 file is usually the desired artifact. Omitting the Content-Encoding header is preferred to avoid having browsers uncompress non-render-able files. Additionally, the Content-Disposition line indicates a final desired filename with .tar.gz or .tar.bz2 extension which makes providing a Content-Encoding header inappropriate. With the current configuration browsers (Chrome and Firefox thus far) are registering the application/x-tar Content-Type and not .tar extension and appending that extension, yielding filename.tar.gz.tar as a final on-disk artifact. This was originally reported here: http://stackoverflow.com/questions/3753659 I've changed the .tar.gz and .tar.bz2 Content-Type values to application/x-gzip and application/x-bzip2, respectively. Which yields correctly named download artifacts on Firefox, Chrome, and IE.

merge with iin