X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=fd59eeefa9052b71499f92b991c9d0fecdd58aa4;hb=768ff5909deb2493f1435ed5ab93019cdd75682a;hp=02acfa7fac5be920236d18cc4fdd51f101be3901;hpb=7cf634614b9a4ee18a70030e3b340dccd470f908;p=dgit.git diff --git a/dgit b/dgit index 02acfa7f..fd59eeef 100755 --- a/dgit +++ b/dgit @@ -28,6 +28,8 @@ use File::Basename; use Dpkg::Version; use POSIX; +our $dgit_version = 0.14; + our $isuite = 'unstable'; our $idistro; our $package; @@ -37,6 +39,7 @@ our $dryrun = 0; our $changesfile; our $new_package = 0; our $ignoredirty = 0; +our $noquilt = 0; our $existing_package = 'dpkg'; our $cleanmode = 'dpkg-source'; @@ -229,7 +232,7 @@ sub badusage { exit 8; } -sub helponly () { +sub cmd_help () { print $helpmsg or die $!; exit 0; } @@ -246,6 +249,7 @@ our %defcfg = ('dgit.default.distro' => 'debian', 'dgit-distro.debian.sshdakls-host' => 'coccia.debian.org', 'dgit-distro.debian.sshdakls-dir' => '/srv/ftp-master.debian.org/ftp/dists', + 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/'); sub cfg { @@ -442,8 +446,6 @@ sub get_archive_dsc () { $dscurl = access_cfg('mirror').$subpath; $dscdata = url_get($dscurl); next unless defined $dscdata; - $dscurl = access_cfg('mirror').$subpath; - $dscdata = url_get($dscurl); my $dscfh = new IO::File \$dscdata, '<' or die $!; print DEBUG Dumper($dscdata) if $debug>1; $dsc = parsecontrolfh($dscfh,$dscurl, allow_pgp=>1); @@ -511,16 +513,35 @@ sub mktree_in_ud_from_only_subdir () { return ($tree,$dir); } -sub dsc_files () { - my $field = $dsc->{'Checksums-Sha256'} || $dsc->{Files}; - defined $field or - fail "missing both Checksums-Sha256 and Files in ". +sub dsc_files_info () { + foreach my $csumi (['Checksums-Sha256','Digest::SHA', 'new(256)'], + ['Checksums-Sha1', 'Digest::SHA', 'new(1)'], + ['Files', 'Digest::MD5', 'new()']) { + my ($fname, $module, $method) = @$csumi; + my $field = $dsc->{$fname}; + next unless defined $field; + eval "use $module; 1;" or die $@; + my @out; + foreach (split /\n/, $field) { + next unless m/\S/; + m/^(\w+) (\d+) (\S+)$/ or + fail "could not parse .dsc $fname line \`$_'"; + my $digester = eval "$module"."->$method;" or die $@; + push @out, { + Hash => $1, + Bytes => $2, + Filename => $3, + Digester => $digester, + }; + } + return @out; + } + fail "missing any supported Checksums-* or Files field in ". $dsc->get_option('name'); - map { - m/^\w+ \d+ (\S+)$/ or - fail "could not parse .dsc Files/Checksums line \`$_'"; - $1; - } grep m/\S/, split /\n/, $field; +} + +sub dsc_files () { + map { $_->{Filename} } dsc_files_info(); } sub is_orig_file ($) { @@ -617,10 +638,20 @@ END } sub ensure_we_have_orig () { - foreach my $f (dsc_files()) { + foreach my $fi (dsc_files_info()) { + my $f = $fi->{Filename}; next unless is_orig_file($f); - if (stat "../$f") { - die "$f ?" unless -f _; + if (open F, "<", "../$f") { + $fi->{Digester}->reset(); + $fi->{Digester}->addfile(*F); + F->error and die $!; + my $got = $fi->{Digester}->hexdigest(); + $got eq $fi->{Hash} or + fail "existing file $f has hash $got but .dsc". + " demands hash $fi->{Hash}". + " (perhaps you should delete this file?)"; + print "using existing $f\n"; + next; } else { die "$f $!" unless $!==&ENOENT; } @@ -651,8 +682,7 @@ sub is_fast_fwd ($$) { } sub git_fetch_us () { - badusage "cannot dry run with fetch" if $dryrun; - runcmd @git, qw(fetch),access_giturl(),fetchspec(); + runcmd_ordryrun @git, qw(fetch),access_giturl(),fetchspec(); } sub fetch_from_archive () { @@ -739,7 +769,7 @@ sub clone ($) { if (check_for_git()) { print "fetching existing git history\n"; git_fetch_us(); - runcmd @git, qw(fetch origin); + runcmd_ordryrun @git, qw(fetch origin); } else { print "starting new git history\n"; } @@ -804,6 +834,10 @@ sub madformat ($) { my ($format) = @_; return 0 unless $format eq '3.0 (quilt)'; print "Format \`$format', urgh\n"; + if ($noquilt) { + print "Not doing any fixup of \`$format' due to --no-quilt-fixup"; + return 0; + } return 1; } @@ -879,6 +913,7 @@ sub dopush () { create_remote_git_repo(); } runcmd_ordryrun @git, qw(push),access_giturl(),"HEAD:".rrref(); + runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), 'HEAD'; if (!$dryrun) { rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!"; } else { @@ -889,7 +924,7 @@ sub dopush () { $keyid = access_cfg('keyid','RETURN-UNDEF'); } my @tag_cmd = (@git, qw(tag -s -m), - "Release $dversion for $csuite [dgit]"); + "$package release $dversion for $csuite [dgit]"); push @tag_cmd, qw(-u),$keyid if defined $keyid; push @tag_cmd, $tag; runcmd_ordryrun @tag_cmd; @@ -1022,6 +1057,7 @@ sub build_maybe_quilt_fixup () { my $ncommits = 3; my $patchname = "auto-$version-$headref-$time"; my $msg = cmdoutput @git, qw(log), "-n$ncommits"; + mkpath '.git/dgit'; my $descfn = ".git/dgit/quilt-description.tmp"; open O, '>', $descfn or die "$descfn: $!"; $msg =~ s/\n/\n /g; @@ -1165,6 +1201,10 @@ sub cmd_quilt_fixup { build_maybe_quilt_fixup(); } +sub cmd_version { + print "dgit version $dgit_version\n"; +} + sub parseopts () { my $om; while (@ARGV) { @@ -1177,7 +1217,7 @@ sub parseopts () { } elsif (m/^--no-sign$/) { $sign=0; } elsif (m/^--help$/) { - helponly(); + cmd_help(); } elsif (m/^--new$/) { $new_package=1; } elsif (m/^--(\w+)=(.*)/s && @@ -1197,6 +1237,8 @@ sub parseopts () { badusage "unknown cleaning mode \`$1'"; } elsif (m/^--ignore-dirty$/s) { $ignoredirty = 1; + } elsif (m/^--no-quilt-fixup$/s) { + $noquilt = 1; } else { badusage "unknown long option \`$_'"; } @@ -1205,7 +1247,7 @@ sub parseopts () { if (s/^-n/-/) { $dryrun=1; } elsif (s/^-h/-/) { - helponly(); + cmd_help(); } elsif (s/^-D/-/) { open DEBUG, ">&STDERR" or die $!; $debug++; @@ -1240,6 +1282,8 @@ if ($ENV{$fakeeditorenv}) { quilt_fixup_editor(); } +delete $ENV{'DGET_UNPACK'}; + parseopts(); print STDERR "DRY RUN ONLY\n" if $dryrun; if (!@ARGV) {