From 2538b357f972b1ff88d378c7cf3109062ab3bdc3 Mon Sep 17 00:00:00 2001 From: Jonathan Bernard Date: Wed, 16 Aug 2017 11:35:12 -0500 Subject: [PATCH] Add support for bare repos, ability to stash unsaved changes. --- git_pull_all.nim | 112 ++++++++++++++++++++++++++++++-------------- git_pull_all.nimble | 4 +- 2 files changed, 79 insertions(+), 37 deletions(-) diff --git a/git_pull_all.nim b/git_pull_all.nim index 4caafdf..f663715 100644 --- a/git_pull_all.nim +++ b/git_pull_all.nim @@ -24,8 +24,12 @@ proc `$`(buf: OutputBuffer): string = buf.outBuf.join("\n") & "\n" & buf.errBuf.join("\n") proc git(repoDir: string, args: openArray[string]): bool = - let res = exec("git", repoDir, args, env, {poUsePath}, outputHandler) - return res.exitCode == 0 + if verbose: + stdout.setForegroundColor(fgBlue, false) + stdout.writeLine("> git " & toSeq(args.items).mapIt("'" & it & "'").join(" ")) + stdout.resetAttributes() + + return exec("git", repoDir, args, env, {poUsePath}, outputHandler) == 0 proc isGitRepo(dir: string): bool = if not existsDir(dir): return false @@ -60,9 +64,11 @@ Options: -V --version Print version -r --remote Pull from (defaults to "origin") -b --branch Pull the branch (defaults to "master") + -o --log-out Log command output to + -e --log-err Log error output to """ - let args = docopt(doc, version = "git_pull_all 0.1.0") + let args = docopt(doc, version = "git_pull_all 0.2.0") let rootDirs: seq[string] = if args[""]: args[""].mapIt(it) @@ -88,9 +94,19 @@ Options: outputHandler = combineProcMsgHandlers(outputHandler, makeProcMsgHandler(stdout, stderr)) + var outLog, errLog: File = nil + if args["--log-out"]: outLog = open($args[""], fmRead) + if args["--log-err"]: errLog = open($args[""], fmRead) + + if outLog != nil or errLog != nil: + outputHandler = combineProcMsgHandlers(outputHandler, + makeProcMsgHandler(outLog, errLog)) + # Foreach repo: for repoDir in repos: let repoName = repoDir.extractFilename + + if verbose: stdout.writeLine("") stdout.setForegroundColor(fgCyan, true) stdout.write("Pulling ") stdout.setForegroundColor(fgYellow, false) @@ -102,36 +118,69 @@ Options: failRepos.add((repoName, reason)) writeErrMsg(reason) - # Is the repo clean? No -> fail to pull this repo + var pullOutput: seq[string] + + # Is the a bare repo clean? cmdOutput.clear() - if not git(repoDir, ["status"]) or - cmdOutput.outBuf.join("\n").find("working tree clean") < 0: - failRepo("working directory is not clean") - continue + if not git(repoDir, ["status"]): - # Are we on the correct branch? - cmdOutput.clear() - if not git(repoDir, ["branch"]): - failRepo("could not get current branch") - continue - - let branches = cmdOutput.outBuf.filterIt(it.find("* ") > 0) - let currentBranch = - if branches.len == 1: branches[0][7..^1] - else: nil - - # not on correct branch, switch branch - if currentBranch != branch: - if not git(repoDir, ["checkout", branch]): - failRepo("could not check out " & branch & " branch") + # pull --ff-only + if not git(repoDir, ["pull", "--ff-only", remote, branch]): + failRepo("unable to ffwd branch") continue - # pull --ff-only - if not git(repoDir, ["pull", "--ff-only", remote, branch]): - failRepo("unable to ffwd branch") - continue + pullOutput = cmdOutput.outBuf - if cmdOutput.outBuf.anyIt(it.find("Already up-to-date") > 0): + # Not bare + else: + # Not clean? Try to stash the changes. + var stashed = false + if cmdOutput.outBuf.join("\n").find("working tree clean") < 0: + cmdOutput.clear() + if not git(repoDir, ["stash", "save"]): + failRepo("error trying to stash uncommitted changes") + continue + else: stashed = true + + # Are we on the correct branch? + cmdOutput.clear() + if not git(repoDir, ["branch"]): + failRepo("could not get current branch") + continue + + let branches = cmdOutput.outBuf.filterIt(it.find("* ") > 0) + let currentBranch = + if branches.len == 1: branches[0][7..^1] + else: nil + + # not on correct branch, switch branch + if currentBranch != branch: + if not git(repoDir, ["checkout", branch]): + failRepo("could not check out " & branch & " branch") + continue + + # pull --ff-only + if not git(repoDir, ["pull", "--ff-only", remote, branch]): + failRepo("unable to ffwd branch") + continue + + pullOutput = cmdOutput.outBuf + + # restore original branch + if currentBranch != branch: + if not git(repoDir, ["checkout", currentBranch]): + stdout.setForegroundColor(fgWhite, true) + stdout.writeLine("WARNING: unable to checkout original branch (" & currentBranch & ")") + stdout.resetAttributes() + + # restore stashed changes + if stashed: + if not git(repoDir, ["stash", "pop"]): + stdout.setForegroundColor(fgWhite, true) + stdout.writeLine("WARNING: unable to pop stashed changes") + stdout.resetAttributes() + + if pullOutput.anyIt(it.find("Already up-to-date") > 0): stdout.setForegroundColor(fgBlack, true) stdout.writeLine("already up-to-date") else: @@ -140,12 +189,5 @@ Options: stdout.resetAttributes() successRepos.add(repoName) - # restore original branch - if currentBranch != branch: - if not git(repoDir, ["checkout", currentBranch]): - stdout.setForegroundColor(fgWhite, true) - stdout.writeLine("WARNING: unable to checkout original branch (" & currentBranch & ")") - stdout.resetAttributes() - except: stderr.writeLine "git_pull_all: " & getCurrentExceptionMsg() diff --git a/git_pull_all.nimble b/git_pull_all.nimble index c04accf..50afbc9 100644 --- a/git_pull_all.nimble +++ b/git_pull_all.nimble @@ -1,6 +1,6 @@ # Package -version = "0.1.0" +version = "0.2.0" author = "Jonathan Bernard" description = "Small CLI utility to pull multiple git repos." license = "MIT" @@ -10,4 +10,4 @@ bin = @["git_pull_all"] requires @["nim >= 0.16.1", "docopt >= 0.6.4"] -requires "https://git.jdb-labs.com/jdb/nim-cli-utils.git" +requires "https://git.jdb-labs.com/jdb/nim-cli-utils.git >= 0.3.0"