gitk: Disable "Reset %s branch to here" when on a detached head

chunga · paulusmack · commit 5e3502dabb6e · 2008-05-03T17:57:35.000+10:00
When we are on a detached head - since gitk does not display where
we are - reset has no sense, so disable the relevant line on the
context menu, and point out to the user that we are on a detached head.

Otherwise, a reset from gitk when on a detached head returns the
error:

can't read "headids()": no such element in array
can't read "headids()": no such element in array
    while executing
"removehead $headids($name) $name"
    (procedure "movehead" line 4)
    invoked from within
"movehead $newhead $mainhead"
    (procedure "readresetstat" line 20)
    invoked from within
"readresetstat file4"
    ("eval" body line 1)
    invoked from within
"eval $script"
    (procedure "dorunq" line 9)
    invoked from within
"dorunq"
    ("after" script)

[paulus@samba.org: changed menu item to "Detached head: can't reset"]

Signed-off-by: Michele Ballabio &lt;barra_cuda@katamail.com&gt;
Signed-off-by: Paul Mackerras &lt;paulus@samba.org&gt;
diff --git a/gitk b/gitk
@@ -6016,7 +6016,11 @@ proc rowmenu {x y id} {
     }
     if {$id ne $nullid && $id ne $nullid2} {
 	set menu $rowctxmenu
-	$menu entryconfigure 7 -label [mc "Reset %s branch to here" $mainhead]
+	if {$mainhead ne {}} {
+	    $menu entryconfigure 7 -label [mc "Reset %s branch to here" $mainhead]
+	} else {
+	    $menu entryconfigure 7 -label [mc "Detached head: can't reset" $mainhead] -state disabled
+	}
     } else {
 	set menu $fakerowmenu
     }

Original file line number	Diff line number	Diff line change
`@@ -6016,7 +6016,11 @@ proc rowmenu {x y id} {`
`6016`	`6016`	`}`
`6017`	`6017`	`if {$id ne $nullid && $id ne $nullid2} {`
`6018`	`6018`	`set menu $rowctxmenu`
`6019`		`- $menu entryconfigure 7 -label [mc "Reset %s branch to here" $mainhead]`
	`6019`	`+ if {$mainhead ne {}} {`
	`6020`	`+ $menu entryconfigure 7 -label [mc "Reset %s branch to here" $mainhead]`
	`6021`	`+ } else {`
	`6022`	`+ $menu entryconfigure 7 -label [mc "Detached head: can't reset" $mainhead] -state disabled`
	`6023`	`+ }`
`6020`	`6024`	`} else {`
`6021`	`6025`	`set menu $fakerowmenu`
`6022`	`6026`	`}`