Hello Ian, On Sun, Nov 13, 2016 at 08:18:16PM +0000, Ian Jackson wrote: > Maybe your proposed script wants to be in devscripts. devscripts is > already rather namespace-abusive, so maybe if it's there we don't care > much...
I just committed the attached to the devscripts repo. If and when it makes it into a release of devscripts, I will update dgit-maint-merge(7). I'm not closing this bug because I get the impression you might want to retitle/clone it for the sake of the other helper scripts we've been discussing. -- Sean Whitton
From 363043b99e941e8797c1876ff3e32adc3531d9ae Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhit...@spwhitton.name>
Date: Mon, 19 Dec 2016 12:05:32 +0000
Subject: [PATCH] new script: git-deborig
---
.gitignore | 2 +
Makefile.common | 3 +-
README | 4 +
debian/changelog | 7 ++
debian/control | 11 +++
debian/copyright | 3 +-
po4a/devscripts-po4a.conf | 2 +
scripts/git-deborig.pl | 188 ++++++++++++++++++++++++++++++++++++++++++++++
8 files changed, 218 insertions(+), 2 deletions(-)
create mode 100755 scripts/git-deborig.pl
diff --git a/.gitignore b/.gitignore
index 00c05c6..e96730c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,6 +76,8 @@ scripts/dscextract
scripts/dscverify
scripts/edit-patch
scripts/getbuildlog
+scripts/git-deborig
+scripts/git-deborig.1
scripts/grep-excuses
scripts/libvfork.o
scripts/libvfork.so.0
diff --git a/Makefile.common b/Makefile.common
index 57b1f4f..1640806 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1,7 +1,8 @@
GEN_MAN1S := bts.1 build-rdeps.1 chdist.1 dcontrol.1 debcheckout.1 debcommit.1 \
deb-reversion.1 desktop2menu.1 dget.1 mass-bug.1 \
mk-build-deps.1 mk-origtargz.1 namecheck.1 rmadison.1 sadt.1 svnpath.1 \
- tagpending.1 origtargz.1 transition-check.1 who-permits-upload.1
+ tagpending.1 origtargz.1 transition-check.1 who-permits-upload.1 \
+ git-deborig.1
PREFIX = /usr
BINDIR = $(PREFIX)/bin
diff --git a/README b/README
index 575d3d4..dea909e 100644
--- a/README
+++ b/README
@@ -175,6 +175,10 @@ And now, in mostly alphabetical order, the scripts:
- getbuildlog: download package build logs from Debian auto-builders [wget]
+- git-deborig: try to produce Debian orig.tar using git-archive(1)
+ [libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl,
+ libparse-debianchangelog-perl]
+
- grep-excuses: grep the update_excuses.html file to find out what is
happening to your packages. [libterm-size-perl, wget, w3m]
diff --git a/debian/changelog b/debian/changelog
index d39f6d1..a77bb2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+devscripts (2.16.14) UNRELEASED; urgency=medium
+
+ * New script: git-deborig, a wrapper around git-archive(1) to generate
+ Debian orig.tar files.
+
+ -- Sean Whitton <spwhit...@spwhitton.name> Mon, 19 Dec 2016 09:51:35 +0000
+
devscripts (2.16.13) unstable; urgency=medium
[ Paul Wise ]
diff --git a/debian/control b/debian/control
index 9c64a0b..8c31a7f 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,11 @@ Build-Depends: bash-completion,
file,
gnupg | gnupg2,
libdistro-info-perl,
+ libdpkg-perl,
libfile-desktopentry-perl,
+ libgit-wrapper-perl,
+ liblist-compare-perl,
+ libparse-debianchangelog-perl,
libtimedate-perl,
liburi-perl,
libwww-perl,
@@ -56,7 +60,11 @@ Recommends: apt,
file,
gnupg | gnupg2,
libdistro-info-perl,
+ libdpkg-perl,
libencode-locale-perl,
+ libgit-wrapper-perl,
+ liblist-compare-perl,
+ libparse-debianchangelog-perl,
liburi-perl,
libwww-perl,
licensecheck,
@@ -179,6 +187,9 @@ Description: scripts to make the life of a Debian Package maintainer easier
- edit-patch: add/edit a patch for a source package and commit the changes
[quilt | dpatch | cdbs]
- getbuildlog: download package build logs from Debian auto-builders [wget]
+ - git-deborig: try to produce Debian orig.tar using git-archive(1)
+ [libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl,
+ libparse-debianchangelog-perl]
- grep-excuses: grep the update_excuses.html file for your packages
[libterm-size-perl, wget, w3m]
- list-unreleased: search for unreleased packages
diff --git a/debian/copyright b/debian/copyright
index a4a78e5..1784e19 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,7 +21,8 @@ the GPL, version 2 or later.
- annotate-output, debdiff and nmudiff are released under version 2
(only) of the GPL.
-- debsnap and diff2patches are released under version 3 or later of the GPL
+- debsnap, diff2patches and git-deborig are released under version 3
+ or later of the GPL
- deb-reversion is under the Artistic License version 2.0.
diff --git a/po4a/devscripts-po4a.conf b/po4a/devscripts-po4a.conf
index 7061e06..83da216 100644
--- a/po4a/devscripts-po4a.conf
+++ b/po4a/devscripts-po4a.conf
@@ -82,6 +82,8 @@
$lang:$lang/dscverify.$lang.1 add_$lang:?add_$lang/translator_man.add
[type:man] ../scripts/getbuildlog.1 \
$lang:$lang/getbuildlog.$lang.1 add_$lang:?add_$lang/translator_man.add
+[type:pod] ../scripts/git-deborig.pl \
+ $lang:$lang/git-deborig.$lang.pl add_$lang:?add_$lang/translator_pod.add
[type:man] ../scripts/grep-excuses.1 \
$lang:$lang/grep-excuses.$lang.1 add_$lang:?add_$lang/translator_man.add
[type:man] ../scripts/list-unreleased.1 \
diff --git a/scripts/git-deborig.pl b/scripts/git-deborig.pl
new file mode 100755
index 0000000..c0107fe
--- /dev/null
+++ b/scripts/git-deborig.pl
@@ -0,0 +1,188 @@
+#!/usr/bin/perl
+
+# git-deborig -- try to produce Debian orig.tar using git-archive(1)
+
+# Copyright (C) 2016 Sean Whitton <spwhit...@spwhitton.name>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+=head1 NAME
+
+git-deborig - try to produce Debian orig.tar using git-archive(1)
+
+=head1 SYNOPSIS
+
+B<git deborig> [B<-f>] [I<TAG>]
+
+=head1 DESCRIPTION
+
+B<git-deborig> tries to produce the orig.tar you need for your upload
+by calling git-archive(1) on an existing git tag. It was written with
+the dgit-maint-merge(7) workflow in mind, but can be used with other
+workflows.
+
+B<git-deborig> will try several common tag names. If this fails, or
+if more than one of those common tags are present, you can specify the
+tag to archive on the command line.
+
+B<git-deborig> should be invoked from the root of the git repository,
+which should contain I<debian/changelog>.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-f>
+
+Overwrite any existing orig.tar in the parent directory.
+
+=back
+
+=head1 SEE ALSO
+
+dgit-maint-merge(7)
+
+=head1 AUTHOR
+
+B<git-deborig> was written by Sean Whitton <spwhit...@spwhitton.name>.
+
+=cut
+
+use strict;
+use warnings;
+no warnings "experimental::smartmatch";
+
+use Parse::DebianChangelog;
+use Git::Wrapper;
+use Dpkg::Version;
+use List::Compare;
+
+# Sanity check #1
+die "pwd doesn't look like a Debian source package in a git repository ..\n"
+ unless ( -d ".git" && -e "debian/changelog" );
+
+# Process command line args
+die "usage: git deborig [-f] [TAG]\n"
+ if ( scalar @ARGV >= 3 || (scalar @ARGV == 2 && !("-f" ~~ @ARGV)) );
+my $overwrite = 0;
+my $user_tag;
+foreach my $arg ( @ARGV ) {
+ if ( $arg eq "-f" ) {
+ $overwrite = 1;
+ } else {
+ $user_tag = $arg;
+ }
+}
+
+# Extract source package name and version from d/changelog
+my $changelog = Parse::DebianChangelog->init();
+$changelog->parse( { infile => "debian/changelog" } );
+my $changelog_data = $changelog->dpkg();
+my $version = Dpkg::Version->new($changelog_data->{"Version"});
+my $upstream_version = $version->version();
+my $source = $changelog_data->{"Source"};
+
+# Sanity check #2
+die "this looks like a native package .." if $version->is_native();
+
+# Default to gzip
+my $compressor = "gzip";
+my $compression = "gz";
+# Now check if we can use xz
+if ( -e "debian/source/format" ) {
+ open( my $format_fh, '<', "debian/source/format" )
+ or die "couldn't open debian/source/format for reading";
+ my $format = <$format_fh>;
+ chomp($format) if defined $format;
+ if ( $format eq "3.0 (quilt)" ) {
+ $compressor = "xz";
+ $compression = "xz";
+ }
+ close $format_fh;
+}
+
+my $orig = "../${source}_$upstream_version.orig.tar.$compression";
+die "$orig already exists: not overwriting without -f\n"
+ if ( -e $orig && ! $overwrite );
+
+# Get available git tags
+my $git = Git::Wrapper->new(".");
+my @all_tags = $git->tag();
+
+if ( defined $user_tag ) { # User told us the tag to archive
+ if ( $user_tag ~~ @all_tags ) {
+ archive_tag($user_tag);
+ } else {
+ die "the tag $user_tag does not exist in this repository\n";
+ }
+} else { # User didn't specify a tag to archive
+ # convert according to DEP-14 rules
+ my $git_upstream_version = $upstream_version;
+ $git_upstream_version =~ y/:~/%_/;
+ $git_upstream_version =~ s/\.(?=\.|$|lock$)/.#/g;
+ # See which candidate version tags are present in the repo
+ my @candidate_tags = ("$git_upstream_version",
+ "v$git_upstream_version",
+ "upstream/$git_upstream_version"
+ );
+ my $lc = List::Compare->new(\@all_tags, \@candidate_tags);
+ my @version_tags = $lc->get_intersection();
+
+ # If there is only one candidate version tag, we're good to go.
+ # Otherwise, let the user know they can tell us which one to use
+ if ( scalar @version_tags > 1 ) {
+ print "tags ", join(", ", @version_tags), " all exist in this repository\n";
+ print "tell me which one you want to make an orig.tar from: git deborig TAG\n";
+ exit 1;
+ } elsif ( scalar @version_tags < 1 ) {
+ die "couldn't find any of the following tags: ",
+ join(", ", @candidate_tags), "\n";
+ } else {
+ my $tag = shift @version_tags;
+ archive_tag($tag);
+ }
+}
+
+sub archive_tag {
+ my $tag = shift;
+
+ # For compatibility with dgit, we have to override any
+ # export-subst and export-ignore git attributes that might be set
+ rename ".git/info/attributes", ".git/info/attributes-deborig"
+ if ( -e ".git/info/attributes" );
+ my $attributes_fh;
+ unless ( open( $attributes_fh, '>', ".git/info/attributes" ) ) {
+ rename ".git/info/attributes-deborig", ".git/info/attributes"
+ if ( -e ".git/info/attributes-deborig" );
+ die "could not open .git/info/attributes for writing";
+ }
+ print $attributes_fh "* -export-subst\n";
+ print $attributes_fh "* -export-ignore\n";
+ close $attributes_fh;
+
+ # git-archive(1) can be taught to invoke xz by adding some lines
+ # to ~/.gitconfig. So that this script always works, we just pipe
+ # to the compression tool
+ system "git archive \\
+ --prefix=$source-$upstream_version/\\
+ --format=tar $tag \\
+ | $compressor > $orig";
+
+ # Restore situation before we messed around with git attributes
+ if ( -e ".git/info/attributes-deborig" ) {
+ rename ".git/info/attributes-deborig", ".git/info/attributes";
+ } else {
+ unlink ".git/info/attributes";
+ }
+}
--
2.10.2
signature.asc
Description: PGP signature
