revset: the name is optional for the tag predicate

revset: note case-sensitive match in grep

revset: note case-insensitive matches in keyword and user

revset: expand help for contains predicate

patch: remove unused variable to make pyflakes test happy

patch: add lexists() to backends, use it in selectfile() At this point, all applydiff() filesystem calls should pass through fsbackend.

patch: move copyfile() into backends, abstract basedir

patch: merge makerejlines() into write_rej()

patch: extract fs access from patchfile into fsbackend Most filesystem calls are already isolated in patchfile but this is not enough: renames are performed before patchfile is available and some chmod calls are even done outside of the applydiff call. Once all these calls are extracted into a backend class, we can provide cleaner APIs to write to a working directory context directly into the repository.

mq: fix qpush changes detection of renamed files patch.changedfile() was not considering renamed file source as changed.

httpconnection: correctly handle redirects from http to https Previously the connection cache for keepalives didn't keep track of ssl. This meant that when we connected to an https server after that same server via http, both on the default port, we'd incorrectly reuse the non-https connection as the default port meant the connection cache key was the same.

win32.py: add argtypes and restype This is a feature of ctypes. Without these, pypy complains with RuntimeWarning: C function without declared arguments called RuntimeWarning: C function without declared return type called As a side effect of specifying restypes, the return value of e.g. CreateFileA is now implicitly converted to an instance of _HANDLE, so we also need to change the definition _INVALID_HANDLE_VALUE = -1 to _INVALID_HANDLE_VALUE = _HANDLE(-1).value Otherwise, tests for equality to _INVALID_HANDLE_VALUE in code like def _getfileinfo(name): fh = _kernel32.CreateFileA(name, 0, _FILE_SHARE_READ | _FILE_SHARE_WRITE | _FILE_SHARE_DELETE, None, _OPEN_EXISTING, 0, None) if fh == _INVALID_HANDLE_VALUE: _raiseoserror(name) would now fail to detect an invalid handle, which in turn would lead to exceptions raised with wrong errno values, like e.g. >>> nlinks('missing.txt') Traceback (most recent call last): ... OSError: [Errno 9] missing.txt: The handle is invalid. instead of the correct (as per this patch and before it) >>> nlinks('missing.txt') Traceback (most recent call last): ... OSError: [Errno 2] missing.txt: The system cannot find the file specified.

win32.py: more explicit definition of _STD_ERROR_HANDLE

revset: add follow(filename) to follow a filename's history across copies

revset: introduce filelog() to emulate log's fast path filelog() only reports revisions present in the matching filelogs.

httpclient: import revision b8c3511a8cae from py-nonblocking-http Fixes issues with SSL_ERROR_WANT_READ incorrectly breaking the response read.

run-tests: replace chdir() with Popen cwd option

run-tests: make --debug run in the temporary test directory

run-tests: use the common test path on Windows and Java The alternate one did not run in the test directory and controlling the jobs execution with threads instead of process made it harder to fix.

run-tests: ignore timeout when Popen.terminate is unavailable Popen.terminate was introduced in python 2.6

run-tests: fix hg.bat python reference hg.bat expects to live in pythonxx/scripts and the python interpreter to be in pythonxx. run-tests.py file layout is a little different and python location must be fixed.

run-tests: fix python executable detection and copy on Windows

changelog: don't use generaldelta

revlog: get rid of defversion defversion was a property (later option) on the store opener, used to propagate the changelog revlog format to the other revlogs, so they would be created with the same format. This required that the changelog instance was created before any other revlog; an invariant that wasn't directly enforced (or documented) anywhere. We now use the revlogv1 requirement instead, which is transfered to the store opener options. If this option is missing, v0 revlogs are created.

bash_completion: Use "hg paths -q" instead of piping through sed

paths: Add support for -q/--quiet Suppresses output (resolved paths or "not found!") when searching a path, similar to "grep -q". Sample usage: hg paths -q foo || echo "there is no foo" Just prints path names (instead of "name = result") when listing all path definitions, like "hg bookmarks -q". Sample usage: hg paths -q | while read i; do hg incoming "$i"; done

fix test broken in merge from stable

merge with stable

simplemerge: do not allow binary files to abort an entire merge When used as the default merge tool, or used as a --tool override, the simplemerge script should not be allowed to raise a util.Abort just because one of the files being merged is binary. Instead, return 1 and mark the file unresolved.

extdiff: grammar "allows to" -> "allows one to" The verb to allow requires a direct object. Lintian, a Debian tool to find common mistakes, reported it. I'm not a native english speaker but I think this is correct.

debugrevlog: add --dump flag to dump graphable per-revision statistics

revlog: restore the base method

Hardcoding ARCHFLAGS breaks the build against fink's python Fink's python is either i386 or amd64, but not universal. Setting ARCHFLAGS to the empty string produces a successful build against both OS X python and fink python. The modules will no longer be universal -- if that is an issue, we can change the test to extract ARCHFLAGS from distutils.sysconfig and remove ppc if necessary.

debugindex etc.: add --changelog and --manifest options These open the changelog and manifest, respectively, directly so you don't need to specify the path. The options have been added to debugindex, debugdata and debugrevlog. The patch also fixes some minor usage-related bugs.

scmutil: drop aliases in cmdutil for match functions

scmutil: drop some aliases in cmdutil

scmutil: fold in wdutil

scmutil: move revsingle/pair/range from cmdutil This allows users at levels below the command layer to avoid import loops.

help: consolidate topic hooks in help.py This removes loops like cmdutil->revset->help->extensions->cmdutil and simplifies the code.

extensions: move moduledoc to break import loop with help

extensions: drop maxlength from enabled and disabled This is a bad/silly API. Instead calculate maxlength in one place in help it's used and simplify all the callers.

Makefile: remove pure modules on clean

hgcia: Handle URL like in notify (issue2406) The URL must be composed with baseurl and webroot like in notify

util: make str(url) return file:/// for abs paths again str(url) was recently changed to return only file:/. However, the canonical way to represent absolute local paths is file:/// [1], which is also expected by at least hgsubversion. Relative paths are returned as file:the/relative/path. [1] http://en.wikipedia.org/wiki/File_URI_scheme

subrepo: use a safer revision check for hg repos This avoids a traceback if the expected revision has been stripped.

graphlog: use cmdutil.command decorator

purge: use cmdutil.command decorator

patchbomb: use cmdutil.command decorator

transplant: use cmdutil.command decorator

monoblue: improve readability of the filenolink template Whitespace changes only. No difference to the rendered page.

rebase: use cmdutil.command decorator

debugrevlog: many improvements

add debugrevlog command Displays data and statistics about revlogs, including generaldelta details.

check-code: add /= to operator list

order commands alphabetically

revlog: improve delta generation heuristics for generaldelta Without this change, pulls (and clones) into a generaldelta repository could generate very inefficient revlogs, the size of which could be at least twice the original size. This was caused by the generated delta chains covering too large distances, causing new chains to be built far too often. This change addresses the problem by forcing a delta against second parent or against the previous revision, when the first parent delta is in danger of creating a long chain.

keyword: use cmdutil.command decorator

gpg: use cmdutil.command decorator

mq: use cmdutil.command decorator

commands: use a decorator to build table incrementally this allows to define the table entries near the command functions

revlog: fix bug in chainbase cache The bug didn't cause corruption, and thus wasn't caught in hg verify or in tests. It could lead to delta chains longer than normally allowed, by affecting the code that decides when to add a full revision. This could, in turn, lead to performance regression.

setup.py: workaround for missing bz2 module in IronPython IronPython does not provide the bz2 module on its own. This patch skips importing it to allow setup to continue. (minor tweaks by mpm)

httpconnection: fix debug logging option for httpclient

httpclient: import f4c380237fd5 to fix keepalive not working

revlog: add docstring to _addrevision

cmdutil: make_file to makefileobj

cmdutil: make_filename -> makefilename

cmdutil: bail_if_changed to bailifchanged

store: change names to comply with project coding standards as stated at http://mercurial.selenic.com/wiki/CodingStyle (see also http://selenic.com/pipermail/mercurial-devel/2011-May/031139.html ) name changes done at module scope: _build_lower_encodefun -> _buildlowerencodefun _windows_reserved_filenames -> _winreservednames (see 23cd7eeff678) MAX_PATH_LEN_IN_HGSTORE -> _maxstorepathlen DIR_PREFIX_LEN -> _dirprefixlen _MAX_SHORTENED_DIRS_LEN -> _maxshortdirslen (no users of these outside the store module) changed locals: win_reserved -> winreserved space_left -> spaceleft

filelog: add file function to open other filelogs

help: add -c/--command flag to only show command help (issue2799)

help: give hint about 'hg help -e' when appropriate The hint is only given if a command shadows an extension with the same name and when that extension has a multi-line module docstring.

help: add -e/--extension switch to display extension help text

debugbuilddag: read DAG from stdin if not given on cmdline

run-tests: remove check on --shell argument No shell is needed when executing Python tests and finding a good shell might be difficult/impossible on some platforms (e.g., Windows).

subrepo: create subrepos using clone instead of pull Subrepositories used to be created empty and then filled with data using pull. This is wasteful when you do a clone from a local source since it means that no hardlinks are created for the subrepos. This patch make the hgsubrepo._get method check for an empty subrepo and in that case do a clone instead of a pull. This brings in the same data as before, but creates hardlinks when possible.

progress: add speed format This is not enabled by default, but the user can add it by setting progress.format. We might want to let the estimate format output a speed instead of an ETA if there is not total. Currently estimate just returns the empty string in that case.

debugbuilddag: output progress information

test-debugbuilddag: replace unneeded 'rm -rf' with 'rm -r'

hgrc.5: document positional arguments in aliases

merge with stable

hgrc.5: document shell aliases

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