Hi Andreas,

[Jean Delvare]
> As a side note, the script creates a temporary file $apatch but then
> never uses it. It has to be an error.

[Andreas Gruenbacher]
> Ahh, a leftover, thanks.

Hm, looks like you removed too much when fixing this, annotate now leaks
its real temporary file. Patch attached. I also attached a patch to
enable bash completion on annotate.

Thanks,
-- 
Jean Delvare
Index: bash_completion
===================================================================
RCS file: /cvsroot/quilt/quilt/bash_completion,v
retrieving revision 1.14
diff -u -r1.14 bash_completion
--- bash_completion     12 Jun 2005 12:37:56 -0000      1.14
+++ bash_completion     22 Jun 2005 18:26:04 -0000
@@ -95,8 +95,8 @@
     prev=${COMP_WORDS[COMP_CWORD-1]}
 
     # quilt sub commands 
-    cmds='add applied delete diff edit files fold fork graph grep  \
-          import new next patches pop previous push refresh remove \
+    cmds='add annotate applied delete diff edit files fold fork graph \
+          grep import new next patches pop previous push refresh remove \
          rename series setup snapshot top unapplied'
 
     # if no command were given, complete on commands
@@ -131,6 +131,10 @@
                ;;
           esac
           ;;
+       annotate)
+          _quilt_comfile 
+          COMPREPLY=( [EMAIL PROTECTED]:-} $( compgen -W "-h" -- $cur ) )
+          ;;
        applied) 
           COMPREPLY=( $( compgen -W "-h $(quilt applied)" -- $cur ) )
           ;;
Index: quilt/annotate.in
===================================================================
RCS file: /cvsroot/quilt/quilt/quilt/annotate.in,v
retrieving revision 1.3
diff -u -r1.3 annotate.in
--- quilt/annotate.in   21 Jun 2005 22:50:41 -0000      1.3
+++ quilt/annotate.in   22 Jun 2005 18:25:43 -0000
@@ -122,6 +122,8 @@
 
 template=$(gen_tempfile)
 
+trap "rm -f $template" EXIT
+
 # The annotated listing is generated as follows: A file of annotations
 # is created based on a file that contains the same number of lines as
 # the source file, but all lines are empty.
_______________________________________________
Quilt-dev mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/quilt-dev

Reply via email to