From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marc Khouzam Subject: [PATCH v3] tcsh-completion re-using git-completion.bash Date: Fri, 16 Nov 2012 11:12:41 -0500 Message-ID: References: <1352980269-15569-1-git-send-email-marc.khouzam@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 To: Felipe Contreras , =?ISO-8859-1?Q?SZEDER_G=E1bor?= , git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Nov 16 17:13:01 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TZOXK-0007fZ-Fs for gcvg-git-2@plane.gmane.org; Fri, 16 Nov 2012 17:12:59 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752109Ab2KPQMo (ORCPT ); Fri, 16 Nov 2012 11:12:44 -0500 Received: from mail-ia0-f174.google.com ([209.85.210.174]:59628 "EHLO mail-ia0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751665Ab2KPQMo (ORCPT ); Fri, 16 Nov 2012 11:12:44 -0500 Received: by mail-ia0-f174.google.com with SMTP id y25so1773558iay.19 for ; Fri, 16 Nov 2012 08:12:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=W2mxw8y91mZ8LjpxmUC9Ree/kMX5xdaBwXQ1hPRlENk=; b=zybQyrdLUdn8T3u7BEIdCgCPpF6fSzSUdHYNVeCHaQNsNDT3KuvGkzxsvJ6ZHbNEHy 53ASYjiAp851Mzkrbacx2o1b/gAfsKlRUies+5ERYFTvUR00z6OenFO2ZbBx/SlcXrAJ DUAcekQRlxJ/mFWDlmPFzx8Qz7gqjl2HKMfowya2EyQlU/1f7ZTMZtN7xFzLXt1iBqfE MBUmpIOQesfgVFoe1AHyJ56aPSgciYEMN7xoV+6rsGvUt0MeW88tlQdr/KNKW34x4DLO HCxIqWz220bREDDQBt4nZ4hY9DfU1yehE0U9/Ccl+/HMmQ31mxgEgNz8IXX/i5WKLQQm CXqA== Received: by 10.50.140.104 with SMTP id rf8mr3809760igb.40.1353082361882; Fri, 16 Nov 2012 08:12:41 -0800 (PST) Received: by 10.64.132.39 with HTTP; Fri, 16 Nov 2012 08:12:41 -0800 (PST) In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: The current tcsh-completion support for Git, as can be found on the Internet, takes the approach of defining the possible completions explicitly. This has the obvious draw-back to require constant updating as the Git code base evolves. The approach taken by this commit is to to re-use the advanced bash completion script and use its result for tcsh completion. This is achieved by sourcing the bash script and outputting the completion result for tcsh consumption. Three solutions were looked at to implement this approach with (C) being retained: A) Modifications: git-completion.bash and new git-completion.tcsh Modify the existing git-completion.bash script to support being sourced using bash (as now), but also executed using bash. When being executed, the script will output the result of the computed completion to be re-used elsewhere (e.g., in tcsh). The modification to git-completion.bash is made not to be tcsh-specific, but to allow future users to also re-use its output. Therefore, to be general, git-completion.bash accepts a second optional parameter, which is not used by tcsh, but could prove useful for other users. Pros: 1- allows the git-completion.bash script to easily be re-used 2- tcsh support is mostly isolated in git-completion.tcsh Cons (for tcsh users only): 1- requires the user to copy both git-completion.tcsh and git-completion.bash to ${HOME} 2- requires bash script to have a fixed name and location: ${HOME}/.git-completion.bash B) Modifications: git-completion.bash Modify the existing git-completion.bash script to support being sourced using bash (as now), but also executed using bash, and sourced using tcsh. Pros: 1- only requires the user to deal with a single file 2- maintenance more obvious for tcsh since it is entirely part of the same git-completion.bash script. Cons: 1- tcsh support could affect bash support as they share the same script 2- small tcsh section must use syntax suitable for both tcsh and bash and must be at the beginning of the script 3- requires script to have a fixed name and location: ${HOME}/.git-completion.sh (for tcsh users only) C) Modifications: New git-completion.tcsh Provide a short tcsh script that generates another script which extends git-completion.bash. This new script can be used by tcsh to perform completion. Pros: 1- tcsh support is entirely isolated in git-completion.tcsh 2- new tcsh script can be as complex as needed Cons (for tcsh users only): 1- requires the user to copy both git-completion.tcsh and git-completion.bash to ${HOME} 2- requires bash script to have a fixed name and location: ${HOME}/.git-completion.bash 3- sourcing the new script will generate a third script Approach (C) was selected avoid any modification to git-completion.bash. Signed-off-by: Marc Khouzam --- Here's another version which adds contrib/completion/git-completion.tcsh but does not modify contrib/completion/git-completion.bash at all. (Sorry, but I still can't get gmail to stop changing the tabs for spaces) Thanks in advance. Marc contrib/completion/git-completion.tcsh | 63 ++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 contrib/completion/git-completion.tcsh diff --git a/contrib/completion/git-completion.tcsh b/contrib/completion/git-completion.tcsh new file mode 100644 index 0000000..76395f9 --- /dev/null +++ b/contrib/completion/git-completion.tcsh @@ -0,0 +1,63 @@ +#!tcsh +# +# tcsh completion support for core Git. +# +# Copyright (C) 2012 Marc Khouzam +# Distributed under the GNU General Public License, version 2.0. +# +# When sourced, this script will generate a new script that uses +# the git-completion.bash script provided by core Git. This new +# script can be used by tcsh to perform git completion. +# The current script also issues the necessary tcsh 'complete' +# commands. +# +# To use this completion script: +# +# 1) Copy both this file and the bash completion script to ${HOME}. +# You _must_ use the name ${HOME}/.git-completion.bash for the +# bash script. +# (e.g. ~/.git-completion.tcsh and ~/.git-completion.bash). +# 2) Add the following line to your .tcshrc/.cshrc: +# source ~/.git-completion.tcsh + +set __git_tcsh_completion_original_script = ${HOME}/.git-completion.bash +set __git_tcsh_completion_script = ${HOME}/.git-completion.tcsh.bash + +cat << EOF > ${__git_tcsh_completion_script} +#!bash +# +# This script is GENERATED and will be overwritten automatically. +# Do not modify it directly. Instead, modify the git-completion.tcsh +# script provided by Git core. +# + +source ${__git_tcsh_completion_original_script} + +# Set COMP_WORDS in a way that can be handled by the bash script. +COMP_WORDS=(\$1) + +# The cursor is at the end of parameter #1. +# We must check for a space as the last character which will +# tell us that the previous word is complete and the cursor +# is on the next word. +if [ "\${1: -1}" == " " ]; then + # The last character is a space, so our location is at the end + # of the command-line array + COMP_CWORD=\${#COMP_WORDS[@]} +else + # The last character is not a space, so our location is on the + # last word of the command-line array, so we must decrement the + # count by 1 + COMP_CWORD=\$((\${#COMP_WORDS[@]}-1)) +fi + +# Call _git() or _gitk() of the bash script, based on the first +# element of the command-line +_\${COMP_WORDS[0]} + +IFS=\$'\n' +echo "\${COMPREPLY[*]}" +EOF + +complete git 'p/*/`bash ${__git_tcsh_completion_script} "${COMMAND_LINE}" | \sort | \uniq`/' +complete gitk 'p/*/`bash ${__git_tcsh_completion_script} "${COMMAND_LINE}" | \sort | \uniq`/' -- 1.8.0.1.g9fe2839