log: abort for -d '>' or -d '<' (issue2749)

convert: add hg source bookmark test

hgweb: add missing bookmarks definition to coal/map It shares most templates with paper style.

hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)

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

hgweb: format page_nav of gitweb/error.tmpl and add missing links

hgweb: fix typo and inactive link in page_nav and page_header of gitweb's help

hgweb: add separate bookmarks listing to monoblue theme (based on 38c9837b1f75)

hgweb: fix typo in page-header of monoblue's help template

hgweb: add missing bookmarks templates to atom/rss styles It's already referenced from paper style.

subrepo: process merge substate in sorted order in submerge() This ensures that subrepositories are pulled in a well defined order when cloning the parent repository. BEFORE: $ hg clone http://hg.gerg.ca/allextensions destination directory: allextensions requesting all changes adding changesets adding manifests adding file changes added 10 changesets with 20 changes to 6 files updating to branch default pulling subrepo caseguard from http://bitbucket.org/alexandru/caseguard real URL is https://bitbucket.org/alexandru/caseguard requesting all changes adding changesets adding manifests adding file changes added 81 changesets with 100 changes to 13 files pulling subrepo hg-prompt from http://bitbucket.org/sjl/hg-prompt real URL is https://bitbucket.org/sjl/hg-prompt requesting all changes adding changesets adding manifests adding file changes added 114 changesets with 176 changes to 35 files pulling subrepo hgpaste from http://bitbucket.org/birkenfeld/hgpaste real URL is https://bitbucket.org/birkenfeld/hgpaste requesting all changes adding changesets adding manifests adding file changes added 18 changesets with 18 changes to 2 files ... AFTER: $ hg clone http://hg.gerg.ca/allextensions destination directory: allextensions requesting all changes adding changesets adding manifests adding file changes added 10 changesets with 20 changes to 6 files updating to branch default pulling subrepo Artemis from http://hg.mrzv.org/Artemis requesting all changes adding changesets adding manifests adding file changes added 55 changesets with 108 changes to 47 files ...

rebase: add --tool argument for specifying merge tool

revert: note that added files are left as is

bugzilla: fix documentation typo

merge with stable

merge with i18n

i18n-pt_BR: synchronized with 8d960240faac

hgweb: add base link to file log for paper and coal styles (issue2452)

HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT This makes it possible to gain the benefits of HGPLAIN for scripting while preserving different behaviors like internationalization.

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.