url: return the matched authentication group name from readauthforuri() Internally, the group name is only used in debug statements, but readauthforuri can be also used externally to determine which group will be matched for a given URL.

url: move [auth] parsing out into a utility function No functionality change, but it makes the [auth] section parsing and best match detection usable by third party tools

url: use rsplit to split [auth] keys None of the auth section subkeys include a period, so it makes zero sense to not split from the end. By using rsplit() users can use the hostname as group keys.

mq: catch attempt to qpush to an earlier patch (issue2587) We can't assume that all pushable patches early in the series have already been applied. If a hg qselect is done while you already have patches applied, some patches with guards may now be pushable, even though they come earlier in the series. So instead of checking only applied patches, explicitly check where we are in the series against the position of the patch we want to qpush to.

bookmarks: move push/pull command features to core

bookmarks: merge current tracking on update into core

bookmarks: merge incoming/outgoing into core

bookmarks: merge suspect addchangegroup into core This is marked with FIXME because it's not clear that it makes any sense.

bookmarks: merge low-level push/pull support into core

bookmarks: merge lookup into localrepo

bookmarks: move strip support to repair

bookmarks: move color style to color

bookmarks: merge _findtags method into core

bookmarks: move revset support to core

bookmarks: merge invalidation into core

bookmarks: move commit action into core

bookmarks: merge rollback support into localrepo

bookmarks: move property methods into localrepo

bookmarks: move diff to core

bookmarks: move pushkey functions into core

bookmarks: move update into core

bookmarks: move read methods to core

bookmarks: move basic io to core

extensions: add an ignore list for old extensions

run-tests: only call WIFEXITED on systems it exists not on Windows or in jython

run-tests: loadable as module

hgignore: ignore more bytecode ignore optimized bytecode and jython bytecode

doc: Capitalize the "options" header of mercurial commands

doc: Add back quotes around filenames Filenames starting with a dot (.hg and .hgignore) confuse man when creating the ps documentation with "man -t hg >hg.ps" if they are not enclosed in back quotes.

merge with stable

opener: use posixfile to hold file open when calling nlinks() Mercurial's posixfile is less intrusive on Windows than Python's open

remove pointless os.path.join calls when opening files in .hg/cache Windows deals just fine with '/' in paths and Mercurial on Windows already does file accesses elsewhere with mixed \ and / in file paths anyway. This patch also makes the static-http repo case use proper URLs of the form http://example.com/repo/.hg/cache/branchheads http://example.com/repo/.hg/cache/tags instead of the entirely pointless http://example.com/repo/.hg/cache%5Cbranchheads http://example.com/repo/.hg/cache%5tags (as introduced by 5ccdca7df211)

backout: make help more explicit about what backout does The help for backout explains: The backout command merges the reverse effect of the reverted changeset into the working directory. Unfortunately, that does not make it obvious to a newcomer what the backout command does. Since it performs a 3-way merge, what is the common ancestor? Will the result be automatically committed? What is this reverted changeset --- is it the rev passed with -r on the command line or its inverse? So try to clarify the description, avoiding jargon and being explicit about what happens from the user's perspective. Thanks to Gilles Moris, Steve Borho, Kevin Bullock, and timeless for help.

subrepo: fix pruning of subrepo filenames in dirstate (issue2619)

merge with self

merge with stable

Added signature for changeset 2b2155623ee2

Added tag 1.7.5 for changeset 2b2155623ee2

merge with crew

Merge with stable

subrepo: fix update -C with svn subrepos when cwd != repo.root

test-subrepo-git.t: make compatible with old git

win32mbcs: Fix typo in documentation extention -> extension

merge with stable

url: add --insecure option to bypass verification of ssl certificates If --insecure specified, it behaves in the same way as no web.cacerts configured. Also shows hint for --insecure option when _verifycert() failed. But currently the hint isn't displayed on SSLError, because it needs a certain level of changes.

mq: factor out push conditions checks Some extensions (e.g. hgsubversion) completely override push command. Because extensions load order is unspecified, if hgsubversion loads before mq, mq checks about not pushing applied patches will be bypassed. Short of finding a way to fix load order, extracting the checking logic will allow hgsubversion-like extensions to run the check themselves.

test-subrepo-mq-svn.t: correct comment This fixes the description of a helper function in the test.

subrepo: clarify comments in dirty() methods Just a little change to bring the comments in the dirty() methods of the various subrepo classes into a uniform structure. This clarifies the meaning of the states checked.

subrepo: make update -C clean the working directory for git subrepos This makes 'hg update --clean' behave the same way for all three kinds of subrepositories [hg, svn, git]. Before git subrepos did not take the clean parameter into account, but just updated to the given revision and merged uncommitted changes into that.

merge with stable

subrepo: make update -C clean the working directory for svn subrepos This makes 'hg update --clean' behave the same way for both kinds of subrepositories. Before Subversion subrepos did not take the clean parameter into account, but just updated to the given revision and merged uncommitted changes into that.

Added signature for changeset a6c855c32ea0

Added tag 1.7.4 for changeset a6c855c32ea0

i18n-pt_BR: messages from crew a939f08fae9c

merge with i18n stable

i18n-pt_BR: messages from crew 8dc488dfcdb4, some small fixes

util: delay loading of textwrap

merge with stable

url: 'ssh known host'-like checking of fingerprints of HTTPS certificates Known fingerprints of HTTPS servers can now be configured in the hostfingerprints section. That makes it possible to verify the identify of web servers without configuring and trusting the CA chain. Limitations: * Portnumbers are ignored, just like with ordinary certificates. * Host name matching is case sensitive.

merge with stable