lp:~nacc/ubuntu-dev-tools/update-vcs

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:~ubuntu-dev/ubuntu-dev-tools/trunk

Mattia Rizzolo: Needs Information on 2017-04-30

Benjamin Drung: Needs Fixing on 2017-03-29

Diff: 241 lines (+129/-44)

2 files modified

ubuntutools/update_maintainer.py (+122/-43)
update-maintainer (+7/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #567629: [update-maintainer] should adjust Vcs-foo fields too	Wishlist	In Progress
Bug #1595744: Tooling (or process) doesn't handle VCS- fields	Low	Triaged

Link a bug report

Related blueprints

1456. By Nish Aravamudan on 2017-03-31

Fix obvious syntax errors. Sorry!

1455. By Nish Aravamudan on 2017-03-31

Pass verbose down to the internal functions.

1454. By Nish Aravamudan on 2017-03-31

Drop unnecessary whitespace change.

1453. By Nish Aravamudan on 2017-03-31

Merge with lp:ubuntu-dev-tools

1452. By Nish Aravamudan on 2017-03-31

Refactor code based upon MR feedback. Remove duplication of code between
update_maintainer.py and update_vcs.py. Delete update_vcs.py. Add a vcs
parameter to {update,restore}_maintainer to indicate if VCS fields
should be modified. Refactor both functions to not continue in the loop
until both maintainer and VCS fields have been examined if necessary.

1451. By Nish Aravamudan on 2016-10-19

update-maintainer: add --vcs mode

As we perform merges on the server team, we tend to try and replay the
maintainer changes to debian/control via update-maintainer. However, for
those packages that also update the Vcs fields, we have no automated
tooling to do the same. Add a fairly simple version of the same code
as in update_maintainer, but handling Vcs-Git-* fields (including
Browser).

LP: #567629, LP: #1595744

Signed-off-by: Nishanth Aravamudan <email address hidden>

1450. By James Page on 2016-08-04

grep-merges: Use unicode string format for pretty output to deal with
non ascii encoding.

1449. By Colin Watson on 2016-07-16

pbuilder-dist, ubuntu-build: Add s390x.

1448. By Martin Pitt on 2016-05-13

grep-merges: Do not override author or uploader with None
There can be JSON entries which have uploader=None.

1447. By Adam Conrad on 2016-05-09

mk-sbuild: cp localtime and timezone a little harder (LP: #1569400)