merge with crew

rename util.is_exec to isexec

posix: delete unused expand_glob

rename util.find_exe to findexe

revlog: support writing generaldelta revlogs With generaldelta switched on, deltas are always computed against the first parent when adding revisions. This is done regardless of what revision the incoming bundle, if any, is deltaed against. The exact delta building strategy is subject to change, but this will not affect compatibility. Generaldelta is switched off by default.

cmdutil: fix errors reported by pyflakes test

merge with stable

check-code: complain about set.isdisjoint

fix bookmarks rollback behavior Before this patch undo.bookmarks was created on bookmarks write and not with other transaction-related files. There were two issues: first is that if you have changed bookmarks few times after a transaction happened, rollback will give you a state which can point to non-existing revision. Second is that if you have not changed bookmarks after a transaction, rollback will touch your state anyway. This change also adds `localrepo._writejournal` method, which can be used by other extensions to save their transaction-related backup in right time.

add positional arguments to non-shell aliases

run-tests: take the basepath when constructing the test temp dir so it's possible to run tests that are outside the test/ dir

run-tests: compare absolute paths in _checkhglib

util: rename _windows_reserved_filenames and _windows_reserved_chars

opener: rename _can_symlink to _cansymlink

patch: make patch()/internalpatch() always update the dirstate

patch: move updatedir() from cmdutil into patch Also, create an artificial wdutil.py to avoid import cycles between patch.py and cmdutil.py.

record: unconditionally update the working dir after patching

mq: explicitly updatedir() even if patch() fails It already works that way in practice, and we intend to merge updatedir() into patch().

mq: allow to qpop/push with a dirty working copy (issue2780) It's safe to do so if the sets of changed files in the working copy and patches are disjoint.

patch: introduce changedfiles returns the set of all changed files in a given patch

debugindex: change output for generaldelta revlogs For generaldelta revlogs, reporting the deltaparent instead of the chain base makes more sense, since that's what's actually stored in the revlog.

revlog: support reading generaldelta revlogs Generaldelta is a new revlog global flag. When it's turned on, the base field of each revision entry holds the deltaparent instead of the base revision of the current delta chain. This allows for great potential flexibility when generating deltas, as any revision can serve as deltaparent. Previously, the deltaparent for revision r was hardcoded to be r - 1. The base revision of the delta chain can still be accessed as before, since it is now computed in an iterative fashion, following the deltaparents backwards.

revlog: calculate base revisions iteratively This is in preparation for generaldelta, where the revlog entry base field is reinterpreted as the deltaparent. For that reason we also rename the base function to chainbase. Without generaldelta, performance is unaffected, but generaldelta will suffer from this in _addrevision, since delta chains will be walked repeatedly. A cache has been added to eliminate this problem completely.

revlog: remove the last bits of punched/shallow Most of it was removed in e7483ec3c374, but a few pieces were accidentally left behind.

util: make readfile() operate in binary mode writefile() and appendfile() are already working that way.

cmdutil: normalize log message eols when reading from file This will be necessary once util.readfile() operates in binary mode. While changelog.add() already normalizes the message, doing so in logmessage() is required as ui.edit() or others expect messages with LF only.

match: make 'listfile:' split on LF and CRLF We want util.readfile() to operate in binary mode, so EOLs have to be handled correctly depending on the platform. It seems both easier and more convenient to treat LF and CRLF the same way on all platforms.

progress: remove useless statement left by bab267e7fc1a

debugbuilddag: simplify tags serialization a bit

httprepo: send 100-continue on POSTs if using http2

url: use new http support if requested by the user The new http library is wired in via an extra module (httpconnection.py), as it requires similar but different plumbing to connect the library to Mercurial's internals and urllib2. Eventualy we should be able to remove all of keepalive.py and its associated tangle in url.py and replace it all with the code in httpconnection.py. To use the new library, set 'ui.usehttp2' to true. The underlying http library uses the logging module liberally, so if things break you can use 'ui.http2debuglevel' to set the log level to INFO or DEBUG to get that logging information (for example, ui.http2debuglevel=info.)

Import new http library as mercurial.httpclient. This is revision a4229f13c374 of http://py-nonblocking-http.googlecode.com/ with a no-check-code comment added to the end of each file using `for fi in $(hg manifest | grep mercurial/httpclient/) ; echo '# no-check-code' >> $fi`.

commands, i18n: add translation hint for split message

mq: don't hide the patch module

patch: remove unused ui arg to iterhunks

mq: loosen except clause when reading patch headers

merge with abuehl

rename util.set_signal_handler to setsignalhandler

rename util.executable_path to executablepath

rename util.os_link to oslink

rename explain_exit to explainexit

rename util.set_binary to setbinary

rename util.set_flags to setflags

rename util.parse_patch_output to parsepatchoutput

rename util.lookup_reg to lookupreg

rename util.set_hgexecutable to _sethgexecutable

rename util.main_is_frozen to mainfrozen

scmutil: rename local function _add_dir_if_not_there

rename scmutil.user_rcpath to userrcpath

rename scmutil.system_rcpath to systemrcpath

rename scmutil.os_rcpath to osrcpath

merge with stable

merge with crew

merge with stable The change from 7b627923739f (parent 2) is not needed after switching to the new url parser.

rename path_auditor to pathauditor The Mercurial 1.9 release is moving a lot of stuff around anyway and we are already moving path_auditor from util.py to scmutil.py for that release. So this seems like a good opportunity to do such a rename. It also strengthens the current project policy to avoid underbars in names.

revlog: use real Booleans instead of 0/1 in nodesbetween

patch: fix clash between local variable and exception instance The local err variable would be bound to PatchError thrown and it keeps this value even after the except block is executed. The whole thing worked anyway since the rejected variable is set in the except block and this makes the function return -1 when a PatchError is thrown.

patchfile: use real Booleans instead of 0/1

annotate: use real Booleans instead of 0/1

hbisect: use real Booleans instead of 0/1

summary: run discovery only once for in/out against same repo Reuses the result of findcommonincoming if default and default-push are the same.

discovery: resurrect findoutgoing as findcommonoutgoing for extension hooks discovery.findoutgoing used to be a useful hook for extensions like hgsubversion. This patch reintroduces this version of findcommonincoming which is meant to be used when computing outgoing changesets.

transplant: remove unneeded loop over repo in revset

transplant: fix revset doc