Mercurial > hg
view tests/test-releasenotes-parsing.t @ 36975:795eb53f1d3e
rebase: allow in-memory merge of the working copy parent
Before this patch and when the rebase involved the working copy parent
(and thus the working copy too), we would not do in-memory rebase even
if requested to. The in-code comment explains that the reason had
something to do with avoiding an extra update, but I don't know which
update that refers to. Perhaps an earlier version of the code used to
update to the destination before rebasing even if in-memory rebase was
requested? That seems to not be done at least since aa660c1203a9
(rebase: do not bail on uncomitted changes if rebasing in-memory,
2017-12-07).
To see if this still made it slower, I create a single tiny commit on
top of one branch of the mozilla-unified repo (commit a1098c82 to be
exact) and rebased it to another branch (commit d4e9a7be). Before this
patch that took 11.8s and after this patch it took 8.6s (I only did
two runs each, but the timings were very consistent).
Differential Revision: https://phab.mercurial-scm.org/D2876
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 15 Mar 2018 13:19:55 -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 ..