url: be stricter about detecting schemes While the URL parser is very forgiving about what characters are allowed in each component, it's useful to be strict about the scheme so we don't accidentally interpret local paths with colons as URLs. This restricts schemes to containing alphanumeric characters, dashes, pluses, and dots (as specified in RFC 2396).

Added signature for changeset b032bec2c0a6

Added tag 1.8.2 for changeset b032bec2c0a6

merge with stable

merge with i18n

i18n-pt_BR: synchronized with 794f4476b974

bugzilla: fix bad reST markup The indented second line turned the first line into a description header.

bugzilla: markup literal text as such

merge with stable

help/hgweb: add pointer to hgrc(5) location

patchbomb, help/hgweb: do not refer to config files as hgrc files

bugzilla: refer to hgrc(5) man page with normal notation

bugzilla: markup section names as literal text

bugzilla: show usermap syntax more clearly

bugzilla: use standard section.name notation

bugzilla: prefix each config option with section

bugzilla: fix reStructuredText errors introduced in 60256f7f30c1

changegroup: introduce bundler objects This makes the bundler pluggable at lower levels.

changegroup: combine lookup functions

changegroup: unnest flookup

changegroup: unnest clookup and mlookup like changegroupsubset

url: nuke some newly-introduced underbars in identifiers

url: refactor util.drop_scheme() and hg.localpath() into url.localpath() This replaces util.drop_scheme() with url.localpath(), using url.url for parsing instead of doing it on its own. The function is moved from util to url to avoid an import cycle. hg.localpath() is removed in favor of using url.localpath(). This provides more consistent behavior between "hg clone" and other commands. To preserve backwards compatibility, URLs like bundle://../foo still refer to ../foo, not /foo. If a URL contains a scheme, percent-encoded entities are decoded. When there's no scheme, all characters are left untouched. Comparison of old and new behaviors: URL drop_scheme() hg.localpath() url.localpath() === ============= ============== =============== file://foo/foo /foo foo/foo /foo file://localhost:80/foo /foo localhost:80/foo /foo file://localhost:/foo /foo localhost:/foo /foo file://localhost/foo /foo /foo /foo file:///foo /foo /foo /foo file://foo (empty string) foo / file:/foo /foo /foo /foo file:foo foo foo foo file:foo%23bar foo%23bar foo%23bar foo#bar foo%23bar foo%23bar foo%23bar foo%23bar /foo /foo /foo /foo Windows-related paths on Windows: URL drop_scheme() hg.localpath() url.localpath() === ============= ============== =============== file:///C:/foo C:/C:/foo /C:/foo C:/foo file:///D:/foo C:/D:/foo /D:/foo D:/foo file://C:/foo C:/foo C:/foo C:/foo file://D:/foo C:/foo D:/foo D:/foo file:////foo/bar //foo/bar //foo/bar //foo/bar //foo/bar //foo/bar //foo/bar //foo/bar \\foo\bar //foo/bar //foo/bar \\foo\bar Windows-related paths on other platforms: file:///C:/foo C:/C:/foo /C:/foo C:/foo file:///D:/foo C:/D:/foo /D:/foo D:/foo file://C:/foo C:/foo C:/foo C:/foo file://D:/foo C:/foo D:/foo D:/foo file:////foo/bar //foo/bar //foo/bar //foo/bar //foo/bar //foo/bar //foo/bar //foo/bar \\foo\bar //foo/bar //foo/bar \\foo\bar For more information about file:// URL handling, see: http://www-archive.mozilla.org/quality/networking/testing/filetests.html Related issues: - issue1153: File URIs aren't handled correctly in windows This patch should preserve the fix implemented in 2770d03ae49f. However, it goes a step further and "promotes" Windows-style drive letters from being interpreted as host names to being part of the path. - issue2154: Cannot escape '#' in Mercurial URLs (#1172 in THG) The fragment is still interpreted as a revision or a branch, even in paths to bundles. However, when file: is used, percent-encoded entities are decoded, so file:test%23bundle.hg can refer to test#bundle.hg ond isk.

url: use url.url in ui.expandpath()

hg: use url.url to parse branch names in parseurl()

hg: look up schemes using url.url

schemes: prevent one letter schemes from being interpreted as drive letters To allow one letter schemes, this makes the extension override url.has_drive_letter() to return False for any schemes defined. On Windows, the extension will raise util.Abort for any schemes that conflict with existing drive letters.

hgweb: use url.url when setting CGI environment variables

url: use url.url in proxyhandler

httprepo/sshrepo: use url.url Like the previous patch to getauthinfo(), this also makes username/password parsing more forgiving for SSH URLs. This also opens up the possibility of allowing non-numeric ports, since the URL parser has no problem handling them. Related issues: - issue851: @ in password in http url - issue2055: nonnumeric port bug with https protocol

url: use url.url in url.open()

url: abort on file:// URLs with non-localhost hosts

url: special case bundle URL parsing to preserve backwards compatibility This allows bundle://../foo to continue to refer to the relative path ../foo (bundle URLs do not take host names).

url: add trailing slashes to URLs with hostnames that don't have one This works around a potential issue in Python 2.4 where cloning a repo with a URL like http://foo:8080 would cause urllib2 to query on http://foo:8080?cmd=capabilities instead of http://foo:8080/?cmd=capabilities. In the past, this issue has been masked by the fact that url.getauthinfo() added a trailing slash when it was missing.

url: move drive letter checking into has_drive_letter() for extensions This will let the schemes extension override drive letter detection to allow single letter schemes.

changegroup: unnest some lookup functions

changegroup: minor ordering and renaming changes for similarity This eliminates some needless differences between the two changegroup variants

changegroup: remove nodeiter temporary

changegroup: refactor prune as a filter

changegroup: add first logic to send file header This will allow us to later change how we filter needed file nodes

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.