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 my $dscfh = new IO::File \$dscdata, '<' or die $!;
447 print DEBUG Dumper($dscdata) if $debug>1;
448 $dsc = parsecontrolfh($dscfh,$dscurl, allow_pgp=>1);
449 print DEBUG Dumper($dsc) if $debug>1;
450 my $fmt = getfield $dsc, 'Format';
451 fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt};
457 sub check_for_git () {
459 my $how = access_cfg('git-check');
460 if ($how eq 'ssh-cmd') {
462 (access_cfg('ssh'),access_gituserhost(),
463 " set -e; cd ".access_cfg('git-path').";".
464 " if test -d $package.git; then echo 1; else echo 0; fi");
465 my $r= cmdoutput @cmd;
466 failedcmd @cmd unless $r =~ m/^[01]$/;
469 badcfg "unknown git-check \`$how'";
473 sub create_remote_git_repo () {
474 my $how = access_cfg('git-create');
475 if ($how eq 'ssh-cmd') {
477 (access_cfg('ssh'),access_gituserhost(),
478 "set -e; cd ".access_cfg('git-path').";".
479 " cp -a _template $package.git");
481 badcfg "unknown git-create \`$how'";
485 our ($dsc_hash,$upload_hash);
487 our $ud = '.git/dgit/unpack';
495 sub mktree_in_ud_from_only_subdir () {
496 # changes into the subdir
499 $dirs[0] =~ m#^([^/]+)/\.$# or die;
501 chdir $dir or die "$dir $!";
502 fail "source package contains .git directory" if stat '.git';
503 die $! unless $!==&ENOENT;
504 runcmd qw(git init -q);
505 rmtree('.git/objects');
506 symlink '../../../../objects','.git/objects' or die $!;
507 runcmd @git, qw(add -Af);
508 my $tree = cmdoutput @git, qw(write-tree);
509 $tree =~ m/^\w+$/ or die "$tree ?";
513 sub dsc_files_info () {
514 foreach my $csumi (['Checksums-Sha256','Digest::SHA', 'new(256)'],
515 ['Checksums-Sha1', 'Digest::SHA', 'new(1)'],
516 ['Files', 'Digest::MD5', 'new()']) {
517 my ($fname, $module, $method) = @$csumi;
518 my $field = $dsc->{$fname};
519 next unless defined $field;
520 eval "use $module; 1;" or die $@;
522 foreach (split /\n/, $field) {
524 m/^(\w+) (\d+) (\S+)$/ or
525 fail "could not parse .dsc $fname line \`$_'";
526 my $digester = eval "$module"."->$method;" or die $@;
531 Digester => $digester,
536 fail "missing any supported Checksums-* or Files field in ".
537 $dsc->get_option('name');
541 map { $_->{Filename} } dsc_files_info();
544 sub is_orig_file ($) {
546 m/\.orig(?:-\w+)?\.tar\.\w+$/;
549 sub make_commit ($) {
551 return cmdoutput @git, qw(hash-object -w -t commit), $file;
554 sub generate_commit_from_dsc () {
558 foreach my $f (dsc_files()) {
559 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
561 link "../../../$f", $f
565 runcmd @dget, qw(--), $dscurl;
566 foreach my $f (grep { is_orig_file($_) } @files) {
567 link $f, "../../../../$f"
571 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
572 runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp';
573 my $clogp = parsecontrol('../changelog.tmp',"commit's changelog");
574 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
575 my $author = getfield $clogp, 'Maintainer';
576 $author =~ s#,.*##ms;
577 my $authline = "$author $date";
578 $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or
579 fail "unexpected commit author line format \`$authline'".
580 " (was generated from changelog Maintainer field)";
581 my $changes = getfield $clogp, 'Changes';
582 open C, ">../commit.tmp" or die $!;
583 print C <<END or die $!;
590 # imported from the archive
593 my $outputhash = make_commit qw(../commit.tmp);
594 my $cversion = getfield $clogp, 'Version';
595 print "synthesised git commit from .dsc $cversion\n";
597 runcmd @git, qw(reset --hard), $upload_hash;
598 runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp';
599 my $oldclogp = parsecontrol('../changelogold.tmp','previous changelog');
600 my $oversion = getfield $oldclogp, 'Version';
602 version_compare_string($oversion, $cversion);
604 # git upload/ is earlier vsn than archive, use archive
605 open C, ">../commit2.tmp" or die $!;
606 print C <<END or die $!;
613 Record $package ($cversion) in archive suite $csuite
615 $outputhash = make_commit qw(../commit2.tmp);
616 } elsif ($vcmp > 0) {
617 print STDERR <<END or die $!;
619 Version actually in archive: $cversion (older)
620 Last allegedly pushed/uploaded: $oversion (newer or same)
623 $outputhash = $upload_hash;
625 $outputhash = $upload_hash;
628 chdir '../../../..' or die $!;
629 runcmd @git, qw(update-ref -m),"dgit fetch import $cversion",
630 'DGIT_ARCHIVE', $outputhash;
631 cmdoutput @git, qw(log -n2), $outputhash;
632 # ... gives git a chance to complain if our commit is malformed
637 sub ensure_we_have_orig () {
638 foreach my $fi (dsc_files_info()) {
639 my $f = $fi->{Filename};
640 next unless is_orig_file($f);
641 if (open F, "<", "../$f") {
642 $fi->{Digester}->reset();
643 $fi->{Digester}->addfile(*F);
645 my $got = $fi->{Digester}->hexdigest();
646 $got eq $fi->{Hash} or
647 fail "existing file $f has hash $got but .dsc".
648 " demands hash $fi->{Hash}".
649 " (perhaps you should delete this file?)";
650 print "using existing $f\n";
653 die "$f $!" unless $!==&ENOENT;
655 my $origurl = $dscurl;
656 $origurl =~ s{/[^/]+$}{};
658 die "$f ?" unless $f =~ m/^${package}_/;
659 die "$f ?" if $f =~ m#/#;
660 runcmd_ordryrun qw(sh -ec),'cd ..; exec "$@"','x',
666 return cmdoutput @git, qw(rev-parse), "$_[0]~0";
669 sub is_fast_fwd ($$) {
670 my ($ancestor,$child) = @_;
671 my @cmd = (@git, qw(merge-base), $ancestor, $child);
672 my $mb = cmdoutput_errok @cmd;
674 return rev_parse($mb) eq rev_parse($ancestor);
676 $?==256 or failedcmd @cmd;
681 sub git_fetch_us () {
682 badusage "cannot dry run with fetch" if $dryrun;
683 runcmd @git, qw(fetch),access_giturl(),fetchspec();
686 sub fetch_from_archive () {
687 # ensures that lrref() is what is actually in the archive,
689 get_archive_dsc() or return 0;
690 foreach my $field (@ourdscfield) {
691 $dsc_hash = $dsc->{$field};
692 last if defined $dsc_hash;
694 if (defined $dsc_hash) {
695 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
697 print "last upload to archive specified git hash\n";
699 print "last upload to archive has NO git hash\n";
702 my $lrref_fn = ".git/".lrref();
703 if (open H, $lrref_fn) {
706 die "$lrref_fn $upload_hash ?" unless $upload_hash =~ m/^\w+$/;
707 } elsif ($! == &ENOENT) {
712 print DEBUG "previous reference hash=$upload_hash\n";
714 if (defined $dsc_hash) {
715 fail "missing git history even though dsc has hash -".
716 " could not find commit $dsc_hash".
717 " (should be in ".access_giturl()."#".rrref().")"
720 ensure_we_have_orig();
721 if ($dsc_hash eq $upload_hash) {
722 } elsif (is_fast_fwd($dsc_hash,$upload_hash)) {
723 print STDERR <<END or die $!;
725 Git commit in archive is behind the last version allegedly pushed/uploaded.
726 Commit referred to by archive: $dsc_hash
727 Last allegedly pushed/uploaded: $upload_hash
730 $hash = $upload_hash;
732 fail "archive's .dsc refers to ".$dsc_hash.
733 " but this is an ancestor of ".$upload_hash;
736 $hash = generate_commit_from_dsc();
738 print DEBUG "current hash=$hash\n";
740 fail "not fast forward on last upload branch!".
741 " (archive's version left in DGIT_ARCHIVE)"
742 unless is_fast_fwd($upload_hash, $hash);
744 if ($upload_hash ne $hash) {
745 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
749 dryrun_report @upd_cmd;
757 canonicalise_suite();
758 badusage "dry run makes no sense with clone" if $dryrun;
759 mkdir $dstdir or die "$dstdir $!";
760 chdir "$dstdir" or die "$dstdir $!";
761 runcmd @git, qw(init -q);
762 runcmd @git, qw(config), "remote.$remotename.fetch", fetchspec();
763 open H, "> .git/HEAD" or die $!;
764 print H "ref: ".lref()."\n" or die $!;
766 runcmd @git, qw(remote add), 'origin', access_giturl();
767 if (check_for_git()) {
768 print "fetching existing git history\n";
770 runcmd @git, qw(fetch origin);
772 print "starting new git history\n";
774 fetch_from_archive() or no_such_package;
775 runcmd @git, qw(reset --hard), lrref();
776 printdone "ready for work in $dstdir";
780 if (check_for_git()) {
783 fetch_from_archive() or no_such_package();
784 printdone "fetched into ".lrref();
789 runcmd_ordryrun @git, qw(merge -m),"Merge from $csuite [dgit]",
791 printdone "fetched to ".lrref()." and merged into HEAD";
794 sub check_not_dirty () {
795 return if $ignoredirty;
796 my @cmd = (@git, qw(diff --quiet HEAD));
797 printcmd(\*DEBUG,"+",@cmd) if $debug>0;
798 $!=0; $?=0; system @cmd;
799 return if !$! && !$?;
800 if (!$! && $?==256) {
801 fail "working tree is dirty (does not match HEAD)";
807 sub commit_quilty_patch () {
808 my $output = cmdoutput @git, qw(status --porcelain);
811 foreach my $l (split /\n/, $output) {
812 next unless $l =~ m/\S/;
813 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
816 print STDERR "git status: $l\n";
820 fail "unexpected output from git status (is tree clean?)" if $bad;
822 print "nothing quilty to commit, ok.\n";
825 runcmd_ordryrun @git, qw(add), sort keys %adds;
826 my $m = "Commit Debian 3.0 (quilt) metadata";
828 runcmd_ordryrun @git, qw(commit -m), $m;
833 return 0 unless $format eq '3.0 (quilt)';
834 print "Format \`$format', urgh\n";
836 print "Not doing any fixup of \`$format' due to --no-quilt-fixup";
843 print DEBUG "actually entering push\n";
844 my $clogp = parsechangelog();
845 $package = getfield $clogp, 'Source';
846 my $cversion = getfield $clogp, 'Version';
847 my $dscfn = dscfn($cversion);
849 fail "looked for .dsc $dscfn, but $!;".
850 " maybe you forgot to build";
851 $dsc = parsecontrol("../$dscfn","$dscfn");
852 my $dscpackage = getfield $dsc, 'Source';
853 my $format = getfield $dsc, 'Format';
854 my $dversion = getfield $dsc, 'Version';
855 ($dscpackage eq $package && $dversion eq $cversion) or
856 fail "$dsc is for $dscpackage $dversion".
857 " but debian/changelog is for $package $cversion";
858 print DEBUG "format $format\n";
859 if (madformat($format)) {
860 commit_quilty_patch();
865 print "checking that $dscfn corresponds to HEAD\n";
866 runcmd qw(dpkg-source -x --), "../../../../$dscfn";
867 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
868 chdir '../../../..' or die $!;
869 printcmd \*DEBUG,"+",@_;
870 my @diffcmd = (@git, qw(diff --exit-code), $tree);
872 if (system @diffcmd) {
874 fail "$dscfn specifies a different tree to your HEAD commit;".
875 " perhaps you forgot to build";
881 #do fast forward check and maybe fake merge
882 # if (!is_fast_fwd(mainbranch
883 # runcmd @git, qw(fetch -p ), "$alioth_git/$package.git",
884 # map { lref($_).":".rref($_) }
886 $dsc->{$ourdscfield[0]} = rev_parse('HEAD');
887 $dsc->save("../$dscfn.tmp") or die $!;
889 my $multi = "../${package}_".(stripepoch $cversion)."_multi.changes";
891 $changesfile = $multi;
893 $!==&ENOENT or die "$multi: $!";
894 my $pat = "${package}_".(stripepoch $cversion)."_*.changes";
895 my @cs = glob "../$pat";
896 fail "failed to find unique changes file".
897 " (looked for $pat in .., or $multi);".
898 " perhaps you need to use dgit -C"
900 ($changesfile) = @cs;
903 my $changes = parsecontrol($changesfile,$changesfile);
904 foreach my $field (qw(Source Distribution Version)) {
905 $changes->{$field} eq $clogp->{$field} or
906 fail "changes field $field \`$changes->{$field}'".
907 " does not match changelog \`$clogp->{$field}'";
909 my $tag = debiantag($dversion);
910 if (!check_for_git()) {
911 create_remote_git_repo();
913 runcmd_ordryrun @git, qw(push),access_giturl(),"HEAD:".rrref();
915 rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!";
917 print "[new .dsc left in $dscfn.tmp]\n";
920 if (!defined $keyid) {
921 $keyid = access_cfg('keyid','RETURN-UNDEF');
923 my @tag_cmd = (@git, qw(tag -s -m),
924 "Release $dversion for $csuite [dgit]");
925 push @tag_cmd, qw(-u),$keyid if defined $keyid;
927 runcmd_ordryrun @tag_cmd;
928 my @debsign_cmd = @debsign;
929 push @debsign_cmd, "-k$keyid" if defined $keyid;
930 push @debsign_cmd, $changesfile;
931 runcmd_ordryrun @debsign_cmd;
933 runcmd_ordryrun @git, qw(push),access_giturl(),"refs/tags/$tag";
934 my $host = access_cfg('upload-host','RETURN-UNDEF');
935 my @hostarg = defined($host) ? ($host,) : ();
936 runcmd_ordryrun @dput, @hostarg, $changesfile;
937 printdone "pushed and uploaded $dversion";
943 badusage "-p is not allowed with clone; specify as argument instead"
947 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
948 ($package,$isuite) = @ARGV;
949 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
950 ($package,$dstdir) = @ARGV;
952 ($package,$isuite,$dstdir) = @ARGV;
954 badusage "incorrect arguments to dgit clone";
956 $dstdir ||= "$package";
961 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
962 if ($branch =~ m#$lbranch_re#o) {
969 sub fetchpullargs () {
970 if (!defined $package) {
971 my $sourcep = parsecontrol('debian/control','debian/control');
972 $package = getfield $sourcep, 'Source';
975 # $isuite = branchsuite(); # this doesn't work because dak hates canons
977 my $clogp = parsechangelog();
978 $isuite = getfield $clogp, 'Distribution';
980 canonicalise_suite();
981 print "fetching from suite $csuite\n";
984 canonicalise_suite();
986 badusage "incorrect arguments to dgit fetch or dgit pull";
1004 badusage "-p is not allowed with dgit push" if defined $package;
1006 my $clogp = parsechangelog();
1007 $package = getfield $clogp, 'Source';
1009 $isuite = getfield $clogp, 'Distribution';
1011 local ($package) = $existing_package; # this is a hack
1012 canonicalise_suite();
1015 badusage "incorrect arguments to dgit push";
1017 if (check_for_git()) {
1020 if (fetch_from_archive()) {
1021 is_fast_fwd(lrref(), 'HEAD') or
1022 fail "dgit push: HEAD is not a descendant".
1023 " of the archive's version.\n".
1024 "$us: To overwrite it, use git-merge -s ours ".lrref().".";
1027 fail "package appears to be new in this suite;".
1028 " if this is intentional, use --new";
1037 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
1039 sub build_maybe_quilt_fixup () {
1040 if (!open F, "debian/source/format") {
1041 die $! unless $!==&ENOENT;
1045 F->error and die $!;
1047 return unless madformat($_);
1049 my $clogp = parsechangelog();
1050 my $version = getfield $clogp, 'Version';
1051 my $author = getfield $clogp, 'Maintainer';
1052 my $headref = rev_parse('HEAD');
1055 my $patchname = "auto-$version-$headref-$time";
1056 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
1057 my $descfn = ".git/dgit/quilt-description.tmp";
1058 open O, '>', $descfn or die "$descfn: $!";
1060 $msg =~ s/^\s+$/ ./mg;
1061 print O <<END or die $!;
1062 Description: Automatically generated patch ($clogp->{Version})
1063 Last (up to) $ncommits git changes, FYI:
1073 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
1074 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
1075 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
1076 runcmd_ordryrun @dpkgsource, qw(--commit .), $patchname;
1079 if (!open P, '>>', ".pc/applied-patches") {
1080 $!==&ENOENT or die $!;
1085 commit_quilty_patch();
1088 sub quilt_fixup_editor () {
1089 my $descfn = $ENV{$fakeeditorenv};
1090 my $editing = $ARGV[$#ARGV];
1091 open I1, '<', $descfn or die "$descfn: $!";
1092 open I2, '<', $editing or die "$editing: $!";
1093 unlink $editing or die "$editing: $!";
1094 open O, '>', $editing or die "$editing: $!";
1095 while (<I1>) { print O or die $!; } I1->error and die $!;
1098 $copying ||= m/^\-\-\- /;
1099 next unless $copying;
1102 I2->error and die $!;
1108 badusage "-p is not allowed when building" if defined $package;
1110 my $clogp = parsechangelog();
1111 $isuite = getfield $clogp, 'Distribution';
1112 $package = getfield $clogp, 'Source';
1113 $version = getfield $clogp, 'Version';
1114 build_maybe_quilt_fixup();
1118 badusage "dgit build implies --clean=dpkg-source"
1119 if $cleanmode ne 'dpkg-source';
1121 runcmd_ordryrun @dpkgbuildpackage, qw(-us -uc), changesopts(), @ARGV;
1122 printdone "build successful\n";
1126 badusage "dgit git-build implies --clean=dpkg-source"
1127 if $cleanmode ne 'dpkg-source';
1130 (qw(git-buildpackage -us -uc --git-no-sign-tags),
1131 "--git-builder=@dpkgbuildpackage");
1132 unless (grep { m/^--git-debian-branch|^--git-ignore-branch/ } @ARGV) {
1133 canonicalise_suite();
1134 push @cmd, "--git-debian-branch=".lbranch();
1136 push @cmd, changesopts();
1137 runcmd_ordryrun @cmd, @ARGV;
1138 printdone "build successful\n";
1143 $sourcechanges = "${package}_".(stripepoch $version)."_source.changes";
1144 $dscfn = dscfn($version);
1145 if ($cleanmode eq 'dpkg-source') {
1146 runcmd_ordryrun (@dpkgbuildpackage, qw(-us -uc -S)), changesopts();
1148 if ($cleanmode eq 'git') {
1149 runcmd_ordryrun @git, qw(clean -xdf);
1150 } elsif ($cleanmode eq 'none') {
1154 my $pwd = cmdoutput qw(env - pwd);
1155 my $leafdir = basename $pwd;
1156 chdir ".." or die $!;
1157 runcmd_ordryrun @dpkgsource, qw(-b --), $leafdir;
1158 chdir $pwd or die $!;
1159 runcmd_ordryrun qw(sh -ec),
1160 'exec >$1; shift; exec "$@"','x',
1161 "../$sourcechanges",
1162 @dpkggenchanges, qw(-S), changesopts();
1166 sub cmd_build_source {
1167 badusage "build-source takes no additional arguments" if @ARGV;
1169 printdone "source built, results in $dscfn and $sourcechanges";
1174 chdir ".." or die $!;
1175 my $pat = "${package}_".(stripepoch $version)."_*.changes";
1177 stat $dscfn or fail "$dscfn (in parent directory): $!";
1178 stat $sourcechanges or fail "$sourcechanges (in parent directory): $!";
1179 foreach my $cf (glob $pat) {
1180 next if $cf eq $sourcechanges;
1181 unlink $cf or fail "remove $cf: $!";
1184 runcmd_ordryrun @sbuild, @ARGV, qw(-d), $isuite, $dscfn;
1185 runcmd_ordryrun @mergechanges, glob $pat;
1186 my $multichanges = "${package}_".(stripepoch $version)."_multi.changes";
1188 stat $multichanges or fail "$multichanges: $!";
1190 printdone "build successful, results in $multichanges\n" or die $!;
1193 sub cmd_quilt_fixup {
1194 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
1195 my $clogp = parsechangelog();
1196 $version = getfield $clogp, 'Version';
1197 build_maybe_quilt_fixup();
1203 last unless $ARGV[0] =~ m/^-/;
1207 if (m/^--dry-run$/) {
1209 } elsif (m/^--no-sign$/) {
1211 } elsif (m/^--help$/) {
1213 } elsif (m/^--new$/) {
1215 } elsif (m/^--(\w+)=(.*)/s &&
1216 ($om = $opts_opt_map{$1}) &&
1219 } elsif (m/^--(\w+):(.*)/s &&
1220 ($om = $opts_opt_map{$1})) {
1222 } elsif (m/^--existing-package=(.*)/s) {
1223 $existing_package = $1;
1224 } elsif (m/^--distro=(.*)/s) {
1226 } elsif (m/^--clean=(dpkg-source|git|none)$/s) {
1228 } elsif (m/^--clean=(.*)$/s) {
1229 badusage "unknown cleaning mode \`$1'";
1230 } elsif (m/^--ignore-dirty$/s) {
1232 } elsif (m/^--no-quilt-fixup$/s) {
1235 badusage "unknown long option \`$_'";
1241 } elsif (s/^-h/-/) {
1243 } elsif (s/^-D/-/) {
1244 open DEBUG, ">&STDERR" or die $!;
1246 } elsif (s/^-N/-/) {
1248 } elsif (m/^-[vm]/) {
1249 push @changesopts, $_;
1251 } elsif (s/^-c(.*=.*)//s) {
1252 push @git, '-c', $1;
1253 } elsif (s/^-d(.*)//s) {
1255 } elsif (s/^-C(.*)//s) {
1257 } elsif (s/^-k(.*)//s) {
1259 } elsif (s/^-wn//s) {
1260 $cleanmode = 'none';
1261 } elsif (s/^-wg//s) {
1263 } elsif (s/^-wd//s) {
1264 $cleanmode = 'dpkg-source';
1266 badusage "unknown short option \`$_'";
1273 if ($ENV{$fakeeditorenv}) {
1274 quilt_fixup_editor();
1277 delete $ENV{'DGET_UNPACK'};
1280 print STDERR "DRY RUN ONLY\n" if $dryrun;
1282 print STDERR $helpmsg or die $!;
1285 my $cmd = shift @ARGV;
1287 { no strict qw(refs); &{"cmd_$cmd"}(); }