~racb/git-ubuntu:release-process-changes-2

Last commit made on 2020-05-12
Get this branch:
git clone -b release-process-changes-2 https://git.launchpad.net/~racb/git-ubuntu
Only Robie Basak can upload to this branch. If you are Robie Basak please log in for upload directions.

Branch merges

Branch information

Name:
release-process-changes-2
Repository:
lp:~racb/git-ubuntu

Recent commits

1595352... by Robie Basak

Release process: add service restart instructions

We probably shouldn't leave the importer service running in a state
where a restart or reboot could change behaviour, so we should restart
the service as part of an update.

9590643... by Robie Basak

Release process: automatic tag annotation

We can reduce manual work by automating the tag annotation in the
instructions.

37463fc... by Robie Basak

Release process: change announcement destination

Announce to ubuntu-devel@ now as git-ubuntu is increasingly not
server-specific any more.

0376fea... by Robie Basak

Fix docstring

This docstring was incorrect. The function uses a repo fixture, not a
repo_factory fixture, so update the docstring to match.

046bb42... by Robie Basak

Fix rich history preservation unescaped patch bug

It turns out that "git format-patch --stdout ... | git am" does not
correctly round-trip in every case. If a commit message contains
something that looks like a patch, "git am" incorrectly tries to apply
it.

Instead, we can note the commits that need to be rebased at export time
with "git rev-list --reverse", and apply them at import time with "git
cherry-pick". This keeps everything "inside git" instead of
round-tripping through an mbox, working around the problem.

This does mean that the repository to which the import happens must have
the commits available, which commonly would mean that the export
destination repository must be the same as the import source repository.
As it happens, this is always the case for us anyway during a
--reimport, so this will work just fine.

d4d29bc... by Robie Basak

Test rich history preservation unescaped patch bug

If a rich history commit _message_ contains something that looks like a
patch, the current implementation will attempt to apply it even though
it shouldn't. This test checks this case, but fails for now as the bug
exists, so we mark it xfail to verify that the test works.

ba0f853... by Robie Basak

Use the same repo fixture in round trip test

We will shortly be changing rich history preservation to use
cherry-picks to fix a bug. This will require the same repository to be
used for rich history import as the commits being imported will need to
be present in the repository still. Tests will therefore need to use the
same repository for import as they did for export.

This does rely on the test cleanly and correctly removing all previous
relevant tags in order to properly test the import, making it a little
more error prone, but we have no choice given the new requirement.

Since this was previously the only use for our repo_factory fixture, we
can drop it from the code base, together with its documentation. If it
is needed again later, we can always pull it out of VCS again.

d8036ed... by Robie Basak

Merge branch 'fix-changelog-timezone-parsing'

9804f96... by Robie Basak

Merge branch 'fix-remote-add-changelog-notes'

f2252e9... by Bryce Harrington

Remove review cli command

The review command was introduced experimentally during the pre-1.0
development period, however it is not believed to be widely used yet,
lacks test cases, and does not have a complete implementation.