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';
39 our $existing_package = 'dpkg';
40 our $cleanmode = 'dpkg-source';
42 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
45 our (@dget) = qw(dget);
46 our (@dput) = qw(dput);
47 our (@debsign) = qw(debsign);
48 our (@sbuild) = qw(sbuild -A);
49 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
50 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
51 our (@dpkggenchanges) = qw(dpkg-genchanges);
52 our (@mergechanges) = qw(mergechanges -f);
53 our (@changesopts) = ('');
55 our %opts_opt_map = ('dget' => \@dget,
57 'debsign' => \@debsign,
59 'dpkg-source' => \@dpkgsource,
60 'dpkg-buildpackage' => \@dpkgbuildpackage,
61 'dpkg-genchanges' => \@dpkggenchanges,
62 'ch' => \@changesopts,
63 'mergechanges' => \@mergechanges);
68 open DEBUG, ">/dev/null" or die $!;
70 our $remotename = 'dgit';
71 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
72 our $branchprefix = 'dgit';
75 sub lbranch () { return "$branchprefix/$csuite"; }
76 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
77 sub lref () { return "refs/heads/".lbranch(); }
78 sub lrref () { return "refs/remotes/$remotename/$branchprefix/$csuite"; }
79 sub rrref () { return "refs/$branchprefix/$csuite"; }
86 sub dscfn ($) { return "${package}_$_[0].dsc"; }
88 sub changesopts () { return @changesopts[1..$#changesopts]; }
92 sub fail { die "$us: @_\n"; }
94 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
96 sub no_such_package () {
97 print STDERR "$us: package $package does not exist in suite $isuite\n";
103 return "+".rrref().":".lrref();
110 $ua = LWP::UserAgent->new();
114 print "downloading $what...\n";
115 my $r = $ua->get(@_) or die $!;
116 return undef if $r->code == 404;
117 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
118 return $r->decoded_content();
121 our ($dscdata,$dscurl,$dsc);
125 my $intro = shift @_;
126 print $fh $intro or die $!;
130 if (s{['\\]}{\\$&}g || m{\s} || m{[^-_./0-9a-z]}i) {
131 print $fh " '$_'" or die $!;
133 print $fh " $_" or die $!;
136 print $fh "\n" or die $!;
140 { local ($!); printcmd \*STDERR, "$_[0]: failed command:", @_ or die $!; };
142 fail "failed to fork/exec: $!";
143 } elsif (!($? & 0xff)) {
144 fail "subprocess failed with error exit status ".($?>>8);
146 fail "subprocess crashed (wait status $?)";
148 fail "subprocess produced invalid output";
153 printcmd(\*DEBUG,"+",@_) if $debug>0;
155 failedcmd @_ if system @_;
160 print "dgit ok: @_\n";
162 print "would be ok: @_ (but dry run only)\n";
166 sub cmdoutput_errok {
167 die Dumper(\@_)." ?" if grep { !defined } @_;
168 printcmd(\*DEBUG,"|",@_) if $debug>0;
169 open P, "-|", @_ or die $!;
172 { local $/ = undef; $d = <P>; }
174 if (!close P) { print DEBUG "=>!$?\n" if $debug>0; return undef; }
177 print DEBUG "=> \`$&'",(length $' ? '...' : ''),"\n" if $debug>0; #';
182 my $d = cmdoutput_errok @_;
183 defined $d or failedcmd @_;
188 printcmd(\*STDOUT,"#",@_);
191 sub runcmd_ordryrun {
199 our $helpmsg = <<END;
201 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
202 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
203 dgit [dgit-opts] build [git-buildpackage-opts|dpkg-buildpackage-opts]
204 dgit [dgit-opts] push [dgit-opts] [suite]
205 important dgit options:
206 -k<keyid> sign tag and package with <keyid> instead of default
207 --dry-run -n do not change anything, but go through the motions
208 --new -N allow introducing a new package
209 --debug -D increase debug level
210 -c<name>=<value> set git config option (used directly by dgit too)
213 our $later_warning_msg = <<END;
214 Perhaps the upload is stuck in incoming. Using the version from git.
218 print STDERR "$us: @_\n", $helpmsg or die $!;
223 print $helpmsg or die $!;
227 our %defcfg = ('dgit.default.distro' => 'debian',
228 'dgit.default.username' => '',
229 'dgit.default.archive-query-default-component' => 'main',
230 'dgit.default.ssh' => 'ssh',
231 'dgit-distro.debian.git-host' => 'git.debian.org',
232 'dgit-distro.debian.git-proto' => 'git+ssh://',
233 'dgit-distro.debian.git-path' => '/git/dgit-repos/repos',
234 'dgit-distro.debian.git-check' => 'ssh-cmd',
235 'dgit-distro.debian.git-create' => 'ssh-cmd',
236 'dgit-distro.debian.sshdakls-host' => 'coccia.debian.org',
237 'dgit-distro.debian.sshdakls-dir' =>
238 '/srv/ftp-master.debian.org/ftp/dists',
239 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/');
243 return undef if $c =~ /RETURN-UNDEF/;
244 my @cmd = (@git, qw(config --), $c);
247 local ($debug) = $debug-1;
248 $v = cmdoutput_errok @cmd;
255 my $dv = $defcfg{$c};
256 return $dv if defined $dv;
258 badcfg "need value for one of: @_";
261 sub access_distro () {
262 return cfg("dgit-suite.$isuite.distro",
263 "dgit.default.distro");
268 my $distro = $idistro || access_distro();
269 my $value = cfg(map { ("dgit-distro.$distro.$_",
270 "dgit.default.$_") } @keys);
274 sub access_someuserhost ($) {
276 my $user = access_cfg("$some-user",'username');
277 my $host = access_cfg("$some-host");
278 return length($user) ? "$user\@$host" : $host;
281 sub access_gituserhost () {
282 return access_someuserhost('git');
285 sub access_giturl () {
286 my $url = access_cfg('git-url','RETURN-UNDEF');
289 access_cfg('git-proto').
290 access_gituserhost().
291 access_cfg('git-path');
293 return "$url/$package.git";
296 sub parsecontrolfh ($$@) {
297 my ($fh, $desc, @opts) = @_;
298 my %opts = ('name' => $desc, @opts);
299 my $c = Dpkg::Control::Hash->new(%opts);
300 $c->parse($fh) or die "parsing of $desc failed";
305 my ($file, $desc) = @_;
306 my $fh = new IO::Handle;
307 open $fh, '<', $file or die "$file: $!";
308 my $c = parsecontrolfh($fh,$desc);
309 $fh->error and die $!;
315 my ($dctrl,$field) = @_;
316 my $v = $dctrl->{$field};
317 return $v if defined $v;
318 fail "missing field $field in ".$v->get_option('name');
322 my $c = Dpkg::Control::Hash->new();
323 my $p = new IO::Handle;
324 my @cmd = (qw(dpkg-parsechangelog));
325 open $p, '-|', @cmd or die $!;
327 $?=0; $!=0; close $p or failedcmd @cmd;
333 sub archive_query ($) {
335 my $query = access_cfg('archive-query','RETURN-UNDEF');
336 if (!defined $query) {
337 my $distro = access_distro();
338 if ($distro eq 'debian') {
339 $query = "sshdakls:".
340 access_someuserhost('sshdakls').':'.
341 access_cfg('sshdakls-dir');
343 $query = "madison:$distro";
346 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
349 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data); }
352 sub archive_query_madison ($$) {
353 my ($proto,$data) = @_;
354 die unless $proto eq 'madison';
355 $rmad{$package} ||= cmdoutput
356 qw(rmadison -asource),"-s$isuite","-u$data",$package;
357 my $rmad = $rmad{$package};
358 return madison_parse($rmad);
361 sub archive_query_sshdakls ($$) {
362 my ($proto,$data) = @_;
363 $data =~ s/:.*// or badcfg "invalid sshdakls method string \`$data'";
364 my $dakls = cmdoutput
365 access_cfg('ssh'), $data, qw(dak ls -asource),"-s$isuite",$package;
366 return madison_parse($dakls);
369 sub canonicalise_suite_sshdakls ($$) {
370 my ($proto,$data) = @_;
371 $data =~ m/:/ or badcfg "invalid sshdakls method string \`$data'";
373 (access_cfg('ssh'), $`,
375 " if test -h $isuite; then readlink $isuite; exit 0; fi;".
376 " if test -d $isuite; then echo $isuite; exit 0; fi;".
378 my $dakls = cmdoutput @cmd;
379 failedcmd @cmd unless $dakls =~ m/^\w/;
383 sub madison_parse ($) {
386 foreach my $l (split /\n/, $rmad) {
387 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
388 \s*( [^ \t|]+ )\s* \|
389 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
390 \s*( [^ \t|]+ )\s* }x or die "$rmad $?";
391 $1 eq $package or die "$rmad $package ?";
398 $component = access_cfg('archive-query-default-component');
400 $5 eq 'source' or die "$rmad ?";
401 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
402 my $subpath = "/pool/$component/$prefix/$package/${package}_$vsn.dsc";
403 push @out, [$vsn,$subpath,$newsuite];
405 return sort { -version_compare_string($a->[0],$b->[0]); } @out;
408 sub canonicalise_suite_madison ($$) {
409 my @r = archive_query_madison($_[0],$_[1]);
411 "unable to canonicalise suite using package $package".
412 " which does not appear to exist in suite $isuite;".
413 " --existing-package may help";
417 sub canonicalise_suite () {
418 return if defined $csuite;
419 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
420 $csuite = archive_query('canonicalise_suite');
421 if ($isuite ne $csuite) {
422 # madison canonicalises for us
423 print "canonical suite name for $isuite is $csuite\n";
427 sub get_archive_dsc () {
428 canonicalise_suite();
429 my @vsns = archive_query('archive_query');
430 foreach my $vinfo (@vsns) {
431 my ($vsn,$subpath) = @$vinfo;
432 $dscurl = access_cfg('mirror').$subpath;
433 $dscdata = url_get($dscurl);
434 next unless defined $dscdata;
435 $dscurl = access_cfg('mirror').$subpath;
436 $dscdata = url_get($dscurl);
437 my $dscfh = new IO::File \$dscdata, '<' or die $!;
438 print DEBUG Dumper($dscdata) if $debug>1;
439 $dsc = parsecontrolfh($dscfh,$dscurl, allow_pgp=>1);
440 print DEBUG Dumper($dsc) if $debug>1;
441 my $fmt = getfield $dsc, 'Format';
442 fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt};
448 sub check_for_git () {
450 my $how = access_cfg('git-check');
451 if ($how eq 'ssh-cmd') {
453 (access_cfg('ssh'),access_gituserhost(),
454 " set -e; cd ".access_cfg('git-path').";".
455 " if test -d $package.git; then echo 1; else echo 0; fi");
456 my $r= cmdoutput @cmd;
457 failedcmd @cmd unless $r =~ m/^[01]$/;
460 badcfg "unknown git-check \`$how'";
464 sub create_remote_git_repo () {
465 my $how = access_cfg('git-create');
466 if ($how eq 'ssh-cmd') {
468 (access_cfg('ssh'),access_gituserhost(),
469 "set -e; cd ".access_cfg('git-path').";".
470 " cp -a _template $package.git");
472 badcfg "unknown git-create \`$how'";
476 our ($dsc_hash,$upload_hash);
478 our $ud = '.git/dgit/unpack';
486 sub mktree_in_ud_from_only_subdir () {
487 # changes into the subdir
490 $dirs[0] =~ m#^([^/]+)/\.$# or die;
492 chdir $dir or die "$dir $!";
493 fail "source package contains .git directory" if stat '.git';
494 die $! unless $!==&ENOENT;
495 runcmd qw(git init -q);
496 rmtree('.git/objects');
497 symlink '../../../../objects','.git/objects' or die $!;
498 runcmd @git, qw(add -Af);
499 my $tree = cmdoutput @git, qw(write-tree);
500 $tree =~ m/^\w+$/ or die "$tree ?";
505 my $field = $dsc->{'Checksums-Sha256'} || $dsc->{Files};
507 fail "missing both Checksums-Sha256 and Files in ".
508 $dsc->get_option('name');
510 m/^\w+ \d+ (\S+)$/ or
511 fail "could not parse .dsc Files/Checksums line \`$_'";
513 } grep m/\S/, split /\n/, $field;
516 sub is_orig_file ($) {
518 m/\.orig(?:-\w+)?\.tar\.\w+$/;
521 sub make_commit ($) {
523 return cmdoutput @git, qw(hash-object -w -t commit), $file;
526 sub generate_commit_from_dsc () {
530 foreach my $f (dsc_files()) {
531 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
533 link "../../../$f", $f
537 runcmd @dget, qw(--), $dscurl;
538 foreach my $f (grep { is_orig_file($_) } @files) {
539 link $f, "../../../../$f"
543 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
544 runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp';
545 my $clogp = parsecontrol('../changelog.tmp',"commit's changelog");
546 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
547 my $author = getfield $clogp, 'Maintainer';
548 $author =~ s#,.*##ms;
549 my $authline = "$author $date";
550 $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or
551 fail "unexpected commit author line format \`$authline'".
552 " (was generated from changelog Maintainer field)";
553 my $changes = getfield $clogp, 'Changes';
554 open C, ">../commit.tmp" or die $!;
555 print C <<END or die $!;
562 # imported from the archive
565 my $outputhash = make_commit qw(../commit.tmp);
566 my $cversion = getfield $clogp, 'Version';
567 print "synthesised git commit from .dsc $cversion\n";
569 runcmd @git, qw(reset --hard), $upload_hash;
570 runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp';
571 my $oldclogp = parsecontrol('../changelogold.tmp','previous changelog');
572 my $oversion = getfield $oldclogp, 'Version';
574 version_compare_string($oversion, $cversion);
576 # git upload/ is earlier vsn than archive, use archive
577 open C, ">../commit2.tmp" or die $!;
578 print C <<END or die $!;
585 Record $package ($cversion) in archive suite $csuite
587 $outputhash = make_commit qw(../commit2.tmp);
588 } elsif ($vcmp > 0) {
589 print STDERR <<END or die $!;
591 Version actually in archive: $cversion (older)
592 Last allegedly pushed/uploaded: $oversion (newer or same)
595 $outputhash = $upload_hash;
597 $outputhash = $upload_hash;
600 chdir '../../../..' or die $!;
601 runcmd @git, qw(update-ref -m),"dgit fetch import $cversion",
602 'DGIT_ARCHIVE', $outputhash;
603 cmdoutput @git, qw(log -n2), $outputhash;
604 # ... gives git a chance to complain if our commit is malformed
609 sub ensure_we_have_orig () {
610 foreach my $f (dsc_files()) {
611 next unless is_orig_file($f);
613 die "$f ?" unless -f _;
615 die "$f $!" unless $!==&ENOENT;
617 my $origurl = $dscurl;
618 $origurl =~ s{/[^/]+$}{};
620 die "$f ?" unless $f =~ m/^${package}_/;
621 die "$f ?" if $f =~ m#/#;
622 runcmd_ordryrun qw(sh -ec),'cd ..; exec "$@"','x',
628 return cmdoutput @git, qw(rev-parse), "$_[0]~0";
631 sub is_fast_fwd ($$) {
632 my ($ancestor,$child) = @_;
633 my $mb = cmdoutput @git, qw(merge-base), $ancestor, $child;
634 return rev_parse($mb) eq rev_parse($ancestor);
637 sub git_fetch_us () {
638 badusage "cannot dry run with fetch" if $dryrun;
639 runcmd @git, qw(fetch),access_giturl(),fetchspec();
642 sub fetch_from_archive () {
643 # ensures that lrref() is what is actually in the archive,
645 get_archive_dsc() or return 0;
646 foreach my $field (@ourdscfield) {
647 $dsc_hash = $dsc->{$field};
648 last if defined $dsc_hash;
650 if (defined $dsc_hash) {
651 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
653 print "last upload to archive specified git hash\n";
655 print "last upload to archive has NO git hash\n";
658 my $lrref_fn = ".git/".lrref();
659 if (open H, $lrref_fn) {
662 die "$lrref_fn $upload_hash ?" unless $upload_hash =~ m/^\w+$/;
663 } elsif ($! == &ENOENT) {
668 print DEBUG "previous reference hash=$upload_hash\n";
670 if (defined $dsc_hash) {
671 fail "missing git history even though dsc has hash -".
672 " could not find commit $dsc_hash".
673 " (should be in ".access_giturl()."#".rrref().")"
676 ensure_we_have_orig();
677 if ($dsc_hash eq $upload_hash) {
678 } elsif (is_fast_fwd($dsc_hash,$upload_hash)) {
679 print STDERR <<END or die $!;
681 Git commit in archive is behind the last version allegedly pushed/uploaded.
682 Commit referred to by archive: $dsc_hash
683 Last allegedly pushed/uploaded: $upload_hash
686 $hash = $upload_hash;
688 fail "archive's .dsc refers to ".$dsc_hash.
689 " but this is an ancestor of ".$upload_hash;
692 $hash = generate_commit_from_dsc();
694 print DEBUG "current hash=$hash\n";
696 fail "not fast forward on last upload branch!".
697 " (archive's version left in DGIT_ARCHIVE)"
698 unless is_fast_fwd($upload_hash, $hash);
700 if ($upload_hash ne $hash) {
701 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
705 dryrun_report @upd_cmd;
713 canonicalise_suite();
714 badusage "dry run makes no sense with clone" if $dryrun;
715 mkdir $dstdir or die "$dstdir $!";
716 chdir "$dstdir" or die "$dstdir $!";
717 runcmd @git, qw(init -q);
718 runcmd @git, qw(config), "remote.$remotename.fetch", fetchspec();
719 open H, "> .git/HEAD" or die $!;
720 print H "ref: ".lref()."\n" or die $!;
722 runcmd @git, qw(remote add), 'origin', access_giturl();
723 if (check_for_git()) {
724 print "fetching existing git history\n";
726 runcmd @git, qw(fetch origin);
728 print "starting new git history\n";
730 fetch_from_archive() or no_such_package;
731 runcmd @git, qw(reset --hard), lrref();
732 printdone "ready for work in $dstdir";
736 if (check_for_git()) {
739 fetch_from_archive() or no_such_package();
740 printdone "fetched into ".lrref();
745 runcmd_ordryrun @git, qw(merge -m),"Merge from $csuite [dgit]",
747 printdone "fetched to ".lrref()." and merged into HEAD";
750 sub check_not_dirty () {
751 my @cmd = (@git, qw(diff --quiet HEAD));
752 printcmd(\*DEBUG,"+",@cmd) if $debug>0;
753 $!=0; $?=0; system @cmd;
754 return if !$! && !$?;
755 if (!$! && $?==256) {
756 fail "working tree is dirty (does not match HEAD)";
762 sub commit_quilty_patch () {
763 my $output = cmdoutput @git, qw(status --porcelain);
766 foreach my $l (split /\n/, $output) {
767 next unless $l =~ m/\S/;
768 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
771 print STDERR "git status: $l\n";
775 fail "unexpected output from git status (is tree clean?)" if $bad;
777 print "nothing quilty to commit, ok.\n";
780 runcmd_ordryrun @git, qw(add), sort keys %adds;
781 my $m = "Commit Debian 3.0 (quilt) metadata";
783 runcmd_ordryrun @git, qw(commit -m), $m;
788 return 0 unless $format eq '3.0 (quilt)';
789 print "Format \`$format', urgh\n";
794 print DEBUG "actually entering push\n";
795 my $clogp = parsechangelog();
796 $package = getfield $clogp, 'Source';
797 my $cversion = getfield $clogp, 'Version';
798 my $dscfn = dscfn($cversion);
800 fail "looked for .dsc $dscfn, but $!;".
801 " maybe you forgot to build";
802 $dsc = parsecontrol("../$dscfn","$dscfn");
803 my $dscpackage = getfield $dsc, 'Source';
804 my $format = getfield $dsc, 'Format';
805 my $dversion = getfield $dsc, 'Version';
806 ($dscpackage eq $package && $dversion eq $cversion) or
807 fail "$dsc is for $dscpackage $dversion".
808 " but debian/changelog is for $package $cversion";
809 print DEBUG "format $format\n";
810 if (madformat($format)) {
811 commit_quilty_patch();
816 print "checking that $dscfn corresponds to HEAD\n";
817 runcmd qw(dpkg-source -x --), "../../../../$dscfn";
818 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
819 chdir '../../../..' or die $!;
820 printcmd \*DEBUG,"+",@_;
821 my @diffcmd = (@git, qw(diff --exit-code), $tree);
823 if (system @diffcmd) {
825 fail "$dscfn specifies a different tree to your HEAD commit;".
826 " perhaps you forgot to build";
832 #do fast forward check and maybe fake merge
833 # if (!is_fast_fwd(mainbranch
834 # runcmd @git, qw(fetch -p ), "$alioth_git/$package.git",
835 # map { lref($_).":".rref($_) }
837 $dsc->{$ourdscfield[0]} = rev_parse('HEAD');
838 $dsc->save("../$dscfn.tmp") or die $!;
840 my $multi = "../${package}_${cversion}_multi.changes";
842 $changesfile = $multi;
844 $!==&ENOENT or die "$multi: $!";
845 my $pat = "${package}_${cversion}_*.changes";
846 my @cs = glob "../$pat";
847 fail "failed to find unique changes file".
848 " (looked for $pat in .., or $multi);".
849 " perhaps you need to use dgit -C"
851 ($changesfile) = @cs;
854 my $changes = parsecontrol($changesfile,$changesfile);
855 foreach my $field (qw(Source Distribution Version)) {
856 $changes->{$field} eq $clogp->{$field} or
857 fail "changes field $field \`$changes->{$field}'".
858 " does not match changelog \`$clogp->{$field}'";
860 my $tag = debiantag($dversion);
861 if (!check_for_git()) {
862 create_remote_git_repo();
864 runcmd_ordryrun @git, qw(push),access_giturl(),"HEAD:".rrref();
866 rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!";
868 print "[new .dsc left in $dscfn.tmp]\n";
871 if (!defined $keyid) {
872 $keyid = access_cfg('keyid','RETURN-UNDEF');
874 my @tag_cmd = (@git, qw(tag -s -m),
875 "Release $dversion for $csuite [dgit]");
876 push @tag_cmd, qw(-u),$keyid if defined $keyid;
878 runcmd_ordryrun @tag_cmd;
879 my @debsign_cmd = @debsign;
880 push @debsign_cmd, "-k$keyid" if defined $keyid;
881 push @debsign_cmd, $changesfile;
882 runcmd_ordryrun @debsign_cmd;
884 runcmd_ordryrun @git, qw(push),access_giturl(),"refs/tags/$tag";
885 my $host = access_cfg('upload-host','RETURN-UNDEF');
886 my @hostarg = defined($host) ? ($host,) : ();
887 runcmd_ordryrun @dput, @hostarg, $changesfile;
888 printdone "pushed and uploaded $dversion";
894 badusage "-p is not allowed with clone; specify as argument instead"
898 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
899 ($package,$isuite) = @ARGV;
900 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
901 ($package,$dstdir) = @ARGV;
903 ($package,$isuite,$dstdir) = @ARGV;
905 badusage "incorrect arguments to dgit clone";
907 $dstdir ||= "$package";
912 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
913 if ($branch =~ m#$lbranch_re#o) {
920 sub fetchpullargs () {
921 if (!defined $package) {
922 my $sourcep = parsecontrol('debian/control','debian/control');
923 $package = getfield $sourcep, 'Source';
926 # $isuite = branchsuite(); # this doesn't work because dak hates canons
928 my $clogp = parsechangelog();
929 $isuite = getfield $clogp, 'Distribution';
931 canonicalise_suite();
932 print "fetching from suite $csuite\n";
935 canonicalise_suite();
937 badusage "incorrect arguments to dgit fetch or dgit pull";
955 badusage "-p is not allowed with dgit push" if defined $package;
957 my $clogp = parsechangelog();
958 $package = getfield $clogp, 'Source';
960 $isuite = getfield $clogp, 'Distribution';
962 local ($package) = $existing_package; # this is a hack
963 canonicalise_suite();
966 badusage "incorrect arguments to dgit push";
968 if (check_for_git()) {
971 if (fetch_from_archive()) {
972 is_fast_fwd(lrref(), 'HEAD') or die;
975 fail "package appears to be new in this suite;".
976 " if this is intentional, use --new";
985 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
987 sub build_maybe_quilt_fixup () {
988 if (!open F, "debian/source/format") {
989 die $! unless $!==&ENOENT;
995 return unless madformat($_);
997 my $clogp = parsechangelog();
998 my $version = getfield $clogp, 'Version';
999 my $author = getfield $clogp, 'Maintainer';
1000 my $headref = rev_parse('HEAD');
1003 my $patchname = "auto-$version-$headref-$time";
1004 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
1005 my $descfn = ".git/dgit/quilt-description.tmp";
1006 open O, '>', $descfn or die "$descfn: $!";
1008 $msg =~ s/^\s+$/ ./mg;
1009 print O <<END or die $!;
1010 Description: Automatically generated patch ($clogp->{Version})
1011 Last (up to) $ncommits git changes, FYI:
1021 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
1022 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
1023 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
1024 runcmd_ordryrun @dpkgsource, qw(--commit .), $patchname;
1027 if (!open P, '>>', ".pc/applied-patches") {
1028 $!==&ENOENT or die $!;
1033 commit_quilty_patch();
1036 sub quilt_fixup_editor () {
1037 my $descfn = $ENV{$fakeeditorenv};
1038 my $editing = $ARGV[$#ARGV];
1039 open I1, '<', $descfn or die "$descfn: $!";
1040 open I2, '<', $editing or die "$editing: $!";
1041 unlink $editing or die "$editing: $!";
1042 open O, '>', $editing or die "$editing: $!";
1043 while (<I1>) { print O or die $!; } I1->error and die $!;
1046 $copying ||= m/^\-\-\- /;
1047 next unless $copying;
1050 I2->error and die $!;
1056 # we pass further options and args to git-buildpackage
1057 badusage "-p is not allowed with dgit build" if defined $package;
1058 badusage "dgit build implies --clean=dpkg-source" if defined $package;
1059 my $clogp = parsechangelog();
1060 $isuite = getfield $clogp, 'Distribution';
1061 $package = getfield $clogp, 'Source';
1062 $version = getfield $clogp, 'Version';
1063 build_maybe_quilt_fixup();
1065 (qw(git-buildpackage -us -uc --git-no-sign-tags),
1066 "--git-builder=@dpkgbuildpackage");
1067 unless (grep { m/^--git-debian-branch/ } @ARGV) {
1068 canonicalise_suite();
1069 push @cmd, "--git-debian-branch=".lbranch();
1071 push @cmd, changesopts();
1072 runcmd_ordryrun @cmd, @ARGV;
1073 printdone "build successful\n";
1077 badusage "-p is not allowed with this action" if defined $package;
1079 my $clogp = parsechangelog();
1080 $package = getfield $clogp, 'Source';
1081 $isuite = getfield $clogp, 'Distribution';
1082 $version = getfield $clogp, 'Version';
1083 $sourcechanges = "${package}_${version}_source.changes";
1084 $dscfn = dscfn($version);
1085 build_maybe_quilt_fixup();
1086 if ($cleanmode eq 'dpkg-source') {
1087 runcmd_ordryrun (@dpkgbuildpackage, qw(-us -uc -S)), changesopts();
1089 if ($cleanmode eq 'git') {
1090 runcmd_ordryrun @git, qw(clean -xdf);
1091 } elsif ($cleanmode eq 'none') {
1095 my $pwd = cmdoutput qw(env - pwd);
1096 my $leafdir = basename $pwd;
1097 chdir ".." or die $!;
1098 runcmd_ordryrun @dpkgsource, qw(-b --), $leafdir;
1099 chdir $pwd or die $!;
1100 runcmd_ordryrun qw(sh -ec),
1101 'exec >$1; shift; exec "$@"','x',
1102 "../$sourcechanges",
1103 @dpkggenchanges, qw(-S), changesopts();
1107 sub cmd_build_source {
1108 badusage "build-source takes no additional arguments" if @ARGV;
1110 printdone "source built, results in $dscfn and $sourcechanges";
1115 chdir ".." or die $!;
1116 my $pat = "${package}_${version}_*.changes";
1118 stat $dscfn or fail "$dscfn (in parent directory): $!";
1119 stat $sourcechanges or fail "$sourcechanges (in parent directory): $!";
1120 foreach my $cf (glob $pat) {
1121 next if $cf eq $sourcechanges;
1122 unlink $cf or fail "remove $cf: $!";
1125 runcmd_ordryrun @sbuild, @ARGV, qw(-d), $isuite, $dscfn;
1126 runcmd_ordryrun @mergechanges, glob $pat;
1127 my $multichanges = "${package}_${version}_multi.changes";
1129 stat $multichanges or fail "$multichanges: $!";
1131 printdone "build successful, results in $multichanges\n" or die $!;
1134 sub cmd_quilt_fixup {
1135 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
1136 my $clogp = parsechangelog();
1137 $version = getfield $clogp, 'Version';
1138 build_maybe_quilt_fixup();
1144 last unless $ARGV[0] =~ m/^-/;
1148 if (m/^--dry-run$/) {
1150 } elsif (m/^--no-sign$/) {
1152 } elsif (m/^--help$/) {
1154 } elsif (m/^--new$/) {
1156 } elsif (m/^--(\w+)=(.*)/s &&
1157 ($om = $opts_opt_map{$1}) &&
1160 } elsif (m/^--(\w+):(.*)/s &&
1161 ($om = $opts_opt_map{$1})) {
1163 } elsif (m/^--existing-package=(.*)/s) {
1164 $existing_package = $1;
1165 } elsif (m/^--distro=(.*)/s) {
1167 } elsif (m/^--clean=(dpkg-source|git|none)$/s) {
1169 } elsif (m/^--clean=(.*)$/s) {
1170 badusage "unknown cleaning mode \`$1'";
1172 badusage "unknown long option \`$_'";
1178 } elsif (s/^-h/-/) {
1180 } elsif (s/^-D/-/) {
1181 open DEBUG, ">&STDERR" or die $!;
1183 } elsif (s/^-N/-/) {
1185 } elsif (m/^-[vm]/) {
1186 push @changesopts, $_;
1188 } elsif (s/^-c(.*=.*)//s) {
1189 push @git, '-c', $1;
1190 } elsif (s/^-d(.*)//s) {
1192 } elsif (s/^-C(.*)//s) {
1194 } elsif (s/^-k(.*)//s) {
1196 } elsif (s/^-wn//s) {
1197 $cleanmode = 'none';
1198 } elsif (s/^-wg//s) {
1200 } elsif (s/^-wd//s) {
1201 $cleanmode = 'dpkg-source';
1203 badusage "unknown short option \`$_'";
1210 if ($ENV{$fakeeditorenv}) {
1211 quilt_fixup_editor();
1215 print STDERR "DRY RUN ONLY\n" if $dryrun;
1217 print STDERR $helpmsg or die $!;
1220 my $cmd = shift @ARGV;
1222 { no strict qw(refs); &{"cmd_$cmd"}(); }