mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-gui: Maintain remote and source ref for tracking branches

Browse Source 
In the next change I want to let the user create their local branch
name to match the remote branch name, so that the existing push
dialog can push the branch back up to the remote repository without
needing to do any sort of remapping.  To do that we need to know
exactly what branch name the remote system is using.

So all_tracking_branches returns a list of specifications, where
each specification is itself a list of:

  - local ref name (destination we fetch into)
  - remote name (repository we fetch from)
  - remote ref name (source ref we fetch from)

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce
2007-07-04 01:10:41 -04:00
parent 6f2a3fc812
commit 79a060e477
2 changed files with 60 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/remote.tcl
View File

@ -17,28 +17,41 @@ proc is_tracking_branch {name} {
proc all_tracking_branches {} {
global tracking_branches
set all_trackings {}
set cmd {}
set all [list]
set pat [list]
set cmd [list]
foreach spec $tracking_branches {
set name [lindex $spec 0]
if {[string range $name end-1 end] eq {/*}} {
lappend cmd [string range $name 0 end-2]
set dst [lindex $spec 0]
if {[string range $dst end-1 end] eq {/*}} {
lappend pat $spec
lappend cmd [string range $dst 0 end-2]
} else {
regsub ^refs/(heads|remotes)/ $name {} name
lappend all_trackings $name
lappend all $spec
}
}
if {$cmd ne {}} {
if {$pat ne {}} {
set fd [open "| git for-each-ref --format=%(refname) $cmd" r]
while {[gets $fd name] > 0} {
regsub ^refs/(heads|remotes)/ $name {} name
lappend all_trackings $name
while {[gets $fd n] > 0} {
foreach spec $pat {
set dst [string range [lindex $spec 0] 0 end-2]
set len [string length $dst]
if {[string equal -length $len $dst $n]} {
set src [string range [lindex $spec 2] 0 end-2]
set spec [list \
$n \
[lindex $spec 1] \
$src[string range $n $len end] \
]
lappend all $spec
}
}
}
close $fd
}
return [lsort -unique $all_trackings]
return [lsort -index 0 -unique $all]
}
proc load_all_remotes {} {
@ -65,6 +78,9 @@ proc load_all_remotes {} {
while {[gets $fd line] >= 0} {
if {![regexp {^Pull:[ ]*([^:]+):(.+)$} \
$line line src dst]} continue
if {[string index $src 0] eq {+}} {
set src [string range $src 1 end]
}
if {![string equal -length 5 refs/ $src]} {
set src $rh_str$src
}
@ -90,6 +106,9 @@ proc load_all_remotes {} {
}
foreach line $fl {
if {![regexp {^([^:]+):(.+)$} $line line src dst]} continue
if {[string index $src 0] eq {+}} {
set src [string range $src 1 end]
}
if {![string equal -length 5 refs/ $src]} {
set src $rh_str$src
}