Changelog: - Add missing -h documentation to 'diff' command - add missing bash completion to 'diff' command - add bash completion for 'fold' command %diffstat bash_completion | 17 +++++++++++++++-- quilt/diff.in | 9 +++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) %patch Index: cvs/quilt/diff.in =================================================================== --- cvs.orig/quilt/diff.in 2004-01-10 12:08:58.000000000 +0100 +++ cvs/quilt/diff.in 2004-01-11 14:02:28.000000000 +0100 @@ -50,6 +50,15 @@ -z Write to standard output the changes that have been made relative to the topmost or specified patch. +--snapshot + Diff agains snapshot (see diff snapshot -h). + +--diff=utility + The specified utility is invoked for each file that is being modified + with the original file and new file as arguments. For new files, the + first argument will be /dev/null. For removed files, the second + argument will be /dev/null. + " exit 0 else Index: cvs/bash_completion =================================================================== --- cvs.orig/bash_completion 2004-01-06 23:39:37.000000000 +0100 +++ cvs/bash_completion 2004-01-11 14:02:28.000000000 +0100 @@ -26,7 +26,7 @@ prev=${COMP_WORDS[COMP_CWORD-1]} # commands (added to patches) - cmds='add applied delete diff edit files fork import new next \ + cmds='add applied delete diff edit files fold fork import new next \ patches pop previous push refresh remove series setup \ snapshot top unapplied' @@ -74,15 +74,28 @@ -P|-c) COMPREPLY=( $( compgen -W "$patches" -- $cur ) ) ;; + --diff|--snapshot) + COMPREPLY=( ) + ;; *) _filedir - COMPREPLY=( address@hidden:-} $( compgen -W "-p -P -c -R -z -h" -- $cur ) ) + COMPREPLY=( address@hidden:-} $( compgen -W "-p -P -c -R -z -h --snapshot --diff" -- $cur ) ) ;; esac ;; files) COMPREPLY=( $( compgen -W "-v $patches" -- $cur ) ) ;; + fold) + case $prev in + -p) + COMPREPLY=( $( compgen -W "0 1 2 3 4 5 6 7 8 9 10" -- $cur ) ) + ;; + *) + COMPREPLY=( $( compgen -W "-p" -- $cur ) ) + ;; + esac + ;; import) case $prev in -p) %diffstat bash_completion | 17 +++++++++++++++-- quilt/diff.in | 9 +++++++++ 2 files changed, 24 insertions(+), 2 deletions(-)