~nacc/git-ubuntu:use-dpkg-mergechangelogs

Last commit made on 2017-07-27
Get this branch:
git clone -b use-dpkg-mergechangelogs https://git.launchpad.net/~nacc/git-ubuntu
Only Nish Aravamudan can upload to this branch. If you are Nish Aravamudan please log in for upload directions.

Branch merges

Branch information

Name:
use-dpkg-mergechangelogs
Repository:
lp:~nacc/git-ubuntu

Recent commits

e537604... by Nish Aravamudan

gitubuntu/git_repository: cat-file produces extra blank lines

bf613ea... by Nish Aravamudan

git ubuntu lint: use dpkg-mergechangelogs rather than git-merge-changelogs

The behavior of the latter does not precisely match the former,
and leads to false negatives.

LP: #1705251

0be4c7e... by Nish Aravamudan

GitUbuntuRepository: silence noise on __init__

logging.info() writes to the terminal by default, so do not use it in
such a common place. Library code shouln't write to the terminal except
by request of the caller.

Adapated from code from Robie Basak, to keep CLI-compatibility with
the prior code, which emitted the tempdir used, if any.

524b7de... by Nish Aravamudan

git ubuntu lint: use gitubuntu.versioning.Version

151c31b... by Robie Basak

versioning: revert series related changes

This regressed tests.

Now we're back where we started. Tests pass for versions calculations
that we had working. The test for the SRU "same version in multiple
series" versioning exception fails as expected, and we're in a position
to be able to implement it.

3bf2574... by Robie Basak

versioning: import the name Version

This is much simpler than the really obtuse fully qualified name. I know
I usually don't like doing this, but in this case (frequent use, obtuse
otherwise) I think it's worth it. We only use one type of Version object
in this module so this should cause minimal confusion.

bf347a7... by Robie Basak

lint: rewrite update-maintainer check

I'm not sure what the logic of the check was before, but it didn't work
(false negatives), so I've rewritten it. All I do is run
update-maintainer and check that it changes nothing. Since
update-maintainer is idempotent, this should always work as far as I can
see.

I'm still dubious about the clobbering of the working tree when
generating the tree object that corresponds to an update-maintainer run,
but this is not a regression and can be fixed in a future commit.

2c6edcb... by Robie Basak

lint: further ret carry forward fixes

Previous failures ret were being clobbered. This is what I mean by this
pattern being error-prone :-)

ddaba62... by Robie Basak

lint: document do_merge_lint parameters

1cf22c4... by Robie Basak

lint: be more specific about return types

These methods definitely return tree objects, not any generic treeishs.