"usd tag" cannot tag logical tags

Bug #1651113 reported by Robie Basak on 2016-12-19
This bug affects 1 person
Affects Status Importance Assigned to Milestone

Bug Description

When tagging the logical tag, the top of debian/changelog contains the version of old/debian, not of old/ubuntu (since that has been stripped by our workflow). Thus having the tool guess the required version number in the tag is impossible unless it takes more than just the current tree-ish. Our documentation currently says to use it (https://wiki.ubuntu.com/UbuntuDevelopment/Merging/GitWorkflow#Detailed_workflow) so this results in an incorrect logical tag.

We should fix at least the documentation, as right now this makes the workflow completely broken if you follow the docs to the letter.

I'm not sure what to do about fixing "usd tag" itself. We'd need to carry state or something. Or perhaps check against "old/ubuntu" that the trees match (except for debian/changelog and update-maintainer) and then use the version number from the "old/ubuntu" tree instead?

<caribou> rbasak: I may have found the reason : using usd tag on the logical goes to fetch the version in the changelog and, once the changelog is removed from the reconstruct/{vers}, it has the debian version at the top

Revision history for this message
Nish Aravamudan (nacc) wrote :

I have updated the wiki to correct the logical tag format.

Revision history for this message
Nish Aravamudan (nacc) wrote :

I think a reasonable choice *may* be to do something like --changelog-from <commitish> which says to use the d/changelog version from commitish to tag this version:

So, the command for logical tagging would be:

usd tag --format='logical/%(version)s' --changelog-from reconstruct/<tab>

with appropriate tab support

or s/<tab>/<version>/ for manual typing in the meanwhile?

Revision history for this message
Robie Basak (racb) wrote :

I think I mentioned this to you in a Hangout: I think this would be fine, but we should have a wrapper for less typing for a relatively common action. Also instead of reconstruct/<tab> we could default to old/ubuntu in that wrapper.

Revision history for this message
Nish Aravamudan (nacc) wrote :

Updated the wiki documentation to match.

Changed in usd-importer:
status: Triaged → Fix Released
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers