timeless <timeless@mozdev.org> [Mon, 14 Dec 2015 22:21:30 +0000] rev 27350
tests: histedit-helpers fixbundle should not complain about no input
timeless <timeless@mozdev.org> [Mon, 14 Dec 2015 22:34:30 +0000] rev 27349
tests: relax histedit issue4251 and issue3893 backups
I'm globbing these because some are globbed, and this pair
gets in the way of the main parts of the series.
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