1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-11-26 09:00:57 +02:00
lazygit/gitcommands.go

655 lines
17 KiB
Go
Raw Normal View History

2018-05-19 09:04:33 +02:00
package main
2018-05-19 03:16:34 +02:00
import (
2018-05-21 12:52:48 +02:00
// "log"
"errors"
"fmt"
"os"
"os/exec"
2018-08-07 11:13:41 +02:00
"regexp"
"strings"
"time"
"github.com/fatih/color"
2018-08-06 15:29:00 +02:00
"github.com/jesseduffield/gocui"
gitconfig "github.com/tcnksm/go-gitconfig"
2018-08-09 06:33:51 +02:00
git "gopkg.in/src-d/go-git.v4"
"gopkg.in/src-d/go-git.v4/plumbing/object"
2018-05-19 03:16:34 +02:00
)
var (
2018-08-06 15:29:00 +02:00
// ErrNoCheckedOutBranch : When we have no checked out branch
ErrNoCheckedOutBranch = errors.New("No currently checked out branch")
2018-08-08 11:46:21 +02:00
// ErrNoOpenCommand : When we don't know which command to use to open a file
ErrNoOpenCommand = errors.New("Unsure what command to use to open this file")
)
2018-05-21 12:52:48 +02:00
// GitFile : A staged/unstaged file
2018-06-05 10:48:46 +02:00
// TODO: decide whether to give all of these the Git prefix
2018-05-21 12:52:48 +02:00
type GitFile struct {
Name string
HasStagedChanges bool
HasUnstagedChanges bool
Tracked bool
Deleted bool
HasMergeConflicts bool
DisplayString string
2018-05-19 03:16:34 +02:00
}
2018-05-21 12:52:48 +02:00
// Branch : A git branch
type Branch struct {
Name string
Type string
BaseBranch string
DisplayString string
2018-05-19 03:16:34 +02:00
}
2018-05-27 08:32:09 +02:00
// Commit : A git commit
type Commit struct {
Sha string
Name string
Pushed bool
DisplayString string
2018-05-27 08:32:09 +02:00
}
2018-06-05 10:48:46 +02:00
// StashEntry : A git stash entry
type StashEntry struct {
Index int
Name string
DisplayString string
2018-06-05 10:48:46 +02:00
}
2018-05-21 12:52:48 +02:00
// Map (from https://gobyexample.com/collection-functions)
func Map(vs []string, f func(string) string) []string {
vsm := make([]string, len(vs))
for i, v := range vs {
vsm[i] = f(v)
}
return vsm
2018-05-21 12:52:48 +02:00
}
2018-05-19 03:16:34 +02:00
2018-06-02 01:05:20 +02:00
func includesString(list []string, a string) bool {
for _, b := range list {
if b == a {
return true
}
}
return false
2018-06-02 01:05:20 +02:00
}
// not sure how to genericise this because []interface{} doesn't accept e.g.
// []int arguments
func includesInt(list []int, a int) bool {
for _, b := range list {
if b == a {
return true
}
}
return false
2018-05-26 05:23:39 +02:00
}
2018-05-21 12:52:48 +02:00
func mergeGitStatusFiles(oldGitFiles, newGitFiles []GitFile) []GitFile {
if len(oldGitFiles) == 0 {
return newGitFiles
}
appendedIndexes := make([]int, 0)
// retain position of files we already could see
result := make([]GitFile, 0)
for _, oldGitFile := range oldGitFiles {
for newIndex, newGitFile := range newGitFiles {
if oldGitFile.Name == newGitFile.Name {
result = append(result, newGitFile)
appendedIndexes = append(appendedIndexes, newIndex)
break
}
}
}
// append any new files to the end
for index, newGitFile := range newGitFiles {
if !includesInt(appendedIndexes, index) {
result = append(result, newGitFile)
}
}
return result
2018-05-21 12:52:48 +02:00
}
2018-05-19 03:16:34 +02:00
2018-05-21 14:34:02 +02:00
func runDirectCommand(command string) (string, error) {
timeStart := time.Now()
commandLog(command)
2018-08-07 07:21:50 +02:00
cmdOut, err := exec.
Command(state.Platform.shell, state.Platform.shellArg, command).
CombinedOutput()
devLog("run direct command time for command: ", command, time.Now().Sub(timeStart))
return sanitisedCommandOutput(cmdOut, err)
2018-05-21 12:52:48 +02:00
}
2018-05-19 03:16:34 +02:00
2018-06-01 15:23:31 +02:00
func branchStringParts(branchString string) (string, string) {
// expect string to be something like '4w master`
splitBranchName := strings.Split(branchString, "\t")
// if we have no \t then we have no recency, so just output that as blank
if len(splitBranchName) == 1 {
return "", branchString
}
return splitBranchName[0], splitBranchName[1]
2018-06-01 15:23:31 +02:00
}
// branchPropertiesFromName : returns branch type, base, and color
func branchPropertiesFromName(name string) (string, string, color.Attribute) {
if strings.Contains(name, "feature/") {
return "feature", "develop", color.FgGreen
} else if strings.Contains(name, "bugfix/") {
return "bugfix", "develop", color.FgYellow
} else if strings.Contains(name, "hotfix/") {
return "hotfix", "master", color.FgRed
}
return "other", name, color.FgWhite
2018-06-01 15:23:31 +02:00
}
2018-06-09 11:06:33 +02:00
func coloredString(str string, colour *color.Color) string {
return colour.SprintFunc()(fmt.Sprint(str))
2018-06-01 15:23:31 +02:00
}
func withPadding(str string, padding int) string {
if padding-len(str) < 0 {
return str
}
return str + strings.Repeat(" ", padding-len(str))
2018-06-01 15:23:31 +02:00
}
2018-06-05 10:48:46 +02:00
// TODO: DRY up this function and getGitBranches
func getGitStashEntries() []StashEntry {
stashEntries := make([]StashEntry, 0)
rawString, _ := runDirectCommand("git stash list --pretty='%gs'")
for i, line := range splitLines(rawString) {
stashEntries = append(stashEntries, stashEntryFromLine(line, i))
}
return stashEntries
2018-06-05 10:48:46 +02:00
}
func stashEntryFromLine(line string, index int) StashEntry {
return StashEntry{
Name: line,
Index: index,
DisplayString: line,
}
2018-06-05 10:48:46 +02:00
}
func getStashEntryDiff(index int) (string, error) {
return runCommand("git stash show -p --color stash@{" + fmt.Sprint(index) + "}")
}
func includes(array []string, str string) bool {
for _, arrayStr := range array {
if arrayStr == str {
return true
}
}
return false
2018-06-05 10:48:46 +02:00
}
2018-05-21 12:52:48 +02:00
func getGitStatusFiles() []GitFile {
statusOutput, _ := getGitStatus()
statusStrings := splitLines(statusOutput)
gitFiles := make([]GitFile, 0)
for _, statusString := range statusStrings {
change := statusString[0:2]
stagedChange := change[0:1]
unstagedChange := statusString[1:2]
filename := statusString[3:]
tracked := !includes([]string{"??", "A "}, change)
gitFile := GitFile{
Name: filename,
DisplayString: statusString,
HasStagedChanges: !includes([]string{" ", "U", "?"}, stagedChange),
HasUnstagedChanges: unstagedChange != " ",
Tracked: tracked,
Deleted: unstagedChange == "D" || stagedChange == "D",
HasMergeConflicts: change == "UU",
}
devLog("tracked", gitFile.Tracked)
devLog("hasUnstagedChanges", gitFile.HasUnstagedChanges)
devLog("HasStagedChanges", gitFile.HasStagedChanges)
devLog("DisplayString", gitFile.DisplayString)
gitFiles = append(gitFiles, gitFile)
}
devLog(gitFiles)
return gitFiles
2018-05-19 03:16:34 +02:00
}
2018-06-05 10:48:46 +02:00
func gitStashDo(index int, method string) (string, error) {
return runCommand("git stash " + method + " stash@{" + fmt.Sprint(index) + "}")
2018-06-05 10:48:46 +02:00
}
func gitStashSave(message string) (string, error) {
output, err := runCommand("git stash save \"" + message + "\"")
if err != nil {
return output, err
}
// if there are no local changes to save, the exit code is 0, but we want
// to raise an error
if output == "No local changes to save\n" {
return output, errors.New(output)
}
return output, nil
2018-06-05 10:48:46 +02:00
}
2018-05-27 08:32:09 +02:00
func gitCheckout(branch string, force bool) (string, error) {
forceArg := ""
if force {
forceArg = "--force "
}
return runCommand("git checkout " + forceArg + branch)
2018-05-19 03:16:34 +02:00
}
func sanitisedCommandOutput(output []byte, err error) (string, error) {
outputString := string(output)
if outputString == "" && err != nil {
return err.Error(), err
}
return outputString, err
}
2018-05-27 08:32:09 +02:00
func runCommand(command string) (string, error) {
commandStartTime := time.Now()
commandLog(command)
splitCmd := strings.Split(command, " ")
devLog(splitCmd)
cmdOut, err := exec.Command(splitCmd[0], splitCmd[1:]...).CombinedOutput()
devLog("run command time: ", time.Now().Sub(commandStartTime))
return sanitisedCommandOutput(cmdOut, err)
2018-05-19 09:04:33 +02:00
}
2018-05-19 03:16:34 +02:00
2018-08-06 15:29:00 +02:00
func vsCodeOpenFile(g *gocui.Gui, filename string) (string, error) {
return runCommand("code -r " + filename)
2018-05-26 05:23:39 +02:00
}
2018-08-06 15:29:00 +02:00
func sublimeOpenFile(g *gocui.Gui, filename string) (string, error) {
return runCommand("subl " + filename)
2018-05-26 05:23:39 +02:00
}
2018-08-06 15:29:00 +02:00
func openFile(g *gocui.Gui, filename string) (string, error) {
2018-08-08 11:46:21 +02:00
cmdName, cmdTrail, err := getOpenCommand()
if err != nil {
return "", err
}
return runCommand(cmdName + " " + filename + cmdTrail)
}
func getOpenCommand() (string, string, error) {
//NextStep open equivalents: xdg-open (linux), cygstart (cygwin), open (OSX)
trailMap := map[string]string{
"xdg-open": " &>/dev/null &",
"cygstart": "",
"open": "",
}
for name, trail := range trailMap {
if out, _ := runCommand("which " + name); out != "exit status 1" {
return name, trail, nil
}
}
return "", "", ErrNoOpenCommand
2018-08-06 15:29:00 +02:00
}
2018-08-07 11:50:35 +02:00
func gitAddPatch(g *gocui.Gui, filename string) {
runSubProcess(g, "git", "add", "--patch", filename)
2018-08-07 11:50:35 +02:00
}
2018-08-06 15:29:00 +02:00
func editFile(g *gocui.Gui, filename string) (string, error) {
editor, _ := gitconfig.Global("core.editor")
if editor == "" {
editor = os.Getenv("VISUAL")
}
2018-08-06 15:29:00 +02:00
if editor == "" {
editor = os.Getenv("EDITOR")
}
if editor == "" {
return "", createErrorPanel(g, "No editor defined in $VISUAL, $EDITOR, or git config.")
2018-08-06 15:29:00 +02:00
}
runSubProcess(g, editor, filename)
return "", nil
}
func runSubProcess(g *gocui.Gui, cmdName string, commandArgs ...string) {
2018-08-07 10:05:43 +02:00
subprocess = exec.Command(cmdName, commandArgs...)
subprocess.Stdin = os.Stdin
subprocess.Stdout = os.Stdout
subprocess.Stderr = os.Stderr
g.Update(func(g *gocui.Gui) error {
return ErrSubprocess
})
2018-08-06 15:29:00 +02:00
}
func getBranchGraph(branch string, baseBranch string) (string, error) {
return runCommand("git log --graph --color --abbrev-commit --decorate --date=relative --pretty=medium -100 " + branch)
2018-06-10 03:36:27 +02:00
// Leaving this guy commented out in case there's backlash from the design
// change and I want to make this configurable
// return runCommand("git log -p -30 --color --no-merges " + branch)
2018-05-21 12:52:48 +02:00
}
2018-06-01 15:23:31 +02:00
func verifyInGitRepo() {
if output, err := runCommand("git status"); err != nil {
fmt.Println(output)
os.Exit(1)
}
2018-06-01 15:23:31 +02:00
}
2018-05-27 08:32:09 +02:00
func getCommits() []Commit {
pushables := gitCommitsToPush()
log := getLog()
commits := make([]Commit, 0)
// now we can split it up and turn it into commits
lines := splitLines(log)
for _, line := range lines {
splitLine := strings.Split(line, " ")
sha := splitLine[0]
pushed := includesString(pushables, sha)
commits = append(commits, Commit{
Sha: sha,
Name: strings.Join(splitLine[1:], " "),
Pushed: pushed,
DisplayString: strings.Join(splitLine, " "),
})
}
return commits
2018-05-27 08:32:09 +02:00
}
2018-05-26 05:23:39 +02:00
func getLog() string {
// currently limiting to 30 for performance reasons
// TODO: add lazyloading when you scroll down
result, err := runDirectCommand("git log --oneline -30")
if err != nil {
// assume if there is an error there are no commits yet for this branch
return ""
}
return result
2018-05-27 08:32:09 +02:00
}
2018-06-01 15:23:31 +02:00
func gitIgnore(filename string) {
if _, err := runDirectCommand("echo '" + filename + "' >> .gitignore"); err != nil {
panic(err)
}
2018-06-01 15:23:31 +02:00
}
2018-05-27 08:32:09 +02:00
func gitShow(sha string) string {
result, err := runDirectCommand("git show --color " + sha)
if err != nil {
panic(err)
}
return result
2018-05-26 05:23:39 +02:00
}
2018-05-21 12:52:48 +02:00
func getDiff(file GitFile) string {
cachedArg := ""
if file.HasStagedChanges && !file.HasUnstagedChanges {
cachedArg = "--cached "
}
deletedArg := ""
if file.Deleted {
deletedArg = "-- "
}
trackedArg := ""
if !file.Tracked && !file.HasStagedChanges {
trackedArg = "--no-index /dev/null "
}
2018-07-28 08:52:20 +02:00
command := "git diff --color " + cachedArg + deletedArg + trackedArg + file.Name
// for now we assume an error means the file was deleted
s, _ := runCommand(command)
return s
2018-05-19 09:04:33 +02:00
}
2018-05-19 03:16:34 +02:00
2018-06-09 11:06:33 +02:00
func catFile(file string) (string, error) {
return runDirectCommand("cat " + file)
2018-06-09 11:06:33 +02:00
}
2018-05-19 09:04:33 +02:00
func stageFile(file string) error {
_, err := runCommand("git add " + file)
return err
2018-05-19 09:04:33 +02:00
}
func unStageFile(file string, tracked bool) error {
var command string
if tracked {
command = "git reset HEAD "
} else {
command = "git rm --cached "
}
devLog(command)
_, err := runCommand(command + file)
return err
2018-05-19 03:16:34 +02:00
}
2018-05-21 12:52:48 +02:00
func getGitStatus() (string, error) {
return runCommand("git status --untracked-files=all --short")
2018-05-21 12:52:48 +02:00
}
2018-05-19 03:16:34 +02:00
2018-06-09 11:06:33 +02:00
func isInMergeState() (bool, error) {
output, err := runCommand("git status --untracked-files=all")
if err != nil {
return false, err
}
return strings.Contains(output, "conclude merge") || strings.Contains(output, "unmerged paths"), nil
2018-06-09 11:06:33 +02:00
}
2018-05-21 14:34:02 +02:00
func removeFile(file GitFile) error {
// if the file isn't tracked, we assume you want to delete it
if !file.Tracked {
_, err := runCommand("rm -rf ./" + file.Name)
return err
}
// if the file is tracked, we assume you want to just check it out
_, err := runCommand("git checkout " + file.Name)
return err
2018-05-21 14:34:02 +02:00
}
func gitCommit(g *gocui.Gui, message string) (string, error) {
gpgsign, _ := gitconfig.Global("commit.gpgsign")
if gpgsign != "" {
runSubProcess(g, "bash", "-c", "git commit -m \""+message+"\"")
return "", nil
}
userName, err := gitconfig.Username()
if userName == "" {
return "", errNoUsername
}
userEmail, err := gitconfig.Email()
_, err = w.Commit(message, &git.CommitOptions{
2018-08-09 06:33:51 +02:00
Author: &object.Signature{
Name: userName,
Email: userEmail,
When: time.Now(),
},
})
if err != nil {
return err.Error(), err
}
return "", nil
2018-05-21 14:34:02 +02:00
}
2018-05-27 08:32:09 +02:00
func gitPull() (string, error) {
return runDirectCommand("git pull --no-edit")
2018-05-27 08:32:09 +02:00
}
func gitPush() (string, error) {
branchName := gitCurrentBranchName()
if branchName == "" {
return "", ErrNoCheckedOutBranch
}
return runDirectCommand("git push -u origin " + branchName)
2018-05-27 08:32:09 +02:00
}
func gitSquashPreviousTwoCommits(message string) (string, error) {
return runDirectCommand("git reset --soft HEAD^ && git commit --amend -m \"" + message + "\"")
2018-05-27 08:32:09 +02:00
}
func gitRenameCommit(message string) (string, error) {
return runDirectCommand("git commit --allow-empty --amend -m \"" + message + "\"")
2018-05-27 08:32:09 +02:00
}
2018-06-02 05:51:03 +02:00
func gitFetch() (string, error) {
return runDirectCommand("git fetch")
2018-06-02 05:51:03 +02:00
}
func gitResetToCommit(sha string) (string, error) {
return runDirectCommand("git reset " + sha)
2018-06-02 05:51:03 +02:00
}
func gitNewBranch(name string) (string, error) {
return runDirectCommand("git checkout -b " + name)
2018-06-02 05:51:03 +02:00
}
2018-06-05 10:48:46 +02:00
func gitListStash() (string, error) {
return runDirectCommand("git stash list")
2018-06-05 10:48:46 +02:00
}
2018-06-09 11:06:33 +02:00
func gitMerge(branchName string) (string, error) {
return runDirectCommand("git merge --no-edit " + branchName)
2018-06-09 11:06:33 +02:00
}
func gitAbortMerge() (string, error) {
return runDirectCommand("git merge --abort")
2018-06-09 11:06:33 +02:00
}
2018-06-01 15:23:31 +02:00
func gitUpstreamDifferenceCount() (string, string) {
pushableCount, err := runDirectCommand("git rev-list @{u}..head --count")
if err != nil {
return "?", "?"
}
pullableCount, err := runDirectCommand("git rev-list head..@{u} --count")
if err != nil {
return "?", "?"
}
return strings.TrimSpace(pushableCount), strings.TrimSpace(pullableCount)
2018-05-27 08:32:09 +02:00
}
2018-06-01 15:23:31 +02:00
func gitCommitsToPush() []string {
pushables, err := runDirectCommand("git rev-list @{u}..head --abbrev-commit")
if err != nil {
return make([]string, 0)
}
return splitLines(pushables)
2018-06-01 15:23:31 +02:00
}
func gitCurrentBranchName() string {
branchName, err := runDirectCommand("git symbolic-ref --short HEAD")
// if there is an error, assume there are no branches yet
if err != nil {
return ""
}
return strings.TrimSpace(branchName)
2018-05-26 07:44:44 +02:00
}
2018-08-07 11:31:19 +02:00
// A line will have the form '10 days ago master' so we need to strip out the
// useful information from that into timeNumber, timeUnit, and branchName
func branchInfoFromLine(line string) (string, string, string) {
r := regexp.MustCompile("\\|.*\\s")
line = r.ReplaceAllString(line, " ")
words := strings.Split(line, " ")
return words[0], words[1], words[3]
}
func abbreviatedTimeUnit(timeUnit string) string {
r := regexp.MustCompile("s$")
timeUnit = r.ReplaceAllString(timeUnit, "")
timeUnitMap := map[string]string{
"hour": "h",
"minute": "m",
"second": "s",
"week": "w",
"year": "y",
"day": "d",
"month": "m",
}
return timeUnitMap[timeUnit]
}
2018-08-07 11:13:41 +02:00
func getBranches() []Branch {
branches := make([]Branch, 0)
2018-08-07 11:23:02 +02:00
rawString, err := runDirectCommand("git reflog -n100 --pretty='%cr|%gs' --grep-reflog='checkout: moving' HEAD")
if err != nil {
return branches
}
2018-08-07 11:13:41 +02:00
branchLines := splitLines(rawString)
for i, line := range branchLines {
2018-08-07 11:31:19 +02:00
timeNumber, timeUnit, branchName := branchInfoFromLine(line)
timeUnit = abbreviatedTimeUnit(timeUnit)
2018-08-07 11:13:41 +02:00
if branchAlreadyStored(branchName, branches) {
continue
}
2018-08-07 11:16:54 +02:00
branch := constructBranch(timeNumber+timeUnit, branchName, i)
2018-08-07 11:13:41 +02:00
branches = append(branches, branch)
}
return branches
}
2018-08-07 11:23:02 +02:00
2018-08-07 11:32:25 +02:00
func constructBranch(prefix, name string, index int) Branch {
2018-08-07 11:23:02 +02:00
branchType, branchBase, colourAttr := branchPropertiesFromName(name)
if index == 0 {
2018-08-07 11:32:25 +02:00
prefix = " *"
2018-08-07 11:23:02 +02:00
}
colour := color.New(colourAttr)
2018-08-07 11:32:25 +02:00
displayString := withPadding(prefix, 4) + coloredString(name, colour)
2018-08-07 11:23:02 +02:00
return Branch{
Name: name,
Type: branchType,
BaseBranch: branchBase,
DisplayString: displayString,
}
}
func getGitBranches() []Branch {
// check if there are any branches
branchCheck, _ := runCommand("git branch")
if branchCheck == "" {
return []Branch{constructBranch("", gitCurrentBranchName(), 0)}
}
branches := getBranches()
if len(branches) == 0 {
branches = append(branches, constructBranch("", gitCurrentBranchName(), 0))
}
2018-08-07 11:23:02 +02:00
branches = getAndMergeFetchedBranches(branches)
return branches
}
func branchAlreadyStored(branchName string, branches []Branch) bool {
for _, existingBranch := range branches {
if existingBranch.Name == branchName {
return true
}
}
return false
}
// here branches contains all the branches that we've checked out, along with
// the recency. In this function we append the branches that are in our heads
// directory i.e. things we've fetched but haven't necessarily checked out.
// Worth mentioning this has nothing to do with the 'git merge' operation
func getAndMergeFetchedBranches(branches []Branch) []Branch {
rawString, err := runDirectCommand("git branch --sort=-committerdate --no-color")
if err != nil {
return branches
}
branchLines := splitLines(rawString)
for _, line := range branchLines {
line = strings.Replace(line, "* ", "", -1)
line = strings.TrimSpace(line)
if branchAlreadyStored(line, branches) {
continue
}
branches = append(branches, constructBranch("", line, len(branches)))
}
return branches
}