Matt Harbison <matt_harbison@yahoo.com> [Fri, 15 Apr 2016 22:37:52 -0400] rev 28940
test-convert-git: skip tests with invalid path characters on Windows
Matt Harbison <matt_harbison@yahoo.com> [Fri, 15 Apr 2016 22:23:34 -0400] rev 28939
test-subrepo-git: add globs for Windows
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 14 Apr 2016 02:41:15 -0700] rev 28938
hook: report untrusted hooks as failure (issue5110) (BC)
Before this patch, there was no way for a repository owner to ensure that
validation hooks would be run by people with write access. If someone had write
access but did not trust the user owning the repository, the config and its hook
would simply be ignored.
After this patch, hooks from untrusted configs are taken into account but never
actually run. Instead they are reported as failures right away. This will ensure
validation performed by a hook is not ignored.
As a side effect writer can be forced to trust a repository hgrc by adding a
'pretxnopen.trust=true' hook to the file.
This was discussed during the 3.8 sprint with Matt Mackall, Augie Fackler and
Kevin Bullock.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 14 Apr 2016 17:03:49 -0700] rev 28937
hook: split config reading further
We want an easy way to fetch the hook config with and without honoring
"trusted" so that we can compare the values. So we extract the part
retrieving raw hook data from the config to be able to call it twice
in the next patch.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 14 Apr 2016 02:28:46 -0700] rev 28936
hook: small refactor to store hooks as dict instead of list
We are about to take untrusted hooks into account (to report them as failures)
so we need to rearrange the code a bit to allow config overwriting each other
in a later patch.
timeless <timeless@mozdev.org> [Fri, 15 Apr 2016 17:43:47 +0000] rev 28935
mail: retain hostname for sslutil.wrapsocket (issue5203)
SMTPS + STARTTLS need to provide serverhostname,
and we can't store it in sslkwargs because that breaks
something involving the https protocol.
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 16 Apr 2016 04:06:24 +0530] rev 28934
tests: make test-trusted use print_function
There was some confusing output format at some places in
test-trusted.py.out, the new print function ends with a newline by
default whereas the old print statement uses a space generally. So the
output in test-trusted.py.out is changed because of some confusing
output format which was produced by print statement
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 16 Apr 2016 03:38:23 +0530] rev 28933
tests: make test-doctest use absolute_import
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 16 Apr 2016 03:35:27 +0530] rev 28932
tests: make test-hgwebdir-paths use absolute_import
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 16 Apr 2016 03:22:45 +0530] rev 28931
tests: make test-lrucachedict use print_function
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 16 Apr 2016 03:10:41 +0530] rev 28930
tests: make test-lrucachedict use absolute_import
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 16 Apr 2016 03:08:16 +0530] rev 28929
tests: make test-manifest use absolute_import
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 16 Apr 2016 03:04:23 +0530] rev 28928
tests: make test-pathencode use absolute_import
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 16 Apr 2016 02:59:36 +0530] rev 28927
tests: make test-simplemerge use absolute_import
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 14 Apr 2016 01:37:29 -0700] rev 28926
crecord: cleanup the remains of commit confirmation
The confirmation screen is now only used for the 'review' option we simplify
the code and rename the function.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 14 Apr 2016 01:27:18 -0700] rev 28925
crecord: drop the extra confirmation screen
The commit confirmation is not very useful -- it gives no way to view what you
have selected, so you're blindly choosing whether to proceed or not, and it adds
a lot of unnecessary friction to committing. In addition, we now have a working
'review' choice for those who really want to review the final change.
Ryan McElroy initially submitted a config option to make this optional, but we
never saw a V2. However as the freeze is near and curses have never been
officially out of the door, I think it is worth skipping the config and trying
getting it right for this release.
Yuya Nishihara <yuya@tcha.org> [Fri, 15 Apr 2016 20:37:11 +0900] rev 28924
update: resurrect bare update from null parent to tip-most branch head
The situation is tricky if repository has no "default" branch, because "null"
revision belongs to non-existent "default" branch.
Before e1dd0de26557, bare update from null would bring us to the tip-most
non-closed branch head. e1dd0de26557 removed the special handling of missing
"default" branch since we wanted to stick to the uncommitted branch in that
case. But, if the parent is "null" revision, and if the missing branch is
"default", it shouldn't be an uncommitted branch. In this case, bare update
should bring us to the tip-most head as before.
This should fix the test breakage introduced by e1dd0de26557.
timeless <timeless@mozdev.org> [Tue, 12 Apr 2016 14:43:36 +0000] rev 28923
tests: run import-checker with tests .t files
timeless <timeless@mozdev.org> [Tue, 12 Apr 2016 21:43:56 +0000] rev 28922
import-checker: parse python code from .t files
timeless <timeless@mozdev.org> [Wed, 13 Apr 2016 16:34:59 +0000] rev 28921
import-checker: track filenames for SyntaxErrors
timeless <timeless@mozdev.org> [Wed, 13 Apr 2016 16:36:19 +0000] rev 28920
import-checker: track SyntaxErrors
We don't really need to report SyntaxErrors, since in theory
docchecker or a test will catch them, but they happen, and
we can't just have the code crash, so for now, we're reporting
them.
timeless <timeless@mozdev.org> [Mon, 11 Apr 2016 22:34:04 +0000] rev 28919
import-checker: refactor source reading
This will allow .t files to generate multiple sources.
It will also allow .py doctests to generate additional sources.
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 14 Apr 2016 01:06:45 +0530] rev 28918
tests: make test-pathencode use print_function
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 14 Apr 2016 01:03:24 +0530] rev 28917
tests: make test-run-tests use absolute_import
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 14 Apr 2016 00:58:31 +0530] rev 28916
tests: make test-symlink-os-yes-fs-no use absolute_import
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 14 Apr 2016 00:56:08 +0530] rev 28915
tests: make test-ui-color use absolute_import
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 14 Apr 2016 00:53:35 +0530] rev 28914
tests: make test-url use absolute_import
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 14 Apr 2016 00:49:58 +0530] rev 28913
tests: make test-trusted use absolute_import
Yuya Nishihara <yuya@tcha.org> [Sun, 27 Mar 2016 20:31:56 +0900] rev 28912
templater: add parsing and expansion rules to process "templatealias" section
The debugtemplate command is updated to show expanded tree, but still the
template engine doesn't support alias expansion. That's why the test says
"parse error" for now.
Yuya Nishihara <yuya@tcha.org> [Sun, 27 Mar 2016 20:29:03 +0900] rev 28911
templater: add function to parse whole string as template expression
This will be a parser of template aliases, and it can also be used for
processing quoted string templates in map files. That's why this function
isn't defined in the upcoming _aliasrules class.
Yuya Nishihara <yuya@tcha.org> [Tue, 29 Mar 2016 17:27:34 +0900] rev 28910
parser: factor out _trygetfunc() that extracts function name and arguments
This provides a customization point for templater. In templater, there are
two ways to call a unary function: func(x) and x|func. They are processed
differently in templater due to historical reasons, but they should be
handled in the same way while expanding aliases. In short, x|func should be
processed as syntactic sugar for func(x).
_funcnode and _getlist() are replaced by _trygetfunc().
Yuya Nishihara <yuya@tcha.org> [Tue, 29 Mar 2016 17:21:11 +0900] rev 28909
parser: make _getalias() return (alias, pattern-args) pair
This allows us to factor out a function that extracts a function (name, args)
pair. See the next patch for why.
Yuya Nishihara <yuya@tcha.org> [Tue, 29 Mar 2016 16:50:16 +0900] rev 28908
parser: drop redundant comparison between alias declaration tree and pattern
Since _getalias() explicitly tests the type and name of the pattern tree, we
don't need to compare "a.tree == tree" for 'symbol', and "a.tree == tree[:2]"
for 'func', where tree is either ('symbol', name) or ('func', ('symbol', name)).
This change helps implementing better handling of template aliases. See the
subsequent patches for details.
The alias.tree field is removed as it is no longer used.
timeless <timeless@mozdev.org> [Thu, 14 Apr 2016 14:26:37 +0000] rev 28907
patchbomb: fix public-is-missing hint
Without this, there is no space between a hash and the -r preceding the next
line in the use hg push hint
timeless <timeless@mozdev.org> [Thu, 14 Apr 2016 14:36:52 +0000] rev 28906
tests: clarify patchbomb repo is public not remote
timeless <timeless@mozdev.org> [Wed, 13 Apr 2016 13:51:39 +0000] rev 28905
run-tests: set HGMODULEPOLICY for --pure
Without this, my python 2.6 virtualenv test run with --pure and
--local fails with:
+ ImportError: Python minor version mismatch: The Mercurial extension modules were compiled with Python 2.7.8, but Mercurial is currently using Python with sys.hexversion=33950192: Python 2.6.9 (unknown, Apr 13 2016, 12:40:12)
+ [GCC 4.9.2 20141101 (Red Hat 4.9.2-1)]
+ at: ~/hg/py26/bin/python
Nathaniel Manista <nathaniel@google.com> [Thu, 14 Apr 2016 15:26:18 -0400] rev 28904
cmdutil: avoid recycling variable name "name" in namespaces code
This just feels like asking for future trouble and confusion.
liscju <piotr.listkiewicz@gmail.com> [Tue, 05 Apr 2016 06:53:33 +0200] rev 28903
update: fix bare update to work on new branch
So far bare update on new branch results in
'abort: branch new-branch not found'. This commit fixes
this by updating to the parent of wctx.
The effect of updating to the parent of wctx is to move to the paren't
branch - this means that it is no longer necessary to prevent you from
updating if you would lose your newly created branch.
liscju <piotr.listkiewicz@gmail.com> [Wed, 13 Apr 2016 09:56:51 +0200] rev 28902
remove: fix --force option help description (issue5177)
Before this commit --force option help description stated
that file was removed and deleted even if file was added
or modified which is not true. Force option removes added
file only from dirstate, it doesn't delete it from the
filesystem.
Martijn Pieters <mjpieters@fb.com> [Tue, 05 Apr 2016 17:39:59 +0100] rev 28901
logtoprocess: new experimental extension
This extension lets you direct specific ui.log() information to shell
commands, spawned in the background. This can be used to, say, capture
timings, commandfailure tracebacks, etc., making the output available
to other command-line tools.
Mads Kiilerich <madski@unity3d.com> [Wed, 13 Apr 2016 00:16:21 +0200] rev 28900
convert: keep converted hg parents that are outside convert.hg.revs (BC)
Before, when converting revisions without also including their already
converted parents in convert.hg.revs, the parents would no longer be parents.
That seems unfortunate and we dare to assume that nobody ever wants that.
Instead, preserve parents that are outside the current convert range but
already have been converted.
The parents returned in getcommit() are unconditionally converted, so we
introduce a separate optparents with optional parents.
Mads Kiilerich <madski@unity3d.com> [Thu, 24 Mar 2016 16:01:07 -0700] rev 28899
tests: coverage of ancestry with convert in multiple non-overlapping steps
This exposes that parent information is lost in cases where it is possible to
preserve it - and where it thus would make sense if that was what happened.
Yuya Nishihara <yuya@tcha.org> [Mon, 29 Feb 2016 22:58:15 +0900] rev 28898
revset: rename findaliases() to expandaliases()
This function returns a full tree of alias expansion applied, which sounds
different from what "findaliases" would do.
Yuya Nishihara <yuya@tcha.org> [Tue, 29 Mar 2016 16:30:59 +0900] rev 28897
parser: add short comment how aliases are expanded in phases
Yuya Nishihara <yuya@tcha.org> [Tue, 29 Mar 2016 16:19:31 +0900] rev 28896
parser: reorder alias expansion routine to return early
I think it improves readability to move trivial cases first, and unindent
blocks.
Yuya Nishihara <yuya@tcha.org> [Mon, 29 Feb 2016 22:15:44 +0900] rev 28895
parser: move functions that process alias expansion to rule-set class
They will be commonly used by revset and templater. It isn't easy to understand
how _expand() works, so I'll add comments by a follow-up patch.
The local variable 'alias' is renamed to 'a' to avoid shadowing the global
'alias' class.
Yuya Nishihara <yuya@tcha.org> [Mon, 29 Feb 2016 22:10:48 +0900] rev 28894
revset: unindent codes in _getalias() function
We generally do return early if tree isn't a tuple.
Yuya Nishihara <yuya@tcha.org> [Mon, 29 Feb 2016 19:24:15 +0900] rev 28893
parser: extract helper that creates a dict of aliases
This will be common between revset and templater.
The local variable 'alias' is renamed to 'a' to avoid shadowing the global
'alias' class.
Yuya Nishihara <yuya@tcha.org> [Mon, 29 Feb 2016 18:33:30 +0900] rev 28892
parser: construct alias object by rule-set class
It was odd that the revsetalias did the whole parsing stuff in __init__().
Instead, this patch adds a factory function to the aliasrules class, and
makes the alias (= revsetalias) class a plain-old value object.
santiagopim <santiagopim@gmail.com> [Fri, 08 Apr 2016 16:42:43 +0200] rev 28891
graphmod: shorten graph
Shorten the graph, cutting the all vertical (not oblique) edges rows.
Activate with 'graphshorten = true' in [experimental] section.
Example graph with deactivated option:
$ hg log --graph --template '{rev} {desc|firstline}' --rev 1035:1015
o 1035 Merge with BOS
|\
| o 1034 Fix help output, and a few broken tests.
| |
| o 1033 Merge with MPM.
| |\
| | o 1032 Get patchbomb working with tip again.
| | |
| | o 1031 Rewrite log command. New version is faster and more featureful.
| | |
| | o 1030 Merge with MPM.
| | |\
| | | o 1029 Emacs: implement hg-incoming, hg-outgoing and hg-push.
| | | |
| | | o 1028 Add commands.debugconfig.
| | | |
| | | o 1027 Emacs: fix up hg-log and hg-diff to operate more uniformly.
| | | |
| | | o 1026 Merge with MPM.
| | | |\
| | | | o 1025 Merge with MPM.
| | | | |
| | | | ~
| | | o 1024 Sync buffers prior to doing a diff.
| | | |
| | | ~
o | | 1023 Minor tweak to the revgen algorithm
|/ /
o | 1022 Minor hgwebdir tweaks
| |
o | 1021 Add Makefile to the manifest
| |
o | 1020 Add default make rule
| |
o | 1019 Create helper functions for I/O to files in the working directory
| |
o | 1018 Add some aliases
| |
o | 1017 Fix up help for binary options
|/
o 1016 Teach annotate about binary files
|
o 1015 Add automatic binary file detection to diff and export
|
~
Example graph with activated option:
$ hg log --graph --template '{rev} {desc|firstline}' --rev 1035:1015
o 1035 Merge with BOS
|\
| o 1034 Fix help output, and a few broken tests.
| o 1033 Merge with MPM.
| |\
| | o 1032 Get patchbomb working with tip again.
| | o 1031 Rewrite log command. New version is faster and more featureful.
| | o 1030 Merge with MPM.
| | |\
| | | o 1029 Emacs: implement hg-incoming, hg-outgoing and hg-push.
| | | o 1028 Add commands.debugconfig.
| | | o 1027 Emacs: fix up hg-log and hg-diff to operate more uniformly.
| | | o 1026 Merge with MPM.
| | | |\
| | | | o 1025 Merge with MPM.
| | | | |
| | | | ~
| | | o 1024 Sync buffers prior to doing a diff.
| | | |
| | | ~
o | | 1023 Minor tweak to the revgen algorithm
|/ /
o | 1022 Minor hgwebdir tweaks
o | 1021 Add Makefile to the manifest
o | 1020 Add default make rule
o | 1019 Create helper functions for I/O to files in the working directory
o | 1018 Add some aliases
o | 1017 Fix up help for binary options
|/
o 1016 Teach annotate about binary files
o 1015 Add automatic binary file detection to diff and export
|
~
Jason Gauci <jjg@fb.com> [Mon, 11 Apr 2016 12:06:18 -0700] rev 28890
tests: ensure that 'hg update' is disabled during histedit (issue3655)
Matt Harbison <matt_harbison@yahoo.com> [Tue, 12 Apr 2016 00:34:02 -0400] rev 28889
test-remove: drop a useless Windows specific conditional
The Windows branch didn't pick up the 'deleting' progress bar addition from
62e73d42bd14. But since the Windows branch already globbed the error message,
let's just drop the other branch.
Matt Harbison <matt_harbison@yahoo.com> [Tue, 15 Mar 2016 23:04:35 -0400] rev 28888
test-blackbox: add missing glob for Windows
The test warns instead of completes without this.
Matt Harbison <matt_harbison@yahoo.com> [Tue, 15 Mar 2016 21:56:01 -0400] rev 28887
test-largefiles: stabilize output for Windows
Systems with unix-permissions have a test above this that adds an additional
head.
Matt Harbison <matt_harbison@yahoo.com> [Tue, 15 Mar 2016 21:47:43 -0400] rev 28886
test-import: fix output on Windows
There's a symlink conditionalized test above this that causes the rev to be 1.
It isn't important to this test, so ignore it.
Matt Harbison <matt_harbison@yahoo.com> [Tue, 15 Mar 2016 21:45:32 -0400] rev 28885
test-install: fix output on Windows
See 1ff28873830e.