subrepo: initialize subrepo relative default paths relative to their root

merge with stable

bookmarks: create undo.bookmarks using repo.opener instead of util.copyfile This more closely matches how the other undo files are created, and we don't care about settings permissions or times on the file, which can fail if the user running hg doesn't own the file.

archival: don't set gzip filename header when there's no filename This mainly affects hgweb, which can generate tar.gz archives without filenames. Without this change, the header would be set to ".gz", which can confuse Safari into extracting the file and renaming it to "gz" when "Open 'safe' files after downloading" is enabled. file(1) before: hg-crew-5e51254ad4d4.tar.gz: gzip compressed data, was ".gz", last modified: Thu Dec 2 11:46:20 2010, max compression after: hg-crew-5e51254ad4d4.tar.gz: gzip compressed data, last modified: Thu Dec 2 11:46:20 2010, max compression

build: don't delete precious version information on 'make clean' setup.py rebuilds version information if it's locally available, regardless if file already exists.

patch: write .rej files without rewriting EOLs Do not pass reject file content to patchfile.writelines() to: - Avoid line endings transformations - Avoid polluting overriding implementations with unrelated data. They should override write_rej() to deal or ignore reject files properly. Bug report, analysis and original patch and test by Shun-ichi GOTO <shunichi.goto@gmail.com>

record: move copystat() hack out of util.copyfile() and into record b2410ed2cbe9 updated copyfile to also copy over atimes and mtimes. That behavior is specifically to trick editors into thinking files that hg record has modified haven't changed. We don't really care about preserving times in the general case.

util: make atomicfiles closable

subrepo: drop arguments unsupported by old git

subrepo: work around old git's remote naming scheme Older git versions use 'origin/master' Current git uses 'remotes/origin/master'

subrepo: use environment variable instead of git commit's --date Older git versions do not have a --date flag.

subrepo: parse git status's human-readable output Older git versions do not have a machine-readable output, but the default format has not changed over time.

subrepo: use subprocess's cwd instead of git's --work-tree Some older git commands (e.g. git merge) do not properly recognize the --work-tree argument, so abstract that away from git.

test-subrepo-git.t: make gitroot pushable earlier Older git versions get confused when the git repo becomes bare.

test-subrepo-git.t: silence git output Older git versions have different ideas of what output is considered quiet, so the tests can be more version-blind.

bdiff: Fix bogus NULL return

bdiff: dynamically allocate hunks Make the hunk list a singly-linked list rather than a large array.

merge with stable

subrepo: lazily update git's local tracking branches This continues the strategy of separation between hg pull and hg update in git subrepos by only dealing with git's branches on an update. This behavior tries to cover the bare essentials of the semantics of git pull in the subrepo when the parent repo does hg pull and hg update.

subrepo: return both mapping directions from gitbranchmap

subrepo: strip gitcommand output

sshrepo: don't use readline() on the stderr pipe For some reason, the stat/readline dance suppressed lines following the first in PyPy 1.4.

test-demandimport.py: PyPy support The stringification of sys.stderr is different in PyPy: $ pypy -c 'import sys; print sys.stderr' <open file '<fdopen>', mode 'w' at 0x00a42080> $ python -c 'import sys; print sys.stderr' <open file '<stderr>', mode 'w' at 0x10025a270> The test will now ignore the exact value between the angle brackets.

demandimport: change default for level from None to -1 The Python default for this function is -1, indicating both relative and absolute imports should be used.[1] Previously, we relied on the Python VM not passing level when such semantics were requisted. This is not the case for PyPy, however, where a level of -1 is always passed to __import__. [1] <http://docs.python.org/library/functions.html#__import__>

export: flush the file pointer between patches

test-clone-failure.t: fix unification oversight Prior to unification, the test contained an 'echo $?' line. This line was removed during unification, but the 'echo 255' line that faked it when FIFO support is absent was not.

keyword: make kwfiles show deleted files configured for expansion

keyword: colorize hg kwfiles output

coding style: fix yield used as a function

check-code: single check for Python keywords used as a function This replaces the specific checks for del/and/or/not/except and additionally checks other Python keywords.

coding style: fix gratuitous whitespace after Python keywords

check-code: check for gratuitous whitespace after Python keywords

i18n-pt_BR: synchronized with 9696954415db

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

wix: add support for x64 native MSI packages

wix: switch Mercurial Windows installer to use py2exe --bundle 3 --bundle 3 leaves all of the compiled C extensions and other DLLs outside of the library.zip, so we no longer add the installer folder to the system PATH. Instead, we now ship a small bin/hg.cmd and it is placed in the PATH. Switching to py2exe --bundle 3 is necessary because the higher bundle options are not supported on x64.

Merge with stable

util.datestr: do not crash on revisions with negative timestamp (issue2513) Python's time.gmtime(lt) fails on Windows, producing a traceback with ValueError: (22, 'Invalid argument') if lt < -43200. We get a local time boundary value of -43200 if we take "the epoch" Thu Jan 01 00:00:00 1970 = time.gmtime(0) from timezone 'UTC+0' into timezone 'UTC-12'. All other timezones will have larger local time values for that point in time. Aborting with a traceback on 'hg log' for revisions with a timestamp value < -43200 is clearly not acceptable. Returning "invalid timestamp" or similar as string representation is not an option either, since that may crash other tools which parse the output of 'hg log'. Instead, we teach util.datestr() to return the epoch in timezone UTC+0 on *all platforms*, represented by the string Thu Jan 01 00:00:00 1970 +0000 if the timestamp's unix time value is negative. (based on a patch originally proposed by Benjamin Pollack)

checknlink: return False if .hgtmp file preexists (issue2517) If os_link fails on Windows, errno is always errno.EINVAL, so we can't really say if the testlink could not be created because (a) the FS doesn't support hardlinks or (b) there is a leaked .hgtmp file lying around from a previous crashed run. So let's err on the safe side, keep the code simple and assume we can't detect hardlinks in both cases.

localrepo: move string formatting out of gettext call

merge with stable

mq: ignore subrepos (issue2499) If MQ allows modifying .hgsub or .hgsubstate in a patch, it can easily lead to an inconsistent subrepo state. This patch prevents qrefresh from adding any modifications to .hgsub or .hgsubstate to a patch. The user is warned that these files are not included in the patch. The tests test both the slightly irrational and the pathological cases.

tests: integrate test-hardlinks-safety.t into test-hardlinks.t Should make running the testsuite a bit faster. Also, test-hardlinks.t and test-hardlinks-safety.t now have enough infrastructure in common.

mq: add an '-e/--exact' option to qpush This patch adds an '--exact/-e' option to qpush that will try to push the patches in the correct location in the DAG. Specifying this option does the following: * If --move is specified, abort. It makes no sense to move a patch to the front of the queue and try to apply it to its parent, because its parent is one of the patches we just moved it in front of! * If patches are already applied, abort. We don't want patch changesets scattered throughout the DAG. * If local changes are present, abort unless --force is used, as usual. * Find the first patch we're going to push (if we're pushing multiple patches with a target or --all). * If that patch doesn't have a parent, abort, obviously. * If the parent doesn't exist in the repo, abort. Something is wrong. * Update to the parent, then continue pushing the patches as normal.

dirstate: warn on invalid parents rather than aborting This allows more graceful recovery from some mangled dirstates

code style: prefer 'is' and 'is not' tests with singletons

polib: remove unnecessary comparisons with True Submitted to upstream repository as changeset f11e0b1b37b0.

subrepo: lazier git push logic Avoids calls to git push when the revision is already known to be in the remote repository. Now, when using a read-only git subrepo, git will never need to talk to its upstream repository.

merge with stable

subrepo: archive git subrepos

check-code: catch Python 'is' comparing number or string literals The Python 'is' operator compares object identity, so it should definitely not be applied to string or number literals, which Python implementations are free to represent with a temporary object. This should catch the following kinds of bogus expressions (examples): x is 'foo' x is not 'foo' x is "bar" x is not "bar" x is 42 x is not 42 x is -36 x is not -36 As originally proposed by Martin Geisler, amended with catching negative numbers.

keyword: s/config/configuration/ in help

Merge with stable

record: quote command in use hg commit message

revert: improve merge advice and favor its error over all

rebase: support --detach when null is common ancestor

templater: fix variable name 'format' was renamed to 'parsed' in 0d50586a9d31

test-hardlinks: add testcase for repo copied with 'cp -al' This patch adds a case to test-hardlinks.t which demonstrates that hardlinks in the working directory are broken up (using 'hg update'). Motivation for this patch: 'hg help clone' shows copying repositories *and* the working directory using 'cp -al', creating hardlinks in the *working directory* too (not just in the store). Note that we can't use 'cp -al' since for example MacOS X doesn't support these options on cp. I'm thus using the same trick as in test-hardlinks-safety.t for creating hardlinks in the working dir.

Merge with stable

subrepo: handle missing subrepo spec file as removed Otherwise, all commands involving a dirstate walk will abort when trying to readone of them. Deleting .hgsub basically breaks a repository.

Merge with stable

subrepo: prune empty directories when removing svn subrepo

subrepo: use subprocess directly to avoid python 2.6 bug Using svn subrepos on MacOSX with native python 2.6.1 results in a lot of unexpected output caused by: http://bugs.python.org/issue5099 subprocess.Popen.__del__ causes AttributeError (os module == None) Avoiding dangling Popen instance solves the issue.

subrepo: fix removing read-only svn files on Windows

check-code: catch 'ls filename --option' case as per 6bdae8ea0b48

minirst: improved support for option lists. This enables minirst to parse and print option lists which have both long and short options. Before, we could only parse option lists with long options.

test-subrepo-git.t: portability fix. Specifying arguments after file names for 'ls' is a GNU extension.

minirst: modified minirst to also recognize empty comments. The modifies minirst to also handle empty comments. An empty comment is a block with a single line containing two dots.

merge with stable

posix: remove is-comparison between integers Comparing integers by identity relies on a CPython implementation detail of caching integers between -5 and 256.[1] [1] <http://docs.python.org/c-api/int.html#PyInt_FromLong>

httprepo: remove is-comparison with string literal An identity check between a variable and a string literal was added to the pushkey implementation in 6bd9778ae749. While CPython will normally intern strings and thus make the test safe, value identity is what should be used here.

mq: fix comment to reflect change in efbee27415ab

mq: clean up unused variable in qrefresh Removes the unused variable `aa2` that holds the list of deleted files returned from repo.status().

minirst: better interaction between comments and margins You can now split a list with a comment: * foo .. separator * bar and the two list items will no longer be run together, that is the output is * foo * bar instead of * foo * bar

run-tests: fix --debug for .t tests When --debug is given to the test runner, run() returns (retcode, None). Do not try to use None output as a string, and return directly, similarly as other testers.

merge with stable

commit: search both parents for missing copy revision (issue2484) raise a proper abort if we can't find an ancestor

context: walk both parents for workingctx.ancestors()

discovery: list new remote heads in prepush() on --debug With this patch applied, Mercurial will list the hashes of new remote heads if push --debug aborts because of new remote heads (option -f/--force not set). Example: $ hg push --debug repo1 using http://example.org/repo1 http auth: user johndoe, password not set sending between command pushing to http://example.org/repo1 sending capabilities command capabilities: changegroupsubset stream=1 lookup pushkey unbundle=HG10GZ,HG10BZ,HG10UN branchmap sending heads command searching for changes common changesets up to 609edbc7853f sending branchmap command new remote heads on branch 'default' <- new output line new remote head 5862c07f53a2 <- new output line abort: push creates new remote heads on branch 'default'! (did you forget to merge? use push -f to force) Compare to without --debug (not changed by this patch, including it here for reference purposes only): $ hg push repo1 pushing to http://example.org/repo1 searching for changes abort: push creates new remote heads on branch 'default'! (did you forget to merge? use push -f to force) Motivation for this change: 'hg outgoing' may list a whole lot of benign changesets plus an odd changeset that will trigger the "new remote heads" abort. It can be hard to spot that single unwanted changeset (it may be an old forgotten experiment, lingering in the local repo). "hg log -r 'heads(outgoing())'" might be useful, but that also lists a head that may be benign on push. Inside prepush(), we already know which heads are causing troubles on 'hg push'. Why not make that info available (at least on --debug)? This would also be helpful for doing remote support, as the supporter can ask the user to paste the output of 'hg push --debug' on error and then ask further questions about the heads listed.

discovery: remove erroneous comment in prepush() New named branches *can* be created without -f/--force by specifying --new-branch

subrepo: removing (and restoring) git subrepo state

subrepo: update and merge works with any git branch

subrepo: allow git subrepos to push and merge (master branch only) gitsubrepo based on patch from David Soria Parra: http://bitbucket.org/segv/davids-poor-git-subrepo-attempt/

subrepo: cloning and updating of git subrepos gitsubrepo based on patch from David Soria Parra: http://bitbucket.org/segv/davids-poor-git-subrepo-attempt/

subrepo: support for adding a git subrepo gitsubrepo based on patch from David Soria Parra: http://bitbucket.org/segv/davids-poor-git-subrepo-attempt/

merge with stable

merge with i18n

Added signature for changeset 4438875ec01b

Added tag 1.7.1 for changeset 4438875ec01b

merge with stable

merge with i18n stable