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

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

mq: add a 'mq()' revset predicate that returns applied mq csets

pyflakes: ignore files marked no-check-code

revlog: compute correct deltaparent in the deltaparent function It now returns nullrev for chain base revisions, since they are conceptually deltas against nullrev. The revdiff function was updated accordingly.

changelog: fixes leaked file handle

setdiscovery: limit lines to 80 characters

subrepo: use code from 71ea5b2b9517 only if Python needs it (issue2795) With Python >= 2.6 the original code already works correct, therefore the fix for issue2556 on Python <= 2.5 broke relative subrepositories with newer versions of Python.

sslutil: extracted ssl methods from httpsconnection in url.py This makes it easier to share ssl cert validation with other http implementations.

check-code: fix checking for sh style in .t tests Restore checks after they were disabled by 64de9ca66511.

run-tests: add --shell command line flag This makes it easy to test with, say, both /bin/bash and /bin/dash instead of changing the system-wide /bin/sh.

run-tests: use type of default to convert environment variable Before, defaults could only be integers, they can now also be strings, floats and what have you.

test-treediscovery: fix escaping for both dash and bash A '\n' on the command line is turned into a newline by dash, but kept as-is by bash, which resulted in a syntax error in the config file. Luckily, dash wont turn '\n' into a newline when it is part of a here-doc, so we can write the config file using that technique.

treediscovery: fix regression when run against older repos (issue2793) I ran the entire test suite with "known" and "getbundle" disabled in localrepository. This generated failures because the old findoutgoing had always queried remote's heads explicitly and thus always got them back in the returned heads. treediscovery.findcommonincoming now correctly returns remote's heads in all cases. Also adds a dedicated test for running treediscovery against a pre-getbundle HTTP server.

commands: use util.Abort's hint some more

commands: use double-quotes for strings with single-quotes The globalopts table contain a couple of \' still, but it was normalized like that in 83238c1db6de.

revlog: remove support for punched/shallow The feature was never finished, and there has been restructuring going on since it was added.

revlog: remove support for parentdelta We will introduce a more powerful and general delta concept instead, called generaldelta.

store: break up reference cycle introduced in 9cbff8a39a2a see also 996c1cd8f530

test-https.t: clean up superfluous trailing whitespace

run-tests.py: correctly handle list options with parallel tasks

mq: don't suggest to refresh when qpushing with no applied patches

bundlerepo: fix closing and docstring of getremotechanges I did not in fact implement what I documented about closing of the original repo. And there was a bit of leftover from an older version of the API.

bookmarks: allow deactivating current bookmark with -i

bookmarks: allow to create/move bookmark without making it current (issue2788) Adds a -i/--inactive flag to the bookmarks command to create or move a bookmark without making it the current one. This lets you use a bookmark like a shareable, movable 'tag' and less like a 'branch'. Thanks to Alexander Solovyov <alexander@solovyov.net> for most of the work of implementation, and Matt Mackall <mpm@selenic.com> for suggesting the option name.

tests: test subrepos with ssh urls

tests: share dummyssh

tests: fix test-ssh.t after 6bd9778ae749

fix errors reported by pyflakes test

merge with crew

tests: fix deprecated use of hg debugdata/debugindex For filelogs, debugindex and debugdata can be called with the file name directly instead of the path to the revlog. Since in the future filelogs will no longer be valid revlogs, calling with a path to the revlog is deprecated for debugdata. For debugindex it is expected to still work, but I changed them as well for consistency.

merge with stable

merge with crew

hgext: fixup a couple missed file().read() instances

test-casecollision.t: add test for case changing rename

convert: fix error in git solaris code

test: add pyflakes checking for unable to detect undefined names

tests: add pyflakes checking for assigned to but never used

remove unused variables

test-pyflake: improve sorting algorithm

add make check: tests rule

ui: add configint function and tests

mq: strip extra whitespace from node ids in header (issue2790) This makes `hg qpush --exact` work with patches created by `hg export`.

check-code: disallow calling opener(...).read() and opener(..).write()

prevent transient leaks of file handle by using new helper functions These leaks may occur in environments that don't employ a reference counting GC, i.e. PyPy. This implies: - changing opener(...).read() calls to opener.read(...) - changing opener(...).write() calls to opener.write(...) - changing open(...).read(...) to util.readfile(...) - changing open(...).write(...) to util.writefile(...)

util & scmutil: adapt read/write helpers as request by mpm

store: use a subclass, not a function for fncacheopener

util.termwidth: never return 0 for terminal width Catch a case where the termwidth was being reported as 0 when I was connecting with TLMTask instead of NSTask in OSX. This caused the progress extension to print no progress. The termwidth should never return 0 so in case we would return 0, simply fall back to the default termwidth below which is 80.

discovery: add new set-based discovery Adds a new discovery method based on repeatedly sampling the still undecided subset of the local node graph to determine the set of nodes common to both the client and the server. For small differences between client and server, it uses about the same or slightly fewer roundtrips than the old tree-based discovery. For larger differences, it typically reduces the number of roundtrips drastically (from 150 to 4, for instance). The old discovery code now lives in treediscovery.py, the new code is in setdiscovery.py. Still missing is a hook for extensions to contribute nodes to the initial sample. For instance, Augie's remotebranches could contribute the last known state of the server's heads. Credits for the actual sampler and computing common heads instead of bases go to Benoit Boissinot.

debugbuilddag: use memctx for speed This drops the options to run arbitrary shell commands within commits and the option to create a file that gets appended to in every revision. It now supports to not write file data at all, which is very fast for generating a pure 00changelog.i (useful for discovery tests, for instance). Timings for 1000 linear nodes: * Old `hg debugbuilddag -o '+1000'` took 4.5 secs. * New `hg debugbuilddag -o '+1000'` takes 2 secs. * New `hg debugbuilddag '+1000'` takes 0.8 secs. (The last one creates only 00changelog.i).

localrepo: reuse parent manifest in commitctx if no files have changed This speeds up the in-memory version of debugbuilddag that I'm working on considerably for the case where we want to build just a 00changelog.i (for discovery tests, for instance). There are a couple of test changes because node ids in tests have changed. The changes to the patch names in test-mq-qdelete.t were required because they could collide with nodeid abbreviations and newly actually do (patch "c" collides with id "cafe..." for patch "b").

bundlerepo: fix and improve getremotechanges Fixes the regression where incoming could show local changes introduced by rev 72c84f24b420.

hgrc.5: mention new 'case collision' handling for ui.portablefilenames

win32: remove obsolete bookmarks and parentrevspec extensions from mercurial.ini

bundlerepo: drop struct

bisect: fix indent level

share: create 'hgrc' using an opener, like clone

backout 3a3584967a93 - the "unreachable code" was apparently not unreachable All tests repeatedly passes with 3a3584967a93 on some machines, but on other machines it regularly causes failure in test-mv-cp-st-diff.t, such as: @@ -203,6 +203,7 @@ - working to root: --rev 0 M a + M x/x A b a

merge with mpm

revset: avoid over-aggresive optimizations of non-filtering functions (issue2549) When limit, last, min and max were evaluated they worked on a reduced set in the wrong way. Now they work on an unrestricted set (the whole repo) and get limited later on.

convert: handle invalid subversion source paths

convert: also catch missing revlogs when introduced in repo roots The previous behaviour was almost as if convert.hg.ignoreerrors was always set for revisions without parents, except that errors were silently ignored. Revlog errors are handled as a side effect of getcopies(), but getcopies() was only called when convert.hg.ignoreerrors was set. Now we always call self.getcopies for root revisions, not only when convert.hg.ignoreerrors is set, just like we do on all other revisions. The extra call might be a bit expensive, but the proper fix for that would be to catch these errors in another way.

status: remove unreachable code for status between revisions The manifest value of a file will never be false when "not parentworking", and the expensive content comparision would thus fortunately never be reached. (If it was reached it would be wrong for example in case of renames.) This code once handled status against working directory, but that has been done elsewhere for a long time.

httprepo: proper handling of invalid responses without content-type (issue2019) This can currently be tested on http://sf.net/

httprepo: use the original exception after falling back to static-http failed Before the fine exception handling in httprepo was never shown. The static-http exception will now only be shown when static-http is requested explicitly.

test: test that backslash is preserved by the url class

tests: use raw string for url tests of '\' handling

color: fix using multiple effects

unbundler: separate delta and header parsing Add header parsing for changelog and manifest (currently no headers might change for next-gen bundle).

changegroup: new bundler API

bundlerepo: port to new bundle API

bundler: make parsechunk return the base revision of the delta

tests: add pyflakes checking for unused imports

remove unused imports

scmutil: introduce casecollisionauditor and cleaning up portability functions

check-code: check for repo in revlog and ui in util

check-code: allow for checking multiple pattern sets per file

check-code: adding debug flag

run-tests: add flag to provide extra hgrc options for test runs

graphlog: always sort revisions topologically The grapher cannot really handled revisions if they are not emitted in topological order. The previous 'reverse()' revset was not enough to achieve that and was replaced by an explicit sort call for simplicity. The --limit option is now also handled as usual with cmdutil.loglimit() instead of a 'limit' revset.

graphlog: take the union of --rev specs instead of the intersection

graphmod: correctly emit nodes with more than 2 predecessors The grandparent() function was returning only the closest predecessor of a missing parent while it must return all of them to display a correct ancestry graph.

graphlog: display nodes with more than 2 predecessors While nodes with more than 2 parents do not exist in revision graphs, they do appear when you transform them by removing subgraphs while trying to preserve ancestry links. This code was borrowed from Peter Arrenbrecht <peter.arrenbrecht@gmail.com> pbranch extension.

context: provide an efficient iterator for workingctx This avoids needing to call status or build a synthetic manifest.

merge with stable

merge with nicdumz

tests: export patches only once in test-impexp-branch

tests: do not export several times the same patch/diff in test-import

tests: move rebase-keep-branch into rebase-named-branches It's not worth building a repository just to test keep branch when we can do it our bigger, other, already built repositories.

tests: move testcase from rebase-named-branches to rebase-parameters It saves us a clone of a repository.

tests: change test-rebase-parameters to use bundle/rebase.hg

tests: change test-rebase-detach to use bundle/rebase.hg

tests: simplify test-rebase-named-branches We were cloning a repo to perform a smoke test that could have been performed earlier.

tests: upgrade bundles/rebase.hg to support test-rebase-collapse Add two changesets to the scenario so that the bundle can be reused within three tests. Before: @ 5: 'F' | | o 4: 'E' |/| o | 3: 'D | | | o 2: 'C' |/ | o 1: 'B' |/ o 0: 'A' After: @ 7: 'H' | | o 6: 'G' |/| o | 5: 'F' | | | o 4: 'E' |/ | o 3: 'D' | | | o 2: 'C' | | | o 1: 'B' |/ o 0: 'A' Revisions 0-1 keep the same number/label. Others were translated by an offset of 2 (2.C -> 4.E)

tests: introduce a rebase bundle to use with rebase tests Allows saving a few seconds in test runs by not constructing over and over the same repository.

tests: create a bundle to bootstrap tests using a remote repository It should be faster to use a single common bundle instead of recreating 4 times the same repository manually.

tests: move test bundles in a bundles/ subdirectory

tests: move test-issue436 in test-dispatch where fancyopts is tested

tests: remove test-issue433 as it's covered by test-parents

tests: remove executable bits from unified tests Those files are not executable.

tests: remove test-issue322 as it's fully included in test-issue660

Added signature for changeset 3cb1e95676ad

Added tag 1.8.3 for changeset 3cb1e95676ad

merge with i18n

i18n-pt_BR: synchronized with 42d5165975ad

merge with i18n

i18n-pt_BR: minor spacing fix

i18n-pt_BR: synchronized with 3c753f9a2fbc

zeroconf: notify the Zeroconf threads when hg exits Zeroconf launches two threads in the background, and they wait on Condition objects to exit. We need to call Zeroconf.close() to release those conditions so that threads can gracefully exit. This means that an interrupt on the hg process will now gracefully propagate to the Zeroconf children, fixing that bug which did not allow us to kill an `hg serve` process.

color: use ui.formatted() to test TTYness, not sys.stdout.isatty() This fixes the color extension not working with pager (broken in 877390020477). The pager extension already sets ui.formatted=True to allow this use case.

pushkey: add hooks for pushkey/listkeys

test-patchbomb.t: clean up progress tests

util: really drop size from readfile

util: add readfile() & writefile() helper functions These two functions allow quickly reading or writing a file, without relying on reference counting to close the file handle afterwards.

revset aliases

opener: add read & write utility methods The two new methods are useful for quickly opening a file for reading or writing. Unlike 'opener(...).read()', they ensure they the file is immediately closed without relying on CPython reference counting.

dispatch: handle IndexErrors

color: verify stdout is a tty before using curses Without this change, curses complains when invoked in certain contexts because stdout isn't a tty (such as emacs integration) but we ask it to check for various bits of information from terminfo.

http: minor tweaks to long arg handling x-arg -> x-hgarg replace itertools.count(1)

httprepo: long arguments support (issue2126) Send the command arguments in the HTTP headers. The command is still part of the URL. If the server does not have the 'httpheader' capability, the client will send the command arguments in the URL as it did previously. Web servers typically allow more data to be placed within the headers than in the URL, so this approach will: - Avoid HTTP errors due to using a URL that is too large. - Allow Mercurial to implement a more efficient wire protocol. An alternate approach is to send the arguments as part of the request body. This approach has been rejected because it requires the use of POST requests, so it would break any existing configuration that relies on the request type for authentication or caching. Extensibility: - The header size is provided by the server, which makes it possible to introduce an hgrc setting for it. - The client ignores the capability value after the first comma, which allows more information to be included in the future.

store: rename the 'opener' argument to 'openertype' The 'opener' argument wasn't, in fact, an actual opener instance, but rather something expected to return an opener. The normal argument, from localrepository, is the scmutil.opener type; hence 'openertype'.

statichttprepo: make the opener a subclass of abstractopener

add filteropener abstraction for store openers

opener: introduce an abstact superclass of it Currently, this class doesn't do anything useful.

graphlog: use a set for inclusion test This makes a big difference in performance in the special case where all revisions are being graphed.

graphmod: restore generator nature of dagwalker 9966c95b8c4f introduced the ability to walk the DAG given arbitrary revisions, but changed the behaviour of it to return a list of all nodes (and create a changectx for each one) rather than doing it lazily. This has a pretty significant impact on performance for large repositories (tested on CPython repo, with output disabled): $ time hg glog real 0m2.642s user 0m2.560s sys 0m0.080s Before 9966c95b8c4f: $ time hg glog real 0m0.143s user 0m0.112s sys 0m0.032s And after this fix: $ time hg glog real 0m0.213s user 0m0.184s sys 0m0.028s

graphlog: log -G --follow file does not work, forbid it We do not have revsets to follow file history.

graphlog: unify log -G revset translation

graphlog: fix log -G --prune follow() revset really means '::.' while we want something based on the passed argument. Also, ancestors() revset does not include the parent revisions.

graphlog: escape log -G single value option arguments

graphlog: fix log -G --removed Current version was mispelled and processed like a valued argument.

graphlog: fix log -G option types when translating to revset For instance, --keyword is a multiple value option while it was processed as a single value option.

revset: add tests for multiple and mixed ^ and ~ operators

extensions: obsolete and remove parentrevspec extension As of 305c97670d7a, revsets implements the ^ and ~ operators that this extension provides, so it's no longer necessary.

wix: a new mercurial.js has replaced graph.js

util.url: copy urllib.unquote() into util to improve startup times The ui class uses util.hasscheme() in a couple of places, causing hg to import urllib even when it doesn't need to. This copies urllib.unquote() to avoid that import. perfstartup time before the URL refactoring (8796fb6af67e): ! wall 0.050692 comb 0.000000 user 0.000000 sys 0.000000 (best of 100) before this change: ! wall 0.064742 comb 0.000000 user 0.000000 sys 0.000000 (best of 100) after this change: ! wall 0.052126 comb 0.000000 user 0.000000 sys 0.000000 (best of 100

url: move URL parsing functions into util to improve startup time The introduction of the new URL parsing code has created a startup time regression. This is mainly due to the use of url.hasscheme() in the ui class. It ends up importing many libraries that the url module requires. This fix helps marginally, but if we can get rid of the urllib import in the URL parser all together, startup time will go back to normal. perfstartup time before the URL refactoring (8796fb6af67e): ! wall 0.050692 comb 0.000000 user 0.000000 sys 0.000000 (best of 100) current startup time (139fb11210bb): ! wall 0.070685 comb 0.000000 user 0.000000 sys 0.000000 (best of 100) after this change: ! wall 0.064667 comb 0.000000 user 0.000000 sys 0.000000 (best of 100)

revlog: introduce _chunkbase to allow filelog to override Used by revlog.revision to retrieve the base-chunk in a delta chain.

filelog: extract metadata parsing and packing _parsemeta returns the dictionary and a list of keys in the order they appear in metadata. This can be used to repack the dictionary in the same order. _packmeta creates metadata from a dictionary and an optional key-order list. In _parsemeta, we use slices and re.search indead of str.index so we can accept both buffers and strings.

discovery: drop findoutgoing and simplify findcommonincoming's api This is a long desired cleanup and paves the way for new discovery. To specify subsets for bundling changes, all code should use the heads of the desired subset ("heads") and the heads of the common subset ("common") to be excluded from the bundled set. These can be used revlog.findmissing instead of revlog.nodesbetween. This fixes an actual bug exposed by the change in test-bundle-r.t where we try to bundle a changeset while specifying that said changeset is to be assumed already present in the target. This used to still bundle the changeset. It no longer does. This is similar to the bugs fixed by the recent switch to heads/common for incoming/pull.

revset: add missing whitespace

url: remove unused/obsolete functions

revset: add ^ and ~ operators from parentrevspec extension ^ (Nth parent) and ~ (Nth first ancestor) are infix operators that match certain ancestors of the set: set^0 the set set^1 (also available as set^) the first parent of every changeset in set set^2 the second parent of every changeset in set set~0 the set set~1 the first ancestor (i.e. the first parent) of every changeset in set set~2 the second ancestor (i.e. first parent of first parent) of every changeset in set set~N the Nth ancestor (following first parents only) of every changeset in set; set~N is equivalent to set^1^1..., with ^1 repeated N times.

encoding: add an encoding-aware lower function

add: notify when adding a file that would cause a case-folding collision On a case-sensitive file system, files can be added with names that differ only in case (a "case collision"). This would cause an error on case-insensitive filesystems. A warning or error is now given for such collisions, depending on the value of ui.portablefilenames ('warn', 'abort', or 'ignore'): $ touch file File $ hg add --config ui.portablefilenames=abort File abort: possible case-folding collision for File $ hg add File warning: possible case-folding collision for File

scmutil: refactor ui.portablefilenames processing The ui.portablefilenames config handling is generally useful for notifying the user of various portability problems.

pure bdiff: don't use a generator Generators are slow, and currently defeat the PyPy JIT.

pure mpatch: avoid using list.insert(0, ...) In Python lists are implemented as arrays with overallocation. As a result, list.insert(0, ...) is O(n), whereas list.append() has an amortised running time of O(1). Reversing the internal representation of the list should cause a slight speedup for pure Python builds.

remove unused imports and variables

Zeroconf: catch both ValueError and KeyError in get() This prevents a traceback during discovery of available hosts.

run-tests: print a new line before writing the diff

revsets: add a last function last(set, n) = reverser(limit(reverse(set), n))

bundle: more comments about the different header types, remove useless if

merge with mpm

hgweb: initialize permhooks at definition time This is simpler than creating it empty and then appending the default checkauthz hook 50 lines below.

revset: fix undefined name ParseError

branchcache: improve speed relative to the amount of heads Updating the branch cache is quadratic to the amount of heads in the repository. One consequence of this was that cloning a pathological repository with 10,000 heads (and nothing else) took hours of CPU time. This patch makes one of the inner loop much faster, by removing a changectx instantiation, and removes another entirely in cases where there are no candidate branch heads which descend from other branch heads.

drop {short,hex}(ctx.node()) calls in favor of ctx methods

mq: be more explicit on invalid patch name message

fix broken tests test-debugcomplete.t broken by 58e58406ed19 test-highlight.t broken by b24e5a708fad

merge with stable

mq: add '.' and '..' to list of forbidden patch names When an empty string is being passed to normname it would return '.' causing checkfile() to always return that a patch with that name exists.

subrepo: handle svn tracked/unknown directory collisions This happens more often than expected. Say you have an svn subrepository with python code. Python would have generated unknown .pyc files. Now, you rebase this setup on a revision where a directory containing python code does not exist. Subversion is first asked to remove this directory when updating, but will not because it contains untracked items. Then it will have to bring back the directory after the merge but will fail because it now collides with an untracked directory. Using --force is not very elegant and only works with svn >= 1.5 but the only alternative I can think of is to write our own purge command for subversion.

subrepo: backout bcc6ed0f6c3b

wireproto: add test for new optional arg missing on server New argument is silently ignored by both HTTP and SSH servers. This means we can, for instance, add new flags to getbundle() to request advanced features (like lightweight-copy-aware bundles), and older servers will silently ignore this request and send back a plain bundle.

merge with stable

web: Made elapsed time calculation dynamic (javascript). This allow safe caching of the pages by the browser and still display the right amount of elapsed time upon page refresh. If javascript is disabled, absolute time is displayed, leaving it readable. All the templates have been updated.

extdiff: add repository root as a variable Some external diff tools (notably Plan 9 diff(1)) require the absolute path to the file being diffed for proper function. A root variable was added to inform an external tool of the repository root (the tool is invoked with the cwd set to tmproot).

help: move hgignore man page into built-in help (issue2769)

graphlog: make use of graphmod's revset support

graphmod: use revsets internally Thanks for the idea and most of the implementation to Klaus Koch Backs revisions() and filerevs() with DAG walker which can iterate through arbitrary list of revisions instead of strict one by one iteration from start to stop. When a gap occurs in a revisions (i.e. in file log), the next topological parent within the revset is searched and the connection to it is printed in the ascii graph. File graph can draw sometimes more connections than previous version, because graph is produced according to the revset, not according to a file's filelog. In case the graph contains several branches where the left parent is null, the graphs for each are printed sequentially, not in parallel as it was a case earlier (see for example the graph for README in hg-dev).

svn subrepo: attempt work around obstructed checkouts (issue2752) It should be possible to do better than this with 'svn switch', but the logic required woud be significantly more complex. Until someone needs the performance improvements of using switch, we'll just use the same strategy for everything.

churn: strip key earlier to avoid false negative seach in aliases

bookmarks: further restrict IOError on write This won't risk losing the undo file when the error was something other than file not found

tags: loosen IOError filtering when reading localtags

run-tests: don't count test as succeeded if it failed regressed around ec4ae5727f07

changegroup: do not count closed new heads (issue2697) If a closed head gets pulled, we currently see (example): $ hg pull pulling from $TESTTMP/repo2 searching for changes adding changesets adding manifests adding file changes added 2 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) A subsequent 'hg heads' doesn't show that head because it is closed. This patch improves the UI response texts for that same use case to: $ hg pull pulling from $TESTTMP/repo2 searching for changes adding changesets adding manifests adding file changes added 2 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) That is, the part "(+1 heads)" is not shown in that case any longer.

merge with crew

shrink-revlog: defend against null first parents

test-contrib: add a test for shrink-revlog We only verify the extension runs and that verify passes at the end as constructing a test repository that would result in a shrink would be nontrivial.

test-simplemerge-cmd.t: move all tests into test-contrib.t

Move test-dumprevlog to test-contrib in anticipation of more contrib tests

shrink-revlog: use a bundler object (see d69c9510d648)

shrink-revlog: update util.opener to scmutil.opener after d13913355390

shrink-revlog: remove \ from docstring

bookmarks: be more restrictive in our Exception catching

strip: make it clear that --force discards changes (issue310)

subrepo: tell Subversion when we are non-interactive (issue2759) $ hg clone repo repo-clone -v updating to branch default resolving manifests getting .hgsub getting .hgsubstate abort: svn: OPTIONS of 'https://subversion.srv/project': Server certificate verification failed: issuer is not trusted (https://subversion.srv)

merge with stable

tests: check for (*/sec) instead of (*B/sec) to match (X bytes/sec) I just had: transferred 606 bytes in 2.9 seconds (211 bytes/sec)

test-repair-strip: turn into new style test

extdiff: fix broken symlinks handling (issue1909)

tags: catch more corruption during cache parsing (issue2779)

run-tests: do chdir for tests under a lock for thread safety

run-tests: add iolock to vlog

patch: remove redundant variable in iterhunks()

merge with stable

merge default heads

commit: improve --date help text

merge with stable

test-transplant: fix missing file addition

tests: add script to disable a selected wire protocol capability This can be used to test that the client and server both fall back to the previous wire protocol when the capability is not supported. It is currently used by test-push-http.t and I plan to use it for the HTTP long argument support tests.

mq: prevent traceback when qfinish patches not in series. When mq status entry referencing a patches that is not in series `hg qfinish -a` used to issue a traceback. This states is inconsistent but might happen regularly when people misuse hg up -mq. This changeset prevent hg from crashing. The faulty entry is finished anyway and a warning is issued.

check-code: separate warnings to avoid repetitive str.startswith

atomictempfile: rewrite docstring to clarify rename() vs. close().

atomictempfile: avoid infinite recursion in __del__(). The problem is that a programmer using atomictempfile directly can make an innocent everyday mistake -- not enough args to the constructor -- which escalates badly. You would expect a simple TypeError crash in that case, but you actually get an infinite recursion that is surprisingly difficult to kill: it happens between __del__() and __getattr__(), and Python does not handle infinite recursion from __del__() well. The fix is to not implement __getattr__(), but instead assign instance attributes for the methods we wish to delegate to the builtin file type: write() and fileno(). I've audited mercurial.* and hgext.* and found no users of atomictempfile using methods other than write() and rename(). I audited third-party extensions and found one (snap) passing an atomictempfile to util.fstat(), so I also threw in fileno(). The last time I submitted a similar patch, Matt proposed that we make atomictempfile a subclass of file instead of wrapping it. Rejected on grounds of unnecessary complexity: for one thing, it would make the Windows implementation of posixfile quite a bit more complex. It would have to become a subclass of file rather than a simple function -- but since it's written in C, this is non-obvious and non-trivial. Furthermore, there's nothing wrong with wrapping objects and delegating methods: it's a well-established pattern that works just fine in many cases. Subclassing is not the answer to all of life's problems.

run-tests: display diff before prompting with --interactive

check-code: warn about naked except clauses

eliminate various naked except clauses

run-tests: fix some missing i/o locks

run-tests: add a lock for console I/O

run-tests: switch timeout handling from alarm to helper thread This should be slightly more portable than signals and be compatible with threaded dispatch.

run-tests: add locking on results struct

run-tests: fix --interactive (after 994ad067ac6e) - Do not prompt if there is no .err file - Fix source and target paths

color: code simplification

test-status-color: fix terminfo code compatibility problem On a linux host in xterm mode, 'none' is translated to: \x1b[m\x1b(B While it is the following on osx: \x1b(B\x1b[m Take advantage of the new color.color.X option to force it to a common value.

hg-ssh: fix duplicate word in docstring

run-tests: move test loop into a helper function

run-tests: use a results dict

run-tests: move blacklist and retest filtering to runone

run-tests: keep a list of passed tests

run-tests: move keyword checking into runone

run-tests: add ignores list

run-tests: move existence/name format check into runone

run-tests: move interactive handling into runone

color: add support for terminfo-based attributes and color Using terminfo instead of hard-coding ECMA-48 control sequences provides a greater assurance that the terminal codes are correct for the current terminal type; not everything supports the ANSI escape codes. It also allows us to use a wider range of colors when a terminal emulator supports it (such as 16- or 256-color xterm), and a few more non-color attributes, such as the ever-popular blink.

move system_rcpath and user_rcpath to scmutil

move os_rcpath from util to scmutil

move rcpath from util to scmutil

merge with stable

merge with i18n

merge with i18n

i18n-pt_BR: synchronized with 1416b9118540

i18n: merge with stable

i18n-da: synchronize with 1184bb274cb3

i18n-de: improve grammar

win32: Wine doesn't know about hardlinks

move walkrepos from util to scmutil

move checkfilename from util to scmutil checkfilename is specific to Mercurial, since it contains the knowledege that Mercurial can't track files with \n or \r in the name.

scmutil: fix erroneous Abort call This fixes d13913355390 (affected Windows only).

move path_auditor from util to scmutil

move canonpath from util to scmutil

move opener from util to scmutil

merge with stable

convert: make filemap prune useless branch closing revs (issue2774) A branch closing revision only applies if one of its parents belongs to the branch being closed. Otherwise the filemap can prune it too.

dispatch: improve repository not found message This should help clarify what the problem is in various problematic cases like ssh.

hgweb: support disabling page cache By default, hgweb_mod supports caching via the ETag header. This can cause some confusion with browsers which cache aggressively. This change preserves existing behavior while giving the administrator a knob to disable the ETag header.

merge with stable

hgweb: support alternate logo url Clicking on the logo image/text in the hgweb interface brings the user to the Mercurial project page. The majority of users expect that this would bring them to the top level index. I have added a new template variable named `logourl' which allows an administrator to change this behavior. To stay compatible with existing behavior, `logourl' will default to http://mercurial.selenic.com/. This change is very useful in large installations where jumping to the index is common.

identify: further clarification of help Following on to 1416b9118540, correct a minor grammar issue, re-wrap to 72 columns, and further clarify wording.

add: introduce a warning message for non-portable filenames (issue2756) (BC) On POSIX platforms, the 'add', 'addremove', 'copy' and 'rename' commands now warn if a file has a name that can't be checked out on Windows. Example: $ hg add con.xml warning: filename contains 'con', which is reserved on Windows: 'con.xml' $ hg status A con.xml The file is added despite the warning. The warning is ON by default. It can be suppressed by setting the config option 'portablefilenames' in section 'ui' to 'ignore' or 'false': $ hg --config ui.portablefilenames=ignore add con.xml $ hg sta A con.xml If ui.portablefilenames is set to 'abort', then the command is aborted: $ hg --config ui.portablefilenames=abort add con.xml abort: filename contains 'con', which is reserved on Windows: 'con.xml' On Windows, the ui.portablefilenames config setting is irrelevant and the command is always aborted if a problematic filename is found.

paper: use monospace font for description

update: fix check for no rev when a date is given The previous check caught a corner case in which rev was pointing to 0.

merge with stable

hgweb: detect change based on changelog size too Before, there was a race between an access and a modification made within the same second.

rollback: lower-case warning issued when branch cannot be reset Also improved the word order.

tests: remove redundant mkdir There are still many tests that check that a bare 'hg init' initializes the current directory.

help config: explain that config files do not exist by default Inspired by critique given on StackOverflow where a user writes: I can have a good guess at what "%USERPROFILE%" might signify but none of the files listed in the "hg help config" output exist after running the installer. Previous experience would suggest that missing files mean something somewhere has gone seriously wrong. http://stackoverflow.com/questions/2329023/2351139#2351139

merge with stable

identify: restructure code to make it more readable

identify/help: say what the command does first, mention bookmarks

templatefilters: improve person() for john.doe@example.com BEFORE: person('john.doe@example.com') -> 'john' AFTER: person('john.doe@example.com') -> 'john doe'

help: do not show full help text for command on option errors Example $ hg clone --jump foo bar hg clone: option --jump not recognized hg clone [OPTION]... SOURCE [DEST] make a copy of an existing repository options: -U --noupdate the clone will include an empty working copy (only a repository) -u --updaterev REV revision, tag or branch to check out -r --rev REV [+] include the specified changeset -b --branch BRANCH [+] clone only the specified branch --pull use pull protocol to copy metadata --uncompressed use uncompressed transfer (fast over LAN) -e --ssh CMD specify ssh command to use --remotecmd CMD specify hg command to run on the remote side --insecure do not verify server certificate (ignoring web.cacerts config) [+] marked option can be specified multiple times use "hg help clone" to show the full help text Motivation for this change If the user already has specified the command, he probably already knows the command to some extent. Apparently, he has a problem with the options, so we show him just the synopsis with the short help and the details about the options, with a hint on the last line how to get the full help text. Why is Mercurial better with this change? Experts who just forgot about the details of an option don't get that much text thrown at them, while the newbies still get a hint on the last line how to get the full help text.

store: add some doctests

paper: don't add breaks on the remaining instances of desc fixes ebe1ddbbefd7

checkwinfilename: use %r in format string

tests: new test cases for the unbundlehash capability

copy: do not copy file if name is disallowed anyway

util: new function checkfilename checkfilename checks for restrictions on filenames imposed by Mercurial itself, irrespective of on what platform it is run.

opener: use %r in format string for abort

wireproto: allow unbundle with hashed heads parameter (issue2126) Current wire protocol of unbundle sends the list of all heads in the remote repository to avoid race condition. This causes "URL too long" error on HTTP server when the repository has many heads. This change allows clients to send SHA1 hash of sorted head hashes instead. Also, this introduces "unbundlehash" capability to inform them that the server accepts hashed heads parameter.

merge with stable

encoding: avoid localstr when a string can be encoded losslessly (issue2763) localstr's hash method exists to prevent bogus matching on lossy local encodings. For instance, we don't want 'caf?' to match 'café' in an ASCII locale. But when café can be losslessly encoded in the local charset, we can simply use a normal string and avoid the hashing trick. This avoids using localstr's hash method, which would prevent a match between

merge with stable

revset: optimize stringset when subset == entire repo if range(len(repo)) is passed to stringset and x is a valid rev (checked before) then x is guaranteed to be in subset, we can check for that by comparing the lengths of the sets

help/revset: fix grammar

qrecord: provide help when mq is not enabled

record: improve help test coverage

paper: preserve whitespace on description instead of adding breaks This preserves the indentation of text in the changeset description. This is useful for example for descriptions containing command line use case examples like: $ hg -q heads 13934:648a834cca14 13912:71ea5b2b9517 Without this patch, such space-char indented text was just left aligned.

compact style: show bookmarks in the same manner as tags

revsets: preserve ordering with the or operator This is valuable because now revsets like 'bookmarks() or tip' will always show tip after bookmarks unless tip was itself a bookmark. This is a somewhat contrived example, but this behavior is useful for "where am I" type aliases that use log and revsets.

hgweb: set minimum number of revision to display to 1 when revcount is 0 When revcount goes to 0 nothing is displayed in hgweb. This patch sets revcount to max(revcount, 1).

zeroconf: clean up naked exceptions

localrepo: don't add deleted files to list of modified/added files (issue2761) If a file is deleted (rm, not 'hg rm') from the working dir an attempt to run 'hg diff -r X', with the file being present in X will cause an abort. We didn't check if the file has been deleted from the working dir and later on tried to open it to compare with the one from X, causing the abort. This fix adds that check. Consequently, no output will be returned.

path_auditor: eliminate local function 'check' in __call__

subrepo: trailing whitespace cleanup

util: move checkosfilename call from path_auditor to opener path_auditor is used for checking patterns too, but a pattern is not a valid filename. This patch fixes 98ee3dd5bab4, which introduced the bug: $ hg log -l3 glob:**.py abort: filename contains '*', which is reserved on Windows: mercurial\**.py

tests: add tests for non-existant branch/tag/bookmark

hgweb: add bookmarks listing to summary page of gitweb/monoblue styles

hgweb: remove useless notip handling from bookmarks listing

hgweb: sort bookmarks in the same manner as console command

hgweb: add bookmarks listing to raw style with test case

grep: don't print data from binary files for matches (issue2614)

color: reset win32 console color in a finally block

tests: better output on timeouts Formerly, timeouts would generate huge scrollback-destroying diffs and weird -15 return codes in the summary. Now we simply report "timed out".

acl: add branch tests for the current behavior of acl extension Adds simple tests for the acl.allow.branches and acl.deny.branches configuration options of the acl extension.

path_auditor: check filenames for basic platform validity (issue2755) Example (on Windows): $ hg parents $ hg manifest tip con.xml $ hg update abort: filename contains 'con', which is reserved on Windows: con.xml Before this patch, update produced (as explained in issue2755): $ hg update abort: No usable temporary filename found I've added the new function checkwinfilename to util.py and not to windows.py, so that we can later call it when running on posix platforms too, for when we decide to implement a (configurable) warning message on 'hg add'. As per this patch, checkwinfilename is currently only used when running on Windwows. path_auditor calls checkosfilename, which is a NOP on posix and an alias for checkwinfilename on Windows.

revset: rearrange code so functions are sorted alphabetically

revset: abort when tag or bookmark doesn't exist

merge with stable

subrepo: prevent url normalization from removing // in ssh paths (issue2556)

bookmarks: change error messages to match those given by 'hg tag' commands

audit: improve nested repo message

tags: remove another check for valid nodes see 1aea86673dee

revset: replace for-loop with list comprehension

subrepo: fix up svn test output

merge with stable

hgweb: fix inconsistant display of graphlog (issue1706)

hgrc.5: drop 'hgext.' prefix when talking about extensions The first paragraph apply to all extensions, not just those in hgext. The second paragraph can just use the simpler form to load mq.

merge with crew

merge with stable

merge with crew

url: use a regex to hide unsupported ssh passwords (issue2754)

commit: note when files are missing Before, you could experience the following strange interaction: $ hg commit nothing changed $ hg merge abort: outstanding uncommitted changes which confused at least one user in #mercurial.

relink: correct unusual indentation

hg: make parseurl() consistently return normalised path Before this the path was only normalised when a fragment was used.

bugzilla: more documentation formatting fixups Correct typo in numbering list of access methods. Convert a section reference and a template parameter reference into literal text, for consistency with other use.

merge with stable

rebase: don't mark file as removed if missing in parent's manifest (issue2725)

tags: no need to check for valid nodes _findtags in localrepo checks that nodes exist in the revlog so we can't get a LookupError here. The output of 'hg tags' stays the same since tags to unknown nodes didn't get printed before anyway due to ae3089cefaab.

localrepo: ignore tags to unknown nodes (issue2750)

merge: added info that hg help merge-tools shows the options for --tool

util: move checklink() to posix.py and return False on Windows Python added support for Windows 6.0 (Vista) symbolic links in 3.2 [1], but even these symbolic links aren't what we can expect from a canonical symbolic link, since creation requires SeCreateSymbolicLinkPrivilege, which typically only admins have. So we can safely assume that we don't have symbolic links on Windows. [1] http://docs.python.org/py3k/library/os.html#os.symlink

util: make 'hg log -d --2' abort (issue2734)

help: sort help topics to make the output more readable (issue2751)

merge with stable

help/dates: use DATE as place-holder in help and abort texts The use of "{datetime}" was unfortunate since I as a user never knew if I was expected to do hg log -d '>{2011-04-01}' or hg log -d '>2011-04-01' The word "datetime" is also confusing -- calling it a date it much simpler.

keyword: convert a verbatim block to a field list

bugzilla: convert a verbatim block to a field list

bugzilla: fix reST error introduced in 22d200e49b10 All blocks must be indented. Here we can use a field list instead of a verbatim block for a real list layout.

help/dates: rephrase explanation of internal format The old explanation referred to the two numbers as "unixtime" and "offset" without really defining those terms.

rebase: drop ancestor import

rebase: drop unused p2 arg from rebasenode

util: move checkexec() to posix.py and return False on Windows

misc: replace .parents()[0] with p1()

filectx: introduce p1/p2 convenience methods

dirstate: add p1/p2 convenience methods

rebase: use merge's ancestor parameter

merge: add ancestor to the update function This makes it easier to do rebase-like operations.

revset: teach optimizer that closed is slowish

localrepo: tighten except clause when looking rev

bugzilla: more documentation fixes Correct formatting of the possible values of bugzilla.version. Fix typo and polish XMLRPC/email mode description.

bugzilla: correct sample configurations Use consistent sample domains and wording in all configuration examples. Add missing template and strip parameters to XMLRPC examples and correct Bugzilla URL key in XMLRPC+email.

date: fixup breakage from ">" fix

merge with stable

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