zsh completion: remove computed default values from help texts
The default encoding and encoding mode are computed at runtime and can
vary from system to system. The two remaining default values in the
completion help texts (number of directories to strip on import and
default bundle name) are fixed in the source code.
merge: remove last traces of fastforward merging
bbc97d419b16 introduced fast-forward branch merging.
66ed92ed115a partly removed it again.
The fastforward variable would always be false if branchmerge was false, so the
fastforward variable makes no difference and we can remove it completely.
subrepo: backout
67fbe566eff1, --force requires svn >= 1.5
i18n-de: improve translation for "unmerged branches"
This translation issue was pointed out by Georg Brandl.
httprepo: order URL query string fields for readability
- cmd is always first, since the other fields are arguments to that command.
- The other fields are in alphabetical order, rather than random order.
example "hg serve" output
BEFORE
127.0.0.1 - - [26/Feb/2011 14:20:07] "GET /?bases=
fa5962be1d87fe9a57244a14033550e192e57521+
1a38f137b190482eaf0986594cd6e6b486c76fec&cmd=changegroupsubset&heads=
1a38f137b190482eaf0986594cd6e6b486c76fec+
fa5962be1d87fe9a57244a14033550e192e57521 HTTP/1.1" 200 -
127.0.0.1 - - [26/Feb/2011 14:00:50] "GET /?pairs=
0000000000000000000000000000000000000000-
0000000000000000000000000000000000000000&cmd=between HTTP/1.1" 200 -
127.0.0.1 - - [26/Feb/2011 14:17:28] "GET /?nodes=
1a38f137b190482eaf0986594cd6e6b486c76fec+
fa5962be1d87fe9a57244a14033550e192e57521&cmd=branches HTTP/1.1" 200 -
AFTER
127.0.0.1 - - [26/Feb/2011 14:21:28] "GET /?cmd=changegroupsubset&bases=
fa5962be1d87fe9a57244a14033550e192e57521+
1a38f137b190482eaf0986594cd6e6b486c76fec&heads=
1a38f137b190482eaf0986594cd6e6b486c76fec+
fa5962be1d87fe9a57244a14033550e192e57521 HTTP/1.1" 200 -
127.0.0.1 - - [26/Feb/2011 13:48:13] "GET /?cmd=between&pairs=
0000000000000000000000000000000000000000-
0000000000000000000000000000000000000000 HTTP/1.1" 200 -
127.0.0.1 - - [26/Feb/2011 14:19:17] "GET /?cmd=branches&nodes=
1a38f137b190482eaf0986594cd6e6b486c76fec+
fa5962be1d87fe9a57244a14033550e192e57521 HTTP/1.1" 200 -
ancestor: rewrite to deal with crossed linkrevs (
issue2682)
This version is about 10% slower, possibly because it visits some
revisions in a different topological order than what's in the revlog.
merge: back out single-parent fast-forward merge
This backs out
changeset: 13158:
9e7e24052745
user: Mads Kiilerich <mads@kiilerich.com>
date: Tue Dec 07 03:29:21 2010 +0100
summary: merge: fast-forward merge with descendant
Before named branches, the invariants were:
a) "merges" always have two parents
b) p1 is not linearly related to p2
Adding named branches made (b) problematic, so the above patch was
introduced, which fixed (b) but broke (a).
After discussion, we decided that the invariants should be:
a) "merges" always have two parents
b) p1 is not linearly related to p2 OR p1 and p2 are on different branches
merge: drop resolve state for mergers with identical contents (
issue2680)