Re: [Quilt-dev] Tests, temporary file leaks

[Jean Delvare]

Hallo Andreas,

> > Note that I did _not_ fully update "import" as there seemed to be some
> > disagreement on the recent option renaming from -n to -P. Depending on
> > the outcome, we may need to update bash_completion again before the
> > release.
> 
> I don't see an advantage in using -n instead of -P (and thus reverting the -n 
> to -p change). Does anybody think that -P as used in import vs. -P as used in 
> other commands would confuse users?

Don't ask me. I wouldn't have changed any option to -P in the first
place, at least not without also leaving the original option for now,
for compatibility purposes. I know that quilt is still in the 0.s so
no compatibility is guaranteed between versions, but still.

> > If I am, then we should make the help text clearer about that point,
> 
> How?

Something like this? If it's OK I'll apply it. The only downside is
that it'll require some more translation efforts. I can handle French
and German but not Japanese.

Index: quilt/files.in
===================================================================
RCS file: /cvsroot/quilt/quilt/quilt/files.in,v
retrieving revision 1.21
diff -u -r1.21 files.in
--- quilt/files.in      19 Jan 2006 08:02:05 -0000      1.21
+++ quilt/files.in      29 Jan 2006 18:54:36 -0000
@@ -23,7 +23,7 @@
        if [ x$1 = x-h ]
        then
                printf $"
-Print the list of files that the topmost or specified patch changes.
+Print the list of files that the topmost or specified applied patch changes.
 
 -a     List all files in all applied patches.
 
@@ -33,8 +33,8 @@
 
 --combine patch
        Create a listing for all patches between this patch and
-       the topmost applied patch. A patch name of \"-\" is equivalent
-       to specifying the first applied patch.
+       the topmost or specified applied patch. A patch name of \"-\" is
+       equivalent to specifying the first applied patch.
 
 "
                exit 0
@@ -88,6 +88,12 @@
 
 last_patch=$(find_patch_in_series "$1") || exit 1
 
+if ! is_applied "$last_patch"
+then
+       printf $"Patch %s is not applied\n" "$(print_patch $last_patch)" >&2
+       exit 1
+fi
+
 if [ -n "$opt_all" -a -z "$first_patch" ]
 then
        first_patch=$(applied_patches | head -n 1)


> > and we should also update bash_completion accordingly.
> 
> That would be nice.

Index: bash_completion
===================================================================
RCS file: /cvsroot/quilt/quilt/bash_completion,v
retrieving revision 1.21
diff -u -r1.21 bash_completion
--- bash_completion     29 Jan 2006 14:44:32 -0000      1.21
+++ bash_completion     29 Jan 2006 18:54:36 -0000
@@ -175,7 +175,7 @@
                COMPREPLY=( $( compgen -W "$(quilt applied)" -- $cur ) )
                ;;
             *)
-               COMPREPLY=( $( compgen -W "-a -l -v -h --combine $(quilt 
series)" -- $cur ) )
+               COMPREPLY=( $( compgen -W "-a -l -v -h --combine $(quilt 
applied)" -- $cur ) )
                ;;
           esac
           ;;

-- 
Jean Delvare