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

Re: [PATCH 1/6] Enable ability to visualise the results of git cherry C1 C2

From
Paul Mackerras <paulus@ozlabs.org>
Date
Dec 31, 2016, 08:30 UTC
Message-ID
<20161231083051.GA21019@fergus.ozlabs.ibm.com>
In-Reply-To
<20161215112847.14719-1-pmdumuid@gmail.com>
On Thu, Dec 15, 2016 at 09:58:42PM +1030, Pierre Dumuid wrote:
Show 6 quoted lines
> It's a bit clunky but it works!!
> 
> Usage:
>  - mark commit one (e.g. v45)
>  - Select commit two.
>  - Switch the gdttype to the option, "git-cherry between marked commit and:"

This needs a better description. "Git-cherry between marked commit and" is a description of an implementation not a description of what's being achieved. Having read the git cherry man page, it seems like it's (Find commit) included in marked commit but not in this commit (or the other way around?). We would need a terser description that that, though.

[...]
Show 24 quoted lines
> +proc update_gitcherrylist {} {
> +    global gitcherryids
> +    global markedid
> +    global findstring
> +    global fstring
> +    global currentid
> +    global iddrawn
> +
> +    unset -nocomplain gitcherryids
> +    set fs $findstring
> +
> +    if {$findstring eq {}} {
> +	$fstring delete 0 end
> +	$fstring insert 0 $currentid
> +    }
> +
> +    if {![info exists markedid]} {
> +	error_popup [mc "Please mark a git commit before using this find method!"]
> +	return
> +    }
> +
> +    #puts [join [list "Running cherry between: `" $markedid "` and `" $findstring "`"] ""]
> +
> +    if {[catch {set cherryOutput [exec git cherry $markedid $findstring]}]} {

How long could the git cherry take to run? If it's more than a fraction of a second, then we would need to handle its output asynchronously like we do in [do_file_hl].

Paul.
Previous: Pierre Dumuid
Message 9 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.