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

dirstate: use quicker matchfn() instead of match() everywhere matchfn does the same as match(), but a direct "link"

patchbomb: don't localize Date headers

alias: a0104303f400 did not correctly handle whitespace in the args

update --clean: do not unlink added files (issue575)

templater: lowercase error message Changing this messages should be safe: automated scripts ought to have debugged their templates and wont grep for this error message.

util: use set instead of dict

localrepo: update commit*() docstrings

patchbomb: with --in-reply-to, still thread message under first in series When specifying --in-reply-to for a message M, have [M] [0/2] [1/2] [2/2] instead of [M] [0/2] [1/2] [2/2] which is more consistent with the way messages are being threaded when --in-reply-to is not used.

merge with mpm

patchbomb: minor typo and language fixes

patchbomb: clarify diffstat usage

patchbomb: fix inexact description of the messages threading Each message refers only to the first of the series.

coal/paper: minimize whitespace differences in CSS files

coal/paper: equal heights for file and annotate views

spartan: ensure equal heights for file and annotate views The display used to jump up and down when switching from the file view to the annotate view. It now stays still: when switching from the file view to the annotate view it looks like the file content is simply right-shifted to make room for the author names.

coal/paper: simplify margin and padding CSS rules

spartan: simplify CSS colors (#xxxxxx -> #xxx)

coal/paper/spartan: remove extra line break in annotate view

commit: tidy up mergestate slightly

commit: drop unneeded dirstate invalidate logic We no longer touch the dirstate in the middle of a commit, so a failing commit doesn't require invalidating the dirstate.

commit: some tidying - simplify handling of 'close' - kill silly wlock=None - sort/uniq files later

commit: remove unused lock var

commit: move description trimming into changelog

commit: simplify manifest commit

commit: explain how to abort commit in editor

commit: move editor outside transaction The commit editor is now invoked before files and manifest are committed. The editor is now run with only the wlock held and aborting an edit no longer requires rolling back a transaction. Changes to files during a commit still result in undefined behavior. (This is preliminary work for committing subrepositories)

convert: directly use nullid

Merge with stable

Fix how setup.py identifies the Mercurial version. There is a problem with setup.py where it will not identify the Mercurial version properly when not being ran in within a repository even if mercurial/__version__.py exists. To fix, use mercurial.__version__.version when available before defaulting to "unknown". (Using mercurial.util.version() is not an option due to a dependency issue where osutil can be referenced before it is built.)

templater: replace eval with closure

win32mbcs: remove silly eval

merge with crew