X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=48143341e9f47177228a6f58a96b9af416542dec;hp=79618d90400f0a834ddd78a2d92a5005c4102aed;hb=808b73e0d25838e98cb19d0f71e62abc145cbd21;hpb=ce6eee9d419bcac712d3ddbb084619d3c02681bd

diff --git a/dgit b/dgit
index 79618d90..48143341 100755
--- a/dgit
+++ b/dgit
@@ -76,7 +76,7 @@ our $tagformatfn;
 
 our %forceopts = map { $_=>0 }
     qw(unrepresentable unsupported-source-format
-       dsc-changes-mismatch
+       dsc-changes-mismatch changes-origs-exactly
        import-gitapply-absurd
        import-gitapply-no-absurd);
 
@@ -960,6 +960,13 @@ sub must_getcwd () {
     return $d;
 }
 
+sub parse_dscdata () {
+    my $dscfh = new IO::File \$dscdata, '<' or die $!;
+    printdebug Dumper($dscdata) if $debuglevel>1;
+    $dsc = parsecontrolfh($dscfh,$dscurl,1);
+    printdebug Dumper($dsc) if $debuglevel>1;
+}
+
 our %rmad;
 
 sub archive_query ($;@) {
@@ -1358,10 +1365,7 @@ sub get_archive_dsc () {
 		fail "$dscurl has hash $got but".
 		    " archive told us to expect $digest";
 	}
-	my $dscfh = new IO::File \$dscdata, '<' or die $!;
-	printdebug Dumper($dscdata) if $debuglevel>1;
-	$dsc = parsecontrolfh($dscfh,$dscurl,1);
-	printdebug Dumper($dsc) if $debuglevel>1;
+	parse_dscdata();
 	my $fmt = getfield $dsc, 'Format';
 	$format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
 	    "unsupported source format $fmt, sorry";
@@ -1824,10 +1828,15 @@ sub generate_commits_from_dsc () {
 	my $f = $fi->{Filename};
 	die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
 
-	link_ltarget "../../../$f", $f
+	printdebug "considering linking $f: ";
+
+	link_ltarget "../../../../$f", $f
+	    or ((printdebug "($!) "), 0)
 	    or $!==&ENOENT
 	    or die "$f $!";
 
+	printdebug "linked.\n";
+
 	complete_file_from_dsc('.', $fi)
 	    or next;
 
@@ -2206,6 +2215,7 @@ sub complete_file_from_dsc ($$) {
     if (stat_exists $tf) {
 	progress "using existing $f";
     } else {
+	printdebug "$tf does not exist, need to fetch\n";
 	my $furl = $dscurl;
 	$furl =~ s{/[^/]+$}{};
 	$furl .= "/$f";
@@ -3453,7 +3463,8 @@ END
 
     # Perhaps adjust .dsc to contain right set of origs
     changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
-				  $changesfile);
+				  $changesfile)
+	unless forceing [qw(changes-origs-exactly)];
 
     # Checks complete, we're going to try and go ahead:
 
@@ -5263,6 +5274,74 @@ sub cmd_quilt_fixup {
     build_maybe_quilt_fixup();
 }
 
+sub cmd_import_dsc {
+    badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
+    my ($dscfn, $dstbranch) = @ARGV;
+
+    badusage "dry run makes no sense with import-dsc" unless act_local();
+
+    $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
+    $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
+
+    open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
+    $dscdata = do { local $/ = undef; <D>; };
+    D->error and fail "read $dscfn: $!";
+    close C;
+    parse_dscdata();
+
+    my $dgit_commit = $dsc->{$ourdscfield[0]};
+    if (defined $dgit_commit && 
+	!forceing [qw(import-dsc-with-dgit-field)]) {
+	$dgit_commit =~ m/\w+/ or fail "invalid hash in .dsc";
+	progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
+	my @cmd = (qw(sh -ec),
+		   "echo $dgit_commit | git cat-file --batch-check");
+	my $objgot = cmdoutput @cmd;
+	if ($objgot =~ m#^\w+ missing\b#) {
+	    fail <<END
+.dsc contains Dgit field referring to object $dgit_commit
+Your git tree does not have that object.  Try `git fetch' from a
+plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
+END
+	}
+	@cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $dscfn",
+		$dstbranch, $dgit_commit);
+	runcmd @cmd;
+	progress "dgit: import-dsc updated git ref $dstbranch";
+	return 0;
+    }
+
+    $package = getfield $dsc, 'Source';
+    my @dfi = dsc_files_info();
+    foreach my $fi (@dfi) {
+	my $f = $fi->{Filename};
+	my $here = "../$f";
+	next if lstat $here;
+	fail "stat $here: $!" unless $! == ENOENT;
+	my $there = $dscfn;
+	if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
+	    $there = $';
+	} elsif ($dscfn =~ m#^/#) {
+	    $there = $dscfn;
+	} else {
+	    fail "cannot import $dscfn which seems to be inside working tree!";
+	}
+	$there =~ s#/+[^/]+$## or
+	    fail "cannot import $dscfn which seems to not have a basename";
+	$there .= "/$f";
+	symlink $there, $here or fail "symlink $there to $here: $!";
+	progress "made symlink $here -> $there";
+	print STDERR Dumper($fi);
+    }
+    my @mergeinputs = generate_commits_from_dsc();
+    die unless @mergeinputs == 1;
+
+    my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $dscfn",
+	       $dstbranch, $mergeinputs[0]{Commit});
+    runcmd @cmd;
+    progress "dgit: import-dsc results are in in git ref $dstbranch";
+}
+
 sub cmd_archive_api_query {
     badusage "need only 1 subpath argument" unless @ARGV==1;
     my ($subpath) = @ARGV;