Rename git package to repo package

pkg/print/dump.go

@@ -1,7 +1,7 @@
 package print
 
 import (
-	"git-get/pkg/git"
+	"git-get/pkg/repo"
 	"strings"
 )
 
@@ -9,22 +9,22 @@ type DumpPrinter struct{}
 
 // Print generates a list of repos URLs. Each line contains a URL and, if applicable, a currently checked out branch name.
 // It's a way to dump all repositories managed by git-get and is supposed to be consumed by `git get --dump`.
-func (p *DumpPrinter) Print(_ string, repos []*git.Repo) string {
+func (p *DumpPrinter) Print(_ string, repos []*repo.Repo) string {
 	var str strings.Builder
 
-	for i, repo := range repos {
-		remotes, err := repo.Remotes()
+	for i, r := range repos {
+		remotes, err := r.Remotes()
 		if err != nil || len(remotes) == 0 {
 			continue
 		}
 
 		// TODO: Needs work. Right now we're just assuming the first remote is the origin one and the one from which the current branch is checked out.
 		url := remotes[0].Config().URLs[0]
-		current := repo.Status.CurrentBranch
+		current := r.Status.CurrentBranch
 
 		str.WriteString(url)
 
-		if current != git.StatusDetached && current != git.StatusUnknown {
+		if current != repo.StatusDetached && current != repo.StatusUnknown {
 			str.WriteString(" " + current)
 		}
 

pkg/print/flat.go

@@ -2,25 +2,25 @@ package print
 
 import (
 	"fmt"
-	"git-get/pkg/git"
+	"git-get/pkg/repo"
 	"path/filepath"
 	"strings"
 )
 
 type FlatPrinter struct{}
 
-func (p *FlatPrinter) Print(root string, repos []*git.Repo) string {
+func (p *FlatPrinter) Print(root string, repos []*repo.Repo) string {
 	val := root
 
-	for _, repo := range repos {
-		path := strings.TrimPrefix(repo.Path, root)
+	for _, r := range repos {
+		path := strings.TrimPrefix(r.Path, root)
 		path = strings.Trim(path, string(filepath.Separator))
 
-		val += fmt.Sprintf("\n%s %s", path, printWorktreeStatus(repo))
+		val += fmt.Sprintf("\n%s %s", path, printWorktreeStatus(r))
 
-		for _, branch := range repo.Status.Branches {
+		for _, branch := range r.Status.Branches {
 			// Don't print the status of the current branch. It was already printed above.
-			if branch.Name == repo.Status.CurrentBranch {
+			if branch.Name == r.Status.CurrentBranch {
 				continue
 			}
 

pkg/print/print.go

@@ -2,12 +2,12 @@ package print
 
 import (
 	"fmt"
-	"git-get/pkg/git"
+	"git-get/pkg/repo"
 	"strings"
 )
 
 type Printer interface {
-	Print(root string, repos []*git.Repo) string
+	Print(root string, repos []*repo.Repo) string
 }
 
 const (
@@ -17,35 +17,35 @@ const (
 	ColorYellow = "\033[1;33m%s\033[0m"
 )
 
-func printWorktreeStatus(repo *git.Repo) string {
+func printWorktreeStatus(r *repo.Repo) string {
 	clean := true
 	var status []string
 
 	// if current branch status can't be found it's probably a detached head
 	// TODO: what if current HEAD points to a tag?
-	if current := repo.CurrentBranchStatus(); current == nil {
-		status = append(status, fmt.Sprintf(ColorYellow, repo.Status.CurrentBranch))
+	if current := r.CurrentBranchStatus(); current == nil {
+		status = append(status, fmt.Sprintf(ColorYellow, r.Status.CurrentBranch))
 	} else {
 		status = append(status, printBranchStatus(current))
 	}
 
 	// TODO: this is ugly
 	// unset clean flag to use it to render braces around worktree status and remove "ok" from branch status if it's there
-	if repo.Status.HasUncommittedChanges || repo.Status.HasUntrackedFiles {
+	if r.Status.HasUncommittedChanges || r.Status.HasUntrackedFiles {
 		clean = false
 	}
 
 	if !clean {
-		status[len(status)-1] = strings.TrimSuffix(status[len(status)-1], git.StatusOk)
+		status[len(status)-1] = strings.TrimSuffix(status[len(status)-1], repo.StatusOk)
 		status = append(status, "[")
 	}
 
-	if repo.Status.HasUntrackedFiles {
-		status = append(status, fmt.Sprintf(ColorRed, git.StatusUntracked))
+	if r.Status.HasUntrackedFiles {
+		status = append(status, fmt.Sprintf(ColorRed, repo.StatusUntracked))
 	}
 
-	if repo.Status.HasUncommittedChanges {
-		status = append(status, fmt.Sprintf(ColorRed, git.StatusUncommitted))
+	if r.Status.HasUncommittedChanges {
+		status = append(status, fmt.Sprintf(ColorRed, repo.StatusUncommitted))
 	}
 
 	if !clean {
@@ -55,7 +55,7 @@ func printWorktreeStatus(repo *git.Repo) string {
 	return strings.Join(status, " ")
 }
 
-func printBranchStatus(branch *git.BranchStatus) string {
+func printBranchStatus(branch *repo.BranchStatus) string {
 	// ok indicates that the branch has upstream and is not ahead or behind it
 	ok := true
 	var status []string
@@ -64,21 +64,21 @@ func printBranchStatus(branch *git.BranchStatus) string {
 
 	if branch.Upstream == "" {
 		ok = false
-		status = append(status, fmt.Sprintf(ColorYellow, git.StatusNoUpstream))
+		status = append(status, fmt.Sprintf(ColorYellow, repo.StatusNoUpstream))
 	}
 
 	if branch.Behind != 0 {
 		ok = false
-		status = append(status, fmt.Sprintf(ColorYellow, fmt.Sprintf("%d %s", branch.Behind, git.StatusBehind)))
+		status = append(status, fmt.Sprintf(ColorYellow, fmt.Sprintf("%d %s", branch.Behind, repo.StatusBehind)))
 	}
 
 	if branch.Ahead != 0 {
 		ok = false
-		status = append(status, fmt.Sprintf(ColorYellow, fmt.Sprintf("%d %s", branch.Ahead, git.StatusAhead)))
+		status = append(status, fmt.Sprintf(ColorYellow, fmt.Sprintf("%d %s", branch.Ahead, repo.StatusAhead)))
 	}
 
 	if ok {
-		status = append(status, fmt.Sprintf(ColorGreen, git.StatusOk))
+		status = append(status, fmt.Sprintf(ColorGreen, repo.StatusOk))
 	}
 
 	return strings.Join(status, " ")

pkg/print/tree.go

@@ -1,7 +1,7 @@
 package print
 
 import (
-	"git-get/pkg/git"
+	"git-get/pkg/repo"
 	"path/filepath"
 	"strings"
 
@@ -16,13 +16,13 @@ type SmartTreePrinter struct {
 	length int
 }
 
-func (p *SmartTreePrinter) Print(root string, repos []*git.Repo) string {
+func (p *SmartTreePrinter) Print(root string, repos []*repo.Repo) string {
 	tree := BuildTree(root, repos)
 
 	return p.PrintSmartTree(tree)
 }
 
-func (p *SimpleTreePrinter) Print(root string, repos []*git.Repo) string {
+func (p *SimpleTreePrinter) Print(root string, repos []*repo.Repo) string {
 	tree := BuildTree(root, repos)
 
 	tp := treeprint.New()
@@ -39,7 +39,7 @@ type Node struct {
 	depth    int // depth is a nesting depth used when rendering a smart tree, not a depth level of a tree node.
 	parent   *Node
 	children []*Node
-	repo     *git.Repo
+	repo     *repo.Repo
 }
 
 // Root creates a new root of a tree
@@ -83,11 +83,11 @@ func (n *Node) GetChild(val string) *Node {
 // BuildTree builds a directory tree of paths to repositories.
 // Each node represents a directory in the repo path.
 // Each leaf (final node) contains a pointer to the repo.
-func BuildTree(root string, repos []*git.Repo) *Node {
+func BuildTree(root string, repos []*repo.Repo) *Node {
 	tree := Root(root)
 
-	for _, repo := range repos {
-		path := strings.TrimPrefix(repo.Path, root)
+	for _, r := range repos {
+		path := strings.TrimPrefix(r.Path, root)
 		path = strings.Trim(path, string(filepath.Separator))
 		subs := strings.Split(path, string(filepath.Separator))
 
@@ -103,7 +103,7 @@ func BuildTree(root string, repos []*git.Repo) *Node {
 
 				// If that's the last fragment, it's a tree leaf and needs a *Repo attached.
 				if i == len(subs)-1 {
-					node.repo = repo
+					node.repo = r
 				}
 
 				continue

pkg/print/tree_test.go

@@ -2,7 +2,7 @@ package print
 
 import (
 	"fmt"
-	"git-get/pkg/git"
+	"git-get/pkg/repo"
 	"strings"
 	"testing"
 )
@@ -91,9 +91,9 @@ gitlab.com/
 	}
 
 	for i, test := range tests {
-		var repos []*git.Repo
+		var repos []*repo.Repo
 		for _, path := range test.paths {
-			repos = append(repos, git.NewRepo(nil, path)) //&Repo{path: path})
+			repos = append(repos, repo.New(nil, path)) //&Repo{path: path})
 		}
 
 		printer := SmartTreePrinter{}