Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 01 Jul 2014 17:06:02 +0200] rev 22018
push: make discovery extensible
We need to gather all discovery before the unified bundle2 push. We
use the same pattern as bundle2 parts generation.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 30 Jul 2014 19:04:50 -0700] rev 22017
push: rework the bundle2partsgenerators logic
Instead of a single list of functions, we now have a list of names and
a mapping of names to functions. This simplifies wrapping of steps
from extensions. In the same move, declaration becomes decorator-based
(syntax sugar, nom nom nom!).
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 01 Jul 2014 17:27:22 +0200] rev 22016
push: move common heads computation into pushop
Now that both options (push succeed or fall back) live in pushop, we
can move the common heads computation there too. It is a very commonly
accessed attribute so it makes a lot of sense to have it in pushop.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 01 Jul 2014 17:20:47 +0200] rev 22015
push: extract fallback heads computation into pushop
Similar motivation to `futureheads`, we extract the computation into pushop
to make it available early to all possibly interested parties.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 01 Jul 2014 17:20:31 +0200] rev 22014
push: extract future heads computation into pushop
Bundle2 will allow pushing all different parts of the push in a single bundle.
This mean that the discovery for each part needs to be done before trying to
push. Currently we may have different behaviors for phases and obsolescence markers
when the push of changesets fails. For example, information may still be
exchanged for a part of the history where changesets are common but where
phases mismatch. So the preparation of the push need to determine what
information need to be pushed in both situations. And it needs a different set of
heads for this. Therefore we are moving heads computation within pushop for easy
access by all parties. We start with the simplest set of heads.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 02 Aug 2014 21:46:27 +0900] rev 22013
cmdutil: use '[committemplate]' section like as map file for style definition
Before this patch, each template definitions for 'changeset*' in
'[committemplate]' section have to be written fully from scratch,
even though many parts of them may be common.
This patch uses '[committemplate]' section like as the map file for
the style definition. All items other than 'changeset' can be referred
from others.
This can reduce total cost of template customization in
'[committemplate]' section.
When the commit template other than '[committemplate] changeset'
is chosen by 'editform', putting '[committemplate] changeset'
value into the cache of the templater causes unexpected result,
because the templater stores the specified (= chosen) template
definition into own cache as 'changeset' at construction time.
This is the reason why '[committemplate] changeset' can't be referred
from others.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 02 Aug 2014 21:46:27 +0900] rev 22012
cmdutil: look commit template definition up by specified 'editform'
Before this patch, '[committemplate] changeset' definition is shared
between all actions invoking 'commitforceeditor()'.
This prevents template definition from showing action specific
messages: for example, 'hg tag --remove' may need specific
message to call attention, but showing it may be redundant for
other actions.
This patch looks commit template definition up by specified
'editform' introduced by prior patches. 'editform' are
dot-separated list of names, and treated as hierarchical one.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 02 Aug 2014 21:46:27 +0900] rev 22011
import: pass 'editform' argument to 'cmdutil.getcommiteditor'
This patch passes 'editform' argument according to the format below:
COMMAND[.ROUTE]
- ROUTE: name of route, if there are two or more routes in COMMAND
In this patch, 'normal' and 'bypass' are used as ROUTE.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 02 Aug 2014 21:46:27 +0900] rev 22010
commit: pass 'editform' argument to 'cmdutil.getcommiteditor'
This patch passes 'editform' argument according to the format below:
COMMAND[.ROUTE]
- ROUTE: name of route, if there are two or more routes in COMMAND
In this patch, 'normal' and 'amend' are used as ROUTE.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 02 Aug 2014 21:46:27 +0900] rev 22009
tag: pass 'editform' argument to 'cmdutil.getcommiteditor'
This patch passes 'editform' argument according to the format below:
COMMAND[.ROUTE]
- ROUTE: name of route, if there are two or more routes in COMMAND
In this patch, 'add' and 'remove' are used as ROUTE
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 02 Aug 2014 21:46:27 +0900] rev 22008
graft: pass 'editform' argument to 'cmdutil.getcommiteditor'
This patch passes 'editform' argument according to the format below:
COMMAND[.ROUTE]
- ROUTE: name of route, if there are two or more routes in COMMAND
In this patch, ROUTE is omitted.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 02 Aug 2014 21:46:27 +0900] rev 22007
backout: pass 'editform' argument to 'cmdutil.getcommiteditor'
This patch passes 'editform' argument according to the format below:
COMMAND[.ROUTE]
- ROUTE: name of route, if there are two or more routes in COMMAND
In this patch, ROUTE is omitted..
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 02 Aug 2014 21:46:26 +0900] rev 22006
transplant: pass 'editform' argument to 'cmdutil.getcommiteditor'
This patch passes 'editform' argument according to the format below:
EXTENSION[.COMMAND][.ROUTE]
- EXTENSION: name of extension
- COMMAND: name of command, if there are two or more commands in EXTENSION
- ROUTE: name of route, if there are two or more routes in COMMAND
In this patch, COMMAND and ROUTE are omitted.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 02 Aug 2014 21:46:26 +0900] rev 22005
shelve: pass 'editform' argument to 'cmdutil.getcommiteditor'
This patch passes 'editform' argument according to the format below:
EXTENSION[.COMMAND][.ROUTE]
- EXTENSION: name of extension
- COMMAND: name of command, if there are two or more commands in EXTENSION
- ROUTE: name of route, if there are two or more routes in COMMAND
In this patch:
- 'shelve' is used as COMMAND
- ROUTE is omitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 02 Aug 2014 21:46:26 +0900] rev 22004
rebase: pass 'editform' argument to 'cmdutil.getcommiteditor'
This patch passes 'editform' argument according to the format below:
EXTENSION[.COMMAND][.ROUTE]
- EXTENSION: name of extension
- COMMAND: name of command, if there are two or more commands in EXTENSION
- ROUTE: name of route, if there are two or more routes in COMMAND
In this patch:
- COMMAND is omitted
- 'normal' and 'collapse' are used as ROUTE
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 02 Aug 2014 21:46:26 +0900] rev 22003
mq: pass 'editform' argument to 'cmdutil.getcommiteditor'
This patch passes 'editform' argument according to the format below:
EXTENSION[.COMMAND][.ROUTE]
- EXTENSION: name of extension
- COMMAND: name of command, if there are two or more commands in EXTENSION
- ROUTE: name of route, if there are two or more routes in COMMAND
In this patch:
- MQ command names (qnew/qrefresh/qfold) are used as COMMAND
- ROUTE is omitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 02 Aug 2014 21:46:26 +0900] rev 22002
histedit: pass 'editform' argument to 'cmdutil.getcommiteditor'
This patch passes 'editform' argument according to the format below:
EXTENSION[.COMMAND][.ROUTE]
- EXTENSION: name of extension
- COMMAND: name of command, if there are two or more commands in EXTENSION
- ROUTE: name of route, if there are two or more routes for COMMAND
In this patch:
- 'edit', 'fold', 'mess' and 'pick' are used as COMMAND
- ROUTE is omitted
'histedit.pick' case is very rare, but possible if:
- target revision causes conflict at merging (= requires '--continue'), and
- description of it is empty ('hg commit -m " "' can create such one)
In the code path for 'histedit --continue' (the last patch hunk),
'canonaction' doesn't contain the entry for 'fold', because 'fold'
action causes:
- using temporary commit message forcibly, and
- making 'editopt' False always (= omit editor invocation if commit
message is specified)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 02 Aug 2014 21:46:26 +0900] rev 22001
gpg: pass 'editform' argument to 'cmdutil.getcommiteditor'
This patch passes 'editform' argument according to the format below:
EXTENSION[.COMMAND][.ROUTE]
- EXTENSION: name of extension
- COMMAND: name of command, if there are two or more commands in EXTENSION
- ROUTE: name of route, if there are two or more routes in COMMAND
In this patch, 'sign' is used as COMMAND, and ROUTE is omitted.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 02 Aug 2014 21:46:26 +0900] rev 22000
fetch: pass 'editform' argument to 'cmdutil.getcommiteditor'
This patch passes 'editform' argument according to the format below:
EXTENSION[.COMMAND][.ROUTE]
- EXTENSION: name of extension
- COMMAND: name of command, if there are two or more commands in EXTENSION
- ROUTE: name of route, if there are two or more routes in COMMAND
In this patch, COMMAND and ROUTE are omitted.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 02 Aug 2014 21:46:26 +0900] rev 21999
cmdutil: introduce 'editform' to distinguish the purpose of commit text editing
This information will be used to switch '[committemplate] changeset'
definition according to its purpose in the subsequent patch.
This information also makes it easier to hook commit text editing only
in the specific cases.
Durham Goode <durham@fb.com> [Tue, 22 Jul 2014 22:40:16 -0700] rev 21998
log: allow patterns with -f
It's not uncommon for a user to want to run log with a pattern or directory name
on the history of their current commit. Currently we prevent that, but
I can't think of any reason to continue blocking that.
This commit removes the restriction and allows 'hg log -f <dir/pat>'
Augie Fackler <raf@durin42.com> [Mon, 28 Jul 2014 19:48:59 -0400] rev 21997
run-tests: fix test result counts with --keyword specified or skips occurring
This preserves the current behavior that excludes ignored or skipped
tests from the number of tests run, except when tests are ignored due
to the --retest flag.
Augie Fackler <raf@durin42.com> [Tue, 29 Jul 2014 22:35:59 -0400] rev 21996
test-run-tests.t: add tests for skips
This will make some minor behavior changes in a future patch more obvious.
Augie Fackler <raf@durin42.com> [Mon, 28 Jul 2014 20:54:14 -0400] rev 21995
test-run-tests.t: add extra data to tests for keyword tests
This adds a fair amount of overall instability in the enclosing .t. As
such, this is performed in its own commit, and a test for --keyword on
run-tests.t will be added in a followup change.
Matt Mackall <mpm@selenic.com> [Mon, 04 Aug 2014 15:24:57 -0500] rev 21994
purge: drop stat import
Matt Mackall <mpm@selenic.com> [Mon, 04 Aug 2014 14:42:24 -0500] rev 21993
run-tests: add iolock to failure output
Matt Mackall <mpm@selenic.com> [Mon, 04 Aug 2014 14:32:34 -0500] rev 21992
merge with stable
Sean Farley <sean.michael.farley@gmail.com> [Fri, 01 Aug 2014 13:09:06 -0500] rev 21991
color: pass on key error for win32 (issue4298)
This is a quick fix for some consoles on windows (consoles that are not mingw
based) so that the debugcolor command doesn't throw a KeyError when effects
aren't supported (e.g. italic).
Siddharth Agarwal <sid0@fb.com> [Fri, 01 Aug 2014 18:30:18 -0700] rev 21990
context: call normal on the right object
dirstate.normal is the method that marks files as unchanged/normal.
Rev 20a30cd41d21 started caching dirstate.normal in order to improve
performance. However, there was an error in the patch: taking the wlock, under
some conditions depending on platform, can cause a new dirstate object to be
created. Caching dirstate.normal before calling wlock would then cause the
fixup calls below to be on the old dirstate object, effectively disappearing
into the ether.
On Unix and Unix-like OSes, the condition under which we create a new dirstate
object is 'the dirstate file has been modified since the last time we opened
it'. This happens pretty rarely, so the object is usually the same -- there's
little impact.
On Windows, the condition is 'always'. This means files in the lookup state are
never marked normal, so the bug has a serious performance impact since all the
files in the lookup state are re-read every time hg status is run.
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 31 May 2014 16:48:29 -0700] rev 21989
getbundle: add a ``cg`` boolean argument to control changegroup inclusion
The ``getbundle`` function was initially design to return a changegroup bundle.
However, bundle2 allows transmitting a wide range of data. Some bundle2
requests may not include a changegroup at all.
Before this changeset, the client would request a changegroup for
``heads=[nullid]`` and receive an empty changegroup.
We introduce an official boolean parameter, ``cg``, that can be set
to false to disable changegroup generation on getbundle. A new bundle2
capability is introduced to let the client know.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 22 May 2014 17:20:52 -0700] rev 21988
wireproto: add a ``boolean`` type for getbundle parameters
This will be used to control inclusion of some parts in a bundle2.
Yuya Nishihara <yuya@tcha.org> [Sun, 03 Aug 2014 19:19:23 +0900] rev 21987
i18n: detect UI language without POSIX-style locale variable on Windows (BC)
On Windows, it isn't common to set LANG environment variable. This patch makes
gettext honor Windows-style UI language [1] if no locale variables are set.
Because of this change, LANG=C or HGPLAIN must be set in order to disable
translation on non-English Windows.
[1]: http://msdn.microsoft.com/en-us/library/dd374098(v=VS.85).aspx
Siddharth Agarwal <sid0@fb.com> [Fri, 01 Aug 2014 22:16:54 -0700] rev 21986
locate: use ctx.matches instead of ctx.walk
On mozilla-central, which is around 100,000 files, best of 5:
$ hg --time locate > /dev/null
before: real 1.460 secs (user 1.140+0.000 sys 0.320+0.000)
after: real 0.620 secs (user 0.610+0.000 sys 0.020+0.000)
$ hg --time locate README > /dev/null
before: real 0.630 secs (user 0.330+0.000 sys 0.290+0.000)
after: real 0.120 secs (user 0.110+0.000 sys 0.020+0.000)
Larger repositories see correspondingly larger performance gains.
Siddharth Agarwal <sid0@fb.com> [Fri, 01 Aug 2014 22:07:29 -0700] rev 21985
context: add a method to efficiently filter by match if possible
For non-working contexts, walk and matches do the same thing. For working
contexts, walk stats all the files and looks for unknown files, while matches
just filters the dirstate by match.
Siddharth Agarwal <sid0@fb.com> [Fri, 01 Aug 2014 22:05:16 -0700] rev 21984
dirstate: add a method to efficiently filter by match
Current callers that require just this data call workingctx.walk, which calls
dirstate.walk, which stats all the files. Even worse, workingctx.walk looks for
unknown files, significantly slowing things down, even though callers might not
be interested in them at all.
Christian Ebert <blacktrash@gmx.net> [Sat, 02 Aug 2014 09:45:21 +0100] rev 21983
purge: prefer util.unlink instead over own removefile
Christian Ebert <blacktrash@gmx.net> [Sat, 02 Aug 2014 09:44:45 +0100] rev 21982
keyword: bump copyright year
Christian Ebert <blacktrash@gmx.net> [Sat, 02 Aug 2014 09:44:11 +0100] rev 21981
keyword: really clean up kwdemo temp tree
Siddharth Agarwal <sid0@fb.com> [Sat, 26 Jul 2014 14:54:36 -0700] rev 21980
graft: make --force apply across continues (issue3220)
Since --force determines the list of revisions to be grafted, it doesn't really
make sense for users to have to keep typing --force --continue as they continue
grafting.
Siddharth Agarwal <sid0@fb.com> [Fri, 25 Jul 2014 18:21:16 -0700] rev 21979
graft: allow regrafting ancestors with --force (issue3220)
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 04 Jul 2014 19:52:39 +0200] rev 21978
test-obsolete: better logging template
Gratuitous improvement of the test readability.
anuraggoel <anurag.dsps@gmail.com> [Thu, 26 Jun 2014 01:22:50 +0530] rev 21977
run-tests: '--time' option provide more details to Linux users
As our tests execute in child processes, this patch uses os.times()
module in replace of time.time() module to provide additional info like
user time and system time spent by child's processes along with real elapsed
time taken by a process.
There is one limitation of this patch. It can work only for Linux users and
not for Windows.
"os.times" module returns a 5-tuple of a floaing point numbers.
1) User time
2) System time
3) Child's user time
4) Child's system time
5) Ellapsed real time
On Windows, only the first two items are filled, the others are zero.
Therefore, below test cases does not break on Windows but instead gives the
zero value.
Matt Mackall <mpm@selenic.com> [Fri, 01 Aug 2014 18:32:52 -0500] rev 21976
merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 01 Aug 2014 18:23:18 -0500] rev 21975
Added signature for changeset 3178e4989202
Matt Mackall <mpm@selenic.com> [Fri, 01 Aug 2014 18:22:56 -0500] rev 21974
Added tag 3.1 for changeset 3178e4989202
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 01 Aug 2014 13:01:35 -0700] rev 21973
status: do not reverse deleted and unknown
When reversing a status, trading "added" and "removed" make sense.
Reversing "deleted" and "unknown" does not. We stop doing it.
The reversing is documented in place for the poor soul not even able to remember
the index of all status elements by heart.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 01 Aug 2014 12:49:00 -0700] rev 21972
status: don't drop unknown and ignored information (issue4321)
By the magic of code movement, we ended up dropping unknown and ignored
information when comparing the working directory with a non-parent revision.
Let's stop doing it and add a test.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 01 Aug 2014 13:13:24 -0700] rev 21971
status: explicitly exclude removed file from unknown and ignored
Changeset 64fe488b5179 introduced a test to validate that file were not reported
twice when both unknown and removed. This behavior change was introduced by
65cdc6bab91e alongside a bug that dropped ignored and unknown completely
(issue4321). As we are going to fix the bug, we need a proper implementation of
the behavior tested in 64fe488b5179.
Matt Mackall <mpm@selenic.com> [Fri, 01 Aug 2014 11:45:26 -0500] rev 21970
merge with i18n some more
Matt Mackall <mpm@selenic.com> [Fri, 01 Aug 2014 11:44:50 -0500] rev 21969
merge with i18n
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 01 Aug 2014 17:29:02 +0900] rev 21968
i18n-ja: synchronized with f582fa1167f7
Wagner Bruna <wbruna@yahoo.com> [Fri, 01 Aug 2014 02:02:06 -0300] rev 21967
i18n-pt_BR: synchronized with dccbf52ffe9f
Yuya Nishihara <yuya@tcha.org> [Fri, 01 Aug 2014 21:36:56 +0900] rev 21966
log: do not use exact matcher for --patch --follow without file (issue4319)
e2530d4a47c1 is valid only if file argument is specified. If no pattern
specified, it can simply fall back to the original matcher.
Matt Mackall <mpm@selenic.com> [Thu, 31 Jul 2014 16:32:12 -0500] rev 21965
qimport: record imported revs incrementally (issue3874)
When an import fails, this doesn't lose the state for the earlier
revisions.
Matt Mackall <mpm@selenic.com> [Thu, 31 Jul 2014 16:01:01 -0500] rev 21964
test-bundle2: add missing os import
Matt Mackall <mpm@selenic.com> [Thu, 31 Jul 2014 14:42:14 -0500] rev 21963
merge with i18n
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 01 Aug 2014 01:13:53 +0900] rev 21962
i18n-ja: synchronized with 838025b15925
Matt Mackall <mpm@selenic.com> [Thu, 31 Jul 2014 14:31:31 -0500] rev 21961
help: always show command help with -h (issue4240)
Old behavior:
hg help x hg x -h hg help -e x hg help -c x
config topic topic (!) - cmd
showconfig cmd topic (!) - cmd
rebase cmd cmd ext cmd
New behavior:
hg help x hg x -h hg help -e x hg help -c x
config topic cmd - cmd
showconfig cmd cmd - cmd
rebase cmd cmd ext cmd
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 01 Aug 2014 02:14:24 +0900] rev 21960
templater: add i18n comments to error messages of newly added functions
This patch adds i18n comments to error messages of newly added
functions "startswith" (introduced by 4a445dc5abff) and "word" (by
8f23f8096606).
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 01 Aug 2014 02:14:24 +0900] rev 21959
commands: make the warning message for "patch --partial" translatable
This patch makes the warning message for "patch --partial"
translatable: this message was introduced by bee0e1cffdd3, and there is
no reason to prevent this from being translatable.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 01 Aug 2014 02:14:24 +0900] rev 21958
convert: fix argument mismatch at formatting the abort message
This patch fixes argument mismatch at formatting the abort message,
introduced by a204fd9b5ba9: the last '%s' doesn't have corresponded
argument.
This patch uses "unexpected size" in the abort message, to distinguish
the reason of failure from "unexpected type" failure checked in the
prior code path below:
if info[1] != type:
raise util.Abort(_('cannot read %r object at %s') % (type, rev))
Alexandre Garnier <zigarn@gmail.com> [Thu, 31 Jul 2014 10:31:56 +0100] rev 21957
debuginstall: handle quoted path for editor (issue4316)
When using an editor path with spaces and options, you can set 'ui.editor'
to '"/path to your/editor" -opt' and it works fine but 'hg debuginstall'
is complaining about it because it simply splits the editor and
tests presence of '"/path'.
Now correctly parse 'ui.editor' string by handling quoted path.
Matt Mackall <mpm@selenic.com> [Wed, 30 Jul 2014 18:28:37 -0500] rev 21956
test-bundle2: move file mode setting after sys import
anatoly techtonik <techtonik@gmail.com> [Sat, 26 Jul 2014 09:27:11 +0300] rev 21955
config: allow 'user' in .hgrc ui section (issue3169)