Bug#880019: git-buildpackage: gbp pq export should accept --id-length (and so should the [pq] stanza in gbp.conf)

2017-11-10 Thread Daniel Kahn Gillmor
Hi Guido--

On Sat 2017-10-28 18:51:36 +0200, Guido Günther wrote:
> I think you want:
>
> [pq]
> abbrev = 9

i can confirm that this setting has the intended effect, so i'm
closing this bug report.

Thanks for your speedy followup!

--dkg



Bug#880019: git-buildpackage: gbp pq export should accept --id-length (and so should the [pq] stanza in gbp.conf)

2017-10-28 Thread Guido Günther
Hi,
On Sat, Oct 28, 2017 at 03:07:14PM +0200, Daniel Kahn Gillmor wrote:
> Package: git-buildpackage
> Version: 0.9.0
> Severity: normal
> 
> I'm maintaing several patch queues in the gnupg2 source package,
> including (at least) one for stretch and one for unstable.
> 
> At some point, the default git commit ID length written in the
> generated patches moved from 9 hex digits to 7.
> 
> This results in a distracting large-in-bytes change when
> round-tripping through "gbp pq import && gbp pq export".  In
> particular, i'm talking about this kind of change in
> debian/patches/0012-whatever.patch
> 
>  diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
> -index a25b5136e..85eb80ab5 100644
> +index a25b513..85eb80a 100644
> 
> Where it shows up for every hunk.
> 
> I understand that gbp (and git itself) may choose for whatever reason
> to change the default styling.
> 
> but it would be nice for me if i could drop a couple lines into the
> [pq] section of debian/gbp.conf to stabilize the styling so that i can
> work with the patch queue without generating this kind of distracting
> noise.  I want reviewers of my debdiffs to be able to focus on the
> actual changes :)
> 
> gbp dch already has an id-length option.  Maybe gbp pq could support
> one as well?
> 
> I tried putting the following two lines in debian/gbp.conf:
> 
> [pq]
> id-length = 9

I think you want:

[pq]
abbrev = 9

Cheers,
 -- Guido

> 
> but it didn't do what i wanted :)
> 
> I'm filing this as normal instead of wishlist because the generated
> noise is actually a problem for me.  if you want, you can retitle this
> bug report "gbp pq export introduces noise in debian/patches by
> varying the commit id length in exported patches".  or if you want,
> you can reset the severity to wishlist.  my feelings won't be hurt
> either way :)
> 
> thanks for maintaining gbp!
> 
>--dkg
> 
> -- System Information:
> Debian Release: buster/sid
>   APT prefers testing-debug
>   APT policy: (500, 'testing-debug'), (500, 'testing'), (500, 'oldstable'), 
> (200, 'unstable-debug'), (200, 'unstable'), (1, 'experimental-debug'), (1, 
> 'experimental')
> Architecture: amd64 (x86_64)
> Foreign Architectures: i386
> 
> Kernel: Linux 4.13.0-1-amd64 (SMP w/4 CPU cores)
> Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
> LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
> Shell: /bin/sh linked to /bin/dash
> Init: systemd (via /run/systemd/system)
> 
> Versions of packages git-buildpackage depends on:
> ii  devscripts 2.17.10
> ii  git1:2.14.2-1
> ii  man-db 2.7.6.1-2
> ii  python33.6.3-1
> ii  python3-dateutil   2.6.1-1
> ii  python3-pkg-resources  36.2.7-2
> ii  python3-six1.11.0-1
> 
> Versions of packages git-buildpackage recommends:
> pn  cowbuilder | pbuilder | sbuild  
> ii  pristine-tar1.42
> ii  python3-requests2.18.1-1
> 
> Versions of packages git-buildpackage suggests:
> pn  python3-notify2  
> pn  sudo 
> ii  unzip6.0-21
> 
> -- no debconf information
> 



Bug#880019: git-buildpackage: gbp pq export should accept --id-length (and so should the [pq] stanza in gbp.conf)

2017-10-28 Thread Daniel Kahn Gillmor
Package: git-buildpackage
Version: 0.9.0
Severity: normal

I'm maintaing several patch queues in the gnupg2 source package,
including (at least) one for stretch and one for unstable.

At some point, the default git commit ID length written in the
generated patches moved from 9 hex digits to 7.

This results in a distracting large-in-bytes change when
round-tripping through "gbp pq import && gbp pq export".  In
particular, i'm talking about this kind of change in
debian/patches/0012-whatever.patch

 diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
-index a25b5136e..85eb80ab5 100644
+index a25b513..85eb80a 100644

Where it shows up for every hunk.

I understand that gbp (and git itself) may choose for whatever reason
to change the default styling.

but it would be nice for me if i could drop a couple lines into the
[pq] section of debian/gbp.conf to stabilize the styling so that i can
work with the patch queue without generating this kind of distracting
noise.  I want reviewers of my debdiffs to be able to focus on the
actual changes :)

gbp dch already has an id-length option.  Maybe gbp pq could support
one as well?

I tried putting the following two lines in debian/gbp.conf:

[pq]
id-length = 9

but it didn't do what i wanted :)

I'm filing this as normal instead of wishlist because the generated
noise is actually a problem for me.  if you want, you can retitle this
bug report "gbp pq export introduces noise in debian/patches by
varying the commit id length in exported patches".  or if you want,
you can reset the severity to wishlist.  my feelings won't be hurt
either way :)

thanks for maintaining gbp!

   --dkg

-- System Information:
Debian Release: buster/sid
  APT prefers testing-debug
  APT policy: (500, 'testing-debug'), (500, 'testing'), (500, 'oldstable'), 
(200, 'unstable-debug'), (200, 'unstable'), (1, 'experimental-debug'), (1, 
'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages git-buildpackage depends on:
ii  devscripts 2.17.10
ii  git1:2.14.2-1
ii  man-db 2.7.6.1-2
ii  python33.6.3-1
ii  python3-dateutil   2.6.1-1
ii  python3-pkg-resources  36.2.7-2
ii  python3-six1.11.0-1

Versions of packages git-buildpackage recommends:
pn  cowbuilder | pbuilder | sbuild  
ii  pristine-tar1.42
ii  python3-requests2.18.1-1

Versions of packages git-buildpackage suggests:
pn  python3-notify2  
pn  sudo 
ii  unzip6.0-21

-- no debconf information