Index: trychange.py |
diff --git a/trychange.py b/trychange.py |
index 65e935a08a9b55c8c3ad62f3b075fa6bd0d03616..7191faa06a7e742d5d181184a67162bebb298668 100755 |
--- a/trychange.py |
+++ b/trychange.py |
@@ -175,6 +175,8 @@ class SVN(SCM): |
self.options.diff = self.GenerateDiff(adjusted_paths, root=source_root) |
self.change_info = gcl.LoadChangelistInfoForMultiple(self.options.name, |
gcl.GetRepositoryRoot(), True, True) |
+ if not self.options.email: |
+ self.options.email = scm.SVN.GetEmail(gcl.GetRepositoryRoot()) |
class GIT(SCM): |
@@ -191,10 +193,6 @@ class GIT(SCM): |
diff[i] = '--- %s' % diff[i+1][4:] |
return ''.join(diff) |
- def GetEmail(self): |
- # TODO: check for errors here? |
- return upload.RunShell(['git', 'config', 'user.email']).strip() |
- |
def GetFileNames(self): |
"""Return the list of files in the diff.""" |
return self.options.files |
@@ -222,7 +220,7 @@ class GIT(SCM): |
if not self.options.name: |
self.options.name = self.GetPatchName() |
if not self.options.email: |
- self.options.email = self.GetEmail() |
+ self.options.email = scm.GIT.GetEmail('.') |
def _ParseSendChangeOptions(options): |