Finish redirection mechanism

Author: delvh

modules/git/tree_blob_nogogit.go

@@ -26,23 +26,24 @@ func (t *Tree) GetTreeEntryByPath(relpath string) (*TreeEntry, error) {
 	relpath = path.Clean(relpath)
 	parts := strings.Split(relpath, "/")
 	var err error
+
 	tree := t
-	for i, name := range parts {
-		if i == len(parts)-1 {
-			entries, err := tree.ListEntries()
-			if err != nil {
-				return nil, err
-			}
-			for _, v := range entries {
-				if v.Name() == name {
-					return v, nil
-				}
-			}
-		} else {
-			tree, err = tree.SubTree(name)
-			if err != nil {
-				return nil, err
-			}
+	for _, name := range parts[:len(parts)-1] {
+		tree, err = tree.SubTree(name)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	name := parts[len(parts)-1]
+	entries, err := tree.ListEntries()
+	if err != nil {
+		return nil, err
+	}
+	for _, v := range entries {
+		if v.Name() == name {
+			v.fullName = relpath
+			return v, nil
 		}
 	}
 	return nil, ErrNotExist{"", relpath}

modules/git/tree_entry.go

@@ -103,7 +103,7 @@ func (te *TreeEntry) FollowLinks() (*TreeEntry, error) {
 
 // TryFollowingLinks attempts to follow the symlinks of this entry to the origin
 // If that fails, it defaults to the entry itself
-func (te *TreeEntry) TryFollowingLinks() (*TreeEntry) {
+func (te *TreeEntry) TryFollowingLinks() *TreeEntry {
 	newEntry, err := te.FollowLinks()
 	if err != nil {
 		return te

modules/git/tree_entry_nogogit.go

@@ -23,9 +23,6 @@ type TreeEntry struct {
 
 // Name returns the name of the entry
 func (te *TreeEntry) Name() string {
-	if te.fullName != "" {
-		return te.fullName
-	}
 	return te.name
 }
 
@@ -58,6 +55,12 @@ func (te *TreeEntry) Size() int64 {
 	te.sized = true
 	return te.size
 }
+func (te *TreeEntry) FullPath() string {
+	if te.fullName == "" {
+		return te.Name()
+	}
+	return te.fullName
+}
 
 // IsSubModule if the entry is a sub module
 func (te *TreeEntry) IsSubModule() bool {

templates/repo/view_list.tmpl

@@ -76,7 +76,7 @@
 								{{svg (printf "octicon-%s" (EntryIcon $entry))}}
 								{{$symLinkEntry := $entry}}
 								{{if $entry.IsLink}}{{$symLinkEntry = $entry.TryFollowingLinks}}{{end}}
-								<a class="muted" href="{{$.TreeLink}}/{{$symLinkEntry.Name}}" data-tooltip-content title="{{$entry.Name}}">{{$entry.Name}}</a>
+								<a class="muted" href="{{$.TreeLink}}/{{$symLinkEntry.FullPath}}" data-tooltip-content title="{{$symLinkEntry.FullPath}}">{{$entry.Name}}</a>
 							{{end}}
 						{{end}}
 					</span>