Fix GenerateDiff -- don't strip whitespace.

scm.py

Index: scm.py
diff --git a/scm.py b/scm.py
index 6f508c83ab2b7a2e3ec9e266028164c14e0c2735..df14806441341c0a0189c9f65d8c219d7a71916b 100644
--- a/scm.py
+++ b/scm.py
@@ -101,9 +101,14 @@ class GIT(object):
     env = os.environ.copy()
     # 'cat' is a magical git string that disables pagers on all platforms.
     env['GIT_PAGER'] = 'cat'
-    return subprocess2.check_output(
+    no_strip = kwargs.pop('no_strip', None)

[iannucci, 2013/07/12 22:49:08]

"I'm gonna pop some kwargs -- only got 20 vars in my namespace..."

Seriously though, I would just add this as a named argument (no_strip=None) to
the function.

May want to make it neutral too... strip=False

[Isaac (away), 2013/07/12 23:19:41]

Done -- named it strip_out

+    output = subprocess2.check_output(
         ['git'] + args,
-        cwd=cwd, stderr=subprocess2.PIPE, env=env, **kwargs).strip()
+        cwd=cwd, stderr=subprocess2.PIPE, env=env, **kwargs)
+    if no_strip:
+      return output
+    else:
+      return output.strip()

[iannucci, 2013/07/12 22:49:08]

return output if no_strip else output.strip()

[Isaac (away), 2013/07/12 23:19:41]

Done.

 
   @staticmethod
   def CaptureStatus(files, cwd, upstream_branch):
@@ -359,7 +364,7 @@ class GIT(object):
     if files:
       command.append('--')
       command.extend(files)
-    diff = GIT.Capture(command, cwd=cwd).splitlines(True)
+    diff = GIT.Capture(command, cwd=cwd, no_strip=True).splitlines(True)
     for i in range(len(diff)):
       # In the case of added files, replace /dev/null with the path to the
       # file being added.