Gregory Szorc <gregory.szorc@gmail.com> [Thu, 03 Mar 2016 23:11:33 -0800] rev 28329
tests: update test output for test written on stable branch (issue5104)
The changed test lines were added in d493d64757eb, which
landed on stable. When this changeset merged to the default
branch, the test failed because a4692267bc2d (on default
but not stable) changed the order of working directory update
when performing a share-based clone from pooled storage.
The changes in this patch are similar to test changes in
a4692267bc2d.
Jun Wu <quark@fb.com> [Mon, 29 Feb 2016 13:46:54 +0000] rev 28328
chgserver: pass hashstate and base server address to chgcmdserver
In order to detect a hash change from a request handler, chg must know the
original hashstate. It also needs the base server address to figure out
redirect addresses.
Jun Wu <quark@fb.com> [Mon, 29 Feb 2016 11:43:25 +0000] rev 28327
chg: drop progress.assume-tty config
It was necessary to go through progress.uisetup() to set up the progressui
wrapper. Since the progress extension has got into the core, progress.assume-tty
is no longer necessary.
Jun Wu <quark@fb.com> [Wed, 02 Mar 2016 10:10:06 +0000] rev 28326
chgserver: mangle server address to include confighash
Before this patch, chgserver will use the address provided by the client. The
new design is one server per confighash. This patch appends "-$confighash" to
the address the client provides. To maintain the compatibility and make sure
the client can connect to the server, a symbolic link is created at the original
address pointing to the new address.
The address is intentionally mangled at the server, instead of being pre-
calculated by some other process (eg. a previous server). In this way, we can
avoid file system race conditions.
Jun Wu <quark@fb.com> [Mon, 29 Feb 2016 14:05:45 +0000] rev 28325
chgserver: update docs
Update the docstring to reflect the latest changes
Matt Mackall <mpm@selenic.com> [Wed, 02 Mar 2016 16:44:56 -0600] rev 28324
merge with stable
Gregory Szorc <gregory.szorc@gmail.com> [Mon, 21 Dec 2015 22:26:31 -0800] rev 28323
commands: use absolute_import
All mercurial.* modules are now using absolute_import \o/
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 27 Feb 2016 23:57:07 -0800] rev 28322
cmdutil: use absolute_import
Now that @command doesn't write back into commands when it is being
executed during the loading of commands.py itself, we are unblocked
from converting cmdutil to absolute_import.
Christian Ebert <blacktrash@gmx.net> [Tue, 01 Mar 2016 10:33:06 +0000] rev 28321
keyword: use absolute_import
Augie Fackler <augie@google.com> [Sun, 28 Feb 2016 22:15:00 -0500] rev 28320
pager: use absolute_import
Augie Fackler <augie@google.com> [Sun, 28 Feb 2016 22:13:47 -0500] rev 28319
pager: add tests
We've never had tests for pager, and I want to start experimenting
with ways to clean up the implementation and make it a bit more
graceful.
Matt Harbison <matt_harbison@yahoo.com> [Mon, 29 Feb 2016 01:01:20 -0500] rev 28318
tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com> [Sun, 28 Feb 2016 23:21:28 -0500] rev 28317
run-tests: defer leftover (?) cleanup until after all output is exhausted
Previously, after matching a single line, any contiguous subsequent lines ending
with (?) would be added to the output and removed from the expected output.
This is a problem if the subsequent test output would have matched the consumed
(?) line, because it kept the optional line and then added a duplicate without
the (?) [1]. Instead, wait until there is nothing more to match before handling
the leftovers.
[1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-February/080197.html
Matt Harbison <matt_harbison@yahoo.com> [Sun, 28 Feb 2016 23:16:30 -0500] rev 28316
test-run-tests: pad the failure test to preserve the run order
Test size seems to dictate the order in which the tests are run, and the next
patch will add to test-success.t.
Matt Mackall <mpm@selenic.com> [Wed, 02 Mar 2016 16:05:30 -0600] rev 28315
changelog: backed out changeset 86de91c56355
Matt Mackall <mpm@selenic.com> [Wed, 02 Mar 2016 12:46:54 -0600] rev 28314
changelog: backed out changeset 1778770e1982
We want to avoid leaking UTF-8 to main body of code wherever possible.
Yuya Nishihara <yuya@tcha.org> [Fri, 01 Jan 2016 22:16:25 +0900] rev 28313
dispatch: store norepo/optionalrepo/inferrepo attributes in function (API)
This can eliminate import cycles and ugly push/pop of global variables at
_checkshellalias(). Attributes of aliascmd are directly accessible.
Because norepo/optionalrepo/inferrepo lists aren't populated, extensions
examining them no longer work. That's why this patch removes these lists
to signal the API incompatibility.
This breaks 3rd-party extensions that are yet to be ported to @command
decorator.
Yuya Nishihara <yuya@tcha.org> [Sat, 09 Jan 2016 20:04:03 +0900] rev 28312
extensions: copy extra __dict__ of original function
Future patches will make @command decorator set properties such as "norepo" to
a function object. This patch makes sure these properties never be lost by
wrapcommand() or wrapfunction().
This change won't be crazy as the standard functools.wraps() copies __dict__.
Yuya Nishihara <yuya@tcha.org> [Sat, 09 Jan 2016 19:52:55 +0900] rev 28311
extensions: copy attributes to wrapper by wrapfunction()
Before this patch, new partial function "wrap" had no useful docstring. It
makes sense to copy __doc__ and __module__ as we do for wrapcommand().
Yuya Nishihara <yuya@tcha.org> [Sat, 09 Jan 2016 19:45:10 +0900] rev 28310
extensions: extract function that copies function attributes to wrapper
wrapfunction() will be changed to copy these attributes. See the next patch
for details.
timeless <timeless@mozdev.org> [Mon, 29 Feb 2016 23:28:32 +0000] rev 28309
tests: fix section description
Copy and paste error
Augie Fackler <augie@google.com> [Tue, 01 Mar 2016 13:48:25 -0500] rev 28308
zeroconf: import ui as uimod per test-check-module-imports
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 27 Feb 2016 22:34:18 -0800] rev 28307
changelog: lazy decode user (API)
This appears to show a similar speedup as the previous patch.
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 27 Feb 2016 22:25:14 -0800] rev 28306
changelog: lazy decode description (API)
Currently, changelog reading decodes read values. This is wasteful
because a lot of times consumers aren't interested in some of these
values.
This patch changes description decoding to occur in changectx as
needed.
revsets reading changelog entries appear to speed up slightly:
revset #7: author(lmoscovicz)
plain
0) 0.906329
1) 0.872653
revset #8: author(mpm)
plain
0) 0.903478
1) 0.878037
revset #9: author(lmoscovicz) or author(mpm)
plain
0) 1.817855
1) 1.778680
revset #10: author(mpm) or author(lmoscovicz)
plain
0) 1.837052
1) 1.764568
timeless <timeless@mozdev.org> [Thu, 11 Feb 2016 19:38:26 +0000] rev 28305
blackbox: optionally log event source
timeless <timeless@mozdev.org> [Tue, 01 Mar 2016 10:45:47 +0000] rev 28304
blackbox: remove hexfn
It was introduced as copy+paste code, but was never necessary.
timeless <timeless@mozdev.org> [Tue, 01 Mar 2016 10:43:52 +0000] rev 28303
blackbox: rewrite dirty documentation noting it is expensive
timeless <timeless@mozdev.org> [Tue, 01 Mar 2016 09:49:38 +0000] rev 28302
zeroconf: remove whitespace around = for named parameters
timeless <timeless@mozdev.org> [Tue, 01 Mar 2016 09:44:32 +0000] rev 28301
zeroconf: del is not a function
timeless <timeless@mozdev.org> [Tue, 01 Mar 2016 09:48:11 +0000] rev 28300
zeroconf: add whitespace around operator
timeless <timeless@mozdev.org> [Tue, 01 Mar 2016 09:33:39 +0000] rev 28299
zeroconf: wrap long lines
timeless <timeless@mozdev.org> [Tue, 01 Mar 2016 08:53:40 +0000] rev 28298
zeroconf: drop tabs
timeless <timeless@mozdev.org> [Tue, 01 Mar 2016 08:48:10 +0000] rev 28297
zeroconf: omit semicolons
timeless <timeless@mozdev.org> [Tue, 01 Mar 2016 08:42:46 +0000] rev 28296
zeroconf: use absolute_import
timeless <timeless@mozdev.org> [Tue, 01 Mar 2016 07:17:32 +0000] rev 28295
zeroconf: use print function
liscju <piotr.listkiewicz@gmail.com> [Mon, 29 Feb 2016 15:12:26 +0100] rev 28294
histedit: improve error when run on nodes with children (issue5056)
timeless <timeless@mozdev.org> [Tue, 01 Mar 2016 11:51:46 +0000] rev 28293
tests: minor grammar change for check-commit
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 27 Feb 2016 21:43:17 -0800] rev 28292
worker: document poor partitioning scheme impact
mpm isn't a fan of the existing or previous partitioning scheme. He
provided a fantastic justification for why on the mailing list.
This patch adds his words to the code so they aren't forgotten.
Matt Mackall <mpm@selenic.com> [Tue, 01 Mar 2016 18:03:49 -0600] rev 28291
Added signature for changeset d493d64757eb
Matt Mackall <mpm@selenic.com> [Tue, 01 Mar 2016 18:03:44 -0600] rev 28290
Added tag 3.7.2 for changeset d493d64757eb
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 27 Feb 2016 18:22:49 -0800] rev 28289
hg: obtain lock when creating share from pooled repo (issue5104)
There are race conditions between clients performing a shared clone
to pooled storage:
1) Clients race to create the new shared repo in the pool directory
2) 1 client is seeding the repo in the pool directory and another goes
to share it before it is fully cloned
We prevent these race conditions by obtaining a lock in the pool
directory that is derived from the name of the repo we will be
accessing.
To test this, a simple generic "lockdelay" extension has been added.
The extension inserts an optional, configurable delay before or after
lock acquisition. In the test, we delay 2 seconds after lock acquisition
in the first process and 1 second before lock acquisition in the 2nd
process. This means the first process has 1s to obtain the lock. There
is a race condition here. If we encounter it in the wild, we could
change the dummy extension to wait on the lock file to appear instead
of relying on timing. But that's more complicated. Let's see what
happens first.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Tue, 01 Mar 2016 03:28:46 +0900] rev 28288
doc: remove deprecated option from synopsis of command help
Before this patch, deprecated options below are used in synopsis of
command help, even though they aren't listed up as available options
by default. These might confuse readers.
- -n (no-op, now) of strip
- -a/--active of branches
- -f/--force of merge
Wagner Bruna <wbruna@yahoo.com> [Mon, 29 Feb 2016 22:20:53 -0300] rev 28287
i18n-pt_BR: synchronized with 535f2900d078
Matt Mackall <mpm@selenic.com> [Mon, 29 Feb 2016 17:52:17 -0600] rev 28286
merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 29 Feb 2016 17:44:00 -0600] rev 28285
merge with i18n
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 27 Feb 2016 21:29:42 -0800] rev 28284
run-tests: fix Python 3 incompatibilities
At one point run-tests.py and test-run-tests.t worked and passed
under Python 3.5. Various changes to run-tests.py over the past
several months appear to have broken Python 3.5 compatibility.
This patch implements various fixes (all related to str/bytes type
coercion) to make run-tests.py and test-run-tests.t mostly work
again. There are still a few failures in test-run-tests.t due to
issues importing mercurial.* modules. But at least run-tests.py
seems to work under 3.5 again.
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 27 Feb 2016 21:19:53 -0800] rev 28283
hghave: use print function
For Python 3 compatibility.
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 27 Feb 2016 22:25:47 -0800] rev 28282
changelog: remove redundant parentheses
You don't need to surround returned tuples with parens.
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 27 Feb 2016 23:06:05 -0800] rev 28281
changegroup: use changelog.readfiles
We have a dedicated function to get just the list of files in
a changelog entry. Use it.
This will presumably speed up changegroup application since we're
no longer decoding the entire changelog entry. But I didn't measure
the impact.
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 27 Feb 2016 18:02:12 +0100] rev 28280
rebase: remove experimental option from 'rebase' config section
Changeset f0e9f38d250f introduced a guard against case where obsolete changesets
are included in the rebase in a way this will result in divergence (because
rebase create new successors for changeset which already have successors). In
the same go a 'rebase.allowdivergence' option was introduced to control that
behavior.
We rename this config option to 'experimental.allowdivergence' for multiple
reasons:
* First this behavior is attached to changeset evolution, a feature still
experimental.
* Second, there was no 'rebase' section in config before we introduced this
option. I would like to avoid proliferation of micro config section and
therefore would like to avoid the creation of this new section just for an
experimental feature.
* Third, this guard (warning the user about a history rewriting operation that
will create divergence) will very likely be generalised to all history
rewriting operations, making this not rebase specific.
* Finally, because this will likely be a general guard present a bit everywhere
in the UI we'll likely end up with something better than a config option to
control this behavior, so having the current config option living in
experimental will allow us make it disappear in the future.
So we banish this config option back to the experimental section where it
belongs, killing the newly born 'rebase' config section in the process.
David R. MacIver <david@drmaciver.com> [Fri, 26 Feb 2016 17:15:49 +0000] rev 28279
testing: allow Hypothesis tests to disable extensions
Doing this required the introduction of a mechanism for keeping
track of more general config in the test. At present this is only
used for extensions but it could be used more widely (e.g. to
control specific extension behaviour)
This greatly simplifies the extension management logic by introducing
a general notion of config, which we maintain ourselves and pass to
HG on every invocation.
This results in significantly less error prone test generation, and
also allows us to turn extensions off as well as on.
The logic that used an environment variable to rerun the tests with
an extension disabled now just edits the test file (in a fresh copy)
to remove these --config command line flags.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 28 Feb 2016 00:00:13 -0800] rev 28278
keepalive: remove useless parentheses around exception type
Jun Wu <quark@fb.com> [Wed, 24 Feb 2016 20:45:47 +0000] rev 28277
chgserver: add a structure for confighash and mtimehash
confighash and mtimehash are often used together. This patch adds a simple
structure called hashstate to store them. hashstate also has a handly method
called fromui to calculate the hashes from a ui object.
Jun Wu <quark@fb.com> [Fri, 26 Feb 2016 14:59:39 +0000] rev 28276
chgserver: add utilities to calculate mtimehash
mtimehash is designed to detect file changes. These files include:
- single file extensions (__init__.py for complex extensions)
- mercurial/__version__.py
- python (sys.executable)
mtimehash only uses stat to check files so it's fast but not 100% accurate.
However it should be good enough for our use case.
For chgserver, once mtimehash changes, the server is considered outdated
immediately and should no longer provide service.
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 27 Feb 2016 17:31:23 +0100] rev 28275
tests: rename 'test-module-import.t' into 'test-check-module-import.t'
This test is checking our source code to ensure style and correct behavior (eg:
no cycle). Current convention is that such tests starts with 'test-check-' so we
flock this on back with the others.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 26 Feb 2016 20:22:05 +0900] rev 28274
pull: deactivate a bookmark not matching with the destination of the update
Before this patch, "hg pull -u" with a target doesn't deactivate a current
active bookmark, which doesn't match with the explicit destination of the
update, even though bare "hg update" does so.
A "target" can be provided through:
- option --rev ANOTHER
- option --branch ANOTHER
- source URL#ANOTHER
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 26 Feb 2016 20:22:05 +0900] rev 28273
pull: activate a bookmark matching with the destination of the update (BC)
Before this patch, "hg pull -u" with a target doesn't activate a bookmark, which
matches with the explicit destination of the update, even though bare "hg
update" does so.
A "target" can be provided through:
- option --rev BOOKMARK
- source URL#BOOKMARK
Yuya Nishihara <yuya@tcha.org> [Sat, 13 Feb 2016 20:13:45 +0900] rev 28272
revset: define "pat" variable unconditionally in subrepo()
It's a source of UnboundLocalError to define and use local variables
conditionally. As getstring() always returns a str, "pat" can be initialized
to None.
Yuya Nishihara <yuya@tcha.org> [Tue, 05 May 2015 10:47:35 +0900] rev 28271
revset: drop translation markers from error messages of internal _matchfiles
They are a sort of debug messages, which should never be visible to end users.
Yuya Nishihara <yuya@tcha.org> [Fri, 12 Feb 2016 19:16:09 +0900] rev 28270
templatekw: switch ctx of list expression to rev of {parents} (BC)
This is the same semantics as revset() introduced at e4609ec959f8. Before
this patch, {parents} provided nothing useful in new-style template. For
example, '{parents % "{parent}"}' generated cryptic string like
"rev12345node0123abcdef...".
This patch drops {parent} variable since it was useless. We can get a revision
number by '{parents % "{rev}"}'.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 26 Feb 2016 20:22:05 +0900] rev 28269
commands: add postincoming explicit brev argument (API)
Before this patch, postincoming() initializes 'brev' with 'checkout',
but this isn't useful to activate/deactivate bookmark after updating,
because 'checkout' is not a string actually specified at command line,
but an already node-nized byte sequence.
This patch adds postincoming() explicit 'brev' argument, and makes
'pull()' pass appropriate value.
This patch adds 'brev' argument instead of 'brev=None', because
'brev=None' isn't reasonable value if checkout is not None.
Anton Shestakov <av6@dwimlabs.net> [Sat, 27 Feb 2016 19:53:18 +0800] rev 28268
hgweb: add index template to json/map
This template allows showing the list of all repos in an hgweb instance (in
hgwebdir mode) as json.
The test has "lastchange" globbed because hgweb uses here file modification
time and not the last commit time.
Simon Farnsworth <simonfar@fb.com> [Fri, 26 Feb 2016 19:13:10 +0000] rev 28267
merge: fix error message
Obvious copy-and-paste error
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 24 Feb 2016 23:00:33 +0900] rev 28266
destutil: show message about other branch heads, even if on a closed head
Before this patch, bare "hg update" displays message below, if there
is at least one non-closed branch head other than current parent:
1. 'XX other heads for branch "BRANCH"' message, if current parent is
on a non-closed branch head
This suggests user to invoke "hg heads" or so for merging them.
2. no message, if current parent is on a closed branch head
At this patch, bare "hg update" might choose closed branch head
as update destination, and it causes this situation easily.
3. no message, otherwise (= current parent isn't on any branch head)
'XX other heads for branch "BRANCH"' should be displayed also in #2
case above, because user might overlook other non-closed branch heads.
This patch gets a list of all branch heads regardless of closed-ness
of it, and uses it (= 'allheads') to distinguish #1/#2 from #3 above.