3 # Integration between git and Debian-style archives
5 # Copyright (C)2013 Ian Jackson
7 # This program is free software: you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License as published by
9 # the Free Software Foundation, either version 3 of the License, or
10 # (at your option) any later version.
12 # This program is distributed in the hope that it will be useful,
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 # GNU General Public License for more details.
17 # You should have received a copy of the GNU General Public License
18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
25 use Dpkg::Control::Hash;
31 our $isuite = 'unstable';
41 our $existing_package = 'dpkg';
42 our $cleanmode = 'dpkg-source';
44 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
47 our (@dget) = qw(dget);
48 our (@dput) = qw(dput);
49 our (@debsign) = qw(debsign);
50 our (@sbuild) = qw(sbuild -A);
51 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
52 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
53 our (@dpkggenchanges) = qw(dpkg-genchanges);
54 our (@mergechanges) = qw(mergechanges -f);
55 our (@changesopts) = ('');
57 our %opts_opt_map = ('dget' => \@dget,
59 'debsign' => \@debsign,
61 'dpkg-source' => \@dpkgsource,
62 'dpkg-buildpackage' => \@dpkgbuildpackage,
63 'dpkg-genchanges' => \@dpkggenchanges,
64 'ch' => \@changesopts,
65 'mergechanges' => \@mergechanges);
70 open DEBUG, ">/dev/null" or die $!;
72 our $remotename = 'dgit';
73 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
74 our $branchprefix = 'dgit';
77 sub lbranch () { return "$branchprefix/$csuite"; }
78 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
79 sub lref () { return "refs/heads/".lbranch(); }
80 sub lrref () { return "refs/remotes/$remotename/$branchprefix/$csuite"; }
81 sub rrref () { return "refs/$branchprefix/$csuite"; }
96 return "${package}_".(stripepoch $vsn).".dsc";
99 sub changesopts () { return @changesopts[1..$#changesopts]; }
103 sub fail { die "$us: @_\n"; }
105 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
107 sub no_such_package () {
108 print STDERR "$us: package $package does not exist in suite $isuite\n";
114 return "+".rrref().":".lrref();
121 $ua = LWP::UserAgent->new();
125 print "downloading $what...\n";
126 my $r = $ua->get(@_) or die $!;
127 return undef if $r->code == 404;
128 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
129 return $r->decoded_content();
132 our ($dscdata,$dscurl,$dsc);
136 my $intro = shift @_;
137 print $fh $intro or die $!;
141 if (s{['\\]}{\\$&}g || m{\s} || m{[^-_./0-9a-z]}i) {
142 print $fh " '$_'" or die $!;
144 print $fh " $_" or die $!;
147 print $fh "\n" or die $!;
151 { local ($!); printcmd \*STDERR, "$_[0]: failed command:", @_ or die $!; };
153 fail "failed to fork/exec: $!";
154 } elsif (!($? & 0xff)) {
155 fail "subprocess failed with error exit status ".($?>>8);
157 fail "subprocess crashed (wait status $?)";
159 fail "subprocess produced invalid output";
164 printcmd(\*DEBUG,"+",@_) if $debug>0;
166 failedcmd @_ if system @_;
171 print "dgit ok: @_\n";
173 print "would be ok: @_ (but dry run only)\n";
177 sub cmdoutput_errok {
178 die Dumper(\@_)." ?" if grep { !defined } @_;
179 printcmd(\*DEBUG,"|",@_) if $debug>0;
180 open P, "-|", @_ or die $!;
183 { local $/ = undef; $d = <P>; }
185 if (!close P) { print DEBUG "=>!$?\n" if $debug>0; return undef; }
188 print DEBUG "=> \`$&'",(length $' ? '...' : ''),"\n" if $debug>0; #';
193 my $d = cmdoutput_errok @_;
194 defined $d or failedcmd @_;
199 printcmd(\*STDOUT,"#",@_);
202 sub runcmd_ordryrun {
210 our $helpmsg = <<END;
212 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
213 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
214 dgit [dgit-opts] build [git-buildpackage-opts|dpkg-buildpackage-opts]
215 dgit [dgit-opts] push [dgit-opts] [suite]
216 important dgit options:
217 -k<keyid> sign tag and package with <keyid> instead of default
218 --dry-run -n do not change anything, but go through the motions
219 --new -N allow introducing a new package
220 --debug -D increase debug level
221 -c<name>=<value> set git config option (used directly by dgit too)
224 our $later_warning_msg = <<END;
225 Perhaps the upload is stuck in incoming. Using the version from git.
229 print STDERR "$us: @_\n", $helpmsg or die $!;
234 print $helpmsg or die $!;
238 our %defcfg = ('dgit.default.distro' => 'debian',
239 'dgit.default.username' => '',
240 'dgit.default.archive-query-default-component' => 'main',
241 'dgit.default.ssh' => 'ssh',
242 'dgit-distro.debian.git-host' => 'git.debian.org',
243 'dgit-distro.debian.git-proto' => 'git+ssh://',
244 'dgit-distro.debian.git-path' => '/git/dgit-repos/repos',
245 'dgit-distro.debian.git-check' => 'ssh-cmd',
246 'dgit-distro.debian.git-create' => 'ssh-cmd',
247 'dgit-distro.debian.sshdakls-host' => 'coccia.debian.org',
248 'dgit-distro.debian.sshdakls-dir' =>
249 '/srv/ftp-master.debian.org/ftp/dists',
250 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/');
254 return undef if $c =~ /RETURN-UNDEF/;
255 my @cmd = (@git, qw(config --), $c);
258 local ($debug) = $debug-1;
259 $v = cmdoutput_errok @cmd;
266 my $dv = $defcfg{$c};
267 return $dv if defined $dv;
269 badcfg "need value for one of: @_";
272 sub access_distro () {
273 return cfg("dgit-suite.$isuite.distro",
274 "dgit.default.distro");
279 my $distro = $idistro || access_distro();
280 my $value = cfg(map { ("dgit-distro.$distro.$_",
281 "dgit.default.$_") } @keys);
285 sub access_someuserhost ($) {
287 my $user = access_cfg("$some-user",'username');
288 my $host = access_cfg("$some-host");
289 return length($user) ? "$user\@$host" : $host;
292 sub access_gituserhost () {
293 return access_someuserhost('git');
296 sub access_giturl () {
297 my $url = access_cfg('git-url','RETURN-UNDEF');
300 access_cfg('git-proto').
301 access_gituserhost().
302 access_cfg('git-path');
304 return "$url/$package.git";
307 sub parsecontrolfh ($$@) {
308 my ($fh, $desc, @opts) = @_;
309 my %opts = ('name' => $desc, @opts);
310 my $c = Dpkg::Control::Hash->new(%opts);
311 $c->parse($fh) or die "parsing of $desc failed";
316 my ($file, $desc) = @_;
317 my $fh = new IO::Handle;
318 open $fh, '<', $file or die "$file: $!";
319 my $c = parsecontrolfh($fh,$desc);
320 $fh->error and die $!;
326 my ($dctrl,$field) = @_;
327 my $v = $dctrl->{$field};
328 return $v if defined $v;
329 fail "missing field $field in ".$v->get_option('name');
333 my $c = Dpkg::Control::Hash->new();
334 my $p = new IO::Handle;
335 my @cmd = (qw(dpkg-parsechangelog));
336 open $p, '-|', @cmd or die $!;
338 $?=0; $!=0; close $p or failedcmd @cmd;
344 sub archive_query ($) {
346 my $query = access_cfg('archive-query','RETURN-UNDEF');
347 if (!defined $query) {
348 my $distro = access_distro();
349 if ($distro eq 'debian') {
350 $query = "sshdakls:".
351 access_someuserhost('sshdakls').':'.
352 access_cfg('sshdakls-dir');
354 $query = "madison:$distro";
357 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
360 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data); }
363 sub archive_query_madison ($$) {
364 my ($proto,$data) = @_;
365 die unless $proto eq 'madison';
366 $rmad{$package} ||= cmdoutput
367 qw(rmadison -asource),"-s$isuite","-u$data",$package;
368 my $rmad = $rmad{$package};
369 return madison_parse($rmad);
372 sub archive_query_sshdakls ($$) {
373 my ($proto,$data) = @_;
374 $data =~ s/:.*// or badcfg "invalid sshdakls method string \`$data'";
375 my $dakls = cmdoutput
376 access_cfg('ssh'), $data, qw(dak ls -asource),"-s$isuite",$package;
377 return madison_parse($dakls);
380 sub canonicalise_suite_sshdakls ($$) {
381 my ($proto,$data) = @_;
382 $data =~ m/:/ or badcfg "invalid sshdakls method string \`$data'";
384 (access_cfg('ssh'), $`,
386 " if test -h $isuite; then readlink $isuite; exit 0; fi;".
387 " if test -d $isuite; then echo $isuite; exit 0; fi;".
389 my $dakls = cmdoutput @cmd;
390 failedcmd @cmd unless $dakls =~ m/^\w/;
394 sub madison_parse ($) {
397 foreach my $l (split /\n/, $rmad) {
398 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
399 \s*( [^ \t|]+ )\s* \|
400 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
401 \s*( [^ \t|]+ )\s* }x or die "$rmad $?";
402 $1 eq $package or die "$rmad $package ?";
409 $component = access_cfg('archive-query-default-component');
411 $5 eq 'source' or die "$rmad ?";
412 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
413 my $subpath = "/pool/$component/$prefix/$package/".dscfn($vsn);
414 push @out, [$vsn,$subpath,$newsuite];
416 return sort { -version_compare_string($a->[0],$b->[0]); } @out;
419 sub canonicalise_suite_madison ($$) {
420 my @r = archive_query_madison($_[0],$_[1]);
422 "unable to canonicalise suite using package $package".
423 " which does not appear to exist in suite $isuite;".
424 " --existing-package may help";
428 sub canonicalise_suite () {
429 return if defined $csuite;
430 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
431 $csuite = archive_query('canonicalise_suite');
432 if ($isuite ne $csuite) {
433 # madison canonicalises for us
434 print "canonical suite name for $isuite is $csuite\n";
438 sub get_archive_dsc () {
439 canonicalise_suite();
440 my @vsns = archive_query('archive_query');
441 foreach my $vinfo (@vsns) {
442 my ($vsn,$subpath) = @$vinfo;
443 $dscurl = access_cfg('mirror').$subpath;
444 $dscdata = url_get($dscurl);
445 next unless defined $dscdata;
446 $dscurl = access_cfg('mirror').$subpath;
447 $dscdata = url_get($dscurl);
448 my $dscfh = new IO::File \$dscdata, '<' or die $!;
449 print DEBUG Dumper($dscdata) if $debug>1;
450 $dsc = parsecontrolfh($dscfh,$dscurl, allow_pgp=>1);
451 print DEBUG Dumper($dsc) if $debug>1;
452 my $fmt = getfield $dsc, 'Format';
453 fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt};
459 sub check_for_git () {
461 my $how = access_cfg('git-check');
462 if ($how eq 'ssh-cmd') {
464 (access_cfg('ssh'),access_gituserhost(),
465 " set -e; cd ".access_cfg('git-path').";".
466 " if test -d $package.git; then echo 1; else echo 0; fi");
467 my $r= cmdoutput @cmd;
468 failedcmd @cmd unless $r =~ m/^[01]$/;
471 badcfg "unknown git-check \`$how'";
475 sub create_remote_git_repo () {
476 my $how = access_cfg('git-create');
477 if ($how eq 'ssh-cmd') {
479 (access_cfg('ssh'),access_gituserhost(),
480 "set -e; cd ".access_cfg('git-path').";".
481 " cp -a _template $package.git");
483 badcfg "unknown git-create \`$how'";
487 our ($dsc_hash,$upload_hash);
489 our $ud = '.git/dgit/unpack';
497 sub mktree_in_ud_from_only_subdir () {
498 # changes into the subdir
501 $dirs[0] =~ m#^([^/]+)/\.$# or die;
503 chdir $dir or die "$dir $!";
504 fail "source package contains .git directory" if stat '.git';
505 die $! unless $!==&ENOENT;
506 runcmd qw(git init -q);
507 rmtree('.git/objects');
508 symlink '../../../../objects','.git/objects' or die $!;
509 runcmd @git, qw(add -Af);
510 my $tree = cmdoutput @git, qw(write-tree);
511 $tree =~ m/^\w+$/ or die "$tree ?";
516 my $field = $dsc->{'Checksums-Sha256'} || $dsc->{Files};
518 fail "missing both Checksums-Sha256 and Files in ".
519 $dsc->get_option('name');
521 m/^\w+ \d+ (\S+)$/ or
522 fail "could not parse .dsc Files/Checksums line \`$_'";
524 } grep m/\S/, split /\n/, $field;
527 sub is_orig_file ($) {
529 m/\.orig(?:-\w+)?\.tar\.\w+$/;
532 sub make_commit ($) {
534 return cmdoutput @git, qw(hash-object -w -t commit), $file;
537 sub generate_commit_from_dsc () {
541 foreach my $f (dsc_files()) {
542 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
544 link "../../../$f", $f
548 runcmd @dget, qw(--), $dscurl;
549 foreach my $f (grep { is_orig_file($_) } @files) {
550 link $f, "../../../../$f"
554 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
555 runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp';
556 my $clogp = parsecontrol('../changelog.tmp',"commit's changelog");
557 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
558 my $author = getfield $clogp, 'Maintainer';
559 $author =~ s#,.*##ms;
560 my $authline = "$author $date";
561 $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or
562 fail "unexpected commit author line format \`$authline'".
563 " (was generated from changelog Maintainer field)";
564 my $changes = getfield $clogp, 'Changes';
565 open C, ">../commit.tmp" or die $!;
566 print C <<END or die $!;
573 # imported from the archive
576 my $outputhash = make_commit qw(../commit.tmp);
577 my $cversion = getfield $clogp, 'Version';
578 print "synthesised git commit from .dsc $cversion\n";
580 runcmd @git, qw(reset --hard), $upload_hash;
581 runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp';
582 my $oldclogp = parsecontrol('../changelogold.tmp','previous changelog');
583 my $oversion = getfield $oldclogp, 'Version';
585 version_compare_string($oversion, $cversion);
587 # git upload/ is earlier vsn than archive, use archive
588 open C, ">../commit2.tmp" or die $!;
589 print C <<END or die $!;
596 Record $package ($cversion) in archive suite $csuite
598 $outputhash = make_commit qw(../commit2.tmp);
599 } elsif ($vcmp > 0) {
600 print STDERR <<END or die $!;
602 Version actually in archive: $cversion (older)
603 Last allegedly pushed/uploaded: $oversion (newer or same)
606 $outputhash = $upload_hash;
608 $outputhash = $upload_hash;
611 chdir '../../../..' or die $!;
612 runcmd @git, qw(update-ref -m),"dgit fetch import $cversion",
613 'DGIT_ARCHIVE', $outputhash;
614 cmdoutput @git, qw(log -n2), $outputhash;
615 # ... gives git a chance to complain if our commit is malformed
620 sub ensure_we_have_orig () {
621 foreach my $f (dsc_files()) {
622 next unless is_orig_file($f);
624 die "$f ?" unless -f _;
626 die "$f $!" unless $!==&ENOENT;
628 my $origurl = $dscurl;
629 $origurl =~ s{/[^/]+$}{};
631 die "$f ?" unless $f =~ m/^${package}_/;
632 die "$f ?" if $f =~ m#/#;
633 runcmd_ordryrun qw(sh -ec),'cd ..; exec "$@"','x',
639 return cmdoutput @git, qw(rev-parse), "$_[0]~0";
642 sub is_fast_fwd ($$) {
643 my ($ancestor,$child) = @_;
644 my @cmd = (@git, qw(merge-base), $ancestor, $child);
645 my $mb = cmdoutput_errok @cmd;
647 return rev_parse($mb) eq rev_parse($ancestor);
649 $?==256 or failedcmd @cmd;
654 sub git_fetch_us () {
655 badusage "cannot dry run with fetch" if $dryrun;
656 runcmd @git, qw(fetch),access_giturl(),fetchspec();
659 sub fetch_from_archive () {
660 # ensures that lrref() is what is actually in the archive,
662 get_archive_dsc() or return 0;
663 foreach my $field (@ourdscfield) {
664 $dsc_hash = $dsc->{$field};
665 last if defined $dsc_hash;
667 if (defined $dsc_hash) {
668 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
670 print "last upload to archive specified git hash\n";
672 print "last upload to archive has NO git hash\n";
675 my $lrref_fn = ".git/".lrref();
676 if (open H, $lrref_fn) {
679 die "$lrref_fn $upload_hash ?" unless $upload_hash =~ m/^\w+$/;
680 } elsif ($! == &ENOENT) {
685 print DEBUG "previous reference hash=$upload_hash\n";
687 if (defined $dsc_hash) {
688 fail "missing git history even though dsc has hash -".
689 " could not find commit $dsc_hash".
690 " (should be in ".access_giturl()."#".rrref().")"
693 ensure_we_have_orig();
694 if ($dsc_hash eq $upload_hash) {
695 } elsif (is_fast_fwd($dsc_hash,$upload_hash)) {
696 print STDERR <<END or die $!;
698 Git commit in archive is behind the last version allegedly pushed/uploaded.
699 Commit referred to by archive: $dsc_hash
700 Last allegedly pushed/uploaded: $upload_hash
703 $hash = $upload_hash;
705 fail "archive's .dsc refers to ".$dsc_hash.
706 " but this is an ancestor of ".$upload_hash;
709 $hash = generate_commit_from_dsc();
711 print DEBUG "current hash=$hash\n";
713 fail "not fast forward on last upload branch!".
714 " (archive's version left in DGIT_ARCHIVE)"
715 unless is_fast_fwd($upload_hash, $hash);
717 if ($upload_hash ne $hash) {
718 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
722 dryrun_report @upd_cmd;
730 canonicalise_suite();
731 badusage "dry run makes no sense with clone" if $dryrun;
732 mkdir $dstdir or die "$dstdir $!";
733 chdir "$dstdir" or die "$dstdir $!";
734 runcmd @git, qw(init -q);
735 runcmd @git, qw(config), "remote.$remotename.fetch", fetchspec();
736 open H, "> .git/HEAD" or die $!;
737 print H "ref: ".lref()."\n" or die $!;
739 runcmd @git, qw(remote add), 'origin', access_giturl();
740 if (check_for_git()) {
741 print "fetching existing git history\n";
743 runcmd @git, qw(fetch origin);
745 print "starting new git history\n";
747 fetch_from_archive() or no_such_package;
748 runcmd @git, qw(reset --hard), lrref();
749 printdone "ready for work in $dstdir";
753 if (check_for_git()) {
756 fetch_from_archive() or no_such_package();
757 printdone "fetched into ".lrref();
762 runcmd_ordryrun @git, qw(merge -m),"Merge from $csuite [dgit]",
764 printdone "fetched to ".lrref()." and merged into HEAD";
767 sub check_not_dirty () {
768 return if $ignoredirty;
769 my @cmd = (@git, qw(diff --quiet HEAD));
770 printcmd(\*DEBUG,"+",@cmd) if $debug>0;
771 $!=0; $?=0; system @cmd;
772 return if !$! && !$?;
773 if (!$! && $?==256) {
774 fail "working tree is dirty (does not match HEAD)";
780 sub commit_quilty_patch () {
781 my $output = cmdoutput @git, qw(status --porcelain);
784 foreach my $l (split /\n/, $output) {
785 next unless $l =~ m/\S/;
786 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
789 print STDERR "git status: $l\n";
793 fail "unexpected output from git status (is tree clean?)" if $bad;
795 print "nothing quilty to commit, ok.\n";
798 runcmd_ordryrun @git, qw(add), sort keys %adds;
799 my $m = "Commit Debian 3.0 (quilt) metadata";
801 runcmd_ordryrun @git, qw(commit -m), $m;
806 return 0 unless $format eq '3.0 (quilt)';
807 print "Format \`$format', urgh\n";
809 print "Not doing any fixup of \`$format' due to --no-quilt-fixup";
816 print DEBUG "actually entering push\n";
817 my $clogp = parsechangelog();
818 $package = getfield $clogp, 'Source';
819 my $cversion = getfield $clogp, 'Version';
820 my $dscfn = dscfn($cversion);
822 fail "looked for .dsc $dscfn, but $!;".
823 " maybe you forgot to build";
824 $dsc = parsecontrol("../$dscfn","$dscfn");
825 my $dscpackage = getfield $dsc, 'Source';
826 my $format = getfield $dsc, 'Format';
827 my $dversion = getfield $dsc, 'Version';
828 ($dscpackage eq $package && $dversion eq $cversion) or
829 fail "$dsc is for $dscpackage $dversion".
830 " but debian/changelog is for $package $cversion";
831 print DEBUG "format $format\n";
832 if (madformat($format)) {
833 commit_quilty_patch();
838 print "checking that $dscfn corresponds to HEAD\n";
839 runcmd qw(dpkg-source -x --), "../../../../$dscfn";
840 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
841 chdir '../../../..' or die $!;
842 printcmd \*DEBUG,"+",@_;
843 my @diffcmd = (@git, qw(diff --exit-code), $tree);
845 if (system @diffcmd) {
847 fail "$dscfn specifies a different tree to your HEAD commit;".
848 " perhaps you forgot to build";
854 #do fast forward check and maybe fake merge
855 # if (!is_fast_fwd(mainbranch
856 # runcmd @git, qw(fetch -p ), "$alioth_git/$package.git",
857 # map { lref($_).":".rref($_) }
859 $dsc->{$ourdscfield[0]} = rev_parse('HEAD');
860 $dsc->save("../$dscfn.tmp") or die $!;
862 my $multi = "../${package}_".(stripepoch $cversion)."_multi.changes";
864 $changesfile = $multi;
866 $!==&ENOENT or die "$multi: $!";
867 my $pat = "${package}_".(stripepoch $cversion)."_*.changes";
868 my @cs = glob "../$pat";
869 fail "failed to find unique changes file".
870 " (looked for $pat in .., or $multi);".
871 " perhaps you need to use dgit -C"
873 ($changesfile) = @cs;
876 my $changes = parsecontrol($changesfile,$changesfile);
877 foreach my $field (qw(Source Distribution Version)) {
878 $changes->{$field} eq $clogp->{$field} or
879 fail "changes field $field \`$changes->{$field}'".
880 " does not match changelog \`$clogp->{$field}'";
882 my $tag = debiantag($dversion);
883 if (!check_for_git()) {
884 create_remote_git_repo();
886 runcmd_ordryrun @git, qw(push),access_giturl(),"HEAD:".rrref();
888 rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!";
890 print "[new .dsc left in $dscfn.tmp]\n";
893 if (!defined $keyid) {
894 $keyid = access_cfg('keyid','RETURN-UNDEF');
896 my @tag_cmd = (@git, qw(tag -s -m),
897 "Release $dversion for $csuite [dgit]");
898 push @tag_cmd, qw(-u),$keyid if defined $keyid;
900 runcmd_ordryrun @tag_cmd;
901 my @debsign_cmd = @debsign;
902 push @debsign_cmd, "-k$keyid" if defined $keyid;
903 push @debsign_cmd, $changesfile;
904 runcmd_ordryrun @debsign_cmd;
906 runcmd_ordryrun @git, qw(push),access_giturl(),"refs/tags/$tag";
907 my $host = access_cfg('upload-host','RETURN-UNDEF');
908 my @hostarg = defined($host) ? ($host,) : ();
909 runcmd_ordryrun @dput, @hostarg, $changesfile;
910 printdone "pushed and uploaded $dversion";
916 badusage "-p is not allowed with clone; specify as argument instead"
920 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
921 ($package,$isuite) = @ARGV;
922 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
923 ($package,$dstdir) = @ARGV;
925 ($package,$isuite,$dstdir) = @ARGV;
927 badusage "incorrect arguments to dgit clone";
929 $dstdir ||= "$package";
934 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
935 if ($branch =~ m#$lbranch_re#o) {
942 sub fetchpullargs () {
943 if (!defined $package) {
944 my $sourcep = parsecontrol('debian/control','debian/control');
945 $package = getfield $sourcep, 'Source';
948 # $isuite = branchsuite(); # this doesn't work because dak hates canons
950 my $clogp = parsechangelog();
951 $isuite = getfield $clogp, 'Distribution';
953 canonicalise_suite();
954 print "fetching from suite $csuite\n";
957 canonicalise_suite();
959 badusage "incorrect arguments to dgit fetch or dgit pull";
977 badusage "-p is not allowed with dgit push" if defined $package;
979 my $clogp = parsechangelog();
980 $package = getfield $clogp, 'Source';
982 $isuite = getfield $clogp, 'Distribution';
984 local ($package) = $existing_package; # this is a hack
985 canonicalise_suite();
988 badusage "incorrect arguments to dgit push";
990 if (check_for_git()) {
993 if (fetch_from_archive()) {
994 is_fast_fwd(lrref(), 'HEAD') or
995 fail "dgit push: HEAD is not a descendant".
996 " of the archive's version.\n".
997 "$us: To overwrite it, use git-merge -s ours ".lrref().".";
1000 fail "package appears to be new in this suite;".
1001 " if this is intentional, use --new";
1010 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
1012 sub build_maybe_quilt_fixup () {
1013 if (!open F, "debian/source/format") {
1014 die $! unless $!==&ENOENT;
1018 F->error and die $!;
1020 return unless madformat($_);
1022 my $clogp = parsechangelog();
1023 my $version = getfield $clogp, 'Version';
1024 my $author = getfield $clogp, 'Maintainer';
1025 my $headref = rev_parse('HEAD');
1028 my $patchname = "auto-$version-$headref-$time";
1029 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
1030 my $descfn = ".git/dgit/quilt-description.tmp";
1031 open O, '>', $descfn or die "$descfn: $!";
1033 $msg =~ s/^\s+$/ ./mg;
1034 print O <<END or die $!;
1035 Description: Automatically generated patch ($clogp->{Version})
1036 Last (up to) $ncommits git changes, FYI:
1046 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
1047 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
1048 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
1049 runcmd_ordryrun @dpkgsource, qw(--commit .), $patchname;
1052 if (!open P, '>>', ".pc/applied-patches") {
1053 $!==&ENOENT or die $!;
1058 commit_quilty_patch();
1061 sub quilt_fixup_editor () {
1062 my $descfn = $ENV{$fakeeditorenv};
1063 my $editing = $ARGV[$#ARGV];
1064 open I1, '<', $descfn or die "$descfn: $!";
1065 open I2, '<', $editing or die "$editing: $!";
1066 unlink $editing or die "$editing: $!";
1067 open O, '>', $editing or die "$editing: $!";
1068 while (<I1>) { print O or die $!; } I1->error and die $!;
1071 $copying ||= m/^\-\-\- /;
1072 next unless $copying;
1075 I2->error and die $!;
1081 badusage "-p is not allowed when building" if defined $package;
1083 my $clogp = parsechangelog();
1084 $isuite = getfield $clogp, 'Distribution';
1085 $package = getfield $clogp, 'Source';
1086 $version = getfield $clogp, 'Version';
1087 build_maybe_quilt_fixup();
1091 badusage "dgit build implies --clean=dpkg-source"
1092 if $cleanmode ne 'dpkg-source';
1094 runcmd_ordryrun @dpkgbuildpackage, qw(-us -uc), changesopts(), @ARGV;
1095 printdone "build successful\n";
1099 badusage "dgit git-build implies --clean=dpkg-source"
1100 if $cleanmode ne 'dpkg-source';
1103 (qw(git-buildpackage -us -uc --git-no-sign-tags),
1104 "--git-builder=@dpkgbuildpackage");
1105 unless (grep { m/^--git-debian-branch|^--git-ignore-branch/ } @ARGV) {
1106 canonicalise_suite();
1107 push @cmd, "--git-debian-branch=".lbranch();
1109 push @cmd, changesopts();
1110 runcmd_ordryrun @cmd, @ARGV;
1111 printdone "build successful\n";
1116 $sourcechanges = "${package}_".(stripepoch $version)."_source.changes";
1117 $dscfn = dscfn($version);
1118 if ($cleanmode eq 'dpkg-source') {
1119 runcmd_ordryrun (@dpkgbuildpackage, qw(-us -uc -S)), changesopts();
1121 if ($cleanmode eq 'git') {
1122 runcmd_ordryrun @git, qw(clean -xdf);
1123 } elsif ($cleanmode eq 'none') {
1127 my $pwd = cmdoutput qw(env - pwd);
1128 my $leafdir = basename $pwd;
1129 chdir ".." or die $!;
1130 runcmd_ordryrun @dpkgsource, qw(-b --), $leafdir;
1131 chdir $pwd or die $!;
1132 runcmd_ordryrun qw(sh -ec),
1133 'exec >$1; shift; exec "$@"','x',
1134 "../$sourcechanges",
1135 @dpkggenchanges, qw(-S), changesopts();
1139 sub cmd_build_source {
1140 badusage "build-source takes no additional arguments" if @ARGV;
1142 printdone "source built, results in $dscfn and $sourcechanges";
1147 chdir ".." or die $!;
1148 my $pat = "${package}_".(stripepoch $version)."_*.changes";
1150 stat $dscfn or fail "$dscfn (in parent directory): $!";
1151 stat $sourcechanges or fail "$sourcechanges (in parent directory): $!";
1152 foreach my $cf (glob $pat) {
1153 next if $cf eq $sourcechanges;
1154 unlink $cf or fail "remove $cf: $!";
1157 runcmd_ordryrun @sbuild, @ARGV, qw(-d), $isuite, $dscfn;
1158 runcmd_ordryrun @mergechanges, glob $pat;
1159 my $multichanges = "${package}_".(stripepoch $version)."_multi.changes";
1161 stat $multichanges or fail "$multichanges: $!";
1163 printdone "build successful, results in $multichanges\n" or die $!;
1166 sub cmd_quilt_fixup {
1167 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
1168 my $clogp = parsechangelog();
1169 $version = getfield $clogp, 'Version';
1170 build_maybe_quilt_fixup();
1176 last unless $ARGV[0] =~ m/^-/;
1180 if (m/^--dry-run$/) {
1182 } elsif (m/^--no-sign$/) {
1184 } elsif (m/^--help$/) {
1186 } elsif (m/^--new$/) {
1188 } elsif (m/^--(\w+)=(.*)/s &&
1189 ($om = $opts_opt_map{$1}) &&
1192 } elsif (m/^--(\w+):(.*)/s &&
1193 ($om = $opts_opt_map{$1})) {
1195 } elsif (m/^--existing-package=(.*)/s) {
1196 $existing_package = $1;
1197 } elsif (m/^--distro=(.*)/s) {
1199 } elsif (m/^--clean=(dpkg-source|git|none)$/s) {
1201 } elsif (m/^--clean=(.*)$/s) {
1202 badusage "unknown cleaning mode \`$1'";
1203 } elsif (m/^--ignore-dirty$/s) {
1205 } elsif (m/^--no-quilt-fixup$/s) {
1208 badusage "unknown long option \`$_'";
1214 } elsif (s/^-h/-/) {
1216 } elsif (s/^-D/-/) {
1217 open DEBUG, ">&STDERR" or die $!;
1219 } elsif (s/^-N/-/) {
1221 } elsif (m/^-[vm]/) {
1222 push @changesopts, $_;
1224 } elsif (s/^-c(.*=.*)//s) {
1225 push @git, '-c', $1;
1226 } elsif (s/^-d(.*)//s) {
1228 } elsif (s/^-C(.*)//s) {
1230 } elsif (s/^-k(.*)//s) {
1232 } elsif (s/^-wn//s) {
1233 $cleanmode = 'none';
1234 } elsif (s/^-wg//s) {
1236 } elsif (s/^-wd//s) {
1237 $cleanmode = 'dpkg-source';
1239 badusage "unknown short option \`$_'";
1246 if ($ENV{$fakeeditorenv}) {
1247 quilt_fixup_editor();
1250 delete $ENV{'DGET_UNPACK'};
1253 print STDERR "DRY RUN ONLY\n" if $dryrun;
1255 print STDERR $helpmsg or die $!;
1258 my $cmd = shift @ARGV;
1260 { no strict qw(refs); &{"cmd_$cmd"}(); }