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)
Matt Mackall <mpm@selenic.com> [Wed, 30 Jul 2014 14:51:56 -0500] rev 21954
merge with i18n
Wagner Bruna <wbruna@yahoo.com> [Tue, 29 Jul 2014 19:29:02 -0300] rev 21953
i18n-pt_BR: synchronized with ad56fc55cbc3
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 30 Jul 2014 00:14:52 +0900] rev 21952
doc: unify help text for "--edit" option
This patch changes help text for "--edit" option of commands below:
- fetch
- qnew
- qrefresh
- qfold
- commit
- tag
This unification reduces translation cost, too.
This patch chooses not "further edit commit message already specified"
(of "hg commit") but "invoke editor on commit messages" as unified
help text for "--edit" option, because the latter is much older than
the former.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 30 Jul 2014 00:13:59 +0900] rev 21951
doc: unify help text for "--message" option
This patch changes help text for "--message" option of commands below
for unification.
- sign (of gpg)
- tag
This unification reduces translation cost, too.
This patch doesn't change the description for "--message" of "hg
rebase" below, because this should contain "collapse" word to explain
its purpose (only for "--collapse") clearly.
use text as collapse commit message
Augie Fackler <raf@durin42.com> [Mon, 28 Jul 2014 19:20:13 -0400] rev 21950
histedit: respect revsetalias entries (issue4311)
We now expand user-provided revsets before using repo.revs() to locate
the root(s) of the user-specified set.
Alexander Becher <Alexander.Becher@RuD-Steuerungstechnik.De> [Mon, 28 Jul 2014 10:05:17 +0200] rev 21949
graft: add a reference to revsets to the help text (issue3362)
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 26 Jul 2014 03:35:42 +0200] rev 21948
i18n: add parenthesis in Brazilian translation of the resolve message
Eu falo brasileiro agora. Eu não sou uma batata!
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 26 Jul 2014 03:32:49 +0200] rev 21947
resolve: add parenthesis around "no more unresolved files" message
This message may be confused with an error message. Adding parenthesis around it
will make it more recognisable as an informative message.
Matt Mackall <mpm@selenic.com> [Fri, 25 Jul 2014 15:51:42 -0500] rev 21946
help: mention '-T list' in templater topic
Matt Mackall <mpm@selenic.com> [Fri, 25 Jul 2014 15:38:26 -0500] rev 21945
help: drop reference to glog in templates topic
Matt Mackall <mpm@selenic.com> [Fri, 25 Jul 2014 15:35:09 -0500] rev 21944
templates: re-add template listing support
We used to have --style nosuch to list templates, but --style is now
merged with --template/-T where random strings are acceptable
templates. So we reserve 'list' to allow listing templates.
Yuya Nishihara <yuya@tcha.org> [Mon, 21 Jul 2014 11:44:20 +0900] rev 21943
help: use --template to specify existing style
--style is deprecated since 3a35ba2681ec and 870d60294b04.
Yuya Nishihara <yuya@tcha.org> [Thu, 24 Jul 2014 23:39:25 +0900] rev 21942
test-status: add test for removed-and-untracked state (BC)
In Mercurial 3.0, "hg status" can list the same file twice if it was removed
but still exists in working directory, i.e. removed by "hg forget":
$ hg status --rev 0 removed
R removed
? removed
But since 65cdc6bab91e, untracked state, "?", is no longer displayed in this
example.
I think the new behavior is correct since a file should have single state, but
if it is a bug, this patch should be dropped.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 02 Jul 2014 16:13:48 +0200] rev 21941
bundle2: only use callable return as reply handler
When a bundle2 parts generator returns a non callable value, it should not be
used as a reply handler. The changegroup part generator is already having this
case of behavior when there is no changegroup to push. This changeset prevent a
crash for user of the experimentable bundle2 feature.