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