X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=e5edd551cefd9ee2859165bb97afbd6283b8ce36;hb=65e408b63ca374ff30e165e5b876091c49f74370;hp=2434f6a2fb5c2e23d67aa3cd6e02633449a11f9a;hpb=b3e6081e1bdfa93adc1dc962de085754428fa7e4;p=dgit.git

diff --git a/dgit b/dgit
index 2434f6a2..e5edd551 100755
--- a/dgit
+++ b/dgit
@@ -1246,7 +1246,7 @@ sub mktree_in_ud_from_only_subdir () {
 
     remove_stray_gits();
     mktree_in_ud_here();
-    my $format=get_source_format();
+    my ($format, $fopts) = get_source_format();
     if (madformat($format)) {
 	rmtree '.pc';
     }
@@ -1793,6 +1793,26 @@ sub commit_quilty_patch () {
 }
 
 sub get_source_format () {
+    my %options;
+    if (open F, "debian/source/options") {
+	while (<F>) {
+	    next if m/^\s*\#/;
+	    next unless m/\S/;
+	    s/\s+$//; # ignore missing final newline
+	    if (m/\s*\#\s*/) {
+		my ($k, $v) = ($`, $'); #');
+		$v =~ s/^"(.*)"$/$1/;
+		$options{$k} = $v;
+	    } else {
+		$options{$_} = 1;
+	    }
+	}
+	F->error and die $!;
+	close F;
+    } else {
+	die $! unless $!==&ENOENT;
+    }
+
     if (!open F, "debian/source/format") {
 	die $! unless $!==&ENOENT;
 	return '';
@@ -1800,7 +1820,7 @@ sub get_source_format () {
     $_ = <F>;
     F->error and die $!;
     chomp;
-    return $_;
+    return ($_, \%options);
 }
 
 sub madformat ($) {
@@ -2473,7 +2493,7 @@ END
 	local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
 	local $ENV{'VISUAL'} = $ENV{'EDITOR'};
 	local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
-	runcmd_ordryrun_local @dpkgsource, qw(--commit .), $patchname;
+	runcmd @dpkgsource, qw(--commit .), $patchname;
     }
 }
 
@@ -2718,12 +2738,36 @@ sub quiltify ($$) {
 }
 
 sub build_maybe_quilt_fixup () {
-    my $format=get_source_format;
+    my ($format,$fopts) = get_source_format;
     return unless madformat $format;
     # sigh
 
     check_for_vendor_patches();
 
+    my $clogp = parsechangelog();
+    my $headref = git_rev_parse('HEAD');
+
+    prep_ud();
+    changedir $ud;
+
+    my $upstreamversion=$version;
+    $upstreamversion =~ s/-[^-]*$//;
+
+    if ($fopts->{'single-debian-patch'}) {
+	#quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
+	die;
+    } else {
+	quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
+    }
+
+    changedir '../../../..';
+    runcmd_ordryrun_local
+        @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
+}
+
+sub quilt_fixup_multipatch ($$$) {
+    my ($clogp, $headref, $upstreamversion) = @_;
+
     # Our objective is:
     #  - honour any existing .pc in case it has any strangeness
     #  - determine the git commit corresponding to the tip of
@@ -2747,7 +2791,7 @@ sub build_maybe_quilt_fixup () {
     # can work.  We do this as follows:
     #     1. Collect all relevant .orig from parent directory
     #     2. Generate a debian.tar.gz out of
-    #         debian/{patches,rules,source/format}
+    #         debian/{patches,rules,source/format,source/options}
     #     3. Generate a fake .dsc containing just these fields:
     #          Format Source Version Files
     #     4. Extract the fake .dsc
@@ -2768,15 +2812,6 @@ sub build_maybe_quilt_fixup () {
     #     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
 
-    my $clogp = parsechangelog();
-    my $headref = git_rev_parse('HEAD');
-
-    prep_ud();
-    changedir $ud;
-
-    my $upstreamversion=$version;
-    $upstreamversion =~ s/-[^-]*$//;
-
     my $fakeversion="$upstreamversion-~~DGITFAKE";
 
     my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
@@ -2808,7 +2843,7 @@ END
     }
 
     my @files=qw(debian/source/format debian/rules);
-    foreach my $maybe (qw(debian/patches)) {
+    foreach my $maybe (qw(debian/patches debian/source/options)) {
         next unless stat_exists "../../../$maybe";
         push @files, $maybe;
     }
@@ -2852,9 +2887,6 @@ END
         runcmd @git, qw(rm -rqf .pc);
         commit_admin "Commit removal of .pc (quilt series tracking data)";
     }
-
-    changedir '../../../..';
-    runcmd @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
 }
 
 sub quilt_fixup_editor () {