Henrik Stuart <hg@hstuart.dk> [Sun, 24 May 2009 16:14:32 +0200] rev 8594
i18n-da: fixed use of plural form for parent
Henrik Stuart <hg@hstuart.dk> [Sun, 24 May 2009 15:20:04 +0200] rev 8593
i18n-da: better Danish word for "entry"
Simon Heimberg <simohe@besonet.ch> [Tue, 19 May 2009 09:36:20 +0200] rev 8592
runtest: do not start testing when there is no test
Henrik Stuart <hg@hstuart.dk> [Sun, 24 May 2009 11:41:07 +0200] rev 8591
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.
Henrik Stuart <hg@hstuart.dk> [Fri, 22 May 2009 08:56:43 +0200] rev 8590
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.
Simon Heimberg <simohe@besonet.ch> [Thu, 14 May 2009 19:54:26 +0200] rev 8589
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
Simon Heimberg <simohe@besonet.ch> [Thu, 14 May 2009 10:50:45 +0200] rev 8588
dirstate: set more states in step 1 of walk
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:22 -0500] rev 8587
match: fold match into _match base class
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:20 -0500] rev 8586
match: add exact flag to match() to unify all match forms
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 8585
match: redefine always and never in terms of match and exact
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 8584
match: fold _globprefix into _roots
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 8583
match: optimize escaping in _globre
- localize re.escape
- fastpath escaping of non-special characters
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 8582
match: remove head and tail args from _globre
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 8581
match: fold _matcher into match.__init__
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 8580
match: rename _matchfn to _buildmatch
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 8579
match: optimize _patsplit
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 8578
match: tweak some names
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 8577
match: simplify _matcher
- get rid of special case
- simplify anypats logic
- fold inckinds and exckinds
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 8576
match: split up _normalizepats
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 8575
match: optimize _globprefix
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 8574
match: unnest functions in _matcher
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 8573
match: kill unused defaults on _globre
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 8572
match: kill test in matchfn
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 8571
match: refactor matchfn generation
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 8570
match: move util match functions over
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 8569
util: privatize globre
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 8568
match: refactor patkind
add patkind(pat) to match
change external users
change util.patkind to _patsplit
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 8567
match: add some default args
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 8566
match: change all users of util.matcher to match.match
Sune Foldager <cryo@cyanite.org> [Sat, 23 May 2009 17:04:41 +0200] rev 8565
tests: add tests for new pre-push logic (
issue736)
Co-contributor: Henrik Stuart <henrik.stuart@edlund.dk>
Sune Foldager <cryo@cyanite.org> [Sat, 23 May 2009 17:04:31 +0200] rev 8564
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>
Henrik Stuart <henrik.stuart@edlund.dk> [Sat, 23 May 2009 17:03:51 +0200] rev 8563
named branches: client branchmap wire protocol support (
issue736)
Co-contributor: Sune Foldager <cryo@cyanite.org>
Henrik Stuart <henrik.stuart@edlund.dk> [Sat, 23 May 2009 17:02:49 +0200] rev 8562
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>
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:03 -0500] rev 8561
Merge with -stable
Matt Mackall <mpm@selenic.com> [Sat, 23 May 2009 12:31:28 -0500] rev 8560
Merge with crew-stable
Henrik Stuart <hg@hstuart.dk> [Sat, 23 May 2009 19:57:25 +0200] rev 8559
windows: make openhardlinks work
Despite the intention, openhardlinks would always evaluate to False.
Matt Mackall <mpm@selenic.com> [Sat, 23 May 2009 11:53:23 -0500] rev 8558
revlog: fix reading of larger revlog indices on Windows
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 08 May 2009 12:19:57 +0900] rev 8557
inotify: Removing the unnecessary "inotifyserver" class variable.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 06 May 2009 01:40:03 +0900] rev 8556
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()
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 22 Apr 2009 00:37:35 +0900] rev 8555
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 22 Apr 2009 00:23:40 +0900] rev 8554
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 17 Apr 2009 20:10:47 +0900] rev 8553
inotify: change protocol so that different query types can be supported.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 07 Apr 2009 19:30:01 +0900] rev 8552
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
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 07 Apr 2009 18:39:34 +0900] rev 8551
inotify: modular architecture for inotify clients
Put the socket init, query generation and response analysis in
a more generic client class.
Martin Geisler <mg@lazybytes.net> [Sat, 23 May 2009 13:43:11 +0200] rev 8550
setup: another newline if version could not be established.
Martin Geisler <mg@lazybytes.net> [Sat, 23 May 2009 00:24:00 +0200] rev 8549
setup: add missing newline in warning
Jeremy Whitlock <jcscoobyrs@gmail.com> [Fri, 22 May 2009 21:03:06 +0200] rev 8548
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.
Christian Ebert <blacktrash@gmx.net> [Fri, 22 May 2009 14:26:58 +0200] rev 8547
setup.py: subprocess instead of os.popen, sys.stderr.write instead of print
Also check that .hg is a directory.
Ori Avtalion <ori@avtalion.name> [Fri, 22 May 2009 20:19:22 +0200] rev 8546
gendoc: add missing space in command synopsis
Steve Borho <steve@borho.org> [Fri, 22 May 2009 11:42:21 -0500] rev 8545
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.
Ori Avtalion <ori@avtalion.name> [Fri, 22 May 2009 18:57:53 +0200] rev 8544
commands: standardize parents command meta data
Martin Geisler <mg@lazybytes.net> [Thu, 21 May 2009 23:56:15 +0200] rev 8543
i18n-da: synchronized
Martin Geisler <mg@lazybytes.net> [Thu, 21 May 2009 23:43:13 +0200] rev 8542
i18n: accurately generate hg.pot
Martin Geisler <mg@lazybytes.net> [Thu, 21 May 2009 22:53:26 +0200] rev 8541
hgcia, convert: escape backslashes in docstrings
Martin Geisler <mg@lazybytes.net> [Thu, 21 May 2009 17:36:19 +0200] rev 8540
commands: remove unnecessary quotes in backout help
Patrick Mezard <pmezard@gmail.com> [Thu, 21 May 2009 22:43:38 +0200] rev 8539
test-merge-tools: windows fixes
- /bin/cat does not exist, expect 'cat'
- non-interactive mode is not correctly detected in pysh, force it