X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=cd249b4226ada31ea2ae56a2e593a4c1cf5b715e;hp=ca343afc87f911fb832a1b0f0b79182f075dd6f4;hb=f6561dc13583c0b0c242d39d0056368ba2020121;hpb=2799e120b5cfa0ff9f942304f86d8024753bbc70

diff --git a/dgit b/dgit
index ca343afc..cd249b42 100755
--- a/dgit
+++ b/dgit
@@ -48,7 +48,7 @@ our $absurdity = undef; ###substituted###
 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
 our $protovsn;
 
-our $isuite = 'unstable';
+our $isuite;
 our $idistro;
 our $package;
 our @ropts;
@@ -73,12 +73,13 @@ our $dodep14tag;
 our $dodep14tag_re = 'want|no|always';
 our $split_brain_save;
 our $we_are_responder;
+our $we_are_initiator;
 our $initiator_tempdir;
 our $patches_applied_dirtily = 00;
 our $tagformat_want;
 our $tagformat;
 our $tagformatfn;
-our $chase_dsc_distro=1; #xxx configurable
+our $chase_dsc_distro=1;
 
 our %forceopts = map { $_=>0 }
     qw(unrepresentable unsupported-source-format
@@ -565,6 +566,8 @@ sub cmd_help () {
 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
 
 our %defcfg = ('dgit.default.distro' => 'debian',
+	       'dgit.default.default-suite' => 'unstable',
+	       'dgit.default.old-dsc-distro' => 'debian',
 	       'dgit-suite.*-security.distro' => 'debian-security',
 	       'dgit.default.username' => '',
 	       'dgit.default.archive-query-default-component' => 'main',
@@ -664,6 +667,7 @@ sub git_get_config ($) {
     my ($c) = @_;
     foreach my $src (@gitcfgsources) {
 	my $l = $gitcfgs{$src}{$c};
+	croak "$l $c" if $l && !ref $l;
 	printdebug"C $c ".(defined $l ?
 			   join " ", map { messagequote "'$_'" } @$l :
 			   "undef")."\n"
@@ -679,6 +683,7 @@ sub git_get_config ($) {
 sub cfg {
     foreach my $c (@_) {
 	return undef if $c =~ /RETURN-UNDEF/;
+	printdebug "C? $c\n" if $debuglevel >= 5;
 	my $v = git_get_config($c);
 	return $v if defined $v;
 	my $dv = $defcfg{$c};
@@ -691,7 +696,7 @@ sub cfg {
 	"$us: distro or suite appears not to be (properly) supported";
 }
 
-sub access_basedistro () {
+sub access_basedistro__noalias () {
     if (defined $idistro) {
 	return $idistro;
     } else {	
@@ -711,6 +716,12 @@ sub access_basedistro () {
     }
 }
 
+sub access_basedistro () {
+    my $noalias = access_basedistro__noalias();
+    my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
+    return $canon // $noalias;
+}
+
 sub access_nomdistro () {
     my $base = access_basedistro();
     my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
@@ -2664,6 +2675,16 @@ END
 	}
 	last;
     }
+
+    if (defined $csuite) {
+	printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
+	git_for_each_ref("refs/dgit-fetch/$csuite", sub {
+	    my ($objid,$objtype,$lrefname,$reftail) = @_;
+	    next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
+	    runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
+	});
+    }
+
     printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
 	Dumper(\%lrfetchrefs_f);
 }
@@ -2749,12 +2770,13 @@ sub parse_dsc_field ($$) {
     if (!defined $f) {
 	progress "$what: NO git hash";
     } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
-	     = $f =~ m/^(\w+) ($distro_re) ($versiontag_re) (\S+)(?:\s|$)/) {
+	     = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
 	progress "$what: specified git info ($dsc_distro)";
 	$dsc_hint_tag = [ $dsc_hint_tag ];
     } elsif ($f =~ m/^\w+\s*$/) {
 	$dsc_hash = $&;
-	$dsc_distro //= 'debian';
+	$dsc_distro //= cfg qw(dgit.default.old-dsc-distro
+			       dgit.default.distro);
 	$dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
 			  $dsc_distro ];
 	progress "$what: specified git hash";
@@ -2769,7 +2791,8 @@ sub resolve_dsc_field_commit ($$) {
     return unless defined $dsc_hash;
 
     my $mapref =
-	$already_distro eq $dsc_distro || !$chase_dsc_distro 
+	defined $already_mapref &&
+	($already_distro eq $dsc_distro || !$chase_dsc_distro)
 	? $already_mapref : undef;
 
     my $do_fetch;
@@ -2814,8 +2837,12 @@ END
 	return $lrf;
     };
 
-    if (parse_cfg_bool 'rewrite-map-enable', 'true',
-	    access_cfg('rewrite-map-enable', 'RETURN-UNDEF')) {
+    my $rewrite_enable = do {
+	local $idistro = $dsc_distro;
+	access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
+    };
+
+    if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
 	my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
 	$mapref = $lrf.'/'.$rewritemap;
 	my $rewritemapdata = git_cat_file $mapref.':map';
@@ -4273,7 +4300,8 @@ sub fetchpullargs () {
 	$isuite = branchsuite();
 	if (!$isuite) {
 	    my $clogp = parsechangelog();
-	    $isuite = getfield $clogp, 'Distribution';
+	    my $clogsuite = getfield $clogp, 'Distribution';
+	    $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
 	}
     } elsif (@ARGV==1) {
 	($isuite) = @ARGV;
@@ -4305,7 +4333,6 @@ END
 
 sub cmd_push {
     parseopts();
-    pushing();
     badusage "-p is not allowed with dgit push" if defined $package;
     check_not_dirty();
     my $clogp = parsechangelog();
@@ -4318,6 +4345,7 @@ sub cmd_push {
 	badusage "incorrect arguments to dgit push";
     }
     $isuite = getfield $clogp, 'Distribution';
+    pushing();
     if ($new_package) {
 	local ($package) = $existing_package; # this is a hack
 	canonicalise_suite();
@@ -4430,6 +4458,8 @@ sub cmd_rpush {
     my @cmd = (@ssh, $host, shellquote @rdgit);
     debugcmd "+",@cmd;
 
+    $we_are_initiator=1;
+
     if (defined $initiator_tempdir) {
 	rmtree $initiator_tempdir;
 	mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
@@ -5389,6 +5419,7 @@ sub quilt_fixup_multipatch ($$$) {
 
     rmtree '.pc';
 
+    runcmd @git, qw(checkout -f), $headref, qw(-- debian);
     my $unapplied=git_add_write_tree();
     printdebug "fake orig tree object $unapplied\n";
 
@@ -6022,11 +6053,16 @@ sub cmd_import_dsc {
 
     parse_dscdata();
 
-    parse_dsc_field($dsc, "Dgit metadata in .dsc");
+    $package = getfield $dsc, 'Source';
+
+    parse_dsc_field($dsc, "Dgit metadata in .dsc")
+	unless forceing [qw(import-dsc-with-dgit-field)];
 
-    if (defined $dsc_hash
-	&& !forceing [qw(import-dsc-with-dgit-field)]) {
+    if (defined $dsc_hash) {
 	progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
+	resolve_dsc_field_commit undef, undef;
+    }
+    if (defined $dsc_hash) {
 	my @cmd = (qw(sh -ec),
 		   "echo $dsc_hash | git cat-file --batch-check");
 	my $objgot = cmdoutput @cmd;
@@ -6058,7 +6094,6 @@ Specify  +$specbranch to overwrite, discarding existing history
 END
 	if $oldhash && !$force;
 
-    $package = getfield $dsc, 'Source';
     my @dfi = dsc_files_info();
     foreach my $fi (@dfi) {
 	my $f = $fi->{Filename};
@@ -6127,18 +6162,28 @@ sub cmd_clone_dgit_repos_server {
     badusage "need destination argument" unless @ARGV==1;
     my ($destdir) = @ARGV;
     $package = '_dgit-repos-server';
+    local $access_forpush = 0;
     my @cmd = (@git, qw(clone), access_giturl(), $destdir);
     debugcmd ">",@cmd;
     exec @cmd or fail "exec git clone: $!\n";
 }
 
+sub cmd_print_dgit_repos_server_source_url {
+    badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
+	if @ARGV;
+    $package = '_dgit-repos-server';
+    local $access_forpush = 0;
+    my $url = access_giturl();
+    print $url, "\n" or die $!;
+}
+
 sub cmd_setup_mergechangelogs {
     badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
     setup_mergechangelogs(1);
 }
 
 sub cmd_setup_useremail {
-    badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
+    badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
     setup_useremail(1);
 }
 
@@ -6264,6 +6309,9 @@ sub parseopts () {
 	    } elsif (m/^--no-rm-on-error$/s) {
 		push @ropts, $_;
 		$rmonerror = 0;
+	    } elsif (m/^--no-chase-dsc-distro$/s) {
+		push @ropts, $_;
+		$chase_dsc_distro = 0;
 	    } elsif (m/^--overwrite$/s) {
 		push @ropts, $_;
 		$overwrite_version = '';
@@ -6309,6 +6357,11 @@ sub parseopts () {
 		# undocumented, for testing
 		push @ropts, $_;
 		$need_split_build_invocation = 1;
+	    } elsif (m/^--config-lookup-explode=(.+)$/s) {
+		# undocumented, for testing
+		push @ropts, $_;
+		$gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
+		# ^ it's supposed to be an array ref
 	    } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
 		$val = $2 ? $' : undef; #';
 		$valopt->($oi->{Long});
@@ -6398,6 +6451,10 @@ END
 
 
 sub parseopts_late_defaults () {
+    $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
+	if defined $idistro;
+    $isuite //= cfg('dgit.default.default-suite');
+
     foreach my $k (keys %opts_opt_map) {
 	my $om = $opts_opt_map{$k};