http: len(x) fails if it doesn't fit into an int, use __len__() instead len(x) raises OverflowError if it's bigger than 2**31-1, we need to call __len__() ourself instead.

filelog: sort meta entries, ensure deterministic order

Merge with i18n

i18n-sv: synchronized with 44b4a2a31623

util: use the built-in any() and all() methods if they are available

mergetools: improve configuration for several merge tools * meld - provide labels for the three panes * diffmerge - add registry key for detection, improve arguments * beyond compare - add linux version * winmerge - improve arguments * araxis - add configuration, including registry key for detection * misc - provide default priorities for more tools

hgrc.5: document use of environment variables on Windows This feature was introduced in c31ac3f7fd8f

url: correctly quote '/' in user and password embedded in urls

i18n-pt_BR: synchronized with 44b4a2a31623

url: fix python < 2.6 with ssl installed _GLOBAL_DEFAULT_TIMEOUT isn't related to ssl, but to python < 2.6, move it to the right hunk.

bugzilla: revert unhelpful check-code changes, module is actually called MySQLdb

mq: unify implementation of qinit and init -Q

bundle: exclude csets given in --base, unless they are in --rev (issue1910) Thanks Jesse Glick for the first version of this patch.

Merge with stable

Merge with default

mq: more instructive use of "--" in qguard help (issue2040)

color: don't crash on invalid status codes (issue2036) If an unknown file with a newline appears in the status output, color shouldn't raise a KeyError trying to parse second line in the filename.

Add progress extension to win32 default config file

test-interhg: test the extension

interhg: fixes regression introduced by 38170eeed18c

progress: use inline literals in help string

Fix test-pull under Windows

Fix test-push-validation under Windows

Fix test-share and test-subrepo under Windows

patch: remove useless copy, cleanup

patch: separate reverse copy data (issue1959)

Add test for progress extension

progress: make progress.refresh=0 always display the progress line This has no effect in real world where progress.refresh in unlikely to be set to zero, but is very useful in tests where all progress output is to be traced. It failed on platforms with coarse time.time() granularity, like Windows+py25.

remove unused imports

progress: make use of progress.refresh

i18n: merge default into stable

Merge with i18n

i18n-sv: nine basic commands translated Translated the following commands: bundle, branch, branches, cat, copy, grep, heads, identify, incoming Also did a sync with 956498af9812.

Merge with crew-stable

subrepo: make sure that the source path is stripped Test by Patrick Mézard <pmezard@gmail.com>

1.5 code freeze: merge default into stable

ui: add HGPLAIN environment variable for easier scripting If HGPLAIN is set, the following settings are ignored when read from hgrc files: - ui.debug - ui.fallbackencoding - ui.quiet - ui.traceback - ui.verbose - defaults.* Localization is also disabled. Equivalent options set via command line are honored.

tests: update help for add

progress: make determinate bar more like wget progress bar foo [ ] 0/58 foo [> ] 1/58 foo [=> ] 2/58 ... foo [=======================================================> ] 56/58 foo [========================================================> ] 57/58 foo [=========================================================>] 58/58 The bar now has a '>' character at the end. This indicates the direction, is consistent with the indeterminate '<=>' bar, and looks much nicer.

progress: simplify spacejoin()

check-code: two more rules - no plain Exceptions - complain about unmarked ui messages

progress: fix description

parsers: fix some signed comparison issues (spotted by Steve Borho)

commands: correct example in add help text

minirst: support line blocks

commands: add verbose example to help text for add

commands: support verbose help

minirst: report pruned container types

minirst: support containers Text can be grouped into generic containers in reStructuredText: .. container:: foo This is text inside a "foo" container. .. container:: bar This is nested inside two containers. The minirst parser now recognizes these containers. The containers are either pruned completely from the output (included all nested blocks) or they are simply un-indented. So if 'foo' and 'bar' containers are kept, the above example will result in: This is text inside a "foo" container. This is nested inside two containers. If only 'foo' containers are kept, we get: This is text inside a "foo" container. No output is made if only 'bar' containers are kept. This feature will come in handy for implementing different levels of help output (e.g., verbose and debug level help texts).

test-mq-qclone-http: hide port number

progress: only reset state if finishing progress for the current topic This prevents some visual glitches when doing a clone --pull locally.

shrink: use progress API

progress: correctly handle empty progress topic

util: add any() and all() functions for Python 2.4 compatibility This patch adds these two very useful functions to the mercurial.util module, because they are not present in Python 2.4.

merge with mpm

rebase: split line longer than 80 chars

progress: add progress calls to changeset discovery

Progress bar extension

verify: call ui.progress()

localrepo: provide indeterminate progress information while bundling

update: make calls to ui.progress()

localrepo: show indeterminate progress for incoming data This has some quirks, like showing progress bars for importing bundles, including during rebase.

Merge with crew-stable

convert: differentiate between IOError and OSError on commitctx() The IOError exception is overloaded to mean 'this file was deleted in the current commit'. Separate the code that handles IOError and file deletion from general OSError exceptions. The latter are real errors, but IOError is not always a throwable error. This solves the accidental marking of files as 'deleted' in commits that try to write for example in .hg/store/data revlogs that the current user has no permission to modify (a normal OSError that should abort the current commit). Changed by pmezard: use getattr() to be on the safe side.

test-mq-qclone: test --mq option

merge with crew

ui.progress: clarify termination requirement

relink: properly use the progress API

test-subrepo-svn: handle svn output changes gracefully

util: fix trailing whitespace found by check-code

ui: look before you leap on sys.stderr.closed (and look nicer) f83291e5643e introduced a fix if sys.stdout.closed does not exist. This change uses a getattr with default instead of hasattr (which just calls getattr) and accessing the attribute. Additionally it applies the same fix for sys.stderr.closed as this is not available in the bpython shell (reported by Roger Gammans).

Merge with stable

hgrc: update docs for the server section

localrepo: add optional validation (defaults to off) for incoming changes This verifies that all manifests are present for incoming changes, and all files for those manifests are also present. This is a simple first-pass, and could be better, but seems like a valuable thing to have, as I've seen pushes in the past that propagated revlog corruption.

branch: avoid using reserved tag names Reported as Debian bug #552423.

doc: add missing documentation for http_proxy.always

url: proxy handling, simplify and correctly deal with IPv6 Thanks to Henrik for testing.

streaming: actually change default

fix up a bunch of check-code warnings

check-code: import some pylint checks

ssl: fix compatibility with pre-2.6 Python

mq: remove unused import

url: SSL server certificate verification using web.cacerts file (issue1174)

url: httplib.HTTPSConnection already handles IPv6 and port parsing fine

mq: incorporate mq repo config when using --mq For example, incoming should use the paths defined in .hg/patches/hgrc instead of .hg/hgrc.

run-tests.py: skipped tests shouldn't change working directory

whitespace cleanup

revlog.size: remove alternate implementation (revlogv0 specific) it's only useful for revlogv0 anyway, revlogNG has the uncompressed size in the index.

pylintrc: string isn't deprecated, only some of its methods

mq: make init -Q do what qinit -c did

mq: add -Q option to all commands not in norepo

setup.py: fixing version info for Windows hg.exe (py2exe) Fixes warning: py2exe: Version Info will not be included: could not parse version number ... which was seen when doing nightly builds. hg.exe files of nightly builds did not have any version info resoure, which may cause problems with installers. Also setting a copyright string for the version resource (was missing).

test-branch-option: make it executable

tests: don't just silently strip port numbers

mq: add parent node IDs to MQ patches on qrefresh/qnew The goal of this patch is to add the IDs of the parents of applied MQ patches into the patch file headers whenever qnew or qrefresh are run. This will serve as a reminder of when the patches last applied cleanly and will let us do more intelligent things in the future, such as: * Resolve conflicts found when qpushing to a new location by merging instead of simply showing rejects. * Display better diffs of versioned MQ patches because we can tell how the patched files have changed in the meantime. Here are the new rules this patch introduces. They are checked in this order: * If a patch currently has old, plain-style patch headers ("From:" and "Date:") do not change the style or add any new headers. * If the 'mq.plain' configuration setting is true, only plain-style headers will be used for all MQ patches. * qnew will initialize new patches with HG-style headers and fill in the "# Parent" header with the appropriate parent node. * qrefresh will refresh the "# Parent" header with the current parent of the current patch.

prepush: add more precise error messages Part of the patch is from timeless@mozdev.org - indicate the branch name where there are multiple heads - give better advice when hitting a possible race, where new heads are added between discovery and the call to branchmap(). In that case, asking the user to merge isn't helpful, since only remote has the changes.

revlog: don't silently discard revlog flags on revlogv0

fix coding style (reported by pylint)

add pylintrc with some mercurial specific configuration

localrepo: cleanup branch tip computation

hgrc.5: Fix a typo

summary: various fixes, add a test fix breakage from recent parseurl changes fix reporting of resolved fix reporting of update in certain cases

fix remaining hg.parseurl uses

win32: allow hgrc.d on Windows

zeroconf: use DNS length field to safely skip unknown record types

zeroconf: better fix for readName error Stop parsing when an unknown type is seen, since it is impossible to resynchronize on the stream.

zeroconf: try utf-16 decoding if utf-8 fails

import: import each patch in a file or stream as a separate change Supports hg export <revrange>, mail messages, and mailboxes. Does not support multiple patches in a single MIME attachment. Closes issue167.

ui: look before you leap on sys.stdout.closed

mq: fix deprecation mention, line length

merge with mpm

addbranchrevs: fallback for older servers

add -b/--branch option to clone, bundle, incoming, outgoing, pull, push

subrepo: change default path in hgrc of subrepo after cloning Previous behavior was to put in the cloned subrepos the path found in the original main repo. However it isn't valid for relative path and it seems more logical to reference instead the subrepos working copy path of the original main repo.

streamclone: allow uncompressed clones by default

help: Improved body text

commands: Try to improve help options text for basic commands Mostly rewrite -r text

check-code.py: make help strings consistent

check-code.py: escape backslash

qnew: ignore force option This makes the default behavior the same as qnew --force, and deprecates the force option.