mpagano 14/10/21 22:37:19 Added: quilt-0.63-bash-completion.patch quilt-0.63-no-graphviz.patch Removed: quilt-0.60-no-graphviz.patch Log: Version bump to 0.63. Remove old version. Fix bash completion bug. See bug #526294 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key B576E4E3)
Revision Changes Path 1.1 dev-util/quilt/files/quilt-0.63-bash-completion.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/quilt/files/quilt-0.63-bash-completion.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/quilt/files/quilt-0.63-bash-completion.patch?rev=1.1&content-type=text/plain Index: quilt-0.63-bash-completion.patch =================================================================== --- bash_completion.orig 2014-10-21 18:15:29.549789267 -0400 +++ bash_completion 2014-10-21 18:15:38.489789221 -0400 @@ -11,8 +11,6 @@ # completion to work then you must set QUILT_PC in your global environment # (for example in ~/.profile) and not just in your quiltrc file. -if type quilt &> /dev/null ; then - if ! type _expand &> /dev/null ; then # This function expands tildes in pathnames # @@ -310,5 +308,3 @@ _quilt_completion() && _quilt_complete_opt="-o filenames" complete -F _quilt_completion $_quilt_complete_opt quilt unset -v _quilt_complete_opt - -fi 1.1 dev-util/quilt/files/quilt-0.63-no-graphviz.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/quilt/files/quilt-0.63-no-graphviz.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/quilt/files/quilt-0.63-no-graphviz.patch?rev=1.1&content-type=text/plain Index: quilt-0.63-no-graphviz.patch =================================================================== --- Makefile.in.orig 2014-10-21 17:08:25.639810130 -0400 +++ Makefile.in 2014-10-21 17:09:03.269809935 -0400 @@ -79,8 +79,7 @@ QUILT := $(QUILT_IN) SRC += $(QUILT_SRC:%=quilt/%) DIRT += $(QUILT_IN:%=quilt/%) -SCRIPTS_IN := patchfns inspect dependency-graph edmail \ - remove-trailing-ws backup-files +SCRIPTS_IN := patchfns inspect edmail remove-trailing-ws backup-files SCRIPTS_SRC := $(SCRIPTS_IN:%=%.in) SCRIPTS := $(SCRIPTS_IN) --- bash_completion.orig 2014-10-21 17:09:08.789809906 -0400 +++ bash_completion 2014-10-21 17:09:53.189809676 -0400 @@ -100,7 +100,7 @@ _quilt_completion() prev=${COMP_WORDS[COMP_CWORD-1]} # quilt sub commands - cmds='add annotate applied delete diff edit files fold fork graph \ + cmds='add annotate applied delete diff edit files fold fork \ grep header import mail new next patches pop previous push refresh \ remove rename revert series setup snapshot top unapplied' @@ -194,19 +194,6 @@ _quilt_completion() ;; esac ;; - graph) - case $prev in - -T) - COMPREPLY=( $( compgen -W "ps" -- $cur ) ) - ;; - --edge-labels) - COMPREPLY=( $( compgen -W "files" -- $cur ) ) - ;; - *) - COMPREPLY=( $( compgen -W "-T -h --all --reduce --lines --edge-labels $(quilt --quiltrc - applied 2>/dev/null)" -- $cur ) ) - ;; - esac - ;; grep) _longopt grep COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) )