Update to keep up with changing language in git output.

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)
+  if verbose:
-  return res.exitCode == 0
+    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 <remote>  Pull from <remote> (defaults to "origin")
   -b --branch <branch>  Pull the <branch> branch (defaults to "master")
+  -o --log-out <outlog> Log command output to <outfile>
+  -e --log-err <errlog> Log error output to <errfile>
 """
 
-    let args = docopt(doc, version = "git_pull_all 0.1.0")
+    let args = docopt(doc, version = "git_pull_all 0.2.1")
 
     let rootDirs: seq[string] =
       if args["<root>"]: args["<root>"].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["<outlog>"], fmRead)
+    if args["--log-err"]: errLog = open($args["<errlog>"], 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,13 +118,31 @@ 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
+      if not git(repoDir, ["status"]):
-         cmdOutput.outBuf.join("\n").find("working tree clean") < 0:
+
-        failRepo("working directory is not clean")
+        # pull --ff-only
+        if not git(repoDir, ["pull", "--ff-only", remote, branch]):
+          failRepo("unable to ffwd branch")
           continue
 
+        pullOutput = cmdOutput.outBuf
+
+      # Not bare
+      else:
+        # Not clean? Try to stash the changes.
+        var stashed = false
+        if cmdOutput.outBuf.join("\n").find("working tree clean") < 0 and
+           cmdOutput.outBuf.join("\n").find("working directory 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"]):
@@ -131,14 +165,7 @@ Options:
           failRepo("unable to ffwd branch")
           continue
 
-      if cmdOutput.outBuf.anyIt(it.find("Already up-to-date") > 0):
+        pullOutput = cmdOutput.outBuf
-        stdout.setForegroundColor(fgBlack, true)
-        stdout.writeLine("already up-to-date")
-      else:
-        stdout.setForegroundColor(fgGreen, true)
-        stdout.writeLine("UPDATED")
-      stdout.resetAttributes()
-      successRepos.add(repoName)
 
         # restore original branch
         if currentBranch != branch:
@@ -147,5 +174,21 @@ Options:
             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:
+        stdout.setForegroundColor(fgGreen, true)
+        stdout.writeLine("UPDATED")
+      stdout.resetAttributes()
+      successRepos.add(repoName)
+
   except:
     stderr.writeLine "git_pull_all: " & getCurrentExceptionMsg()

git_pull_all.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.1.0"
+version       = "0.2.1"
 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"