templates: add filenolink to raw style (issue2332)

url: limit expansion to safe auth keys (Issue2328) Mads Kiilerich pointed out that 7c9beccb0533 was too eager since the prefix and password keys may contain $-signs. So this only add the username to the list of keys that are expanded. This also updates the documentation to match.

url: expand vars in all [auth] settings (issue2328)

merge with stable

Fix merge-tools.checkconflicts re.match only looks at the beginning of the merged file, and without re.MULTILINE the file had to end with ">>>>>>> something". Now conflict markers inside the file are found, too.

Fix merge-tools.checkconflicts re.match only looks at the beginning of the merged file, and without re.MULTILINE the file had to end with ">>>>>>> something". Now conflict markers inside the file are found, too.

bundlerepo: remove duplication of bundle decompressors

bundle: introduce bundle class

bundle: unify/refactor unbundle/readbundle

bundle: factor out decompressor

merge with stable

alias: make shadowing behavior more consistent (issue2054) Currently, given an alias like the following: [alias] summary = summary --remote The alias might be executed - or it might not - depending on the order of the cmdtable dict. This happens because cmdalias gets assigned back to the cmdtable like so: cmdtable['summary'] = ... Yet '^summary|sum' is still in the table, so which one cmdutil.findcmd() chooses isn't deterministic. This patch makes cmdalias assign back to '^summary|sum'. It uses the same cmdtable key lookup that extensions.wrapcommand() does.

hgweb: handle exception of misconfigured path on index page If hgweb.config contains wrong path mapping, hgweb causes internal server error on repository index page. This patch changes makeindex() to ignore RepoError, because it looks to be designed to suppress configuration error.

statichttprepo: disable pushkey

mq: extend support for the --mq argument to extension commands This allows commands like `purge' to accept the --mq option.

repository: drop unused rjoin() method This method was introduced by cfeeac24fc1e but grepping the history does not reveal any call. Extensions may use it but the method intent is not even clear to me.

tests: unify test-export

revert: wrap long line

util: remove lexists, Python 2.4 introduced os.path.lexists

Merge with stable

context: mark string for translation

test-convert-cvs: test fuzz

test-dispatch: drop test for missing working directory hstuart reported problems when the local Python has been configured to do stuff and crash before reaching the expected error handler.

Merge with stable

bookmarks: guard against listing bookmarks on unsupported repos This fixes clones and pulls from statichttprepository repos.

mdiff.patch(): add a special case for when the base text is empty remove the special casing from revlog.addgroup()

revlog: add rawsize(), identical to size() but not subclassed by filelog

revlog.addrevision(): move computation of nodeid in addrevision() The check "if node in nodemap" is already done earlier in addgroup().

contrib/compress: compress should activate parentdelta

contrib/compress: correct ordering of copying Changelog should always be copied last, otherwise readers can see an inconsistent repo.

contrib/compress: refactor revlog copying

contrib/compress: use store API instead of a collector

contrib/compress: proper lock handling Lock the src repo before beginning the compression and lock the destination repo before copying the revlogs. Proper handling of exceptions.

contrib/compress: use hg API to compute the destination path

contrib/compress: use repo's transaction method

contrib/compress: remove unused variables

tests: unify test-hgrc

tests: remove test-log.out, useless after unification

revlog: fix docstring

deltaparent(): don't return nullrev for a revision containing a full snapshot this allows us to simplify manifest.readdelta and revlog.revdiff

merge with stable

tests: fix up bisect test output

merge: move reverse-merge logic out of filemerge (issue2342)

bisect: add test for unrelated starting revisions

merge with stable

bisect: better message for unrelated starting revisions

debuginstall: report installpath

tests: unify test-glog

bookmarks: fix long line

merge with stable

revlog: addgroup re-adds punched revisions for missing parents While reading changegroup if a node with missing parents is encountered, we add a punched entry in the index with null parents for the missing parent node.

revlog: generate full revisions when parent node is missing The full revision is sent if the first parent, against which diff is calculated, is missing at remote. This happens in the case of shallow clones.

revlog.revision(): inline deltachain computation

revlog.revision(): remove debug code

revlog.revision(): don't use nullrev as the default value for the cache I is probably a bug if the deltachain computation think there was a cache hit at nullrev. Use None instead, this will never trigger a cache hit.

revlog.revision(): minor cleanup Rename some variables, making the name more obvious (in particular "cache" was actually two different variable. Move code around, moving the index preloading before the deltachain computation, without that index preloading was useless (everything was read in deltachain).

bookmarks: Check if the bookmark to delete exists on the remote

Merge with stable

win32: remove useless lstat() fallback in nlinks() The fallback was introduced by 3b4f05ff3130 at the same time than nlinks(). Apparently it only handles the case where target path does not exist. Just raise IOError directly.

win32: correctly break hardlinks on network drives (issue761) win32.nlinks() was often returning 1 instead of the correct hardlinks count when reading from network drives. This made commit or push to a repository on a network share to fail breaking the hardlinks in the datastore, possibly causing integrity errors in repositories linked locally on the remote side. Here is what the MSDN says about GetFileInformationByHandle(): Depending on the underlying network features of the operating system and the type of server connected to, the GetFileInformationByHandle function may fail, return partial information, or full information for the given file. In practice, we never got the correct hardlinks count when reading from and to many combinations of Window XP, 2003, Vista and 7, via network drives or RDP shares. It always returned 1 instead. The only setup returning an accurate links count was a samba on Debian. To avoid this, Mercurial now breaks the hardlinks unconditionally when writing to a network drive.