summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2005-06-22 21:36:23 +0000
committerAndreas Gruenbacher <agruen@suse.de>2005-06-22 21:36:23 +0000
commit8983dd050e04aa16b1fd2783e667826cea9088fa (patch)
treeff5c03aef321e1b8590626dfddb1bffb583da369
parent704cc62b1cfdd1f9e37f51ffef4ad28920b8a06b (diff)
downloadquilt-8983dd050e04aa16b1fd2783e667826cea9088fa.tar.gz
- annotate: temp file leak; add bash completions (Jean Delvare).
-rw-r--r--bash_completion8
-rw-r--r--quilt.changes5
-rw-r--r--quilt/annotate.in2
3 files changed, 13 insertions, 2 deletions
diff --git a/bash_completion b/bash_completion
index 0769a4e..82ea88b 100644
--- a/bash_completion
+++ b/bash_completion
@@ -95,8 +95,8 @@ _quilt_completion()
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 @@ _quilt_completion()
;;
esac
;;
+ annotate)
+ _quilt_comfile
+ COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) )
+ ;;
applied)
COMPREPLY=( $( compgen -W "-h $(quilt applied)" -- $cur ) )
;;
diff --git a/quilt.changes b/quilt.changes
index f338cb2..be12fa9 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Wed Jun 22 23:35:23 CEST 2005 - agruen@suse.de
+
+- annotate: temp file leak; add bash completions (Jean Delvare).
+
+-------------------------------------------------------------------
Wed Jun 22 00:15:19 CEST 2005 - agruen@suse.de
- quilt/annotate.in: Add comment; remove some dead code.
diff --git a/quilt/annotate.in b/quilt/annotate.in
index 6e48a2d..cd9856a 100644
--- a/quilt/annotate.in
+++ b/quilt/annotate.in
@@ -122,6 +122,8 @@ fi
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.