help: point out need for stringification

tests: adapt the test runner to work with jython

posix: move a global fcntl import to keep it from breaking jython Only needed on darwin, anyway.

util: fake the builtin buffer if it's missing (jython)

mq: fix qcommit documentation wrt --mq option

Merge with stable

wsgicgi: call close() on iterable to avoid resource leaks Quoting PEP 333 (WSGI): "If the iterable returned by the application has a close() method, the server or gateway must call that method upon completion of the current request, whether the request was completed normally, or terminated early due to an error. (This is to support resource release by the application. This protocol is intended to complement PEP 325's generator support, and other common iterables with close() methods."

merge with mpm

patch: warn when the internal patcher fails hopefully we'll soon fix the remaining failures from the internal patcher, and not use the external one anymore.

run-tests: make sure GREP_OPTIONS isn't set This can interfere with test output, especially for options like --color.

Merge with stable

patch: more precise NoHunk, raised for every file (issue2102)

patch: differentiate start of file with diff --git vs '--- '

Merge with stable

patch: try harder to find the file to patch on file creation (issue2041) accept the following patch header: first line: foo/a.orig second line: foo/a

Merge with stable

Merge with i18n

Merge with i18n

merge with i18n

merge with i18n stable

i18n-pt_BR: synchronized with e930017f9e2a

Merge with stable

l10n: Updates to Danish (da) translation Transmitted-via: Transifex (www.transifex.net)

patch: second line of a context diff starts with '--- ', not '+++ '

Merge with stable

patchbomb: --desc implies --intro For a single patch, an introductory text should not remain unsent if --intro has been omitted, as the intent of --desc is clear.

wix: don't show version in title of root feature The version is already shown in the title bar of the feature selection dialog and in the text of the welcome dialog. It's unusual for Windows programs to repeat the version in the root feature.

wix: use build variable for VC redist source dir

Merge with stable

mq: allow lines starting with '--- ' in patch messages

patch: enhance diff detection regexp, allow '--- ' in patch message

fix bug in hg.clone when passing in a repository object

check-code: more tests and more robust python filtering

Merge with stable

localrepo: more specific warning on adding large files With better language as suggested by timeless.

progress: drop extra args for pos=None calls (issue2087)

check-code: fix check-code complaint

check-code: improve quote detection regexp, add tests

Merge with stable

check-code: add a return value to checkfile function The checkfile function returns True if the file is correct, False otherwise.

code-code: Add a logfunc argument to checkfile This helps external tool customisation. The logfunc argument must be a function called to report errors. A new logger class is also added to keep the old behaviour by default.

check-code: Add a ``maxerr`` argument to the ``checkfile`` function check-code.py used to halt after 15 errors. This changeset adds a new argument to the checkfile function to control this limit.

check-code: Add a ``checkfile`` function The part of the code actually checking each file is moved in the ``checkfile`` function to allow external reuses.

check-code: Only call check-code if __name__ = "__main__". This changeset moves the code that actually executes something to the "if __name__ = '__main__'" section to allow the file to be imported as a module.

add a small test for contrib/check-code.py This changeset adds a test file for contrib/check-code.py. This test runs check-code.py against two small files. The first file should not raise any check-code.py error while the second should. A line contains multiple errors to verify the check-code.py behaviour: In the case of multiple errors at the same line, the context line should only be displayed once.

keyword: do not bother about detecting extension path in demo Detecting and showing the path to a keyword extension in a non-standard place only made sense while keyword.py was not shipped with Mercurial. The test output has changed because we do not have a spurious space at eol anymore.

keyword: make kwdemo less verbose 1) Set the branchname always silently with dirstate.setbranch(). We create a branch so that testing the {branches} template does not come up empty. But kwdemo is hardly the place to inform the user by inference why {branches} is empty on the default branch. "demobranch" is ascii and cannot be changed, so using the internal command instead of commands.branch() is safe. 2) Do not show full path to temporary directory (distracting long lines on Mac OS X). 3) No special debug output. Output only related to keyword, no internals like unsetting of commit hooks etc.

keyword: 1 variable name for overwriting candidates

keyword: do not customize ui.note() when overwriting Behaviour change: hg commit --verbose now prints out the names of the files which are overwritten.

mq: test for init --mq with a destination argument

contrib/wix: fix product name to include version Without this, Mercurial is registered under the installed programs on Windows as just 'Mercurial', which is unusual for a program to do on Windows. Including the version in the registered product name registers the software in the Windows control panel of installed programs as, for example, 'Mercurial 1.5' (for 1.5), or as 'Mercurial 1.5.1032' for a stable 1.5+32-35893dcfd40c 'Mercurial 1.5.5080' for a unstable 1.5+80-1ee60e82333c when using http://bitbucket.org/tortoisehg/thg-winbuild to create daily builds. Furthermore, the install UI texts in the built installer database (MSI file) are more clear on what the user is about to install, as, for example, the text in the initial installer dialog now reads "The Setup Wizard will install Mercurial 1.5 on your computer" instead of just "The Setup Wizard will install Mercurial on your computer"

help: it's not necessary to escape quotes

check-code: remove simple quotes first

merge with stable

filelog: no need to optimize an uncommon case, assume meta = {}

filelog: text is stored modified when it starts with '\1\n'

Merge with stable

check-code: add check for any/all

cvsps: fix traceback involving 'synthetic' https://bugzilla.redhat.com/show_bug.cgi?id=573666 Reported by Sjoerd Mullender

progress: use a verb in present participle

Merge with stable

progress: use a verb (+noun) in present participle

subrepo: fix hgrc paths section during subrepo pulling There are two bugs in current subrepo ctor: - hgrc paths were using parent repo (ctx._repo) instead of self._repo - it was joined with local extract path, not its source repo path Fixed both bugs using _abssource on self once it is fully initialized. It gets the job done perfectly for pull and push urls.

Merge with crew-stable

convert: teach cvsps to handle . repository (issue1649) For a CVS repository checked out with "cvs co .", the prefix used to strip of what we get from CVS was previously erroneously set to "repopath/.". We now prevent the dot to be added. Test folded in test-convert-cvs and simplified by Patrick Mézard <pmezard@gmail.com>.

record: separate each hunk with a blank line This makes it easier for the eye to find the beginning of a hunk when scrolling up in the terminal.

mq: do not try to delete non-existent files (regression from e8e56d8377ab)

Merge with stable

mq: fix init with nonexistent or non-local repository

mq: no longer refer to deprecated qinit -c command

mq: don't mention qinit as a "common task" Without -c, it is a no-op (the queue is implicitly initialized by all relevant commands if needed), and queue repositories with -c are an advanced usage of mq, and not otherwise required.

mq: don't use regexp when not necessary

mq: use xrange/enumerate instead of += 1

mq: don't use len(list) unless necessary

mq: find_series() simplify and don't use regexps

mq: fix coding style (missing space)

mq: qsave creates entries with the left part empty (':patchname')

mq: simplify statusentry(), fix restore broken by ee48e5ef8753

mq: use context API

mq: simplify qparents calculation

mq: simplify commit message generation

mq: avoid many hex/bin conversions, keep the binary node when possible

rebase: add option to not commit after a collapsing This option is useful when other extensions (e.g., pbranch) want to use rebase --collapse and append other things before committing. This is not intended to be used from command line.

Merge with crew-stable

hgweb: make code to join url path simpler Now SCRIPT_NAME never contains http://host:port part, we don't need to care about '://'.

hgweb: fix broken URLs of RSS/Atom feeds (issue1772) This fixes doubled URL, e.g. http://example.orghttp://example.org/..., which appears on RSS/Atom feeds served by hgwebdir. It splits baseurl to update SERVER_NAME, SERVER_PORT and SCRIPT_NAME, according to RFC 3875. Updated the test output since SCRIPT_NAME becomes not to contain http://host:port part.

hgweb: introduce helper method to update req.env

rebase: always check if rebasing onto an applied mq patch. Previously, it only checked for an mq patch if the user explicitly passed -d/--dest. But rebasing onto an mq patch is a bad idea regardless of how we determine the rebase destination.

subrepo: wrap long line

merge with stable

test-extension: fix disabled extension tests for run-tests.py --local One test that requires inserting a broken extension into hgext does this by modifying PYTHONPATH. This doesn't work when run with --local because the 'hg' script being used is in the same directory as the local hgext. Instead of modifying PYTHONPATH, a secondary extension is enabled using --config that inserts the dummy hgext at the beginning of sys.path, before the script's path.

subrepo: print subrepo pulling URL

merge with stable

subrepo: keep ui and hgrc in sync when creating new repo

subrepo: forward the push to argument into _abssource

mercurial.spec: remove reference to doc/ja

mq: simplify and use context API

mq: avoid a (potentially expensive) repo.status(unknown=True) call

mq: all_files can be a set, remove dangerous default values

Merge with stable

rebase: remove unnecessary \" from help string They are not needed inside triple-quoted strings and they confuse the line number computation done in i18n/hggettext. The script tries to find the docstring in the source file. When \" in the source is turned into just " in the docstring, the docstring can no longer be found.

test-merge-default and check-code.py: No "export x=x" in sh

Merge with stable

progress: document progress.disable config option

shrink-revlog: add missing whitespace in expression

any is not available for python2.4

keyword: update copyright

keyword: remove deprecated options

style: use consistent variable names (*mod) with imports which would shadow

archive: autodetect archive type by extension (issue2058)

merge with stable

tests: use external coverage, mandate newer version This removes the option for including the stdlib in coverage reports.

churn: use ui.progress instead of --progress

rebase: improve help text - add a paragraph about default dest/source changesets - option help: say "changeset" not "revision" - option help: explain -b/--base better - clarify that -a/--abort and -c/--continue are different from the other options

commands: remove extra indentation from list in help text

server: initialize wsgi app in command, then wrap server around it

server: unnest server classes into module namespace

server: pass wsgi application to server (no need for non-local var)

server: abstract setup of ipv6 vs. normal server

server: handle server-internal config setup inside server class

server: externalize and streamline mixin setup

server: externalize application creation

commands: document and test hg clone update priority

rebase: improve help text - add a paragraph about default dest/source changesets - option help: say "changeset" not "revision" - option help: explain -b/--base better - clarify that -a/--abort and -c/--continue are different from the other options

serve: fix port config

merge with other head, will show bug in hg serve

test-serve: Show if port config and option are correctly used this will break in d3f27d15c9cb

drop (default: 8000), non-zero default is automatically added to help

make expression shorter, now the line fits into 80 chars

serve: fix options recording, trailing whitespace

serve: allow --port=0 to specify "server chooses the port number"

rebase: improve output of hg pull --rebase (issue2072)

shrink-revlog: factor out postorder algorithm

shrink-revlog: factor out suboptimal computation

shrink-revlog: remove branchsort algorithm (it behaves poorly)

shrink-revlog: add accounting of suboptimal nodes to the new algorithms.

shrink-revlog: add "reverse postorder" and "postorder reverse" toposorts. Based on a patch by Benoit Boissinot, adapted to the pluggable sort algorithm design. toposort_reversepostorder() is a very good performer; it's designed to recreate what the revlog would have looked like if Mercurial had parent deltas now. toposort_postorderreverse() is unstable and very inconsistent, but perhaps with some work it could be made better.

shrink-revlog: add --sort option for user-selectable toposort algorithm.

shrink-revlog: rename some local variables for consistency.

shrink-revlog: instrument sort code to record statistics. Notably, count "suboptimal" nodes (predecessor is not first parent) and (with -v) report them at the end of the run.

Merge with crew-stable

convert: handle svn tree with empty roots (issue2079)

merge with stable

bundle: fix bundle generation for empty changegroup

patch/diff: move diff related code next to each other

remove header handling out of mdiff.bunidiff, rename it

remove contrib/hgdiff, it makes refactoring diff/patch harder it can always be revived if needed

demandimport: blacklist _ssl (issue1964)

patch/diff: move patch.export() to cmdutil.export() This API change will allow us to break a cycle between patch and cmdutil.

wix: pre-check the 'I approve this license' checkbox This is simply a convenience to the user, they can click next until the installer goes away. Optimally, the checkbox would be hidden or removed, but that requires rewriting the UI.

Merge with stable

addremove: avoid fetching data again and again

addremove: add progress support for similarity search

addremove: atomically update the dirstate In case someone hits ^C during the similarity search, properly rollback

inotify: expose the same dirstate.status() interface as dirstate. The real dirstate.status() does not have any keyword args. For consistency, wrappers or subclasses should not have them either.

keyword: remove spurious locks, improve handling of wlock - kwcommitctx is inside the wlock of repo.commit: no lock - _kwfwrite only needs wlock wlock outside try block, so we don't need to import lock.release _kwfwrite should even be safer that way, as we moved the status call inside the try-except block. Thanks to Benoit Boissinot for help.

keyword: use status' names instead of index

hgweb/graph: edge should be same color as the destination

templatefilters: store the agescales in reverseorder directly

hgweb: separate generation of entries and sorting (cleanup)

Merge stable

demandimport: add __main__ to the blacklist (because of setuptools)

bookmarks: add invalidate() to bookmark_repo Cached bookmark information would not be reset when repo.invalidate() was called, meaning (for instanced) guis would be left with out-of-date bookmark info. This patch fixes that by overriding bookmark_repo.invalidate()

branch: help misuse of hg branch to switch branches Maybe beginners tend to use 'hg branch EXISTING_BRANCH' instead of 'hg update EXISTING_BRANCH' as me. If so, let's help them to use 'update'. Also removed '(use --force to override)' because it can mislead them.

Make Readme.html reference current OS X release

progress: clear progress before writing to stderr

Added signature for changeset ff2704a8ded3

Added tag 1.5 for changeset ff2704a8ded3

mq: drop -Q in favor of --mq only

mq: correct test output

mq: disallow : in patch names (issue2065)

mq: disallow # (and : on Windows) in patch names (issue2065)

Merge with stable

win32/hgwebdir_wsgi: clarify documentation and clean up script a bit

Merge with hg-i18n

i18n-sv: translated bisect, dates, locate, manifest

i18n-ja: synchronized with c50a3d7154d2

i18n-pt_BR: synchronized with f142fa3c0a8c

test-fetch: use relative URL to avoid echoing TMP path

fetch: fix newheads calculation (issue2047)

Make annotate --follow an alias for -f/--file to behave like in older versions Since 98a0421b9e52 annotate follows copies/renames by default, but the output of e.g. "annotate --follow --number" should not change without some deprecation time.

win32/hgwebdir_wsgi: clarify copyright license

store: only add new entries to the fncache file Newly added fncache entries were not added to the in-memory cache, making it possible for 'hg convert' to cause duplicates in .hg/store/fncache. Duplicates in the fncache file are harmless, but excessive numbers of duplicates from large converted repositories may slow down execution speed considerably.

Updated test output of test-convert-baz after f2618cacb485

trailing spaces (and one stray tab)

Merge with default

Merge with stable

add wsgi script for Microsoft IIS with isapi-wsgi

doc/ja: remove old Japanese man page translations They were added way back in 2005 and haven't been updated since. They are no longer referenced by the Makefiles at upper levels and have not been shipped with a recent version of Mercurial.

Merge with hg-i18n

i18n-sv: synchronized with f4f3a74ce832

i18n-pt_BR: synchronized with b1339234080e

ui: ignore ui.logtemplate and ui.style when HGPLAIN is set HGPLAIN should suppress them because they change Mercurial's default output.

Merge with hg-i18n

i18n-ja: synchronized with bb4561401c84

alias: fixes exception when displaying translated help text __doc__ of aliased command shouldn't cointain non-ASCII characters, because it'll be gettext-ed later by commands.help_(). Here gettext can raise UnicodeDecodeError. Once concatenated two translatable strings into one, it become untranslatable. So this patch moves 'alias for:' from dispatch.cmdalias to commands.help_, where help texts are translated. 'alias for:' was introduced by 6e8a16dd3e30.

Merge with hg-i18n

i18n-sv: synchronized with d1bbf01c4a8e

tests: update output to match b1339234080e

Add ElementPath to the list of package ignored by demand import The bzrlib try to import the ElementPath module but had a fallback in case the import fails. Lazy import of this module leads to later failure. The bzrlib is used by the convert extension.

resolve: rewrite help to be clearer and more complete (issue2030).

mq: simplify --mq handling / keep compatibility with other extensions reported by edgimar on IRC

Merge with stable

i18n-da: synchronized with 091dddf05764

doc/Makefile: fix doc generation when LANGUAGE is set

i18n-ja: synchronized with 4462760d6cfc

i18n-pt_BR: synchronized with dd3526162436

contrib/wix: add COPYING.rtf Moving the file from the misc directory of the thg-winbuild repo, which uses mercurial's contrib/wix. This file is displayed by the install UI sequence, so it belongs to the WiX sources quite closely. It happens to be installed by the msi installer, too.

fix test-mq-eol under --pure (mimic diffhelper.c behaviour) bug discovered by apycot (apycot.hg-scm.org)

Updated contrib/vim/patchreview.* to version 0.2.2 - Security fixes by removing custom tempfile creation - Removed need for DiffReviewCleanup/PatchReviewCleanup - Better command execution error detection and display - Improved diff view and folding by ignoring modelines - Improved tab labels display

Merge with hg-i18n

i18n-sv: synchronized with fc5908d01ed7

strip: invalidate all caches after stripping (fixes issue1951) test thanks to Stefano Tortarolo

fix test output changed by 2e1a9b811d13

Updated contrib/vim/patchreview.* to version 0.2.1 1) adds a :DiffReview command to review code changes in the current workspace. 2) removes the need to have patchutils (specifically filterdiff) installed on the system by implementing patch extraction in pure vim script.

httprepo: normalize output from unbundle with ssh Lines from the remote are prefixed with 'remote: ' and written locally using ui.status, similar to what sshrepo does.

merge with default

shrink: handle all combinations of inline/non-inline revlogs

commands: clarify --config syntax

progress: provide an explicit disable method for developers The other three checks for disabling the progress bar have serious side effects for any class that derives from ui.ui()

url: only mark format string for translation

Merge with hg-i18n

i18n-da: fixed typo

i18n-ja: synchronized with eddf859343de

i18n-pt_BR: synchronized with 076e8a8000a3, minor fixes

url: avoid traceback when parsing [auth] (issue2056)

filemerge: use native path separators when merging (issue1399)

gpg: make 13448eab08ca work when not on repo root

hgweb: use string join instead of slower cStringIO

hgweb: fix handling of arguments in the between command The 'pairs' argument was coded to be optional, but the code would crash if it was not provided.

hgcia: report RPC errors

merge with stable

commands: correct diff -c explanation

httprepo: send Content-Type instead of content-type

httprepo: use content-type application/mercurial-0.1 for POST Previously, application/octet-stream was used. The content-type is currently ignored by the server.

patch: fix patching with fuzz and eol normalization

make the progress extension honor ui.quiet

subrepo: Update .hgsubstate in case of deleted subrepo When a subrepo is deleted from .hgsub, it also needs to be removed from .hgsubstate. Previous code was updating .hgsubstate only in case of newly or modified subrepo.

Do not use osutil.c with python 2.4 and Windows (issue1364) Windows python 2.4 os.stat() reports times including DST offset, while osutil.c reports the correct value, which makes status() systematically compare files content. This bug is fixed in python 2.5. Using osutil.py instead of osutil.c is 4x times slower on large repositories but current code is completely unusable. Given few people are likely to use python 2.4 on Windows this solution was considered a good trade-off compared to more invasive solutions trying to address the offset issue.

commands: mention diff -c