git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/6] Add ability to follow a remote branch with a dialog

From
Paul Mackerras <paulus@ozlabs.org>
Date
Dec 31, 2016, 08:53 UTC
Message-ID
<20161231085358.GB21019@fergus.ozlabs.ibm.com>
In-Reply-To
<20161215112847.14719-2-pmdumuid@gmail.com>
On Thu, Dec 15, 2016 at 09:58:43PM +1030, Pierre Dumuid wrote:
Show 32 quoted lines
> 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.
Show 7 quoted lines
>      }
>      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.
Previous: Pierre DumuidNext: Pierre Dumuid
Message 3 of 9 in “Enable ability to visualise the results of git cherry C1 C2”
  1. 1/6 Enable ability to visualise the results of git cherry C1 C2Pierre Dumuid, Dec 15, 2016
  2. 2/6 Add ability to follow a remote branch with a dialogPierre Dumuid, Dec 15, 2016
  3. Paul MackerrasDec 31, 2016
  4. 3/6 Add a tree view to the local branches, remote branches and tags, where / is treated as a directory seperator.Pierre Dumuid, Dec 15, 2016
  5. Paul MackerrasDec 31, 2016
  6. 5/6 gitk: Add a "Save file as" menu itemPierre Dumuid, Dec 15, 2016
  7. 6/6 Rename 'remotes/' to 'r../' in headsPierre Dumuid, Dec 15, 2016
  8. 4/6 Add DirDiffTool as additional optionPierre Dumuid, Dec 15, 2016
  9. Paul MackerrasDec 31, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.