git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paul Mackerras <paulus@ozlabs.org>
To: Pierre Dumuid <pmdumuid@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/6] Add ability to follow a remote branch with a dialog
Date: Sat, 31 Dec 2016 19:53:59 +1100	[thread overview]
Message-ID: <20161231085358.GB21019@fergus.ozlabs.ibm.com> (raw)
In-Reply-To: <20161215112847.14719-2-pmdumuid@gmail.com>

On Thu, Dec 15, 2016 at 09:58:43PM +1030, Pierre Dumuid wrote:
> A suggested name is provided when creating a new "following" branch.
> 
> Signed-off-by: Pierre Dumuid <pmdumuid@gmail.com>
> ---
>  gitk | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
>  1 file changed, 82 insertions(+), 4 deletions(-)
> 
> diff --git a/gitk b/gitk
> index 50d1ef4..36cba49 100755
> --- a/gitk
> +++ b/gitk
> @@ -2673,6 +2673,7 @@ proc makewindow {} {
>  	{mc "Rename this branch" command mvbranch}
>  	{mc "Remove this branch" command rmbranch}
>  	{mc "Copy branch name" command {clipboard clear; clipboard append $headmenuhead}}
> +	{mc "Follow this branch"  command follow_remote_branch_dialog}
>      }
>      $headctxmenu configure -tearoff 0
>  
> @@ -9947,23 +9948,100 @@ proc headmenu {x y id head} {
>      stopfinding
>      set headmenuid $id
>      set headmenuhead $head
> -    array set state {0 normal 1 normal 2 normal}
> +    array set state {0 normal 1 normal 2 normal 3 normal}
>      if {[string match "remotes/*" $head]} {
>  	set localhead [string range $head [expr [string last / $head] + 1] end]
>  	if {[info exists headids($localhead)]} {
>  	    set state(0) disabled
>  	}
> -	array set state {1 disabled 2 disabled}
> +	array set state {1 disabled 2 disabled 3 normal}

You set array(3) to "normal" just above, no need to do it again.

>      }
>      if {$head eq $mainhead} {
> -	array set state {0 disabled 2 disabled}
> +	array set state {0 disabled 2 disabled 3 disabled}
> +    } else {
> +	set state(3) disabled
>      }

As far as I can see, this will always end up with state(3) set to
"disabled", won't it?  Is that really what you want?

Paul.

  reply	other threads:[~2016-12-31 11:04 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-15 11:28 [PATCH 1/6] Enable ability to visualise the results of git cherry C1 C2 Pierre Dumuid
2016-12-15 11:28 ` [PATCH 2/6] Add ability to follow a remote branch with a dialog Pierre Dumuid
2016-12-31  8:53   ` Paul Mackerras [this message]
2016-12-15 11:28 ` [PATCH 3/6] Add a tree view to the local branches, remote branches and tags, where / is treated as a directory seperator Pierre Dumuid
2016-12-31  9:08   ` Paul Mackerras
2016-12-15 11:28 ` [PATCH 4/6] Add DirDiffTool as additional option Pierre Dumuid
2016-12-15 11:28 ` [PATCH 5/6] gitk: Add a "Save file as" menu item Pierre Dumuid
2016-12-15 11:28 ` [PATCH 6/6] Rename 'remotes/' to 'r../' in heads Pierre Dumuid
2016-12-31  8:30 ` [PATCH 1/6] Enable ability to visualise the results of git cherry C1 C2 Paul Mackerras

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161231085358.GB21019@fergus.ozlabs.ibm.com \
    --to=paulus@ozlabs.org \
    --cc=git@vger.kernel.org \
    --cc=pmdumuid@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).