X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=da4e57c3d9f3542b83ebb60c526307a83241193f;hp=819ea55801dc82e2c5a8a62de2f82e9d7a6817cd;hb=204dfaf210b11dd980970166ef7fc2c2456d245c;hpb=ab34d3425ffc141e64a3beb90868619c5a21b407 diff --git a/dgit b/dgit index 819ea558..da4e57c3 100755 --- a/dgit +++ b/dgit @@ -24,6 +24,7 @@ use Data::Dumper; use LWP::UserAgent; use Dpkg::Control::Hash; use File::Path; +use Dpkg::Version; use POSIX; our $suite = 'sid'; @@ -103,6 +104,14 @@ sub runcmd { die "@_ $! $?" if system @_; } +sub printdone { + if (!$dryrun) { + print "dgit ok: @_\n"; + } else { + print "would be ok: @_ (but dry run only)\n"; + } +} + sub cmdoutput_errok { die Dumper(\@_)." ?" if grep { !defined } @_; printcmd(\*DEBUG,"|",@_) if $debug>0; @@ -145,7 +154,7 @@ our %defcfg = ('dgit.default.distro' => 'debian', 'dgit-distro.debian.git-path' => '/git/dgit-repos', 'dgit-distro.debian.git-check' => 'ssh-cmd', 'dgit-distro.debian.git-create' => 'ssh-cmd', - 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/'); + 'dgit-distro.debian.mirror' => 'http://http.debian.net/debian/'); sub cfg { foreach my $c (@_) { @@ -274,7 +283,6 @@ sub check_for_git () { (access_cfg('ssh'),access_gituserhost(), " set -e; cd ".access_cfg('git-path').";". " if test -d $package.git; then echo 1; else echo 0; fi"); - print DEBUG "got \`$r'\n"; die "$r $! $?" unless $r =~ m/^[01]$/; return $r+0; } else { @@ -377,50 +385,47 @@ $clogp->{Changes} # imported from the archive END close C or die $!; - my $commithash = make_commit qw(../commit.tmp); - if ($upload_hash) { - open C, ">../commit2.tmp" or die $!; - print C <{Version}) in archive suite $suite -END - $commithash = make_commit qw(../commit2.tmp); - } + my $outputhash = make_commit qw(../commit.tmp); print "synthesised git commit from .dsc $clogp->{Version}\n"; - chdir '../../../..' or die $!; - cmdoutput @git, qw(update-ref -m),"dgit fetch import $clogp->{Version}", - 'DGIT_ARCHIVE', $commithash; - cmdoutput @git, qw(log -n2), $commithash; - # ... gives git a chance to complain if our commit is malformed - my $outputhash = $commithash; if ($upload_hash) { - chdir "$ud/$dir" or die $!; runcmd @git, qw(reset --hard), $upload_hash; runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp'; my $oldclogp = Dpkg::Control::Hash->new(); - $oldclogp->parse('../changelogold.tmp','previous changelog') or die; + $oldclogp->load('../changelogold.tmp','previous changelog') or die; my $vcmp = version_compare_string($oldclogp->{Version}, $clogp->{Version}); if ($vcmp < 0) { # git upload/ is earlier vsn than archive, use archive - } elsif ($vcmp >= 0) { + open C, ">../commit2.tmp" or die $!; + print C <{Version}) in archive suite $suite +END + $outputhash = make_commit qw(../commit2.tmp); + } elsif ($vcmp > 0) { print STDERR <{Version} (older) Last allegedly pushed/uploaded: $oldclogp->{Version} (newer or same) Perhaps the upload is stuck in incoming. Using the version from git. END - } else { - die "version in archive is same as version in git". - " to-be-uploaded (upload/) branch but archive". - " version hash no commit hash?!\n"; + $outputhash = $upload_hash; + } elsif ($outputhash ne $upload_hash) { + die "version in archive ($clogp->{Version})". + " is same as version in git". + " to-be-uploaded (upload/) branch ($oldclogp->{Version})". + " but archive version hash no commit hash?!\n"; } - chdir '../../../..' or die $!; } + chdir '../../../..' or die $!; + runcmd @git, qw(update-ref -m),"dgit fetch import $clogp->{Version}", + 'DGIT_ARCHIVE', $outputhash; + cmdoutput @git, qw(log -n2), $outputhash; + # ... gives git a chance to complain if our commit is malformed rmtree($ud); return $outputhash; } @@ -481,7 +486,7 @@ sub fetch_from_archive () { } else { die "$lrref_fn $!"; } - print DEBUG "last upload hash $upload_hash\n"; + print DEBUG "previous reference hash $upload_hash\n"; my $hash; if (defined $dsc_hash) { die "missing git history even though dsc has hash" @@ -491,10 +496,11 @@ sub fetch_from_archive () { } else { $hash = generate_commit_from_dsc(); } + print DEBUG "current hash $hash\n"; if ($upload_hash) { die "not fast forward on last upload branch!". " (archive's version left in DGIT_ARCHIVE)" - unless is_fast_fwd($dsc_hash, $upload_hash); + unless is_fast_fwd($upload_hash, $hash); } if ($upload_hash ne $hash) { my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash); @@ -527,7 +533,7 @@ sub clone ($) { } fetch_from_archive() or die; runcmd @git, qw(reset --hard), lrref(); - print "ready for work in $dstdir\n"; + printdone "ready for work in $dstdir"; } sub fetch () { @@ -535,12 +541,26 @@ sub fetch () { git_fetch_us(); } fetch_from_archive() or die; + printdone "fetched into ".lrref(); } sub pull () { fetch(); runcmd_ordryrun @git, qw(merge -m),"Merge from $suite [dgit]", lrref(); + printdone "fetched to ".lrref()." and merged into HEAD"; +} + +sub check_not_dirty () { + my $output = cmdoutput @git, qw(status --porcelain); + if (length $output) { + my $m = "tree dirty:\n$output\n"; + if (!$dryrun) { + die $m; + } else { + warn $m; + } + } } sub dopush () { @@ -550,6 +570,7 @@ sub dopush () { my $dscfn = "${package}_$clogp->{Version}.dsc"; stat "../$dscfn" or die "$dscfn $!"; $dsc = parsecontrol("../$dscfn"); + check_not_dirty(); prep_ud(); chdir $ud or die $!; print "checking that $dscfn corresponds to HEAD\n"; @@ -596,6 +617,7 @@ sub dopush () { my $host = access_cfg('upload-host'); my @hostarg = defined($host) ? ($host,) : (); runcmd_ordryrun @dput, @hostarg, $changesfile; + printdone "pushed and uploaded $dsc->{Version}"; } sub cmd_clone { @@ -662,6 +684,7 @@ sub cmd_pull { sub cmd_push { parseopts(); die if defined $package; + runcmd @git, qw(diff --quiet HEAD); my $clogp = parsechangelog(); $package = $clogp->{Source}; if (@ARGV==0) { @@ -740,6 +763,7 @@ sub parseopts () { } parseopts(); +print STDERR "DRY RUN ONLY\n" if $dryrun; die unless @ARGV; my $cmd = shift @ARGV;