url: fix tests

url: deal with drive letters

bookmarks: do not forward merged bookmark (issue1877)

merge with stable

pull: new output message when there are multiple branches Pull outputs a slightly new message when there are multiple branches and the current branch has many heads: (run 'hg heads .' to see heads, 'hg merge' to merge) This message adds the "." in hg heads to encourage you to consider only the current branch's heads.

pull: don't suggest running hg merge when new heads are on different branches After a pull when new heads are added but no head is added on the current branch, the "run 'hg merge'" message can be misleading. This patch doesn't output the merge message in that scenario.

bugzilla: add modified XMLRPC mode that uses email to send bug comments. If Bugzilla has its email interface configured, an email can be used to update bugs. If the From: address in the email matches a valid user email, Bugzillas make the update as that user. So comments attached to a bug appear under the name of the user making the change, and the user does not receive email about the change, exactly as if they had made the change via the web interface. So add a modified XMLRPC mode that uses email to modify bugs. The format of the mails is documented in the Bugzilla email_in.pl specification. Briefly, initial non-blank lines in the message body starting '@<field> = <value> modify bug fields. A blank line signals the end of the command lines, and the rest of the message is used as bug comment. Invoke the same Mercurial user to Bugzilla user email mapping currently used in the MySQL mode. All other processing - checking the bug numbers, checking user ids, etc. continues to be done via XMLRPC.

bugzilla: add XMLRPC interface. Add support for access to Bugzilla via the XMLRPC interface. This requires a single username and password used to log in to Bugzilla, plus the URL of the Bugzilla installation. Commit messages are added to bugs as before, but security only permits them to be added as the username used to log in.

bugzilla: localise all MySQL direct access inside access class. Prepare for the addition of other Bugzilla access methods by localising direct MySQL database access inside an access class. Provide a base access class largely to document the methods required for a class implementing a particular access method. Rename the 'bugzilla_<version>' classes to 'bzmysql_<version>' to emphasise that they are doing access via direct manipulation of a MySQL database.

bugzilla: keep bug IDs in set. Bug IDs are collected into a set, and then silently converted in filter_real_bug_ids() into a list. For consistency, keep them in a set throughout and update the docstrings to say that.

bugzilla: rename filter_unknown_bug_ids to reflect its actual purpose. The method really removes from the list of bugs any that already have comment text referencing the changeset in question. Rename it to filter_cset_known_bug_ids().

test-paths.t: 'file:' disables [paths] entries for clone dest

hgwebdir: handle IOErrors from localrepo while enumerating Repository() raises a number of IOErrors in addition to RepoErrors. these are just as uninteresting as RepoErrors and should be ignored The easiest case of this is a repo whose .hg/ directory is -rx

set NOT_CONTENT_INDEXED on .hg dir (issue2694) when running on Windows

hgweb: add bookmark labels to monoblue theme (based on 270f57d35525)

merge with stable

convert/mtn: Fix conversion of large files from mtn (broken in ed97955e0c04) "mtn automate stdio" will break output larger than 32kB into several packets. This ensures that we are processing all the output on the main stream and not only the last packet.

mq: fix qselect help for qguard

Fix transplant error message to correspond with test

transplant: fix crash if filter script munges log file This fixes an UnboundLocalError crash if the filter script removes the 'User' or 'Date' lines from the log file.

changegroup: fold linkrev helper into lookup functions

changegroup: fold filenode collector into mlookup

changegroup: roll changegroup.collector into lookup functions

changegroup: add revlog to the group callback

changegroup: move sorting down into group

changegroup: fold progress meter into callbacks progress meters now start at 1 rather than 0

changegroup: combine infocollect and lookup callbacks

changegroup: drop unused fullrev This is unfinished and unused and complicates expanding the wire protocol.

util: dates cannot consist entirely of whitespace (issue2732)

convert/mtn: convert suspended branches as closed branches Monotone treats branch closing ("suspending") in a similar manner to how we do in mercurial - a cert is added to a revision that marks the branch to be hidden. If a subsequent commit is made, the branch is effectively reopened.

rebase: don't mark file as removed if missing in parent's manifest (issue2725)

windows: use win32.unlink in unlinkpath() os.unlink fails to remove files with READONLY attribute