git-gui: Squash populate_{push,fetch}_menu to populate_remotes_menu

The meat of the routines is now separated to add_fetch_entry() and
add_push_entry(). This refactoring will allow easy implementation of adding
individual remotes later.

Signed-off-by: Petr Baudis <petr.baudis@novartis.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

git-gui.sh

@@ -3263,8 +3263,7 @@ if {[is_enabled transport]} {
 	load_all_remotes
 
 	set n [.mbar.remote index end]
-	populate_push_menu
+	populate_remotes_menu
-	populate_fetch_menu
 	set n [expr {[.mbar.remote index end] - $n}]
 	if {$n > 0} {
 		if {[.mbar.remote type 0] eq "tearoff"} { incr n }

lib/remote.tcl

@@ -132,91 +132,92 @@ proc load_all_remotes {} {
 	set all_remotes [lsort -unique $all_remotes]
 }
 
-proc populate_fetch_menu {} {
+proc add_fetch_entry {r} {
-	global all_remotes repo_config
+	global repo_config
-
 	set remote_m .mbar.remote
 	set fetch_m $remote_m.fetch
 	set prune_m $remote_m.prune
-
+	set enable 0
-	foreach r $all_remotes {
+	if {![catch {set a $repo_config(remote.$r.url)}]} {
-		set enable 0
+		if {![catch {set a $repo_config(remote.$r.fetch)}]} {
-		if {![catch {set a $repo_config(remote.$r.url)}]} {
+			set enable 1
-			if {![catch {set a $repo_config(remote.$r.fetch)}]} {
+		}
-				set enable 1
+	} else {
-			}
+		catch {
-		} else {
+			set fd [open [gitdir remotes $r] r]
-			catch {
+			while {[gets $fd n] >= 0} {
-				set fd [open [gitdir remotes $r] r]
+				if {[regexp {^Pull:[ \t]*([^:]+):} $n]} {
-				while {[gets $fd n] >= 0} {
+					set enable 1
-					if {[regexp {^Pull:[ \t]*([^:]+):} $n]} {
+					break
-						set enable 1
-						break
-					}
 				}
-				close $fd
 			}
+			close $fd
 		}
+	}
 
-		if {$enable} {
+	if {$enable} {
-			if {![winfo exists $fetch_m]} {
+		if {![winfo exists $fetch_m]} {
-				menu $prune_m
+			menu $prune_m
-				$remote_m insert 0 cascade \
+			$remote_m insert 0 cascade \
-					-label [mc "Prune from"] \
+				-label [mc "Prune from"] \
-					-menu $prune_m
+				-menu $prune_m
-
+
-				menu $fetch_m
+			menu $fetch_m
-				$remote_m insert 0 cascade \
+			$remote_m insert 0 cascade \
-					-label [mc "Fetch from"] \
+				-label [mc "Fetch from"] \
-					-menu $fetch_m
+				-menu $fetch_m
-			}
-
-			$fetch_m add command \
-				-label $r \
-				-command [list fetch_from $r]
-			$prune_m add command \
-				-label $r \
-				-command [list prune_from $r]
 		}
+
+		$fetch_m add command \
+			-label $r \
+			-command [list fetch_from $r]
+		$prune_m add command \
+			-label $r \
+			-command [list prune_from $r]
 	}
 }
 
-proc populate_push_menu {} {
+proc add_push_entry {r} {
-	global all_remotes repo_config
+	global repo_config
-
 	set remote_m .mbar.remote
 	set push_m $remote_m.push
-
+	set enable 0
-	foreach r $all_remotes {
+	if {![catch {set a $repo_config(remote.$r.url)}]} {
-		set enable 0
+		if {![catch {set a $repo_config(remote.$r.push)}]} {
-		if {![catch {set a $repo_config(remote.$r.url)}]} {
+			set enable 1
-			if {![catch {set a $repo_config(remote.$r.push)}]} {
+		}
-				set enable 1
+	} else {
-			}
+		catch {
-		} else {
+			set fd [open [gitdir remotes $r] r]
-			catch {
+			while {[gets $fd n] >= 0} {
-				set fd [open [gitdir remotes $r] r]
+				if {[regexp {^Push:[ \t]*([^:]+):} $n]} {
-				while {[gets $fd n] >= 0} {
+					set enable 1
-					if {[regexp {^Push:[ \t]*([^:]+):} $n]} {
+					break
-						set enable 1
-						break
-					}
 				}
-				close $fd
 			}
+			close $fd
 		}
+	}
 
-		if {$enable} {
+	if {$enable} {
-			if {![winfo exists $push_m]} {
+		if {![winfo exists $push_m]} {
-				menu $push_m
+			menu $push_m
-				$remote_m insert 0 cascade \
+			$remote_m insert 0 cascade \
-					-label [mc "Push to"] \
+				-label [mc "Push to"] \
-					-menu $push_m
+				-menu $push_m
-			}
-
-			$push_m add command \
-				-label $r \
-				-command [list push_to $r]
 		}
+
+		$push_m add command \
+			-label $r \
+			-command [list push_to $r]
+	}
+}
+
+proc populate_remotes_menu {} {
+	global all_remotes
+
+	foreach r $all_remotes {
+		add_fetch_entry $r
+		add_push_entry $r
 	}
 }