X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=da62de1f39f57708a7874b7f33cfebac2d84730d;hp=c1b1c25374aeaae483ccee3fbb67bdb229d66863;hb=f046c1a2174b3ee12b57ce7baf777f6fd518608b;hpb=afee8943fd120d9f99b3a5890cf2625e12815f5d

diff --git a/dgit b/dgit
index c1b1c253..da62de1f 100755
--- a/dgit
+++ b/dgit
@@ -2,7 +2,7 @@
 # dgit
 # Integration between git and Debian-style archives
 #
-# Copyright (C)2013-2015 Ian Jackson
+# Copyright (C)2013-2016 Ian Jackson
 #
 # 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
@@ -36,11 +36,14 @@ use Digest::SHA;
 use Digest::MD5;
 use List::Util qw(any);
 use List::MoreUtils qw(pairwise);
+use Text::Glob qw(match_glob);
+use Fcntl qw(:DEFAULT :flock);
 use Carp;
 
 use Debian::Dgit;
 
 our $our_version = 'UNRELEASED'; ###substituted###
+our $absurdity = undef; ###substituted###
 
 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
 our $protovsn;
@@ -66,6 +69,7 @@ our $rmchanges;
 our $overwrite_version; # undef: not specified; '': check changelog
 our $quilt_mode;
 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
+our $split_brain_save;
 our $we_are_responder;
 our $initiator_tempdir;
 our $patches_applied_dirtily = 00;
@@ -73,6 +77,13 @@ our $tagformat_want;
 our $tagformat;
 our $tagformatfn;
 
+our %forceopts = map { $_=>0 }
+    qw(unrepresentable unsupported-source-format
+       dsc-changes-mismatch changes-origs-exactly
+       import-gitapply-absurd
+       import-gitapply-no-absurd
+       import-dsc-with-dgit-field);
+
 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
 
 our $suite_re = '[-+.0-9a-z]+';
@@ -86,13 +97,15 @@ our $splitbraincache = 'dgit-intern/quilt-cache';
 
 our (@git) = qw(git);
 our (@dget) = qw(dget);
-our (@curl) = qw(curl -f);
+our (@curl) = qw(curl);
 our (@dput) = qw(dput);
 our (@debsign) = qw(debsign);
 our (@gpg) = qw(gpg);
 our (@sbuild) = qw(sbuild);
 our (@ssh) = 'ssh';
 our (@dgit) = qw(dgit);
+our (@aptget) = qw(apt-get);
+our (@aptcache) = qw(apt-cache);
 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
 our (@dpkggenchanges) = qw(dpkg-genchanges);
@@ -110,6 +123,8 @@ our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
                      'ssh' => \@ssh,
                      'dgit' => \@dgit,
                      'git' => \@git,
+                     'apt-get' => \@aptget,
+                     'apt-cache' => \@aptcache,
                      'dpkg-source' => \@dpkgsource,
                      'dpkg-buildpackage' => \@dpkgbuildpackage,
                      'dpkg-genchanges' => \@dpkggenchanges,
@@ -144,6 +159,11 @@ our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
 our $csuite;
 our $instead_distro;
 
+if (!defined $absurdity) {
+    $absurdity = $0;
+    $absurdity =~ s{/[^/]+$}{/absurd} or die;
+}
+
 sub debiantag ($$) {
     my ($v,$distro) = @_;
     return $tagformatfn->($v, $distro);
@@ -208,6 +228,12 @@ sub changespat ($;$) {
     return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
 }
 
+sub upstreamversion ($) {
+    my ($vsn) = @_;
+    $vsn =~ s/-[^-]+$//;
+    return $vsn;
+}
+
 our $us = 'dgit';
 initdebug('');
 
@@ -222,6 +248,20 @@ END {
 
 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
 
+sub forceable_fail ($$) {
+    my ($forceoptsl, $msg) = @_;
+    fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
+    print STDERR "warning: overriding problem due to --force:\n". $msg;
+}
+
+sub forceing ($) {
+    my ($forceoptsl) = @_;
+    my @got = grep { $forceopts{$_} } @$forceoptsl;
+    return 0 unless @got;
+    print STDERR
+ "warning: skipping checks or functionality due to --force-$got[0]\n";
+}
+
 sub no_such_package () {
     print STDERR "$us: package $package does not exist in suite $isuite\n";
     exit 4;
@@ -546,12 +586,14 @@ sub cmd_help () {
 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
 
 our %defcfg = ('dgit.default.distro' => 'debian',
+	       'dgit-suite.*-security.distro' => 'debian-security',
 	       'dgit.default.username' => '',
 	       'dgit.default.archive-query-default-component' => 'main',
 	       'dgit.default.ssh' => 'ssh',
 	       'dgit.default.archive-query' => 'madison:',
 	       'dgit.default.sshpsql-dbname' => 'service=projectb',
-	       'dgit.default.dgit-tag-format' => 'old,new,maint',
+	       'dgit.default.aptget-components' => 'main',
+	       'dgit.default.dgit-tag-format' => 'new,old,maint',
 	       # old means "repo server accepts pushes with old dgit tags"
 	       # new means "repo server accepts pushes with new dgit tags"
 	       # maint means "repo server accepts split brain pushes"
@@ -561,7 +603,6 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit-distro.debian.git-check' => 'url',
 	       'dgit-distro.debian.git-check-suffix' => '/info/refs',
 	       'dgit-distro.debian.new-private-pushers' => 't',
-	       'dgit-distro.debian.dgit-tag-format' => 'new',
 	       'dgit-distro.debian/push.git-url' => '',
 	       'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
 	       'dgit-distro.debian/push.git-user-force' => 'dgit',
@@ -583,6 +624,11 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit-distro.debian.git-url-suffix' => '',
 	       'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
 	       'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
+ 'dgit-distro.debian-security.archive-query' => 'aptget:',
+ 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
+ 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
+ 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
+ 'dgit-distro.debian-security.nominal-distro' => 'debian',
  'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
  'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
 	       'dgit-distro.ubuntu.git-check' => 'false',
@@ -594,42 +640,55 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit-distro.test-dummy.git-url' => "$td/git",
 	       'dgit-distro.test-dummy.git-host' => "git",
 	       'dgit-distro.test-dummy.git-path' => "$td/git",
-	       'dgit-distro.test-dummy.archive-query' => "ftpmasterapi:",
+	       'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
 	       'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
 	       'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
 	       'dgit-distro.test-dummy.upload-host' => 'test-dummy',
                );
 
-our %gitcfg;
+our %gitcfgs;
+our @gitcfgsources = qw(cmdline local global system);
 
 sub git_slurp_config () {
     local ($debuglevel) = $debuglevel-2;
     local $/="\0";
 
-    my @cmd = (@git, qw(config -z --get-regexp .*));
-    debugcmd "|",@cmd;
-
-    open GITS, "-|", @cmd or die $!;
-    while (<GITS>) {
-	chomp or die;
-	printdebug "=> ", (messagequote $_), "\n";
-	m/\n/ or die "$_ ?";
-	push @{ $gitcfg{$`} }, $'; #';
+    # This algoritm is a bit subtle, but this is needed so that for
+    # options which we want to be single-valued, we allow the
+    # different config sources to override properly.  See #835858.
+    foreach my $src (@gitcfgsources) {
+	next if $src eq 'cmdline';
+	# we do this ourselves since git doesn't handle it
+	
+	my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
+	debugcmd "|",@cmd;
+
+	open GITS, "-|", @cmd or die $!;
+	while (<GITS>) {
+	    chomp or die;
+	    printdebug "=> ", (messagequote $_), "\n";
+	    m/\n/ or die "$_ ?";
+	    push @{ $gitcfgs{$src}{$`} }, $'; #';
+	}
+	$!=0; $?=0;
+	close GITS
+	    or ($!==0 && $?==256)
+	    or failedcmd @cmd;
     }
-    $!=0; $?=0;
-    close GITS
-	or ($!==0 && $?==256)
-	or failedcmd @cmd;
 }
 
 sub git_get_config ($) {
     my ($c) = @_;
-    my $l = $gitcfg{$c};
-    printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
-	if $debuglevel >= 4;
-    $l or return undef;
-    @$l==1 or badcfg "multiple values for $c" if @$l > 1;
-    return $l->[0];
+    foreach my $src (@gitcfgsources) {
+	my $l = $gitcfgs{$src}{$c};
+	printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
+	    if $debuglevel >= 4;
+	$l or next;
+	@$l==1 or badcfg "multiple values for $c".
+	    " (in $src git config)" if @$l > 1;
+	return $l->[0];
+    }
+    return undef;
 }
 
 sub cfg {
@@ -648,11 +707,27 @@ sub access_basedistro () {
     if (defined $idistro) {
 	return $idistro;
     } else {	
-	return cfg("dgit-suite.$isuite.distro",
-		   "dgit.default.distro");
+	my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
+	return $def if defined $def;
+	foreach my $src (@gitcfgsources, 'internal') {
+	    my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
+	    next unless $kl;
+	    foreach my $k (keys %$kl) {
+		next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
+		my $dpat = $1;
+		next unless match_glob $dpat, $isuite;
+		return $kl->{$k};
+	    }
+	}
+	return cfg("dgit.default.distro");
     }
 }
 
+sub access_nomdistro () {
+    my $base = access_basedistro();
+    return cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
+}
+
 sub access_quirk () {
     # returns (quirk name, distro to use instead or undef, quirk-specific info)
     my $basedistro = access_basedistro();
@@ -748,6 +823,8 @@ sub access_distros () {
     unshift @l, $instead_distro;
     @l = grep { defined } @l;
 
+    push @l, access_nomdistro();
+
     if (access_forpush()) {
 	@l = map { ("$_/push", $_) } @l;
     }
@@ -877,10 +954,10 @@ sub parsecontrolfh ($$;$) {
 }
 
 sub parsecontrol {
-    my ($file, $desc) = @_;
+    my ($file, $desc, $allowsigned) = @_;
     my $fh = new IO::Handle;
     open $fh, '<', $file or die "$file: $!";
-    my $c = parsecontrolfh($fh,$desc);
+    my $c = parsecontrolfh($fh,$desc,$allowsigned);
     $fh->error and die $!;
     close $fh;
     return $c;
@@ -922,15 +999,27 @@ 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 ($) {
-    my ($method) = @_;
+sub archive_query ($;@) {
+    my ($method) = shift @_;
     my $query = access_cfg('archive-query','RETURN-UNDEF');
     $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
     my $proto = $1;
     my $data = $'; #';
-    { no strict qw(refs); &{"${method}_${proto}"}($proto,$data); }
+    { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
+}
+
+sub archive_query_prepend_mirror {
+    my $m = access_cfg('mirror');
+    return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
 }
 
 sub pool_dsc_subpath ($$) {
@@ -939,11 +1028,22 @@ sub pool_dsc_subpath ($$) {
     return "/pool/$component/$prefix/$package/".dscfn($vsn);
 }
 
+sub cfg_apply_map ($$$) {
+    my ($varref, $what, $mapspec) = @_;
+    return unless $mapspec;
+
+    printdebug "config $what EVAL{ $mapspec; }\n";
+    $_ = $$varref;
+    eval "package Dgit::Config; $mapspec;";
+    die $@ if $@;
+    $$varref = $_;
+}
+
 #---------- `ftpmasterapi' archive query method (nascent) ----------
 
 sub archive_api_query_cmd ($) {
     my ($subpath) = @_;
-    my @cmd = qw(curl -sS);
+    my @cmd = (@curl, qw(-sS));
     my $url = access_cfg('archive-query-url');
     if ($url =~ m#^https://([-.0-9a-z]+)/#) {
 	my $host = $1;
@@ -971,17 +1071,27 @@ sub archive_api_query_cmd ($) {
     return @cmd;
 }
 
-sub api_query ($$) {
+sub api_query ($$;$) {
     use JSON;
-    my ($data, $subpath) = @_;
+    my ($data, $subpath, $ok404) = @_;
     badcfg "ftpmasterapi archive query method takes no data part"
 	if length $data;
     my @cmd = archive_api_query_cmd($subpath);
+    my $url = $cmd[$#cmd];
+    push @cmd, qw(-w %{http_code});
     my $json = cmdoutput @cmd;
+    unless ($json =~ s/\d+\d+\d$//) {
+	failedcmd_report_cmd undef, @cmd;
+	fail "curl failed to print 3-digit HTTP code";
+    }
+    my $code = $&;
+    return undef if $code eq '404' && $ok404;
+    fail "fetch of $url gave HTTP code $code"
+	unless $url =~ m#^file://# or $code =~ m/^2/;
     return decode_json($json);
 }
 
-sub canonicalise_suite_ftpmasterapi () {
+sub canonicalise_suite_ftpmasterapi {
     my ($proto,$data) = @_;
     my $suites = api_query($data, 'suites');
     my @matched;
@@ -1005,7 +1115,7 @@ sub canonicalise_suite_ftpmasterapi () {
     return $cn;
 }
 
-sub archive_query_ftpmasterapi () {
+sub archive_query_ftpmasterapi {
     my ($proto,$data) = @_;
     my $info = api_query($data, "dsc_in_suite/$isuite/$package");
     my @rows;
@@ -1029,13 +1139,212 @@ sub archive_query_ftpmasterapi () {
 	    if length $@;
     }
     @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
-    return @rows;
+    return archive_query_prepend_mirror @rows;
+}
+
+sub file_in_archive_ftpmasterapi {
+    my ($proto,$data,$filename) = @_;
+    my $pat = $filename;
+    $pat =~ s/_/\\_/g;
+    $pat = "%/$pat";
+    $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
+    my $info = api_query($data, "file_in_archive/$pat", 1);
+}
+
+#---------- `aptget' archive query method ----------
+
+our $aptget_base;
+our $aptget_releasefile;
+our $aptget_configpath;
+
+sub aptget_aptget   () { return @aptget,   qw(-c), $aptget_configpath; }
+sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
+
+sub aptget_cache_clean {
+    runcmd_ordryrun_local qw(sh -ec),
+	'cd "$1"; pwd; find -atime +30 -type f -print0 | xargs -0r echo rm --',
+	'x', $aptget_base;
+}
+
+sub aptget_lock_acquire () {
+    my $lockfile = "$aptget_base/lock";
+    open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
+    flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
+}
+
+sub aptget_prep ($) {
+    my ($data) = @_;
+    return if defined $aptget_base;
+
+    badcfg "aptget archive query method takes no data part"
+	if length $data;
+
+    my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
+
+    ensuredir $cache;
+    ensuredir "$cache/dgit";
+    my $cachekey =
+	access_cfg('aptget-cachekey','RETURN-UNDEF')
+	// access_nomdistro();
+
+    $aptget_base = "$cache/dgit/aptget";
+    ensuredir $aptget_base;
+
+    my $quoted_base = $aptget_base;
+    die "$quoted_base contains bad chars, cannot continue"
+	if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
+
+    ensuredir $aptget_base;
+
+    aptget_lock_acquire();
+
+    aptget_cache_clean();
+
+    $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
+    my $sourceslist = "source.list#$cachekey";
+
+    my $aptsuites = $isuite;
+    cfg_apply_map(\$aptsuites, 'suite map',
+		  access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
+
+    open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
+    printf SRCS "deb-src %s %s %s\n",
+	access_cfg('mirror'),
+	$aptsuites,
+	access_cfg('aptget-components')
+	or die $!;
+
+    ensuredir "$aptget_base/cache";
+    ensuredir "$aptget_base/lists";
+
+    open CONF, ">", $aptget_configpath or die $!;
+    print CONF <<END;
+Debug::NoLocking "true";
+APT::Get::List-Cleanup "false";
+#clear APT::Update::Post-Invoke-Success;
+Dir::Etc::SourceList "$quoted_base/$sourceslist";
+Dir::State::Lists "$quoted_base/lists";
+Dir::Etc::preferences "$quoted_base/preferences";
+Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
+Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
+END
+
+    foreach my $key (qw(
+			Dir::Cache
+			Dir::State
+			Dir::Cache::Archives
+			Dir::Etc::SourceParts
+			Dir::Etc::preferencesparts
+		      )) {
+	ensuredir "$aptget_base/$key";
+	print CONF "$key \"$quoted_base/$key\";\n" or die $!;
+    };
+
+    my $oldatime = (time // die $!) - 1;
+    foreach my $oldlist (<$aptget_base/lists/*Release>) {
+	next unless stat_exists $oldlist;
+	my ($mtime) = (stat _)[9];
+	utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
+    }
+
+    runcmd_ordryrun_local aptget_aptget(), qw(update);
+
+    my @releasefiles;
+    foreach my $oldlist (<$aptget_base/lists/*Release>) {
+	next unless stat_exists $oldlist;
+	my ($atime) = (stat _)[8];
+	next if $atime == $oldatime;
+	push @releasefiles, $oldlist;
+    }
+    my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
+    @releasefiles = @inreleasefiles if @inreleasefiles;
+    die "apt updated wrong number of Release files (@releasefiles), erk"
+	unless @releasefiles == 1;
+
+    ($aptget_releasefile) = @releasefiles;
+}
+
+sub canonicalise_suite_aptget {
+    my ($proto,$data) = @_;
+    aptget_prep($data);
+
+    my $release = parsecontrol $aptget_releasefile, "Release file", 1;
+
+    foreach my $name (qw(Codename Suite)) {
+	my $val = $release->{$name};
+	if (defined $val) {
+	    printdebug "release file $name: $val\n";
+	    $val =~ m/^$suite_re$/o or fail
+ "Release file ($aptget_releasefile) specifies intolerable $name";
+	    cfg_apply_map(\$val, 'suite rmap',
+			  access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
+	    return $val
+	}
+    }
+    return $isuite;
+}
+
+sub archive_query_aptget {
+    my ($proto,$data) = @_;
+    aptget_prep($data);
+
+    ensuredir "$aptget_base/source";
+    foreach my $old (<$aptget_base/source/*.dsc>) {
+	unlink $old or die "$old: $!";
+    }
+
+    my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
+    return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
+    # avoids apt-get source failing with ambiguous error code
+
+    runcmd_ordryrun_local
+	shell_cmd 'cd "$1"/source; shift', $aptget_base,
+	aptget_aptget(), qw(--download-only --only-source source), $package;
+
+    my @dscs = <$aptget_base/source/*.dsc>;
+    fail "apt-get source did not produce a .dsc" unless @dscs;
+    fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
+
+    my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
+
+    use URI::Escape;
+    my $uri = "file://". uri_escape $dscs[0];
+    $uri =~ s{\%2f}{/}gi;
+    return [ (getfield $pre_dsc, 'Version'), $uri ];
+}
+
+#---------- `dummyapicat' archive query method ----------
+
+sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
+sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
+
+sub file_in_archive_dummycatapi ($$$) {
+    my ($proto,$data,$filename) = @_;
+    my $mirror = access_cfg('mirror');
+    $mirror =~ s#^file://#/# or die "$mirror ?";
+    my @out;
+    my @cmd = (qw(sh -ec), '
+            cd "$1"
+            find -name "$2" -print0 |
+            xargs -0r sha256sum
+        ', qw(x), $mirror, $filename);
+    debugcmd "-|", @cmd;
+    open FIA, "-|", @cmd or die $!;
+    while (<FIA>) {
+	chomp or die;
+	printdebug "| $_\n";
+	m/^(\w+)  (\S+)$/ or die "$_ ?";
+	push @out, { sha256sum => $1, filename => $2 };
+    }
+    close FIA or die failedcmd @cmd;
+    return \@out;
 }
 
 #---------- `madison' archive query method ----------
 
 sub archive_query_madison {
-    return map { [ @$_[0..1] ] } madison_get_parse(@_);
+    return archive_query_prepend_mirror
+	map { [ @$_[0..1] ] } madison_get_parse(@_);
 }
 
 sub madison_get_parse {
@@ -1080,6 +1389,8 @@ sub canonicalise_suite_madison {
     return $r[0][2];
 }
 
+sub file_in_archive_madison { return undef; }
+
 #---------- `sshpsql' archive query method ----------
 
 sub sshpsql ($$$) {
@@ -1139,7 +1450,7 @@ END
 	my ($vsn,$component,$filename,$sha256sum) = @$_;
 	[ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
     } @rows;
-    return @rows;
+    return archive_query_prepend_mirror @rows;
 }
 
 sub canonicalise_suite_sshpsql ($$) {
@@ -1155,6 +1466,8 @@ END
     return $rows[0];
 }
 
+sub file_in_archive_sshpsql ($$$) { return undef; }
+
 #---------- `dummycat' archive query method ----------
 
 sub canonicalise_suite_dummycat ($$) {
@@ -1193,9 +1506,12 @@ sub archive_query_dummycat ($$) {
     }
     C->error and die "$dpath: $!";
     close C;
-    return sort { -version_compare($a->[0],$b->[0]); } @rows;
+    return archive_query_prepend_mirror
+	sort { -version_compare($a->[0],$b->[0]); } @rows;
 }
 
+sub file_in_archive_dummycat () { return undef; }
+
 #---------- tag format handling ----------
 
 sub access_cfg_tagformats () {
@@ -1253,8 +1569,8 @@ sub get_archive_dsc () {
     canonicalise_suite();
     my @vsns = archive_query('archive_query');
     foreach my $vinfo (@vsns) {
-	my ($vsn,$subpath,$digester,$digest) = @$vinfo;
-	$dscurl = access_cfg('mirror').$subpath;
+	my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
+	$dscurl = $vsn_dscurl;
 	$dscdata = url_get($dscurl);
 	if (!$dscdata) {
 	    $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
@@ -1268,12 +1584,11 @@ 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';
-	fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt};
+	$format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
+	    "unsupported source format $fmt, sorry";
+	    
 	$dsc_checked = !!$digester;
 	printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
 	return;
@@ -1309,7 +1624,7 @@ sub check_for_git () {
 	my $suffix = access_cfg('git-check-suffix','git-suffix',
 				'RETURN-UNDEF') // '.git';
 	my $url = "$prefix/$package$suffix";
-	my @cmd = (qw(curl -sS -I), $url);
+	my @cmd = (@curl, qw(-sS -I), $url);
 	my $result = cmdoutput @cmd;
 	$result =~ s/^\S+ 200 .*\n\r?\n//;
 	# curl -sS -I with https_proxy prints
@@ -1415,9 +1730,9 @@ sub mktree_in_ud_from_only_subdir (;$) {
 }
 
 our @files_csum_info_fields = 
-    (['Checksums-Sha256','Digest::SHA', 'new(256)'],
-     ['Checksums-Sha1',  'Digest::SHA', 'new(1)'],
-     ['Files',           'Digest::MD5', 'new()']);
+    (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
+     ['Checksums-Sha1',  'Digest::SHA', 'new(1)',   'sha1sum'],
+     ['Files',           'Digest::MD5', 'new()',    'md5sum']);
 
 sub dsc_files_info () {
     foreach my $csumi (@files_csum_info_fields) {
@@ -1523,6 +1838,101 @@ sub is_orig_file_of_vsn ($$) {
     return 1;
 }
 
+sub changes_update_origs_from_dsc ($$$$) {
+    my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
+    my %changes_f;
+    printdebug "checking origs needed ($upstreamvsn)...\n";
+    $_ = getfield $changes, 'Files';
+    m/^\w+ \d+ (\S+ \S+) \S+$/m or
+	fail "cannot find section/priority from .changes Files field";
+    my $placementinfo = $1;
+    my %changed;
+    printdebug "checking origs needed placement '$placementinfo'...\n";
+    foreach my $l (split /\n/, getfield $dsc, 'Files') {
+	$l =~ m/\S+$/ or next;
+	my $file = $&;
+	printdebug "origs $file | $l\n";
+	next unless is_orig_file_of_vsn $file, $upstreamvsn;
+	printdebug "origs $file is_orig\n";
+	my $have = archive_query('file_in_archive', $file);
+	if (!defined $have) {
+	    print STDERR <<END;
+archive does not support .orig check; hope you used --ch:--sa/-sd if needed
+END
+	    return;
+	}
+	my $found_same = 0;
+	my @found_differ;
+	printdebug "origs $file \$#\$have=$#$have\n";
+	foreach my $h (@$have) {
+	    my $same = 0;
+	    my @differ;
+	    foreach my $csumi (@files_csum_info_fields) {
+		my ($fname, $module, $method, $archivefield) = @$csumi;
+		next unless defined $h->{$archivefield};
+		$_ = $dsc->{$fname};
+		next unless defined;
+		m/^(\w+) .* \Q$file\E$/m or
+		    fail ".dsc $fname missing entry for $file";
+		if ($h->{$archivefield} eq $1) {
+		    $same++;
+		} else {
+		    push @differ,
+ "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
+		}
+	    }
+	    die "$file ".Dumper($h)." ?!" if $same && @differ;
+	    $found_same++
+		if $same;
+	    push @found_differ, "archive $h->{filename}: ".join "; ", @differ
+		if @differ;
+	}
+	print "origs $file f.same=$found_same #f._differ=$#found_differ\n";
+	if (@found_differ && !$found_same) {
+	    fail join "\n",
+		"archive contains $file with different checksum",
+		@found_differ;
+	}
+	# Now we edit the changes file to add or remove it
+	foreach my $csumi (@files_csum_info_fields) {
+	    my ($fname, $module, $method, $archivefield) = @$csumi;
+	    next unless defined $changes->{$fname};
+	    if ($found_same) {
+		# in archive, delete from .changes if it's there
+		$changed{$file} = "removed" if
+		    $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
+	    } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
+		# not in archive, but it's here in the .changes
+	    } else {
+		my $dsc_data = getfield $dsc, $fname;
+		$dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
+		my $extra = $1;
+		$extra =~ s/ \d+ /$&$placementinfo /
+		    or die "$fname $extra >$dsc_data< ?"
+		    if $fname eq 'Files';
+		$changes->{$fname} .= "\n". $extra;
+		$changed{$file} = "added";
+	    }
+	}
+    }
+    if (%changed) {
+	foreach my $file (keys %changed) {
+	    progress sprintf
+		"edited .changes for archive .orig contents: %s %s",
+		$changed{$file}, $file;
+	}
+	my $chtmp = "$changesfile.tmp";
+	$changes->save($chtmp);
+	if (act_local()) {
+	    rename $chtmp,$changesfile or die "$changesfile $!";
+	} else {
+	    progress "[new .changes left in $changesfile]";
+	}
+    } else {
+	progress "$changesfile already has appropriate .orig(s) (if any)";
+    }
+}
+
 sub make_commit ($) {
     my ($file) = @_;
     return cmdoutput @git, qw(hash-object -w -t commit), $file;
@@ -1623,7 +2033,9 @@ sub check_for_vendor_patches () {
     vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
 			 "Dpkg::Vendor \`current vendor'");
     vendor_patches_distro(access_basedistro(),
-			  "distro being accessed");
+			  "(base) distro being accessed");
+    vendor_patches_distro(access_nomdistro(),
+			  "(nominal) distro being accessed");
 }
 
 sub generate_commits_from_dsc () {
@@ -1637,10 +2049,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;
 
@@ -1657,8 +2074,7 @@ sub generate_commits_from_dsc () {
     # from the debian/changelog, so we record the tree objects now and
     # make them into commits later.
     my @tartrees;
-    my $upstreamv = $dsc->{version};
-    $upstreamv =~ s/-[^-]+$//;
+    my $upstreamv = upstreamversion $dsc->{version};
     my $orig_f_base = srcfn $upstreamv, '';
 
     foreach my $fi (@dfi) {
@@ -1833,7 +2249,7 @@ sub generate_commits_from_dsc () {
 	printdebug "import clog $r1clogp->{version} becomes r1\n";
     }
     die $! if CLOGS->error;
-    close CLOGS or $?==(SIGPIPE<<8) or failedcmd @clogcmd;
+    close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
 
     $clogp or fail "package changelog has no entries!";
 
@@ -1919,25 +2335,54 @@ END
 	local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
 	local $ENV{GIT_AUTHOR_DATE} =  $authline[2];
 
-	eval {
-	    runcmd shell_cmd 'exec >/dev/null 2>../../gbp-pq-output',
-		gbp_pq, qw(import);
-	};
-	if ($@) {
-	    { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
-	    die $@;
-	}
+	my $path = $ENV{PATH} or die;
+
+	foreach my $use_absurd (qw(0 1)) {
+	    local $ENV{PATH} = $path;
+	    if ($use_absurd) {
+		chomp $@;
+		progress "warning: $@";
+		$path = "$absurdity:$path";
+		progress "$us: trying slow absurd-git-apply...";
+		rename "../../gbp-pq-output","../../gbp-pq-output.0"
+		    or $!==ENOENT
+		    or die $!;
+	    }
+	    eval {
+		die "forbid absurd git-apply\n" if $use_absurd
+		    && forceing [qw(import-gitapply-no-absurd)];
+		die "only absurd git-apply!\n" if !$use_absurd
+		    && forceing [qw(import-gitapply-absurd)];
+
+		local $ENV{PATH} = $path if $use_absurd;
+
+		my @showcmd = (gbp_pq, qw(import));
+		my @realcmd = shell_cmd
+		    'exec >/dev/null 2>../../gbp-pq-output', @showcmd;
+		debugcmd "+",@realcmd;
+		if (system @realcmd) {
+		    die +(shellquote @showcmd).
+			" failed: ".
+			failedcmd_waitstatus()."\n";
+		}
 
-	my $gapplied = git_rev_parse('HEAD');
-	my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
-	$gappliedtree eq $dappliedtree or
-	    fail <<END;
+		my $gapplied = git_rev_parse('HEAD');
+		my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
+		$gappliedtree eq $dappliedtree or
+		    fail <<END;
 gbp-pq import and dpkg-source disagree!
  gbp-pq import gave commit $gapplied
  gbp-pq import gave tree $gappliedtree
  dpkg-source --before-build gave tree $dappliedtree
 END
-	$rawimport_hash = $gapplied;
+		$rawimport_hash = $gapplied;
+	    };
+	    last unless $@;
+	}
+	if ($@) {
+	    { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
+	    die $@;
+	}
     }
 
     progress "synthesised git commit from .dsc $cversion";
@@ -1990,12 +2435,13 @@ 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";
 	die "$f ?" unless $f =~ m/^\Q${package}\E_/;
 	die "$f ?" if $f =~ m#/#;
-	runcmd_ordryrun_local @curl,qw(-o),$tf,'--',"$furl";
+	runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
 	return 0 if !act_local();
 	$downloaded = 1;
     }
@@ -2031,14 +2477,14 @@ sub git_fetch_us () {
     my @specs = deliberately_not_fast_forward ? qw(tags/*) :
 	map { "tags/$_" }
 	(quiltmode_splitbrain
-	 ? (map { $_->('*',access_basedistro) }
+	 ? (map { $_->('*',access_nomdistro) }
 	    \&debiantag_new, \&debiantag_maintview)
-	 : debiantags('*',access_basedistro));
+	 : debiantags('*',access_nomdistro));
     push @specs, server_branch($csuite);
     push @specs, qw(heads/*) if deliberately_not_fast_forward;
 
     # This is rather miserable:
-    # When git-fetch --prune is passed a fetchspec ending with a *,
+    # When git fetch --prune is passed a fetchspec ending with a *,
     # it does a plausible thing.  If there is no * then:
     # - it matches subpaths too, even if the supplied refspec
     #   starts refs, and behaves completely madly if the source
@@ -2048,17 +2494,19 @@ sub git_fetch_us () {
     # We want to fetch a fixed ref, and we don't know in advance
     # if it exists, so this is not suitable.
     #
-    # Our workaround is to use git-ls-remote.  git-ls-remote has its
+    # Our workaround is to use git ls-remote.  git ls-remote has its
     # own qairks.  Notably, it has the absurd multi-tail-matching
-    # behaviour: git-ls-remote R refs/foo can report refs/foo AND
+    # behaviour: git ls-remote R refs/foo can report refs/foo AND
     # refs/refs/foo etc.
     #
     # Also, we want an idempotent snapshot, but we have to make two
-    # calls to the remote: one to git-ls-remote and to git-fetch.  The
-    # solution is use git-ls-remote to obtain a target state, and
-    # git-fetch to try to generate it.  If we don't manage to generate
+    # calls to the remote: one to git ls-remote and to git fetch.  The
+    # solution is use git ls-remote to obtain a target state, and
+    # git fetch to try to generate it.  If we don't manage to generate
     # the target state, we try again.
 
+    printdebug "git_fetch_us specs @specs\n";
+
     my $specre = join '|', map {
 	my $x = $_;
 	$x =~ s/\W/\\$&/g;
@@ -2074,6 +2522,7 @@ sub git_fetch_us () {
     my $fetch_iteration = 0;
     FETCH_ITERATION:
     for (;;) {
+	printdebug "git_fetch_us iteration $fetch_iteration\n";
         if (++$fetch_iteration > 10) {
 	    fail "too many iterations trying to get sane fetch!";
 	}
@@ -2090,7 +2539,7 @@ sub git_fetch_us () {
 	    my ($objid,$rrefname) = ($1,$2);
 	    if (!$wanted_rref->($rrefname)) {
 		print STDERR <<END;
-warning: git-ls-remote @look reported $rrefname; this is silly, ignoring it.
+warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
 END
 		next;
 	    }
@@ -2101,10 +2550,12 @@ END
 
 	# OK, now %want is exactly what we want for refs in @specs
 	my @fspecs = map {
-	    return () if !m/\*$/ && !exists $wantr{"refs/$_"};
+	    !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
 	    "+refs/$_:".lrfetchrefs."/$_";
 	} @specs;
 
+	printdebug "git_fetch_us fspecs @fspecs\n";
+
 	my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
 	runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
 	    @fspecs;
@@ -2123,11 +2574,11 @@ END
 	    if (!exists $wantr{$rrefname}) {
 		if ($wanted_rref->($rrefname)) {
 		    printdebug <<END;
-git-fetch @fspecs created $lrefname which git-ls-remote @look didn't list.
+git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
 END
 		} else {
 		    print STDERR <<END
-warning: git-fetch @fspecs created $lrefname; this is silly, deleting it.
+warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
 END
 		}
 		runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
@@ -2142,28 +2593,28 @@ END
 	    next if $got eq $want;
 	    if (!defined $objgot{$want}) {
 		print STDERR <<END;
-warning: git-ls-remote suggests we want $lrefname
+warning: git ls-remote suggests we want $lrefname
 warning:  and it should refer to $want
-warning:  but git-fetch didn't fetch that object to any relevant ref.
+warning:  but git fetch didn't fetch that object to any relevant ref.
 warning:  This may be due to a race with someone updating the server.
 warning:  Will try again...
 END
 		next FETCH_ITERATION;
 	    }
 	    printdebug <<END;
-git-fetch @fspecs made $lrefname=$got but want git-ls-remote @look says $want
+git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
 END
 	    runcmd_ordryrun_local @git, qw(update-ref -m),
-		"dgit fetch git-fetch fixup", $lrefname, $want;
+		"dgit fetch git fetch fixup", $lrefname, $want;
 	    $lrfetchrefs_f{$lrefname} = $want;
 	}
 	last;
     }
-    printdebug "git_fetch_us: git-fetch --no-insane emulation complete\n",
+    printdebug "git_fetch_us: git fetch --no-insane emulation complete\n",
 	Dumper(\%lrfetchrefs_f);
 
     my %here;
-    my @tagpats = debiantags('*',access_basedistro);
+    my @tagpats = debiantags('*',access_nomdistro);
 
     git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
 	my ($objid,$objtype,$fullrefname,$reftail) = @_;
@@ -2338,11 +2789,8 @@ sub fetch_from_archive () {
     };
 
     if (defined $dsc_hash) {
-	fail "missing remote git history even though dsc has hash -".
-	    " could not find ref ".rref()." at ".access_giturl()
-	    unless $lastpush_hash;
 	ensure_we_have_orig();
-	if ($dsc_hash eq $lastpush_hash) {
+	if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
 	    @mergeinputs = $dsc_mergeinput
 	} elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
 	    print STDERR <<END or die $!;
@@ -2509,7 +2957,8 @@ END
 	die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
     };
 
-    $chkff->($lastpush_hash, 'dgit repo server tip (last push)');
+    $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
+	if $lastpush_hash;
     $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
 
     runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
@@ -2641,6 +3090,11 @@ sub clone ($) {
     }
     setup_new_tree();
     runcmd @git, qw(reset --hard), lrref();
+    runcmd qw(bash -ec), <<'END';
+        set -o pipefail
+        git ls-tree -r --name-only -z HEAD | \
+        xargs -0r touch -r . --
+END
     printdone "ready for work in $dstdir";
 }
 
@@ -2754,6 +3208,18 @@ sub madformat_wantfixup ($) {
     return 1;
 }
 
+sub maybe_split_brain_save ($$$) {
+    my ($headref, $dgitview, $msg) = @_;
+    # => message fragment "$saved" describing disposition of $dgitview
+    return "commit id $dgitview" unless defined $split_brain_save;
+    my @cmd = (shell_cmd "cd ../../../..",
+	       @git, qw(update-ref -m),
+	       "dgit --dgit-view-save $msg HEAD=$headref",
+	       $split_brain_save, $dgitview);
+    runcmd @cmd;
+    return "and left in $split_brain_save";
+}
+
 # An "infopair" is a tuple [ $thing, $what ]
 # (often $thing is a commit hash; $what is a description)
 
@@ -2872,39 +3338,50 @@ sub splitbrain_pseudomerge ($$$$) {
     #   this:                                   $dgitview'
     #
 
+    return $dgitview unless defined $archive_hash;
+
     printdebug "splitbrain_pseudomerge...\n";
 
     my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
 
-    return $dgitview unless defined $archive_hash;
-
     if (!defined $overwrite_version) {
 	progress "Checking that HEAD inciudes all changes in archive...";
     }
 
     return $dgitview if is_fast_fwd $archive_hash, $dgitview;
 
-    my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_basedistro;
-    my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
-    my $t_dgit = debiantag_new $i_arch_v->[0], access_basedistro;
-    my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
-    my $i_archive = [ $archive_hash, "current archive contents" ];
-
-    printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
-
-    infopair_cond_equal($i_dgit, $i_archive);
-    infopair_cond_ff($i_dep14, $i_dgit);
-    $overwrite_version // infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
+    if (defined $overwrite_version) {
+    } elsif (!eval {
+	my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
+	my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
+	my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
+	my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
+	my $i_archive = [ $archive_hash, "current archive contents" ];
+
+	printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
+
+	infopair_cond_equal($i_dgit, $i_archive);
+	infopair_cond_ff($i_dep14, $i_dgit);
+	infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
+	1;
+    }) {
+	print STDERR <<END;
+$us: check failed (maybe --overwrite is needed, consult documentation)
+END
+	die "$@";
+    }
 
     my $r = pseudomerge_make_commit
 	$clogp, $dgitview, $archive_hash, $i_arch_v,
 	"dgit --quilt=$quilt_mode",
 	(defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
-Declare fast forward from $overwrite_version
+Declare fast forward from $i_arch_v->[0]
 END_OVERWR
 Make fast forward from $i_arch_v->[0]
 END_MAKEFF
 
+    maybe_split_brain_save $maintview, $r, "pseudomerge";
+
     progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
     return $r;
 }	
@@ -2916,16 +3393,6 @@ sub plain_overwrite_pseudomerge ($$$) {
 
     my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
 
-    my @tagformats = access_cfg_tagformats();
-    my @t_overwr =
-	map { $_->($i_arch_v->[0], access_basedistro) }
-	(grep { m/^(?:old|hist)$/ } @tagformats)
-	? \&debiantags : \&debiantag_new;
-    my $i_overwr = infopair_lrf_tag_lookup \@t_overwr, "previous version tag";
-    my $i_archive = [ $archive_hash, "current archive contents" ];
-
-    infopair_cond_equal($i_overwr, $i_archive);
-
     return $head if is_fast_fwd $archive_hash, $head;
 
     my $m = "Declare fast forward from $i_arch_v->[0]";
@@ -2946,9 +3413,12 @@ sub push_parse_changelog ($) {
     my $clogp = Dpkg::Control::Hash->new();
     $clogp->load($clogpfn) or die;
 
-    $package = getfield $clogp, 'Source';
+    my $clogpackage = getfield $clogp, 'Source';
+    $package //= $clogpackage;
+    fail "-p specified $package but changelog specified $clogpackage"
+	unless $package eq $clogpackage;
     my $cversion = getfield $clogp, 'Version';
-    my $tag = debiantag($cversion, access_basedistro);
+    my $tag = debiantag($cversion, access_nomdistro);
     runcmd @git, qw(check-ref-format), $tag;
 
     my $dscfn = dscfn($cversion);
@@ -2984,7 +3454,7 @@ sub push_tagwants ($$$$) {
         };
     }
     foreach my $tw (@tagwants) {
-	$tw->{Tag} = $tw->{TagFn}($cversion, access_basedistro);
+	$tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
 	$tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
     }
     printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
@@ -3015,7 +3485,7 @@ sub push_mktags ($$ $$ $) {
     # to control the "tagger" (b) we can do remote signing
     my $authline = clogp_authline $clogp;
     my $delibs = join(" ", "",@deliberatelies);
-    my $declaredistro = access_basedistro();
+    my $declaredistro = access_nomdistro();
 
     my $mktag = sub {
 	my ($tw) = @_;
@@ -3143,21 +3613,22 @@ END
     my $dgithead = $actualhead;
     my $maintviewhead = undef;
 
+    my $upstreamversion = upstreamversion $clogp->{Version};
+
     if (madformat_wantfixup($format)) {
 	# user might have not used dgit build, so maybe do this now:
 	if (quiltmode_splitbrain()) {
-	    my $upstreamversion = $clogp->{Version};
-	    $upstreamversion =~ s/-[^-]*$//;
 	    changedir $ud;
 	    quilt_make_fake_dsc($upstreamversion);
-	    my ($dgitview, $cachekey) =
+	    my $cachekey;
+	    ($dgithead, $cachekey) =
 		quilt_check_splitbrain_cache($actualhead, $upstreamversion);
-	    $dgitview or fail
+	    $dgithead or fail
  "--quilt=$quilt_mode but no cached dgit view:
  perhaps tree changed since dgit build[-source] ?";
 	    $split_brain = 1;
 	    $dgithead = splitbrain_pseudomerge($clogp,
-					       $actualhead, $dgitview,
+					       $actualhead, $dgithead,
 					       $archive_hash);
 	    $maintviewhead = $actualhead;
 	    changedir '../../../..';
@@ -3198,17 +3669,20 @@ END
     my ($tree,$dir) = mktree_in_ud_from_only_subdir();
     check_for_vendor_patches() if madformat($dsc->{format});
     changedir '../../../..';
-    my $diffopt = $debuglevel>0 ? '--exit-code' : '--quiet';
-    my @diffcmd = (@git, qw(diff), $diffopt, $tree, $dgithead);
+    my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
     debugcmd "+",@diffcmd;
     $!=0; $?=-1;
     my $r = system @diffcmd;
     if ($r) {
 	if ($r==256) {
-	    fail "$dscfn specifies a different tree to your HEAD commit;".
-		" perhaps you forgot to build".
-		($diffopt eq '--exit-code' ? "" :
-		 " (run with -D to see full diff output)");
+	    my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
+	    fail <<END
+HEAD specifies a different tree to $dscfn:
+$diffs
+Perhaps you forgot to build.  Or perhaps there is a problem with your
+ source tree (see dgit(7) for some hints).  To see a full diff, run
+   git diff $tree HEAD
+END
 	} else {
 	    failedcmd @diffcmd;
 	}
@@ -3227,7 +3701,14 @@ END
 
     # Check that changes and .dsc agree enough
     $changesfile =~ m{[^/]*$};
-    files_compare_inputs($dsc, parsecontrol($changesfile,$&));
+    my $changes = parsecontrol($changesfile,$&);
+    files_compare_inputs($dsc, $changes)
+	unless forceing [qw(dsc-changes-mismatch)];
+
+    # Perhaps adjust .dsc to contain right set of origs
+    changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
+				  $changesfile)
+	unless forceing [qw(changes-origs-exactly)];
 
     # Checks complete, we're going to try and go ahead:
 
@@ -3368,7 +3849,7 @@ sub cmd_clone {
 	    }
 	    if (stat $dstdir) {
 		rmtree($dstdir) or die "remove $dstdir: $!\n";
-	    } elsif (!grep { $! == $_ }
+	    } elsif (grep { $! == $_ }
 		     (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
 	    } else {
 		print STDERR "check whether to remove $dstdir: $!\n";
@@ -3420,6 +3901,12 @@ sub cmd_fetch {
 sub cmd_pull {
     parseopts();
     fetchpullargs();
+    if (quiltmode_splitbrain()) {
+	my ($format, $fopts) = get_source_format();
+	madformat($format) and fail <<END
+dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
+END
+    }
     pull();
 }
 
@@ -3734,22 +4221,51 @@ END
     }
 }
 
-sub quiltify_trees_differ ($$;$$) {
-    my ($x,$y,$finegrained,$ignorenamesr) = @_;
+sub quiltify_trees_differ ($$;$$$) {
+    my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
     # returns true iff the two tree objects differ other than in debian/
     # with $finegrained,
     # returns bitmask 01 - differ in upstream files except .gitignore
     #                 02 - differ in .gitignore
     # if $ignorenamesr is defined, $ingorenamesr->{$fn}
     #  is set for each modified .gitignore filename $fn
+    # if $unrepres is defined, array ref to which is appeneded
+    #  a list of unrepresentable changes (removals of upstream files
+    #  (as messages)
     local $/=undef;
-    my @cmd = (@git, qw(diff-tree --name-only -z));
-    push @cmd, qw(-r) if $finegrained;
+    my @cmd = (@git, qw(diff-tree -z));
+    push @cmd, qw(--name-only) unless $unrepres;
+    push @cmd, qw(-r) if $finegrained || $unrepres;
     push @cmd, $x, $y;
     my $diffs= cmdoutput @cmd;
     my $r = 0;
+    my @lmodes;
     foreach my $f (split /\0/, $diffs) {
+	if ($unrepres && !@lmodes) {
+	    @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
+	    next;
+	}
+	my ($oldmode,$newmode) = @lmodes;
+	@lmodes = ();
+
 	next if $f =~ m#^debian(?:/.*)?$#s;
+
+	if ($unrepres) {
+	    eval {
+	        die "deleted\n" unless $newmode =~ m/[^0]/;
+		die "not a plain file\n" unless $newmode =~ m/^10\d{4}$/;
+		if ($oldmode =~ m/[^0]/) {
+		    die "mode changed\n" if $oldmode ne $newmode;
+		} else {
+		    die "non-default mode\n" unless $newmode =~ m/^100644$/;
+		}
+	    };
+	    if ($@) {
+		local $/="\n"; chomp $@;
+		push @$unrepres, [ $f, $@ ];
+	    }
+	}
+
 	my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
 	$r |= $isignore ? 02 : 01;
 	$ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
@@ -3793,7 +4309,7 @@ sub quiltify_splitbrain ($$$$$$) {
     local $ENV{GIT_AUTHOR_DATE} =  $authline[2];
 
     if ($quilt_mode =~ m/gbp|unapplied/ &&
-	($diffbits->{H2O} & 01)) {
+	($diffbits->{O2H} & 01)) {
 	my $msg =
  "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
  " but git tree differs from orig in upstream files.";
@@ -3827,7 +4343,7 @@ END
  .gitignores: but, such patches exist in debian/patches.
 END
     }
-    if (($diffbits->{H2O} & 02) && # user has modified .gitignore
+    if (($diffbits->{O2H} & 02) && # user has modified .gitignore
 	!($diffbits->{O2A} & 02)) { # patches do not change .gitignore
 	quiltify_splitbrain_needed();
 	progress "dgit view: creating patch to represent .gitignore changes";
@@ -3865,18 +4381,37 @@ Commit patch to update .gitignore
 END
     }
 
-    my $dgitview = git_rev_parse 'refs/heads/dgit-view';
+    my $dgitview = git_rev_parse 'HEAD';
 
     changedir '../../../..';
+    # When we no longer need to support squeeze, use --create-reflog
+    # instead of this:
     ensuredir ".git/logs/refs/dgit-intern";
     my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
       or die $!;
+
+    my $oldcache = git_get_ref "refs/$splitbraincache";
+    if ($oldcache eq $dgitview) {
+	my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
+	# git update-ref doesn't always update, in this case.  *sigh*
+	my $dummy = make_commit_text <<END;
+tree $tree
+parent $dgitview
+author Dgit <dgit\@example.com> 1000000000 +0000
+committer Dgit <dgit\@example.com> 1000000000 +0000
+
+Dummy commit - do not use
+END
+	runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
+	    "refs/$splitbraincache", $dummy;
+    }
     runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
 	$dgitview;
 
-    progress "dgit view: created (commit id $dgitview)";
-
     changedir '.git/dgit/unpack/work';
+
+    my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
+    progress "dgit view: created ($saved)";
 }
 
 sub quiltify ($$$$) {
@@ -4101,6 +4636,16 @@ sub quiltify ($$$$) {
 	if (!defined $patchname) {
 	    $patchname = $title;
 	    $patchname =~ s/[.:]$//;
+            use Text::Iconv;
+	    eval {
+		my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
+		my $translitname = $converter->convert($patchname);
+		die unless defined $translitname;
+		$patchname = $translitname;
+	    };
+	    print STDERR
+		"dgit: patch title transliteration error: $@"
+		if $@;
 	    $patchname =~ y/ A-Z/-a-z/;
 	    $patchname =~ y/-a-z0-9_.+=~//cd;
 	    $patchname =~ s/^\W/x-$&/;
@@ -4165,8 +4710,7 @@ END
     prep_ud();
     changedir $ud;
 
-    my $upstreamversion=$version;
-    $upstreamversion =~ s/-[^-]*$//;
+    my $upstreamversion = upstreamversion $version;
 
     if ($fopts->{'single-debian-patch'}) {
 	quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
@@ -4307,7 +4851,7 @@ sub quilt_check_splitbrain_cache ($$) {
     my $srcshash = Digest::SHA->new(256);
     my %sfs = ( %INC, '$0(dgit)' => $0 );
     foreach my $sfk (sort keys %sfs) {
-	next unless m/^\$0\b/ || m{^Debian/Dgit\b};
+	next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
 	$srcshash->add($sfk,"  ");
 	$srcshash->add(hashfile($sfs{$sfk}));
 	$srcshash->add("\n");
@@ -4315,7 +4859,7 @@ sub quilt_check_splitbrain_cache ($$) {
     push @cachekey, $srcshash->hexdigest();
     $splitbrain_cachekey = "@cachekey";
 
-    my @cmd = (@git, qw(reflog), '--pretty=format:%H %gs',
+    my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
 	       $splitbraincache);
     printdebug "splitbrain cachekey $splitbrain_cachekey\n";
     debugcmd "|(probably)",@cmd;
@@ -4336,8 +4880,9 @@ sub quilt_check_splitbrain_cache ($$) {
 	    
 	my $cachehit = $1;
 	quilt_fixup_mkwork($headref);
+	my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
 	if ($cachehit ne $headref) {
-	    progress "dgit view: found cached (commit id $cachehit)";
+	    progress "dgit view: found cached ($saved)";
 	    runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
 	    $split_brain = 1;
 	    return ($cachehit, $splitbrain_cachekey);
@@ -4395,10 +4940,10 @@ sub quilt_fixup_multipatch ($$$) {
     #     2. Copy .pc from the fake's extraction, if necessary
     #     3. Run dpkg-source --commit
     #     4. If the result has changes to debian/, then
-    #          - git-add them them
-    #          - git-add .pc if we had a .pc in-tree
-    #          - git-commit
-    #     5. If we had a .pc in-tree, delete it, and git-commit
+    #          - git add them them
+    #          - git add .pc if we had a .pc in-tree
+    #          - git commit
+    #     5. If we had a .pc in-tree, delete it, and git commit
     #     6. Back in the main tree, fast forward to the new HEAD
 
     # Another situation we may have to cope with is gbp-style
@@ -4407,7 +4952,7 @@ sub quilt_fixup_multipatch ($$$) {
     # We would want to detect these, so we know to escape into
     # quilt_fixup_gbp.  However, this is in general not possible.
     # Consider a package with a one patch which the dgit user reverts
-    # (with git-revert or the moral equivalent).
+    # (with git revert or the moral equivalent).
     #
     # That is indistinguishable in contents from a patches-unapplied
     # tree.  And looking at the history to distinguish them is not
@@ -4493,37 +5038,50 @@ END
     # be.  This is mostly for error reporting.
 
     my %editedignores;
+    my @unrepres;
     my $diffbits = {
         # H = user's HEAD
         # O = orig, without patches applied
         # A = "applied", ie orig with H's debian/patches applied
-        H2O => quiltify_trees_differ($headref,  $unapplied, 1,\%editedignores),
+        O2H => quiltify_trees_differ($unapplied,$headref,   1,
+				     \%editedignores, \@unrepres),
         H2A => quiltify_trees_differ($headref,  $oldtiptree,1),
         O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
     };
 
     my @dl;
     foreach my $b (qw(01 02)) {
-        foreach my $v (qw(H2O O2A H2A)) {
+        foreach my $v (qw(O2H O2A H2A)) {
             push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
         }
     }
     printdebug "differences \@dl @dl.\n";
 
     progress sprintf
+"$us: base trees orig=%.20s o+d/p=%.20s",
+              $unapplied, $oldtiptree;
+    progress sprintf
 "$us: quilt differences: src:  %s orig %s     gitignores:  %s orig %s\n".
 "$us: quilt differences:      HEAD %s o+d/p               HEAD %s o+d/p",
                              $dl[0], $dl[1],              $dl[3], $dl[4],
                                  $dl[2],                     $dl[5];
 
+    if (@unrepres) {
+	print STDERR "dgit:  cannot represent change: $_->[1]: $_->[0]\n"
+	    foreach @unrepres;
+	forceable_fail [qw(unrepresentable)], <<END;
+HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
+END
+    }
+
     my @failsuggestion;
-    if (!($diffbits->{H2O} & $diffbits->{O2A})) {
+    if (!($diffbits->{O2H} & $diffbits->{O2A})) {
         push @failsuggestion, "This might be a patches-unapplied branch.";
     }  elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
         push @failsuggestion, "This might be a patches-applied branch.";
     }
     push @failsuggestion, "Maybe you need to specify one of".
-        " --quilt=gbp --quilt=dpm --quilt=unapplied ?";
+        " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
 
     if (quiltmode_splitbrain()) {
 	quiltify_splitbrain($clogp, $unapplied, $headref,
@@ -4630,15 +5188,21 @@ sub cmd_clean () {
     maybe_unapply_patches_again();
 }
 
-sub build_prep () {
+sub build_prep_early () {
+    our $build_prep_early_done //= 0;
+    return if $build_prep_early_done++;
     notpushing();
     badusage "-p is not allowed when building" if defined $package;
-    check_not_dirty();
-    clean_tree();
     my $clogp = parsechangelog();
     $isuite = getfield $clogp, 'Distribution';
     $package = getfield $clogp, 'Source';
     $version = getfield $clogp, 'Version';
+    check_not_dirty();
+}
+
+sub build_prep () {
+    build_prep_early();
+    clean_tree();
     build_maybe_quilt_fixup();
     if ($rmchanges) {
 	my $pat = changespat $version;
@@ -4739,11 +5303,87 @@ sub massage_dbp_args ($;$) {
     return $r;
 }
 
+sub in_parent (&) {
+    my ($fn) = @_;
+    my $wasdir = must_getcwd();
+    changedir "..";
+    $fn->();
+    changedir $wasdir;
+}    
+
+sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
+    my ($msg_if_onlyone) = @_;
+    # If there is only one .changes file, fail with $msg_if_onlyone,
+    # or if that is undef, be a no-op.
+    # Returns the changes file to report to the user.
+    my $pat = changespat $version;
+    my @changesfiles = glob $pat;
+    @changesfiles = sort {
+	($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
+	    or $a cmp $b
+    } @changesfiles;
+    my $result;
+    if (@changesfiles==1) {
+	fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
+only one changes file from build (@changesfiles)
+END
+	$result = $changesfiles[0];
+    } elsif (@changesfiles==2) {
+	my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
+	foreach my $l (split /\n/, getfield $binchanges, 'Files') {
+	    fail "$l found in binaries changes file $binchanges"
+		if $l =~ m/\.dsc$/;
+	}
+	runcmd_ordryrun_local @mergechanges, @changesfiles;
+	my $multichanges = changespat $version,'multi';
+	if (act_local()) {
+	    stat_exists $multichanges or fail "$multichanges: $!";
+	    foreach my $cf (glob $pat) {
+		next if $cf eq $multichanges;
+		rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
+	    }
+	}
+	$result = $multichanges;
+    } else {
+	fail "wrong number of different changes files (@changesfiles)";
+    }
+    printdone "build successful, results in $result\n" or die $!;
+}
+
+sub midbuild_checkchanges () {
+    my $pat = changespat $version;
+    return if $rmchanges;
+    my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
+    @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
+    fail <<END
+changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
+Suggest you delete @unwanted.
+END
+	if @unwanted;
+}
+
+sub midbuild_checkchanges_vanilla ($) {
+    my ($wantsrc) = @_;
+    midbuild_checkchanges() if $wantsrc == 1;
+}
+
+sub postbuild_mergechanges_vanilla ($) {
+    my ($wantsrc) = @_;
+    if ($wantsrc == 1) {
+	in_parent {
+	    postbuild_mergechanges(undef);
+	};
+    } else {
+	printdone "build successful\n";
+    }
+}
+
 sub cmd_build {
     my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
     my $wantsrc = massage_dbp_args \@dbp;
     if ($wantsrc > 0) {
 	build_source();
+	midbuild_checkchanges_vanilla $wantsrc;
     } else {
 	build_prep();
     }
@@ -4753,7 +5393,7 @@ sub cmd_build {
 	runcmd_ordryrun_local @dbp;
     }
     maybe_unapply_patches_again();
-    printdone "build successful\n";
+    postbuild_mergechanges_vanilla $wantsrc;
 }
 
 sub pre_gbp_build {
@@ -4761,6 +5401,24 @@ sub pre_gbp_build {
 }
 
 sub cmd_gbp_build {
+    build_prep_early();
+
+    # gbp can make .origs out of thin air.  In my tests it does this
+    # even for a 1.0 format package, with no origs present.  So I
+    # guess it keys off just the version number.  We don't know
+    # exactly what .origs ought to exist, but let's assume that we
+    # should run gbp if: the version has an upstream part and the main
+    # orig is absent.
+    my $upstreamversion = upstreamversion $version;
+    my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
+    my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
+
+    if ($gbp_make_orig) {
+	clean_tree();
+	$cleanmode = 'none'; # don't do it again
+	$need_split_build_invocation = 1;
+    }
+
     my @dbp = @dpkgbuildpackage;
 
     my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
@@ -4776,8 +5434,27 @@ sub cmd_gbp_build {
 
     push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
 
+    if ($gbp_make_orig) {
+	ensuredir '.git/dgit';
+	my $ok = '.git/dgit/origs-gen-ok';
+	unlink $ok or $!==&ENOENT or die $!;
+	my @origs_cmd = @cmd;
+	push @origs_cmd, qw(--git-cleaner=true);
+	push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
+	push @origs_cmd, @ARGV;
+	if (act_local()) {
+	    debugcmd @origs_cmd;
+	    system @origs_cmd;
+	    do { local $!; stat_exists $ok; }
+		or failedcmd @origs_cmd;
+	} else {
+	    dryrun_report @origs_cmd;
+	}
+    }
+
     if ($wantsrc > 0) {
 	build_source();
+	midbuild_checkchanges_vanilla $wantsrc;
     } else {
 	if (!$clean_using_builder) {
 	    push @cmd, '--git-cleaner=true';
@@ -4786,14 +5463,10 @@ sub cmd_gbp_build {
     }
     maybe_unapply_patches_again();
     if ($wantsrc < 2) {
-	unless (grep { m/^--git-debian-branch|^--git-ignore-branch/ } @ARGV) {
-	    canonicalise_suite();
-	    push @cmd, "--git-debian-branch=".lbranch();
-	}
 	push @cmd, changesopts();
 	runcmd_ordryrun_local @cmd, @ARGV;
     }
-    printdone "build successful\n";
+    postbuild_mergechanges_vanilla $wantsrc;
 }
 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
 
@@ -4866,47 +5539,22 @@ sub cmd_build_source {
 
 sub cmd_sbuild {
     build_source();
-    my $pat = changespat $version;
-    if (!$rmchanges) {
-	my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
-	@unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
-	fail "changes files other than source matching $pat".
-	    " already present (@unwanted);".
-	    " building would result in ambiguity about the intended results"
-	    if @unwanted;
-    }
-    my $wasdir = must_getcwd();
-    changedir "..";
-    if (act_local()) {
-	stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
-	stat_exists $sourcechanges
-	    or fail "$sourcechanges (in parent directory): $!";
-    }
-    runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
-    my @changesfiles = glob $pat;
-    @changesfiles = sort {
-	($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
-	    or $a cmp $b
-    } @changesfiles;
-    fail "wrong number of different changes files (@changesfiles)"
-	unless @changesfiles==2;
-    my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
-    foreach my $l (split /\n/, getfield $binchanges, 'Files') {
-	fail "$l found in binaries changes file $binchanges"
-	    if $l =~ m/\.dsc$/;
-    }
-    runcmd_ordryrun_local @mergechanges, @changesfiles;
-    my $multichanges = changespat $version,'multi';
-    if (act_local()) {
-	stat_exists $multichanges or fail "$multichanges: $!";
-	foreach my $cf (glob $pat) {
-	    next if $cf eq $multichanges;
-	    rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
+    midbuild_checkchanges();
+    in_parent {
+	if (act_local()) {
+	    stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
+	    stat_exists $sourcechanges
+		or fail "$sourcechanges (in parent directory): $!";
 	}
-    }
-    changedir $wasdir;
+	runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
+    };
     maybe_unapply_patches_again();
-    printdone "build successful, results in $multichanges\n" or die $!;
+    in_parent {
+	postbuild_mergechanges(<<END);
+perhaps you need to pass -A ?  (sbuild's default is to build only
+arch-specific binaries; dgit 1.4 used to override that.)
+END
+    };
 }    
 
 sub cmd_quilt_fixup {
@@ -4919,10 +5567,162 @@ sub cmd_quilt_fixup {
     build_maybe_quilt_fixup();
 }
 
+sub cmd_import_dsc {
+    my $needsig = 0;
+
+    while (@ARGV) {
+	last unless $ARGV[0] =~ m/^-/;
+	$_ = shift @ARGV;
+	last if m/^--?$/;
+	if (m/^--require-valid-signature$/) {
+	    $needsig = 1;
+	} else {
+	    badusage "unknown dgit import-dsc sub-option \`$_'";
+	}
+    }
+
+    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();
+
+    my $force = $dstbranch =~ s/^\+//   ? +1 :
+	        $dstbranch =~ s/^\.\.// ? -1 :
+                                           0;
+    my $info = $force ? " $&" : '';
+    $info = "$dscfn$info";
+
+    my $specbranch = $dstbranch;
+    $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
+    $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
+
+    my @symcmd = (@git, qw(symbolic-ref -q HEAD));
+    my $chead = cmdoutput_errok @symcmd;
+    defined $chead or $?==256 or failedcmd @symcmd;
+
+    fail "$dstbranch is checked out - will not update it"
+	if defined $chead and $chead eq $dstbranch;
+
+    my $oldhash = git_get_ref $dstbranch;
+
+    open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
+    $dscdata = do { local $/ = undef; <D>; };
+    D->error and fail "read $dscfn: $!";
+    close C;
+
+    # we don't normally need this so import it here
+    use Dpkg::Source::Package;
+    my $dp = new Dpkg::Source::Package filename => $dscfn,
+	require_valid_signature => $needsig;
+    {
+	local $SIG{__WARN__} = sub {
+	    print STDERR $_[0];
+	    return unless $needsig;
+	    fail "import-dsc signature check failed";
+	};
+	if (!$dp->is_signed()) {
+	    warn "$us: warning: importing unsigned .dsc\n";
+	} else {
+	    my $r = $dp->check_signature();
+	    die "->check_signature => $r" if $needsig && $r;
+	}
+    }
+
+    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
+	}
+	if ($oldhash && !is_fast_fwd $oldhash, $dgit_commit) {
+	    if ($force > 0) {
+		progress "Not fast forward, forced update.";
+	    } else {
+		fail "Not fast forward to $dgit_commit";
+	    }
+	}
+	@cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
+		$dstbranch, $dgit_commit);
+	runcmd @cmd;
+	progress "dgit: import-dsc updated git ref $dstbranch";
+	return 0;
+    }
+
+    fail <<END
+Branch $dstbranch already exists
+Specify ..$specbranch for a pseudo-merge, binding in existing history
+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};
+	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 $newhash = $mergeinputs[0]{Commit};
+
+    if ($oldhash) {
+	if ($force > 0) {
+	    progress "Import, forced update - synthetic orphan git history.";
+	} elsif ($force < 0) {
+	    progress "Import, merging.";
+	    my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
+	    my $version = getfield $dsc, 'Version';
+	    $newhash = make_commit_text <<END;
+tree $tree
+parent $newhash
+parent $oldhash
+
+Merge $package ($version) import into $dstbranch
+END
+	} else {
+	    die; # caught earlier
+	}
+    }
+
+    my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
+	       $dstbranch, $newhash);
+    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;
     my @cmd = archive_api_query_cmd($subpath);
+    push @cmd, qw(-f);
     debugcmd ">",@cmd;
     exec @cmd or fail "exec curl: $!\n";
 }
@@ -4978,10 +5778,9 @@ defvalopt '',                '-k', '.+',      \$keyid;
 defvalopt '--existing-package','', '.*',      \$existing_package;
 defvalopt '--build-products-dir','','.*',     \$buildproductsdir;
 defvalopt '--clean',       '', $cleanmode_re, \$cleanmode;
+defvalopt '--package',   '-p',   $package_re, \$package;
 defvalopt '--quilt',     '', $quilt_modes_re, \$quilt_mode;
 
-defvalopt '', '-c', '.*=.*', sub { push @git, '-c', @_; };
-
 defvalopt '', '-C', '.+', sub {
     ($changesfile) = (@_);
     if ($changesfile =~ s#^(.*)/##) {
@@ -5057,6 +5856,9 @@ sub parseopts () {
 		     ($om = $opts_opt_map{$1})) {
 		push @ropts, $_;
 		push @$om, $2;
+	    } elsif (m/^--(gbp|dpm)$/s) {
+		push @ropts, "--quilt=$1";
+		$quilt_mode = $1;
 	    } elsif (m/^--ignore-dirty$/s) {
 		push @ropts, $_;
 		$ignoredirty = 1;
@@ -5072,12 +5874,27 @@ sub parseopts () {
 	    } elsif (m/^--overwrite=(.+)$/s) {
 		push @ropts, $_;
 		$overwrite_version = $1;
+	    } elsif (m/^--delayed=(\d+)$/s) {
+		push @ropts, $_;
+		push @dput, $_;
+	    } elsif (m/^--dgit-view-save=(.+)$/s) {
+		push @ropts, $_;
+		$split_brain_save = $1;
+		$split_brain_save =~ s#^(?!refs/)#refs/heads/#;
 	    } elsif (m/^--(no-)?rm-old-changes$/s) {
 		push @ropts, $_;
 		$rmchanges = !$1;
 	    } elsif (m/^--deliberately-($deliberately_re)$/s) {
 		push @ropts, $_;
 		push @deliberatelies, $&;
+	    } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
+		push @ropts, $&;
+		$forceopts{$1} = 1;
+		$_='';
+	    } elsif (m/^--force-/) {
+		print STDERR
+		    "$us: warning: ignoring unknown force option $_\n";
+		$_='';
 	    } elsif (m/^--dgit-tag-format=(old|new)$/s) {
 		# undocumented, for testing
 		push @ropts, $_;
@@ -5132,6 +5949,12 @@ sub parseopts () {
 		} elsif (s/^-wc$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'check';
+		} elsif (s/^-c([^=]*)\=(.*)$//s) {
+		    push @git, '-c', $&;
+		    $gitcfgs{cmdline}{$1} = [ $2 ];
+		} elsif (s/^-c([^=]+)$//s) {
+		    push @git, '-c', $&;
+		    $gitcfgs{cmdline}{$1} = [ 'true' ];
 		} elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
 		    $val = $'; #';
 		    $val = undef unless length $val;
@@ -5145,6 +5968,30 @@ sub parseopts () {
     }
 }
 
+sub check_env_sanity () {
+    my $blocked = new POSIX::SigSet;
+    sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
+
+    eval {
+	foreach my $name (qw(PIPE CHLD)) {
+	    my $signame = "SIG$name";
+	    my $signum = eval "POSIX::$signame" // die;
+	    ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
+		die "$signame is set to something other than SIG_DFL\n";
+	    $blocked->ismember($signum) and
+		die "$signame is blocked\n";
+	}
+    };
+    return unless $@;
+    chomp $@;
+    fail <<END;
+On entry to dgit, $@
+This is a bug produced by something in in your execution environment.
+Giving up.
+END
+}
+
+
 sub finalise_opts_opts () {
     foreach my $k (keys %opts_opt_map) {
 	my $om = $opts_opt_map{$k};
@@ -5157,16 +6004,18 @@ sub finalise_opts_opts () {
 	}
 
 	foreach my $c (access_cfg_cfgs("opts-$k")) {
-	    my $vl = $gitcfg{$c};
-	    printdebug "CL $c ",
-	        ($vl ? join " ", map { shellquote } @$vl : ""),
+	    my @vl =
+		map { $_ ? @$_ : () }
+		map { $gitcfgs{$_}{$c} }
+		reverse @gitcfgsources;
+	    printdebug "CL $c ", (join " ", map { shellquote } @vl),
 	        "\n" if $debuglevel >= 4;
-	    next unless $vl;
+	    next unless @vl;
 	    badcfg "cannot configure options for $k"
 		if $opts_opt_cmdonly{$k};
 	    my $insertpos = $opts_cfg_insertpos{$k};
 	    @$om = ( @$om[0..$insertpos-1],
-		     @$vl,
+		     @vl,
 		     @$om[$insertpos..$#$om] );
 	}
     }
@@ -5178,6 +6027,7 @@ if ($ENV{$fakeeditorenv}) {
 }
 
 parseopts();
+check_env_sanity();
 git_slurp_config();
 
 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;