lp:~jameinel/bzr-builddeb/changelog-parser

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:bzr-builddeb

Robert Collins (community): Approve on 2010-02-04

Diff: 609 lines (+271/-269)

2 files modified

merge_changelog.py (+104/-222)
tests/test_merge_changelog.py (+167/-47)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #516056: changelog merge hook should use python-debian for parsing	Undecided	Fix Released
Bug #516060: changelog merge hook should use a 3-way merge	Wishlist	Fix Released

Link a bug report

Related blueprints

407. By John A Meinel on 2010-02-04

Sort out some more details for the 3-way merge code.
The main problem I was running into was that the constructor always suppressed parse failures.

406. By John A Meinel on 2010-02-03

Trying to trigger the invalid code, only to find bugs in python-debian :(

405. By John A Meinel on 2010-02-03

Simplify the conflict logic slightly.

404. By John A Meinel on 2010-02-03

Conflict when appropriate.

We could try to do a textual merge, but it is just easier to
conflict on the whole region. Mostly because merge3.Merge3 is missing
a decent api for telling whether there was a conflict region :(.

403. By John A Meinel on 2010-02-03

Fix bug #516060, implement 3-way changelog merge.

This uses a fairly crude 3-way changelog merge algorithm, but doesn't yet
introduce conflicts. That will be next, as it requires an api bump.
If left != right, then we check if the version is in base, and if
one side is identical to base, then we pick the other.
This doesn't:
a) Conflict when left != right != base
b) Allow deleting entries (present in base & this but not other, for instance)
etc.

402. By John A Meinel on 2010-02-03

Make sure that the blocks are in sorted order before we do anything else.

401. By John A Meinel on 2010-02-03

Lots of simplification.

Use debian_bundle.changelog to parse the changelog files and get versions, rather than
having a local implementation. Use a simple step-largest clustering of iterators to get
the output combined properly.

This also showed that author lines are supposed to have a double blank space between
the author and the timestamp, so I fixed up those tests.

400. By James Westby on 2010-02-02

Depend on a newer bzr for the merge-changelog hook.

399. By James Westby on 2010-02-02

Merge John's merge-changelog work, thanks.

398. By James Westby on 2010-02-01

Merge in my recent work.