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.

strip apostrophes from an error messages

mq: fix typo, thanks pmezard

commands: annotate follows by default, separate -f/--file option

Merge with crew-stable

test-mq-qrefresh: test qrefresh when tip != qtip

mq: remove qrefresh slow path (issue2025) The slow path/fast path distinction has existed since mq was added to Mercurial in 2006. The slow path was used whenever the refreshed revision wasn't the tip

interpret repo#name url syntax as branch instead of revision Previously, the name part of an repo#name url was interpreted as a revision, similar to using the --rev option. Now it is instead looked up as a branch first, and if that succeeds all the heads of the branch will be processed instead of just its tip-most head. If the branch lookup fails, it will be assumed to be an revision as before (e.g. for tags).

dispatch: provide help for disabled extensions and commands Before a command is declared unknown, each extension in hgext is searched, starting with hgext.<cmdname>. If there's a matching command, a help message suggests the appropriate extension and how to enable it. Every extension could potentially be imported, but for cases like rebase, relink, etc. only one extension is imported. For the case of "hg help disabledext", if the extension is in hgext, the extension description is read and a similar help suggestion is printed. No extension import occurs.

extensions: refactor disabled()

mq: don't warn on qpush against a branch head

mq: deprecate qinit and qcommit

mq: deprecate qsave, qrestore and related options

mq: add --mq option to some commands This causes them to operate on the queue repository as qcommit does, and is nicer than hg -R $(hg root)

pull: with -u and -r, update to the first revision given This makes pull consistent with clone. The actual change is in mercurial.hg.parseurl, changing its checkout result, which is only used for pull.

localrepo: inline single-use nested function

localrepo: unify changegroup and changegroupsubset code paths a bit

merge: add hints about the use of 'hg heads' to find the rev to merge

prepush: warn about every new outgoing named branch, not just the first

prepush: rename variables, refactor

rebase: add --detach option to detach intermediate revisions (issue1950) When rebasing an intermediate revision, rebase keeps a parent relationship with the original parent. This option forces the removal of this relationship. In more depth, it 'fakes' null merges between the target revision and the ancestors of source, dropping every change from the ancestors. The result is that every change in source and its descendants will be rebased, ignoring the changes in its ancestors.

rebase: refactoring Separate rebase-specific functions, in order to provide a better base to extend rebase's capabilities. Note that this will be useful especially to share functions with 'adapt'.

commands: do all branch heads by default, demote topological to -t/--topo

commands: actually implement --closed for topological heads

commands: externalize branchheads so we can do it for all branches at once

commands: move inactive/closed out so they can have more effect

commands: don't do too much work for error messages

commands: allow --closed even for topological heads displays But it actually only starts working later on.

util: make spawndetached() handle subprocess early terminations The file-based synchronization introduced by e22695b4472f hangs when the child process fails before terminating the handshake, which the previous pipe-based version handled correctly. To fix this, the parent polling loop was fixed to detect premature terminations of the child process.

zeroconf: do not try to encode encoded strings (issue1942)

zeroconf: override default destination folder on clone

merge with main

merge with main

fix spaces/identation issues

Merge with crew

Merge with crew

run-tests: kill daemons on ^C with -j. This is not perfect, but the problem is fundamentally racy.

commands: fix more changeset header information in 'hg help export'

commands: fix the list of changeset header information in 'hg help export'

graphlog: remove unused import

keyword: fix utcdate filter So far the utcdate filter only omitted the timezone, now it actually converts to utc. Thanks to Kevin Grover for pointing out the issue.

commands: always order heads recent to oldest

commands: fix up stupidly untested heads simplification

revlog: fix up previously stupid API change

commands: simplify heads a little bit before I start hacking it up

localrepo: add a quick docstring for localrepo.branchmap()

commands: deprecate the heads -a option Hopefully we can remove it entirely in two releases or so.

revlog: add a fast path for checking ancestry

subrepo: correct copyright

record: function variable naming & signature cleanup. No functionality change. All tests pass.

add options dict to localrepo.store.opener and use it for defversion

merge with main

localrepo: minor formatting - remove double space

coverage.py: fixed syntax error

merge with stable

zeroconf: gethostbyaddr may also fail with socket.herror

Merge with stable

commands: label from user is in local encoding repo.branchtags().keys() are in UTF-8, so the label should be converted to UTF-8 before checking for a naming conflict. Keep the original label for ui.status()

merge with main

copies: check if revisions are related (bug found with pylint)

Merge with stable

Added signature for changeset 4aa619c4c2c0

Added tag 1.4.3 for changeset 4aa619c4c2c0