Bug#865444: Bug#842614: dgit quilt messages ("o+d/p" is misleading)

[Ian Jackson]

Control: close -1

I wrote:
> It also creates a git object corresponding to the .orig.tar.gz but
> with debian/ copied from your .debian.tar.gz.  That's a "patches
> unapplied" tree.  That git object is 5c8951c97cef58952a93.
> dgit calls this "o+d/p" in some of the next output.  TBH maybe it
> ought to be called "o+d".

But I was badly confused.

> o+d for patches-unapplied makes sense to me: if the patches are
> unapplied, they exist only inside the 'd', so it's confusing to
> additionally add 'p', which makes me think something has been done to
> them inside 'd', or they've been applied.

In fact the tree reported by dgit as "o+d/p" is:
  * the orig
  * plus the contents of the user's debian/
  * with the patches applied in the user's debian/ applied

So I think in fact this is all correct.  I will add an explanation of
this error message to the quilt-fixup section of dgit(1), and a
cross-reference to the error message.

Ian.

-- 
Ian JacksonThese opinions are my own.

If I emailed you from an address @fyvzl.net or @evade.org.uk, that is
a private address which bypasses my fierce spamfilter.

Bug#865444: Bug#842614: dgit quilt messages ("o+d/p" is misleading)

[Sean Whitton]

Hello Ian, Felipe,

On Wed, Jun 21, 2017 at 02:55:02PM +0100, Ian Jackson wrote:
> > It also creates a git object corresponding to the .orig.tar.gz but
> > with debian/ copied from your .debian.tar.gz.  That's a "patches
> > unapplied" tree.  That git object is 5c8951c97cef58952a93.
> > dgit calls this "o+d/p" in some of the next output.  TBH maybe it
> > ought to be called "o+d".
> 
> Or maybe "unap'd" ?  Sean, do you have an opinion ?  Whatever we
> choose for this part of the message:
> 
>  |  dgit: base trees orig=d510ca798480f37fc567 o+d/p=5c8951c97cef58952a93
> 
> needs to have an abbrevation which will fit here:
> 
>  |  dgit: quilt differences: src:  ## orig ## gitignores:  == orig ==
>  |  dgit: quilt differences:  HEAD ## o+d/p   HEAD == o+d/p

o+d for patches-unapplied makes sense to me: if the patches are
unapplied, they exist only inside the 'd', so it's confusing to
additionally add 'p', which makes me think something has been done to
them inside 'd', or they've been applied.

Also, an unapplied tree is what you get in the simplest additive
operation between the 'o' and the 'd': putting the 'd' inside the
expanded 'o'.

(Ignoring the subtlety of 3.0 (quilt) permitting you to overwrite a
debian/ found in upstream's source, but that is rare.)

-- 
Sean Whitton


signature.asc
Description: PGP signature