po4a: pairwise-pocheck: Force it to be run sometimes

[dgit.git] / dgit

diff --git a/dgit b/dgit
index de697a15a22a1c1aeb5b84ef23e931baf30023a4..e10483894bb1084ae5693cf94c1347d959216c1a 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -101,7 +101,7 @@ our %forceopts = map { $_=>0 }
 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
 
 our $suite_re = '[-+.0-9a-z]+';
 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
 
 our $suite_re = '[-+.0-9a-z]+';

-our $cleanmode_re = qr{(?: dpkg-source (?: -d )?
+our $cleanmode_re = qr{(?: dpkg-source (?: -d )? (?: ,no-check | ,all-check )?

                          | git | git-ff
                          | check (?: ,ignores )?
                          | none
                          | git | git-ff
                          | check (?: ,ignores )?
                          | none


@@ -6214,6 +6214,19 @@ sub clean_tree_check_git ($$) {
     }
 }
 
     }
 }
 

+sub clean_tree_check_git_wd ($) {
+    my ($message) = @_;
+    return if $cleanmode =~ m{no-check};
+    return if $patches_applied_dirtily; # yuk
+    clean_tree_check_git +($cleanmode !~ m{all-check}),
+                         (f_ <<END, $message);
+%s
+If this is just missing .gitignore entries, use a different clean
+mode, eg --clean=dpkg-source,no-check (-wdu/-wddu) to ignore them
+or --clean=git (-wg/-wgf) to use \`git clean' instead.
+END
+}
+

 sub clean_tree_check () {
     # Not yet fully implemented.
     # This function needs to not care about modified but tracked files.
 sub clean_tree_check () {
     # Not yet fully implemented.
     # This function needs to not care about modified but tracked files.


@@ -6222,6 +6235,16 @@ sub clean_tree_check () {
     if ($cleanmode =~ m{^check}) {
        clean_tree_check_git +($cleanmode =~ m{ignores}), __
  "tree contains uncommitted files and --clean=check specified";
     if ($cleanmode =~ m{^check}) {
        clean_tree_check_git +($cleanmode =~ m{ignores}), __
  "tree contains uncommitted files and --clean=check specified";

+    } elsif ($cleanmode =~ m{^dpkg-source}) {
+       clean_tree_check_git_wd __
+ "tree contains uncommitted files (NB dgit didn't run rules clean)";
+    } elsif ($cleanmode =~ m{^git}) {
+       # If we were actually cleaning these files would be summarily
+       # deleted.  Since we're not, and not using the working tree
+       # anyway, we can just ignore them - nothing will use them.
+    } elsif ($cleanmode eq 'none') {
+    } else {
+       confess "$cleanmode ?";

     }
 }
 
     }
 }
 


@@ -6234,6 +6257,8 @@ sub clean_tree () {
        push @cmd, qw(-T clean);
        maybe_apply_patches_dirtily();
        runcmd_ordryrun_local @cmd;
        push @cmd, qw(-T clean);
        maybe_apply_patches_dirtily();
        runcmd_ordryrun_local @cmd;

+       clean_tree_check_git_wd __
+ "tree contains uncommitted files (after running rules clean)";

     } elsif ($cleanmode eq 'git') {
        runcmd_ordryrun_local @git, qw(clean -xdf);
     } elsif ($cleanmode eq 'git-ff') {
     } elsif ($cleanmode eq 'git') {
        runcmd_ordryrun_local @git, qw(clean -xdf);
     } elsif ($cleanmode eq 'git-ff') {


@@ -6242,7 +6267,7 @@ sub clean_tree () {
        clean_tree_check();
     } elsif ($cleanmode eq 'none') {
     } else {
        clean_tree_check();
     } elsif ($cleanmode eq 'none') {
     } else {

-       die "$cleanmode ?";
+       confess "$cleanmode ?";

     }
 }
 
     }
 }
 


@@ -7262,12 +7287,12 @@ sub parseopts () {
                } elsif (s/^-wgf$//s) {
                    push @ropts, $&;
                    $cleanmode = 'git-ff';
                } elsif (s/^-wgf$//s) {
                    push @ropts, $&;
                    $cleanmode = 'git-ff';

-               } elsif (s/^-wd$//s) {
+               } elsif (s/^-wd(d?)([na]?)$//s) {

                    push @ropts, $&;
                    $cleanmode = 'dpkg-source';
                    push @ropts, $&;
                    $cleanmode = 'dpkg-source';

-               } elsif (s/^-wdd$//s) {
-                   push @ropts, $&;
-                   $cleanmode = 'dpkg-source-d';
+                   $cleanmode .= '-d' if $1;
+                   $cleanmode .= ',no-check' if $2 eq 'n';
+                   $cleanmode .= ',all-check' if $2 eq 'a';

                } elsif (s/^-wc$//s) {
                    push @ropts, $&;
                    $cleanmode = 'check';
                } elsif (s/^-wc$//s) {
                    push @ropts, $&;
                    $cleanmode = 'check';