revlog: move stat inside lazyparser

dirstate: notice truncated parents read

lookup: check for dirstate damage on failure

keyword: rename matcher() to match() mimicking changes in main

tests: test for dispatch on [defaults]: more clearly differing output Using '-r null' instead of '-v' as the overriden command default. The latter did not have any effect on output, thus not giving much indication on whether the modified defaults were really in use or not.

merge: whitespace cleanup

revlog: add test for 7659eecd9da2 (issue1678)

changegroup: the node list might be an empty generator (fix issue1678)

store encoding: .i/.d encoding for non-store repo (broken by 810387f59696)

replace "i in range(len(xs))" with "i, x in enumerate(xs)" The remaining occurrences should be the ones where "xs" is mutated or where "i" is used for index arithmetic.

util: simplify range expression The n index variable was unused. Every iteration would pop one element off of parts, so the for loop can be replaced with a while loop.

color: cleanup extra commas

setup: execute hg in C locale

setup: handle trust warnings when determining version

setup: renamed l, e vars to out, err

hggettext: ensure correct Mercurial is imported

Makefile: do not create i18n/, it is already there

replace xrange(0, n) with xrange(n)

color: replace re.split with ui.configlist

color: use lists instead of tuples for effects

hgweb: extract config values after reading webdir-config

tests: make coverage run in parallel mode, clean up coverage code

revlog: fix undefined variable introduced in 5726bb290bfe

parentrevspec: remove a trailing colon

purge: fix spelling error

zsh-comp: explain how to use for non-global install

use ui instead of repo.ui when the former is in scope

cmdutils: Take over glob expansion duties from util

match: fix _patsplit breakage with drive letters

statichttprepo: handle remote not supporting Range headers - If remote does not support Range header, 200 is answered instead of 206. The HTTPRangeHandler left these responses unchanged, so the data has to be sliced by the receiver. - httprangereader file pointer was not updated.

convert: better feedback when filtering out empty revisions Original patch by Herbert Griebel <herbertg@gmx.at>

inotify: server: use a common 'pollable' interface for server & repowatcher Mainly for documentation purposes: it easily explains the role of handle_event and handle_timeout, and why both server & repowatcher implement those methods.

inotify: process all inotify events in one batch When several inotify events happen, we don't have to process each event separately, calling everytime repowatcher.read_events() to fetch events from the underlying watcher: it is sufficient to call once read_events, to fetch all the events from the watcher.

inotify: rename handle_event to handle_pollevent to avoid confusion event here refers to poll events, and are different from events read in server.read_events for example, where those events are inotify events.

inotify: handle_event: do not use event and fd parameters. event is particularly confusing given the context (is it an inotify event? a polling event?) and is never used. Remove it. fd has very little use, and it gives the false impression that event handling depends on fd. It's wrong: the same behavior is triggered, for all events.

inotify: use a decorator instead of dispatching calls

inotify: do not defer inotify events processing Doing a part of the event processing and deferring the rest is a bad habit: it complexifies the code, and it does not respect event ordering! Moreover, there is already a timeout handling, so that inotify events are only processed when a treshold is exceeded: there is no requirement to delay anymore the events processing.

inotify: do not recurse in handle_timeout(): call it explicitely, not in scan() When in handle_timeout, scan() is called when a repertory is created/modified. But the first line of scan calls handle_timeout. This had the consequence of calling recursively handle_timeout: * several calls to read_events (but only the first one retrieves events) * every time that an event is queued for a deferred action, the next time that scan() is called, handle_timeout is called, the event queue is treated, even if all the events haven't been read/queued yet. This could lead to inconsistencies

i18n-da: typo

merge with crew

inotify: adding test for issue1556

inotify: proper fix for issue1542 (partially reverting 67e59a9886d5) issue1542 description: Unknown files (?) placed in a directory are still marked as present and unknown when the containing directory is moved out of the repository scope. Why 67e59a9886d5 was bad: * When the problem we're addressing only deals with unknown files, the fix to updatestatus applies for all statuses * The only reason to move the call schedule_work(wpath, 'd') seems to be that it allowed an updatestatus call on the deleted directory, in deleted(). But deleted() should not be called on directories in the first place. * After fixing an independant issue (1371), test-inotify-issue1542 was failing Fix: When processing a deletion of a directory, walk the tree of the unknown files and remove the entries from repowatcher. This step does not need to be added in the generic scan() routine: it is only necessary on a directory deletion.

inotify: server: refactor updatestatus() * Instead of one entry point, use two entry points, updatefile() and deletefile(), both internally calling the helper function _updatestatus * Do not rely on TypeError to detect the type of oldstatus: use isinstance * The call updatestatus(wpath, None) in deleted() was a bit particular: because no osstat and no newstatus was given, the newstatus was determined using the data stored internally. To replace this exact behavior with the new code, one would use: root, fn = self.split(wpath) d = self.dir(self.tree, root) self.filedeleted(wpath, d.get(fn)) This, however, duplicates code with _updatestatus(), which led us to an interesting question: why are we basing ourselves on repowatcher data to update the status, where everywhere else, we are comparing against dirsate? There is no reason to do this, which is why the new code is: self.filedeleted(wpath, self.repo.dirstate[wpath]) Incidentally, after this, the test for issue1371 passes again.

convert: deprecate external cvsps, to be removed in 1.4

osutil: silence uninitialized variable warning

convert/hg: update documentation

i18n-da: better word for "check"

i18n-da: fixed use of plural form for parent

i18n-da: better Danish word for "entry"

runtest: do not start testing when there is no test

templatefilters: add filter to convert date to local date (issue1674) Issue1674 suggests the localdate filter be applied as default to log, but this patch only introduces the filter, not the changed default behaviour.

url: use CONNECT for HTTPS connections through HTTP proxy (issue967) urllib2 and httplib does not support using CONNECT proxy requests, but only regular requests over the proxy. This does not work with HTTPS requests as they typically require that the client issues a CONNECT to the proxy to give a direct connection to the remote HTTPS server. This is solved by duplicating some of the httplib functionality and tying it together with the keepalive library such that a HTTPS connection that need to be proxied can be proxied by letting a connection be established to the proxy server and then subsequently performing the normal request to the specified server through the proxy server. As it stands, the code also purports to support HTTPS proxies, i.e. proxies that you connect to using SSL. These are extremely rare and nothing is done to ensure that CONNECT requests can be made to these as that would require multiple SSL handshakes. This use case is also not supported by most other contemporary web tools like curl and Firefox3.

dirstate: skip step 3 in walk if nothing new will match nothing will ever match on match.never nothing new will match on match.exact (all found in step 1) nothing new will match on match.match when there is no pattern and there is no direcory in pats

dirstate: set more states in step 1 of walk

match: fold match into _match base class

match: add exact flag to match() to unify all match forms

match: redefine always and never in terms of match and exact

match: fold _globprefix into _roots

match: optimize escaping in _globre - localize re.escape - fastpath escaping of non-special characters

match: remove head and tail args from _globre

match: fold _matcher into match.__init__

match: rename _matchfn to _buildmatch

match: optimize _patsplit

match: tweak some names

match: simplify _matcher - get rid of special case - simplify anypats logic - fold inckinds and exckinds

match: split up _normalizepats

match: optimize _globprefix

match: unnest functions in _matcher

match: kill unused defaults on _globre

match: kill test in matchfn

match: refactor matchfn generation

match: move util match functions over

util: privatize globre

match: refactor patkind add patkind(pat) to match change external users change util.patkind to _patsplit

match: add some default args

match: change all users of util.matcher to match.match

tests: add tests for new pre-push logic (issue736) Co-contributor: Henrik Stuart <henrik.stuart@edlund.dk>

named branches: improve pre-push logic (issue736) Each named branch is considered separately, and the push is allowed if no new branch heads are created for any named branch to be pushed. Due to some tests's use of --debug, their output will change after this addition. This has been fixed as well. Co-contributor: Henrik Stuart <henrik.stuart@edlund.dk>

named branches: client branchmap wire protocol support (issue736) Co-contributor: Sune Foldager <cryo@cyanite.org>

named branches: server branchmap wire protocol support (issue736) The repository command, 'branchmap', returns a dictionary, branchname -> [branchheads], and will be implemented for localrepo, httprepo and sshrepo. The following wire format is used for returning data: branchname1 branch1head2 branch1head2 ... branchname2 ... ... Branch names are URL encoded to escape white space, and branch heads are sent as hex encoded node ids. All branches and all their heads are sent. The background and motivation for this command is the desire for a richer named branch semantics when pushing changesets. The details are explained in the original proposal which is included below. 1. BACKGROUND The algorithm currently implemented in Mercurial only considers the graph theoretical heads when determining whether new heads are created, rather than using the branch heads as a count (the algorithm considers a branch head effectively closed when it is merged into another branch or a new named branch is started from that point onward). Our particular problem with the algorithm is that we'd like to see the following case working without forcing a push: Upsteam has: (0:dev) ---- (1:dev) \ `--- (2:stable) Someone merges stable into dev: (0:dev) ---- (1:dev) ------(3:dev) \ / `--- (2:stable) --------´ This can be pushed without --force (as it should). Now someone else does some coding on stable (a bug fix, say): (0:dev) ---- (1:dev) ------(3:dev) \ / `--- (2:stable) ---------´---------(4:stable) This time we need --force to push. We allow this to be pushed without using --force by getting all the remote branch heads (by extending the wire protocol with a new function). We would, furthermore, also prefer if it is impossible to push a new branch without --force (or a later --newbranch option so --force isn't shoe-horned into too many disparate functions, if need be), except of course in the case where the remote repository is empty. This is what our patches accomplish. 2. ALTERNATIVES We have, of course, considered some alternatives to reconstructing enough information to decide whether we are creating new remote branch heads, before we added the new wire protocol command. 2.1. LOOKUP ON REMOTE The main alternative is to use the information from remote.heads() and remote.lookup() to try to reconstruct enough graph information to decide whether we are creating new heads. This is not adequate as illustrated below. Remember that each lookup is typically a request-response pair over SSH or HTTP(S). If we have a simple repository at the remote end like this: (0:dev) ---- (1:dev) ---- (3:stable) \ `--- (2:dev) then remote.heads() will yield [2, 3]. Assume we have nodes [0, 1, 2] locally and want to create a new node, 4:dev, as a descendant from (1:dev), which should be OK as 1:dev is a branch head. If we do remote.lookup('dev') we will get [2]. Thus, we can get information about whether a branch exists on the remote server or not, but this does not solve our problem of figuring out whether we are creating new heads or not. Pushing 4:dev ought to be OK, since after the push, we still only have two heads on branch a. Using remote.lookup() and remote.heads() is thus not adequate to consistently decide whether we are creating new remote heads (e.g. in this situation the latter would never return 1:dev). 2.2. USING INCOMING TO RECONSTRUCT THE GRAPH An alternative would be to use information equivalent to hg incoming to get the full remote graph in addition to the local graph. To do this, we would have to get a changegroup(subset) bundle representing the remote end (which may be a substantial amount of data), getting the branch heads from an instantiated bundlerepository, deleting the bundle, and finally, we can compute the prepush logic. While this is backwards compatible, it will cause a possibly substantial slowdown of the push command as it first needs to pull in all changes. 3. FURTHER ARGUMENTS IN FAVOUR OF THE BRANCHMAP WIRE-PROTOCOL EXTENSION Currently, the commands incoming and pull, work based on the tip of a given branch if used with "-r branchname", making it hard to get all revisions of a certain branch only (if it has multiple heads). This can be solved by requesting the remote's branchheads and letting the revisions to be used with the command be these heads. This can be done by extending the commands with a new option, e.g.: hg pull -b branchname which will be turned into the equivalent of: hg pull -r branchhead1 -r branchhead2 -r branchhead3 We have a simple follow-up patch that can do this ready as well (although not submitted yet as it is pending the acceptance of the branch patch). 4. WRAP-UP We generally find that the branchmap wire protocol extension can provide better named branch support to Mercurial. Currently, some things, like the initial push scenario in this mail, are fairly counter-intuitive, and the more often you have to force push, the more it is likely you will get a lot of spurious and unnecessary merge nodes. Also, restricting incoming and pull to all changes on a branch rather than changes on the tip-most head would be a sensible extension to making named branches a first class citizen in Mercurial. Currently, named branches sometimes feel like a late-coming unwanted step-child. We have run it in a production environment for a while, with fewer multiple heads occurring in our repositories and fewer confused users as a result. Also, it fixes the long-standing issue 736. Co-contributor: Sune Foldager <cryo@cyanite.org>

Merge with -stable

Merge with crew-stable

windows: make openhardlinks work Despite the intention, openhardlinks would always evaluate to False.

revlog: fix reading of larger revlog indices on Windows

inotify: Removing the unnecessary "inotifyserver" class variable.

inotify: set a flag so a failed inotify query doesn't get repeated. If, for some reason, we can't get the inotify server to start, it's better to disable inotify queries for the instance to avoid trying over and over to start the server, which takes time. Just fall back on repo.status()

inotify: introduce debuginotify, which lists which paths are under watch

inotify: put STAT-specific query answer generation part in its own method

inotify: change protocol so that different query types can be supported.

inotify: Separate query sending logic from Server starting. Use a decorator around the public statusquery method of Client: start_server(query_to_server): try: query_to_server() except QueryFailed: [error recovery, inotify Server (re)starting] query_to_server() This way, introducing a new xxxquery Client method is easy: one has only to code the protocol part of xxxquery, ignoring errors, and decorating it using start_server to handle server recovery and (re)starts

inotify: modular architecture for inotify clients Put the socket init, query generation and response analysis in a more generic client class.

setup: another newline if version could not be established.

setup: add missing newline in warning

setup: read .hg_archival.txt for version info (issue1670) Previously, setup.py was enhanced to identify the Mercurial version from either .hg/ or mercurial/__version__.py. When archives are created using 'hg archive' or via hgweb, neither of those options are available. However, there is a .hg_archival.txt file in the root of the archive that has the information. This patch enhances setup.py to identify the Mercurial version from the .hg_archival.txt file when there is no .hg/ or mercurial/__version__.py available.

setup.py: subprocess instead of os.popen, sys.stderr.write instead of print Also check that .hg is a directory.

gendoc: add missing space in command synopsis

merge: give hint as to how to discover uncommitted changes Many users will try 'hg diff' here, and it will not show them missing files.

commands: standardize parents command meta data

i18n-da: synchronized

i18n: accurately generate hg.pot

hgcia, convert: escape backslashes in docstrings

commands: remove unnecessary quotes in backout help

test-merge-tools: windows fixes - /bin/cat does not exist, expect 'cat' - non-interactive mode is not correctly detected in pysh, force it

ui: honor interactive=off even if isatty()

Merge with crew-stable

hgwebdir: fix [collections] evaluation under Windows Virtual and real path separators are not the same under Windows.

cmdutil: mark string for translation

util: use "is" for True/False/None comparisons

remove: warn if unversionned files are specified (issue1454)

fetch: allow -r for remote repos

filelog encoding: move the encoding/decoding into store the escaping of directories ending with .i or .d doesn't really belong to filelog. we put the encoding/decoding in store instead, for backwards compat, streamclone and the fncache file format still uses the partially encoded filenames.

store: refactor the fncache handling put all the fncache file writing and reading in the same place.

hgweb: make hgwebdir handle dict/list paths the same as config paths Before this patch, the only way to get hgwebdir to honor the recursive paths was to create a config object or a config file with the recursive paths in it. This patch makes hgwebdir treat paths the same whether passed in as a list, tuple, config or however hgwebdir supports passing paths.

workingfilectx: always use the same filelog, even for renames workingfilectx() was using the "src" filelog in case the file was renamed in the working copy. For consistency, stop special-casing it. This allows us to remove some duplication between filectx and workingfilectx.

use 'x is None' instead of 'x == None' The built-in None object is a singleton and it is therefore safe to compare memory addresses with is. It is also faster, how much depends on the object being compared. For a simple type like str I get: | s = "foo" | s = None ----------+-----------+---------- s == None | 0.25 usec | 0.21 usec s is None | 0.17 usec | 0.17 usec

patch: simplify Boolean expression slightly The context variable is either True, False or None. Abbreviate it as C and we get the following truth table where the second column is the original expression and the third column is the new expression: C | C or C == None | C is not False True | True | True False | False | False None | True | True

mq: new method invalidate Introduce method invalidate (similar to dirstate and repo).

mq: only read files when needed use util.propertycache as in dirstate

tests: replace #...# syntax with {...}

match: use self.exact instead of lambda self.exact uses a set and does not need an extra copy of the files