merge with stable

Added signature for changeset 6aff4f144ad3

Added tag 1.7.2 for changeset 6aff4f144ad3

keyword: copy: when copied source is a symlink, follow it 1) hg cp symlink copy -> copy is a symlink. 2) cp symlink copy; hg cp -A symlink copy -> copy is a regular file. In the second case we have to follow the symlink to its target to find out whether we have to unexpand keywords in the copy. Add test covering the case where the copied link's target is ignored by keyword but has content which would match the regex for expanded keywords to check whether we indeed leave the destination alone.

makedirs: abort if parent == name (issue2531) catches unknown drive letters on Windows

win32mbcs: use extsetup() to wrap functions only once. Using reposetup() may cause multiple-wrap issue in some situation like "hg serve".

hgwebdir: fix incorrect index generation for invalid paths (issue2023) edd07be943dd moved the subdirectory match inside the repository match loop. A virtual path existing/path/invalid/path would then match existing/path, and generate a wrong index page.

serve: fix doc typo

mq: fix failing qrefresh test Additions to test-mq-qrefresh.t in f08df4d38442 (mq: ignore subrepos (issue2499)) were originally based on a version prior to d0e21c5fde41 (subrepo: handle missing subrepo spec file as removed). This fixes a test failure that resulted from the former being applied after the latter, noticed by abuehl.

makedate: abort on negative timestamps (issue2513) catches weird clock settings

parsedate: abort on negative dates (issue2513) catches "hg commit -d '-7654321 3600'" (example)

merge with i18n

i18n-pt_BR: synchronized with f08df4d38442

merge with stable

test-clone.t: add basic cases for destination '' The case $ hg clone a '' already aborted before 2649be11ab0b, whereas $ hg clone --pull a '' tripped the fixed issue2528. Both basic cases are expected to fail with an abort.

hgrc.5: expand introduction for [web] section

hgrc.5: describe what the [auth] section is for

merge with stable

runrst: add RSTARGS Makefile variable to allow customization In particular, we can ask users to run make RSTARGS='--traceback' doc when we need debugging information

util: do not recurse in makedirs if name is '' (issue2528)

convert/svn: fix changed files list upon directory replacements When branch2/dir was replacing branch1/dir, we only marked branch2/dir files a changed. Add branch1/dir files as they may not exist in branch2.

encoding: fix typo in variable name The typo had no real effect, except for an unnecessary UTF-8 encoding.

pushkey: use UTF-8

wireproto: use proper UTF-8 handling for key lookup Lookups happen in the local encoding space, but the wire protocol should be using UTF-8 for interoperability.

bookmarks: use UTF-8 storage This uses tolocal/fromlocal to translate bookmark metadata to UTF-8 for storage. Existing bookmarks in ASCII, UTF-8 or Latin1 will continue to work, others may need to set HGENCODINGFALLBACK to transition.

branch: operate on branch names in local string space where possible Previously, branch names were ideally manipulated as UTF-8 strings, because they were stored as UTF-8 in the dirstate and the changelog and could not be safely converted to the local encoding and back. However, only about 80% of branch name code was actually using the right encoding conventions. This patch uses the localstr addition to allow working on branch names as local strings, which simplifies handling so that the previously incorrect code becomes correct.

encoding: add localstr class to track UTF-8 version of transcoded strings This allows UTF-8 strings to losslessly round-trip through Mercurial

Merge with stable

wix: allow x86 MSI packages to be installed on x64 systems

Merge with stable