X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=cde85468cfcad54ec99661f9d0ec0d02c2572c4e;hb=69323e5f402c84897eaeea7a28cdae1b3da10066;hp=1fa1f529561f3e45d871eb4bf3116e6ef2842a9a;hpb=4fa125c3dc9f093864d5e327eb339c431a93a5f2;p=dgit.git

diff --git a/dgit b/dgit
index 1fa1f529..cde85468 100755
--- a/dgit
+++ b/dgit
@@ -2,8 +2,9 @@
 # dgit
 # Integration between git and Debian-style archives
 #
-# Copyright (C)2013-2018 Ian Jackson
-# Copyright (C)2017-2018 Sean Whitton
+# Copyright (C)2013-2019 Ian Jackson
+# Copyright (C)2017-2019 Sean Whitton
+# Copyright (C)2019      Matthew Vernon / Genome Research Limited
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -116,7 +117,6 @@ our $rewritemap = 'dgit-rewrite/map';
 
 our @dpkg_source_ignores = qw(-i(?:^|/)\.git(?:/|$) -I.git);
 
-our (@git) = qw(git);
 our (@dget) = qw(dget);
 our (@curl) = (qw(curl --proto-redir), '-all,http,https', qw(-L));
 our (@dput) = qw(dput);
@@ -783,6 +783,12 @@ our %defcfg = ('dgit.default.distro' => 'debian',
  'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
 	       'dgit-distro.ubuntu.git-check' => 'false',
  'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
+	       'dgit-distro.ubuntucloud.git-check' => 'false',
+ 'dgit-distro.ubuntucloud.nominal-distro' => 'ubuntu',
+ 'dgit-distro.ubuntucloud.archive-query' => 'aptget:',
+ 'dgit-distro.ubuntucloud.mirror' => 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
+ 'dgit-distro.ubuntucloud.aptget-suite-map' => 's#^([^-]+):([^:]+)$#${1}-updates/$2#; s#^(.+)-(.+):(.+)#$1-$2/$3#;',
+ 'dgit-distro.ubuntucloud.aptget-suite-rmap' => 's#/(.+)$#-$1#',
 	       'dgit-distro.test-dummy.ssh' => "$td/ssh",
 	       'dgit-distro.test-dummy.username' => "alice",
 	       'dgit-distro.test-dummy.git-check' => "ssh-cmd",
@@ -1435,11 +1441,11 @@ sub canonicalise_suite_aptget {
 	my $val = $release->{$name};
 	if (defined $val) {
 	    printdebug "release file $name: $val\n";
+	    cfg_apply_map(\$val, 'suite rmap',
+			  access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
 	    $val =~ m/^$suite_re$/o or fail f_
 		"Release file (%s) specifies intolerable %s",
 		$aptget_releasefile, $name;
-	    cfg_apply_map(\$val, 'suite rmap',
-			  access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
 	    return $val
 	}
     }
@@ -1828,7 +1834,7 @@ sub prep_ud () {
 }
 
 sub mktree_in_ud_here () {
-    playtree_setup $gitcfgs{local};
+    playtree_setup();
 }
 
 sub git_write_tree () {
@@ -3876,14 +3882,9 @@ sub clone ($) {
     record_maindir();
     setup_new_tree();
     clone_set_head();
-    my $giturl = access_giturl(1);
-    if (defined $giturl) {
-	runcmd @git, qw(remote add), 'origin', $giturl;
-    }
     if ($hasgit) {
 	progress __ "fetching existing git history";
 	git_fetch_us();
-	runcmd_ordryrun_local @git, qw(fetch origin);
     } else {
 	progress __ "starting new git history";
     }
@@ -4363,7 +4364,6 @@ sub push_mktags ($$ $$ $) {
     # We make the git tag by hand because (a) that makes it easier
     # to control the "tagger" (b) we can do remote signing
     my $authline = clogp_authline $clogp;
-    my @dtxinfo = @deliberatelies;
 
     my $mktag = sub {
 	my ($tw) = @_;
@@ -4379,27 +4379,33 @@ tag $tag
 tagger $authline
 
 END
-	if ($tw->{View} eq 'dgit') {
-	    print TO f_ <<ENDT, $package, $cversion, $clogsuite, $csuite
-%s release %s for %s (%s) [dgit]
-ENDT
-		or confess "$!";
-	    unshift @dtxinfo, "--quilt=$quilt_mode" if madformat($format);
-	    unshift @dtxinfo, do_split_brain() ? "split" : "no-split"
-		# rpush protocol 5 and earlier don't tell us
-		unless $we_are_initiator && $protovsn < 6;
-	    my $dtxinfo = join(" ", "",@dtxinfo);
-	    print TO <<END or confess "$!";
+
+	my @dtxinfo = @deliberatelies;
+	unshift @dtxinfo, "--quilt=$quilt_mode" if madformat($format);
+	unshift @dtxinfo, do_split_brain() ? "split" : "no-split"
+	    # rpush protocol 5 and earlier don't tell us
+	    unless $we_are_initiator && $protovsn < 6;
+	my $dtxinfo = join(" ", "",@dtxinfo);
+	my $tag_metadata = <<END;
 [dgit distro=$declaredistro$dtxinfo]
 END
-	    foreach my $ref (sort keys %previously) {
-		print TO <<END or confess "$!";
+	foreach my $ref (sort keys %previously) {
+	    $tag_metadata .= <<END or confess "$!";
 [dgit previously:$ref=$previously{$ref}]
 END
-	    }
+	}
+
+	if ($tw->{View} eq 'dgit') {
+	    print TO sprintf <<ENDT, $package, $cversion, $clogsuite, $csuite
+%s release %s for %s (%s) [dgit]
+ENDT
+		or confess "$!";
 	} elsif ($tw->{View} eq 'maint') {
-	    print TO f_ <<END, $package, $cversion, $clogsuite, $csuite,
+	    print TO sprintf <<END, $package, $cversion, $clogsuite, $csuite;
 %s release %s for %s (%s)
+
+END
+	    print TO f_ <<END,
 (maintainer view tag generated by dgit --quilt=%s)
 END
 		$quilt_mode
@@ -4407,6 +4413,7 @@ END
 	} else {
 	    confess Dumper($tw)."?";
 	}
+	print TO "\n", $tag_metadata;
 
 	close TO or confess "$!";