Gregory Szorc <gregory.szorc@gmail.com> [Sun, 13 Dec 2015 09:40:53 -0800] rev 27348
setup.py: use bytes literals
The b() helper was needed because Python < 2.6 didn't support bytes
literals (b''). Now that we don't support Python < 2.6, we no longer
need this helper.
Mathias De Maré <mathias.demare@gmail.com> [Tue, 15 Dec 2015 07:17:15 +0100] rev 27347
clonebundles: fix typo
Augie Fackler <augie@google.com> [Mon, 14 Dec 2015 20:47:22 -0500] rev 27346
merge: rework manifestmerge to use a matcher
This opens the door to working slightly more closely with the manifest
type and letting it optimize out some of the diff comparisons for us,
and also makes life significantly easier for narrowhg.
Augie Fackler <augie@google.com> [Mon, 14 Dec 2015 20:37:41 -0500] rev 27345
merge: restate calculateupdates in terms of a matcher
Once we get a matcher down into manifestmerge, we can make narrowhg
work more easily and potentially let manifest.match().diff() do less
work in manifestmerge.
Augie Fackler <augie@google.com> [Mon, 14 Dec 2015 18:54:03 -0500] rev 27344
merge: have merge.update use a matcher instead of partial fn
This is relatively rarely used functionality, but migrating this to a
matcher will make future work on narrow clones more feasible.
Martin von Zweigbergk <martinvonz@google.com> [Sat, 12 Dec 2015 09:57:05 -0800] rev 27343
treemanifest: don't iterate entire matching submanifests on match()
Before 2773540c3650 (match: remove unnecessary optimization where
visitdir() returns 'all', 2015-05-06), match.visitdir() used to return
the special value 'all' to indicate that it was known that all
subdirectories would also be included in the match. The purpose for
that value was to avoid calling the matcher on all the paths. It
turned out that calling the matcher was not a problem, so the special
return value was removed and the code was simplified. However, if we
use the same special value for not just avoiding calling the matcher
on each file, but to avoid iterating over each file, it's a much
bigger win. On commands like
hg st --rev .^ --rev . dom/
we run the matcher (dom/) on the two manifests, then diff the narrowed
manifest. If the size of the match is much larger than the size of the
diff, this is wasteful. In the above case, we would end up iterating
over the 15k-or-so files in dom/ for each of the manifests, only to
later discover that they are mostly the same. This means that runningt
the command above is usually slower than getting the status for the
entire repo, because that code avoids calling treemanifest.match() and
only calls treemanifest.diff(), which loads only what's needed for the
diff.
Let's fix this by reintroducing the 'all' value in match.visitdir()
and making treemanifest.match() return a lazy copy of the manifest
from dom/ and down (in the above case). This speeds up the above
command on the Firefox repo from 0.357s to 0.137s (best of 5). The
wider the match, the bigger the speedup.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 12 Dec 2015 20:59:37 -0800] rev 27342
pathencode: remove an unused assignment
Bryan O'Sullivan <bos@serpentine.com> [Sat, 12 Dec 2015 20:57:01 -0800] rev 27341
parsers: narrow scope of a variable to be less confusing
Bryan O'Sullivan <bos@serpentine.com> [Sat, 12 Dec 2015 20:10:33 -0800] rev 27340
manifest: fix formatting
One poor unfortunate line was hanging way off the right hand side
of the universe. Rescued it.
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 12 Dec 2015 13:39:29 -0500] rev 27339
parsers: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 12 Dec 2015 13:46:32 -0500] rev 27338
osutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 12 Dec 2015 13:37:56 -0500] rev 27337
mpatch: use absolute_import
While I was here, I removed the try..except around importing cStringIO
because cStringIO should always be importable on modern Python versions.
We already do an unconditional import in other files.
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 12 Dec 2015 13:35:41 -0500] rev 27336
diffhelpers: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 12 Dec 2015 13:34:55 -0500] rev 27335
bdiff: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 12 Dec 2015 13:33:47 -0500] rev 27334
base85: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 12 Dec 2015 13:32:25 -0500] rev 27333
destutil: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 12 Dec 2015 13:30:47 -0500] rev 27332
obsolete: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 12 Dec 2015 13:27:31 -0500] rev 27331
contrib: ignore empty files in check-py3-compat.py
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 12 Dec 2015 13:23:29 -0500] rev 27330
doc: make gendoc.py module import policy aware
Without this, running gendoc.py during an install without C modules
available (via `make local`) will result in an import failure because
the default module load policy insists on C modules.
We also remove the sys.path adjustment because it is no longer needed
since our magic importer handles things.
Matt Mackall <mpm@selenic.com> [Fri, 11 Dec 2015 17:45:19 -0600] rev 27329
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 11 Dec 2015 12:21:26 +0000] rev 27328
check-commit: add a test for the patch checking script in contrib
This introduces a test for the change introduced in 8f5735b4aca5.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 10 Dec 2015 21:33:55 -0800] rev 27327
match: use re2 in readpatternfile if possible
This has a small, but measurable, effect on performance if a pattern
file is very large. In an artificial test with 200,000 lines of
pattern data, using re2 reduced read time by 200 milliseconds.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 10 Dec 2015 21:32:19 -0800] rev 27326
test-hgignore.t: add tests for comments
Although support for comments in hgignore files has existed for a
while, it was previously untested.
timeless <timeless@mozdev.org> [Wed, 09 Dec 2015 05:56:54 +0000] rev 27325
help: fix help -c/help -e/help -k
Before, hg help -c was the same as hg help, now it only shows commands.
Before, hg help -e was the same as hg help, now it only shows extensions.
Before, hg help -k crashed, now it shows all topics.
timeless <timeless@mozdev.org> [Wed, 09 Dec 2015 19:09:35 +0000] rev 27324
help: call filtercmd from topicmatch
update test coverage to explicitly define when help -c should
list debug/deprecated items.
timeless <timeless@mozdev.org> [Wed, 09 Dec 2015 19:09:06 +0000] rev 27323
help: refactor filtercmd
timeless <timeless@mozdev.org> [Mon, 30 Nov 2015 19:28:26 +0000] rev 27322
transplant: use Oxford comma
Laurent Charignon <lcharignon@fb.com> [Wed, 09 Dec 2015 17:01:27 -0800] rev 27321
crecord: add dictionary to default return value of filterpatch
When committing interactively without changes, the user would get a ValueError
exception. This patch adds a dictionary to the return value of filterpatch
when there are no files to change.
Yuya Nishihara <yuya@tcha.org> [Mon, 07 Dec 2015 21:42:50 +0900] rev 27320
paths: include #fragment again
Since 5f2a4fc3c4fa, #fragment was missing in "hg paths" output because
path.loc was changed to a parsed URL. "hg paths" should use path.rawloc to
show complete URLs.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 02 Dec 2015 16:12:15 -0800] rev 27319
discovery: properly filter changeset in 'peer.known' (issue4982)
The 'peer.known' call (handled at the repository level) was applying its own
manual filtering (looking at phases) instead of relying on the repoview
mechanism. This led to the discovery finding more "common" node that
'getbundle' was willing to recognised. From there, bad things happen, issue4982
is a symptom of it. While situations like described in issue4982 can still
happen because of race conditions, fixing 'peer.known' is important for
consistency in all cases.
We update the code to use 'repoview' filtering. This lead to small changes in
the tests for exchanging obsolescence marker because the discovery yields
different results.
The test affected in 'test-obsolete-changeset-exchange.t' is a test for
issue4982 getting back to its expected state.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 09 Dec 2015 14:22:57 -0800] rev 27318
test: add an extra base changeset in test-obsolete.t
A fix to issue4982 (not fixed in this patch) will reinforce the filtering
during discovery. This will makes two of our test repositories appear
unrelated (because all common content is properly hidden). To avoid this, we
introduce an extra base changeset that will not get obsoleted. This affects
various test output so we put this addition in its own changeset.
timeless <timeless@mozdev.org> [Tue, 08 Dec 2015 20:21:08 +0000] rev 27317
parents: provide equivalent revsets in help
Martin von Zweigbergk <martinvonz@google.com> [Mon, 07 Dec 2015 20:43:24 -0800] rev 27316
merge: refuse update/merge if there are unresolved conflicts (BC)
We currently allow updating and merging (with --force) when there are
unresolved merge conflicts, as long as there is only one parent of the
working copy. Even worse, when updating to another revision
(linearly), if one of the unresolved files (including any conflict
markers in the working copy) can now be merged cleanly with the target
revision, the file becomes marked as resolved.
While we could potentially allow updates that affect only files that
are not in the set of unresolved files, that's considerably more work,
and we don't have a use case for it anyway. Instead, let's keep it
simple and refuse any merge or update (without -C) when there are
unresolved conflicts.
Note that test-merge-local.t explicitly checks for conflict markers
that get carried over on update. It's unclear if that was intentional
or not, but it seems bad enough that we should forbid it. The simplest
way of fixing the test case is to leave the conflict markers in place
and just mark the files resolved, so let's just do that for now.
timeless <timeless@mozdev.org> [Tue, 08 Dec 2015 07:05:37 +0000] rev 27315
tests: drop require slow in test-contrib-perf
* skip presleep
* use a stub mode which does not output and generally loops only once
* only use one node for perfparents
timeless <timeless@mozdev.org> [Tue, 08 Dec 2015 08:37:12 +0000] rev 27314
convert/svn: quiet check-config
timeless <timeless@mozdev.org> [Tue, 08 Dec 2015 08:21:46 +0000] rev 27313
check-config: handle multiline config
timeless <timeless@mozdev.org> [Tue, 08 Dec 2015 08:36:00 +0000] rev 27312
check-config: escape period in regexp for inline comments
timeless <timeless@mozdev.org> [Tue, 08 Dec 2015 09:09:01 +0000] rev 27311
check-config: allow numbers in configs
p4...
timeless <timeless@mozdev.org> [Tue, 08 Dec 2015 09:22:53 +0000] rev 27310
check-config: recognize convert style documentation
timeless <timeless@mozdev.org> [Tue, 08 Dec 2015 04:56:26 +0000] rev 27309
tests: use a single repo for test-contrib-perf
timeless <timeless@mozdev.org> [Fri, 04 Dec 2015 19:05:56 +0000] rev 27308
perf: perfrevlog optimize for perf.stub
timeless <timeless@mozdev.org> [Fri, 04 Dec 2015 19:05:32 +0000] rev 27307
perf: add getlen
getlen will return 1 if perf.stub
timeless <timeless@mozdev.org> [Fri, 04 Dec 2015 18:08:50 +0000] rev 27306
perf: add optional rev for perflog and perftemplating
timeless <timeless@mozdev.org> [Fri, 04 Dec 2015 18:18:07 +0000] rev 27305
perf: perfparents honor config perf.parentscount
timeless <timeless@mozdev.org> [Fri, 04 Dec 2015 17:41:30 +0000] rev 27304
perf: offer perf.stub to only run one loop
timeless <timeless@mozdev.org> [Fri, 04 Dec 2015 17:41:02 +0000] rev 27303
perf: improve grammar of gettimer comment
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 06 Dec 2015 22:20:08 -0800] rev 27302
tests: use absolute_import in tinyproxy
Thus begins a series of adding absolute_import to a bunch of files for
Python 3 compatibility.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 06 Dec 2015 22:02:39 -0800] rev 27301
tests: use absolulte_import in test-wireproto.py
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 06 Dec 2015 22:05:19 -0800] rev 27300
tests: use absolute_import in test-walkrepo
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 06 Dec 2015 22:27:53 -0800] rev 27299
tests: use absolute_import in hgweberror.py
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 06 Dec 2015 22:27:18 -0800] rev 27298
tests: use absolute_import in hghave.py
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 06 Dec 2015 22:26:12 -0800] rev 27297
tests: use absolute_import for heredoctest.py
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 06 Dec 2015 22:25:41 -0800] rev 27296
tests: use absolute_import in /get-with-headers.py
While I was here, I removed condition code for failure to import json.
This code was necessary to support Python < 2.6, which didn't include
the json module.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 06 Dec 2015 22:23:37 -0800] rev 27295
tests: use absolute_import in generate-working-copy-states.py
Anton Shestakov <av6@dwimlabs.net> [Fri, 13 Nov 2015 14:35:36 +0800] rev 27294
hgweb: move entry-preparing code from webcommands to webutils.commonentry()
The new function is used to fill basic information about a ctx, such as
revision number and hash, author, commit message, etc. Before, every webcommand
used to get this basic information on its own using some boilerplate code, and
some things in some places just weren't available.
timeless <timeless@mozdev.org> [Mon, 30 Nov 2015 19:30:16 +0000] rev 27293
grammar: favor zero, one, two over ... or no
timeless <timeless@mozdev.org> [Mon, 30 Nov 2015 19:29:46 +0000] rev 27292
commands: use Oxford comma (help clone)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 09 Dec 2015 08:28:53 +0900] rev 27291
commit: make commit acquire store lock before processing for consistency
If acquisition of wlock waits for another "hg commit" process to
release it, dirstate will refer newly committed revision after
acquisition of wlock.
At that time, '00changelog.i' on the filesystem contains this new
revision, but in-memory 'repo.changelog' doesn't, if it is cached
without store lock (slock) before updating by another "hg commit".
This makes validating parents at re-loading 'repo.dirstate' from
'.hg/dirstate' replace such new revision with 'nullid'. Then,
'localrepository.commit()' creates "orphan" revision (see issue4368
for detail).
a01d3d32b53a makes 'commands.commit()' acquire both wlock and slock
before processing to avoid this issue at "hg commit".
But similar issue can occur even after a01d3d32b53a, if 3rd party
extension does:
- refer 'repo.changelog' outside wlock scope, and
- invoke 'repo.commit()' directly (instead of 'commands.commit()')
This patch makes 'commit()' acquire slock before processing, to refer
recent changelog at validating parents of 'repo.dirstate'.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 09 Dec 2015 08:28:53 +0900] rev 27290
censor: make censor acquire locks before processing
Before this patch, "hg censor" executes below:
- without acquisition of wlock, examine whether the working
directory refers the revision of the file to be censored or not
- without acquisition of store lock (slock), replace existing
filelog of file to be censored with censored one,
Replacement consists of steps below, and it is assumed that the
destination filelog at (1) isn't changed before renaming at (3).
1. read existing filelog in
2. write filelog entries (both censored and not) into temporary file
3. rename from temporary file to existing filelog to be censored
It may cause unintentional result, if another command runs parallelly
(see also issue4368).
This patch makes "hg censor" acquire wlock and slock before
processing.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 09 Dec 2015 08:28:53 +0900] rev 27289
transplant: widen wlock scope of transplant for consitency while processing
Before this patch, "hg transplant" executes below before acquisition
of wlock.
- cmdutil.checkunfinished()
- repo.status() for dirty check
- repo.dirstate.parents()
It may cause unintentional result, if another command runs parallelly
(see also issue4368).
This patch makes "hg transplant" acquire wlock before processing
instead of acquiring wlock in each of 'transplanter.apply()' and
'transplanter.recover()'.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 09 Dec 2015 08:28:53 +0900] rev 27288
shelve: remove redundant acquisition of wlock for sub commands of unshelve
Previous patch ensures that wlock is acquired before processing for
"hg unshelve". It makes acquisition of wlock in each functions below
redundant.
- unshelveabort() for "unshelve --abort"
- unshelvecontinue() for "unshelve --continue"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 09 Dec 2015 08:28:53 +0900] rev 27287
shelve: widen wlock scope of unshelve for consistency while processing
Before this patch, "hg unshelve" of shelve extension executes below
before acquisition of wlock:
- cmdutil.checkunfinished()
- examine existence of (specified) shelve file
It may cause unintentional result, if another command runs parallelly
(see also issue4368).
This patch widens wlock scope of "hg unshelve" of shelve extension for
consistency while processing.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 06 Dec 2015 17:07:50 -0800] rev 27286
perf: add perflrucachedict command
It measures time to construct, perform gets, sets, or mixed mode
operations on a cache of configurable size with variable numbers of
operations.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 06 Dec 2015 22:22:09 -0800] rev 27285
tests/filterpyflakes: use absolute_import