diff options
| -rw-r--r-- | bash_completion | 14 | ||||
| -rw-r--r-- | quilt.changes | 7 | ||||
| -rw-r--r-- | quilt/diff.in | 5 | ||||
| -rw-r--r-- | quilt/snapshot.in | 5 | ||||
| -rw-r--r-- | scripts/patchfns.in | 5 |
5 files changed, 31 insertions, 5 deletions
diff --git a/bash_completion b/bash_completion index 2a3c7c3..92dae8c 100644 --- a/bash_completion +++ b/bash_completion @@ -26,7 +26,7 @@ _quilt() 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,25 @@ _quilt() -P|-c) COMPREPLY=( $( compgen -W "$patches" -- $cur ) ) ;; + --diff|--snapshot) + COMREPLY=( ) + ;; *) _filedir - COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-p -P -c -R -z -h" -- $cur ) ) + COMPREPLY=( ${COMPREPLY[@]:-} $( 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 ) ) + ;; + esac + ;; import) case $prev in -p) diff --git a/quilt.changes b/quilt.changes index e384262..6b1de14 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 5 11:51:21 CET 2004 - agruen@suse.de + +- Add some fixes from Manuel Estrada Sainz <ranty@debian.org>. +- Add QUILT_SERIES setting: Override the location of the series + file to use. + +------------------------------------------------------------------- Tue Feb 3 12:58:49 CET 2004 - agruen@suse.de - Add --quiltrc={rcfile|-} option. Remove some superfluous quoting diff --git a/quilt/diff.in b/quilt/diff.in index 8944734..90c5b44 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -24,7 +24,7 @@ usage() then redirect='>&2' fi - echo $"Usage: quilt diff [-p n] [-c patch|-z] [-R] [-P patch] [--diff=utility] [file ...]" $redirect + echo $"Usage: quilt diff [-p n] [-c patch|-z] [-R] [-P patch] [--snapshot] [--diff=utility] [file ...]" $redirect if [ x$1 = x-h ] then @@ -49,6 +49,9 @@ included. -z Write to standard output the changes that have been made relative to the topmost or specified patch. +--snapshot + Diff agains snapshot (see \`quilt snapshot -h'). + --diff=utility Use the specified utility for generating the diff. The utility is invoked with the original and new file name as arguments." diff --git a/quilt/snapshot.in b/quilt/snapshot.in index 91cbb4c..00445ff 100644 --- a/quilt/snapshot.in +++ b/quilt/snapshot.in @@ -23,7 +23,10 @@ usage() if [ x$1 = x-h ] then echo $" -Take a snapshot of the current working state. +Take a snapshot of the current working state. After taking the snapshot, +the tree can be modified in the usual ways, including pushing and +popping patches. A diff against the tree at the moment of the +snapshot can be generated with \`quilt diff --snapshot'. -d Remove current snapshot." exit 0 diff --git a/scripts/patchfns.in b/scripts/patchfns.in index d3e5d25..8649dfc 100644 --- a/scripts/patchfns.in +++ b/scripts/patchfns.in @@ -54,7 +54,10 @@ then unset basedir fi -if [ -e $QUILT_PC/series ] +if [ -n "$QUILT_SERIES" ] +then + SERIES=$QUILT_SERIES +elif [ -e $QUILT_PC/series ] then SERIES=$QUILT_PC/series elif [ -e series ] |