Merged Makefile change

Merged change to print nicer message about chunk counts Add shell script for executing git-bin.exe on Unix-based systems smudge push: indicate when no chunks need transferring, handy for debugging Use correct grammar for amount of chunks being transferred
hbons · Aug 13, 2012 · bf2a824 · bf2a824
1 parent 1654b41
commit bf2a824
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 21 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,5 @@
-all:
-	xbuild /property:Configuration=Release
-	mv git-bin/bin/Release/git-bin.exe git-bin/bin/Release/git-bin
-
+all:
+	xbuild /property:Configuration=Release
+	cp git-bin/git-bin.in git-bin/bin/Release/git-bin
+	chmod +x git-bin/bin/Release/git-bin
+
diff --git a/build.sh b/build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
-
-xbuild /property:Configuration=Release
-
+#!/bin/bash
+
+xbuild /property:Configuration=Release
+
diff --git a/git-bin/Commands/PushCommand.cs b/git-bin/Commands/PushCommand.cs
@@ -29,14 +29,28 @@ public void Execute()
 
             var filesToUpload = filesInCache.Except(filesInRemote).ToList();
 
-            GitBinConsole.WriteLine("Uploading {0} chunks", filesToUpload.Count);
-
-            for (int i = 0; i < filesToUpload.Count; i++)
+            if (filesToUpload.Count == 0)
+            {
+                GitBinConsole.WriteLine("All chunks already present on remote");
+            }
+            else
             {
-                using (new RemoteProgressPrinter(i, filesToUpload.Count, _remote))
+                if (filesToUpload.Count == 1)
+                {
+                    GitBinConsole.WriteLine("Uploading 1 chunk");
+                }
+                else
+                {
+                    GitBinConsole.WriteLine("Uploading {0} chunks", filesToUpload.Count);
+                }
+
+                for (int i = 0; i < filesToUpload.Count; i++)
                 {
-                    var file = filesToUpload[i];
-                    _remote.UploadFile(_cacheManager.GetPathForFile(file.Name), file.Name);
+                    using (new RemoteProgressPrinter(i + 1, filesToUpload.Count, _remote))
+                    {
+                        var file = filesToUpload[i];
+                        _remote.UploadFile(_cacheManager.GetPathForFile(file.Name), file.Name);
+                    }
                 }
             }
         }

diff --git a/git-bin/Commands/SmudgeCommand.cs b/git-bin/Commands/SmudgeCommand.cs
@@ -38,23 +38,30 @@ private void DownloadMissingFiles(IEnumerable<string> chunkHashes)
         {
             var filesToDownload = _cacheManager.GetFilenamesNotInCache(chunkHashes);
 
-            if (filesToDownload.Length > 0)
+            if (filesToDownload.Length == 0)
             {
-                GitBinConsole.WriteLineNoPrefix(" Downloading {0} chunks...", filesToDownload.Length);
+                GitBinConsole.WriteLineNoPrefix(" All chunks already present in cache\n");
+            }
+            else
+            {
+                if (filesToDownload.Length == 1)
+                {
+                    GitBinConsole.WriteLineNoPrefix(" Downloading 1 chunk...");
+                }
+                else
+                {
+                    GitBinConsole.WriteLineNoPrefix(" Downloading {0} chunks...", filesToDownload.Length);
+                }
 
                 for (int i = 0; i < filesToDownload.Length; i++)
                 {
-                    using (new RemoteProgressPrinter(i, filesToDownload.Length, _remote))
+                    using (new RemoteProgressPrinter(i + 1, filesToDownload.Length, _remote))
                     {
                         var file = filesToDownload[i];
                         _remote.DownloadFile(_cacheManager.GetPathForFile(file), file);
                     }
                 }
             }
-            else
-            {
-                GitBinConsole.WriteNoPrefix(Environment.NewLine);                
-            }
         }
 
         private void OutputReassembledChunks(IEnumerable<string> chunkHashes)

diff --git a/git-bin/git-bin.in b/git-bin/git-bin.in
@@ -0,0 +1,2 @@
+#!/bin/bash
+mono git-bin.exe $@