Mercurial > hg
view tests/test-releasenotes-merging.t @ 33453:f6b7617a85bb
phases: add a 'registernew' method to set new phases
This new function will be used by code that adds new changesets. It ajusts the
phase boundary to make sure added changesets are at least in their target
phase (they end up in an higher phase if their parents are in a higher phase).
Having a dedicated function also simplify the phases tracking. All the new
nodes are passed as argument, so we know that all of them needs to have their
new phase registered. We also know that no other nodes will be affected, so no
extra computation are needed.
This function differ from 'retractboundary' where some nodes might change
phase while some other might not. It can also affect nodes not passed as
parameters.
These simplification also apply to the computation itself. For now we use
'_retractboundary' there by convenience, but we may introduces simpler code
later.
While registering new revisions, we still need to check the actual phases of
the added node because it might be higher than the target phase (eg: target is
draft but parent is secret).
We will migrate users over the next changesets.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Tue, 11 Jul 2017 03:47:25 +0200 |
parents | 5814db57941c |
children | 3748098d072a |
line wrap: on
line source
$ cat >> $HGRCPATH << EOF > [extensions] > releasenotes= > EOF $ hg init simple-repo $ cd simple-repo A fix directive from commit message is added to release notes $ touch fix1 $ hg -q commit -A -l - << EOF > commit 1 > > .. fix:: > > Fix from commit message. > EOF $ cat >> $TESTTMP/single-fix-bullet << EOF > Bug Fixes > ========= > > * Fix from release notes. > EOF $ hg releasenotes -r . $TESTTMP/single-fix-bullet $ cat $TESTTMP/single-fix-bullet Bug Fixes ========= * Fix from release notes. * Fix from commit message. Processing again ignores the already added bullet. $ hg releasenotes -r . $TESTTMP/single-fix-bullet $ cat $TESTTMP/single-fix-bullet Bug Fixes ========= * Fix from release notes. * Fix from commit message. $ cd .. Sections are unioned $ hg init subsections $ cd subsections $ touch fix1 $ hg -q commit -A -l - << EOF > Commit 1 > > .. feature:: Commit Message Feature > > This describes a feature from a commit message. > EOF $ cat >> $TESTTMP/single-feature-section << EOF > New Features > ============ > > Notes Feature > ------------- > > This describes a feature from a release notes file. > EOF $ hg releasenotes -r . $TESTTMP/single-feature-section $ cat $TESTTMP/single-feature-section New Features ============ Notes Feature ------------- This describes a feature from a release notes file. Commit Message Feature ---------------------- This describes a feature from a commit message. Doing it again won't add another section $ hg releasenotes -r . $TESTTMP/single-feature-section Commit Message Feature already exists in feature section; ignoring $ cat $TESTTMP/single-feature-section New Features ============ Notes Feature ------------- This describes a feature from a release notes file. Commit Message Feature ---------------------- This describes a feature from a commit message. $ cd .. Bullets from rev merge with those from notes file. $ hg init bullets $ cd bullets $ touch fix1 $ hg -q commit -A -l - << EOF > commit 1 > > .. fix:: > > this is fix1. > EOF $ touch fix2 $ hg -q commit -A -l - << EOF > commit 2 > > .. fix:: > > this is fix2. > EOF $ hg releasenotes -r 'all()' $TESTTMP/relnotes-bullet-problem $ cat $TESTTMP/relnotes-bullet-problem Bug Fixes ========= * this is fix1. * this is fix2. $ touch fix3 $ hg -q commit -A -l - << EOF > commit 3 > > .. fix:: > > this is fix3. > EOF $ hg releasenotes -r . $TESTTMP/relnotes-bullet-problem $ cat $TESTTMP/relnotes-bullet-problem Bug Fixes ========= * this is fix1. * this is fix2. * this is fix3.