Mercurial > hg
view tests/test-releasenotes-parsing.t @ 42486:35d674a3d5db
copies: don't filter out copy targets created on other side of merge commit
If file X is copied to Y on one side of merge and the other side
creates Y (no copy), we would not mark that as copy. In the
changeset-centric pathcopies() version, that was done by checking if
the copy target existed on the other branch. Even though merge commits
are pretty uncommon, it still turned out to be too expensive to load
the manifest of the parents of merge commits. In a repo of
mozilla-unified converted to storing copies in changesets, about 2m30s
of `hg debugpathcopies FIREFOX_BETA_59_END FIREFOX_BETA_60_BASE` is
spent on this check of merge commits.
I tried to think of a way of storing more information in the
changesets in order to cheaply detect these cases, but I couldn't
think of a solution. So this patch simply removes those checks.
For reference, these extra copies are reported from the aforementioned
command after this patch:
browser/base/content/sanitize.js -> browser/modules/Sanitizer.jsm
testing/mozbase/mozprocess/tests/process_normal_finish_python.ini -> testing/mozbase/mozprocess/tests/process_normal_finish.ini
testing/mozbase/mozprocess/tests/process_waittimeout_python.ini -> testing/mozbase/mozprocess/tests/process_waittimeout.ini
testing/mozbase/mozprocess/tests/process_waittimeout_10s_python.ini -> testing/mozbase/mozprocess/tests/process_waittimeout_10s.ini
Since these copies were created on one side of some merge, it still
seems reasonable to include them, so I'm not even sure it's worse than
filelog pathcopies(), just different.
Differential Revision: https://phab.mercurial-scm.org/D6420
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 18 Apr 2019 21:22:14 -0700 |
parents | 3fff6f30bd7f |
children |
line wrap: on
line source
#require fuzzywuzzy $ cat >> $HGRCPATH << EOF > [extensions] > releasenotes= > EOF Bullet point with a single item spanning a single line $ hg debugparsereleasenotes - << EOF > New Features > ============ > > * Bullet point item with a single line > EOF section: feature bullet point: paragraph: Bullet point item with a single line Bullet point that spans multiple lines. $ hg debugparsereleasenotes - << EOF > New Features > ============ > > * Bullet point with a paragraph > that spans multiple lines. > EOF section: feature bullet point: paragraph: Bullet point with a paragraph that spans multiple lines. $ hg debugparsereleasenotes - << EOF > New Features > ============ > > * Bullet point with a paragraph > that spans multiple lines. > > And has an empty line between lines too. > With a line cuddling that. > EOF section: feature bullet point: paragraph: Bullet point with a paragraph that spans multiple lines. paragraph: And has an empty line between lines too. With a line cuddling that. Multiple bullet points. With some entries being multiple lines. $ hg debugparsereleasenotes - << EOF > New Features > ============ > > * First bullet point. It has a single line. > > * Second bullet point. > It consists of multiple lines. > > * Third bullet point. It has a single line. > EOF section: feature bullet point: paragraph: First bullet point. It has a single line. bullet point: paragraph: Second bullet point. It consists of multiple lines. bullet point: paragraph: Third bullet point. It has a single line. Bullet point without newline between items $ hg debugparsereleasenotes - << EOF > New Features > ============ > > * First bullet point > * Second bullet point > And it has multiple lines > * Third bullet point > * Fourth bullet point > EOF section: feature bullet point: paragraph: First bullet point bullet point: paragraph: Second bullet point And it has multiple lines bullet point: paragraph: Third bullet point bullet point: paragraph: Fourth bullet point Sub-section contents are read $ hg debugparsereleasenotes - << EOF > New Features > ============ > > First Feature > ------------- > > This is the first new feature that was implemented. > > And a second paragraph about it. > > Second Feature > -------------- > > This is the second new feature that was implemented. > > Paragraph two. > > Paragraph three. > EOF section: feature subsection: First Feature paragraph: This is the first new feature that was implemented. paragraph: And a second paragraph about it. subsection: Second Feature paragraph: This is the second new feature that was implemented. paragraph: Paragraph two. paragraph: Paragraph three. Multiple sections are read $ hg debugparsereleasenotes - << EOF > New Features > ============ > > * Feature 1 > * Feature 2 > > Bug Fixes > ========= > > * Fix 1 > * Fix 2 > EOF section: feature bullet point: paragraph: Feature 1 bullet point: paragraph: Feature 2 section: fix bullet point: paragraph: Fix 1 bullet point: paragraph: Fix 2 Mixed sub-sections and bullet list $ hg debugparsereleasenotes - << EOF > New Features > ============ > > Feature 1 > --------- > > Some words about the first feature. > > Feature 2 > --------- > > Some words about the second feature. > That span multiple lines. > > Other Changes > ------------- > > * Bullet item 1 > * Bullet item 2 > EOF section: feature subsection: Feature 1 paragraph: Some words about the first feature. subsection: Feature 2 paragraph: Some words about the second feature. That span multiple lines. bullet point: paragraph: Bullet item 1 bullet point: paragraph: Bullet item 2 Warn user in case of unexpected block while parsing $ hg init relnotes-warn $ cd relnotes-warn $ touch feature1 $ hg -q commit -A -l - << EOF > commit 1 > > .. feature:: > > new feature added. > some words about the feature. > EOF $ hg releasenote -r . changeset a4251905c440: unexpected block in release notes directive feature New Features ============ * new feature added. some words about the feature. $ cd ..