Revert r138874 "Automatically adds quotes on Windows when necessary"
This breaks _some_ msysgit uses cases. I'll investigate later.
[email protected]
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10445042
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@139114 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/git_cl.py b/git_cl.py
index 7fa0c2d..2c63d73 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -51,21 +51,9 @@
sys.exit(1)
-def QuoteCommand(command):
- """Quotes command on Windows so it runs fine even with & and | in the string.
- """
- if sys.platform == 'win32':
- def fix(arg):
- if ('&' in arg or '|' in arg) and '"' not in arg:
- arg = '"%s"' % arg
- return arg
- command = [fix(arg) for arg in command]
- return command
-
-
def RunCommand(args, error_ok=False, error_message=None, **kwargs):
try:
- return subprocess2.check_output(QuoteCommand(args), **kwargs)
+ return subprocess2.check_output(args, shell=False, **kwargs)
except subprocess2.CalledProcessError, e:
if not error_ok:
DieWithError(
@@ -545,7 +533,8 @@
# If the change was never uploaded, use the log messages of all commits
# up to the branch point, as git cl upload will prefill the description
# with these log messages.
- description = CreateDescriptionFromLog([upstream_branch + '..'])
+ description = RunCommand(['git', 'log', '--pretty=format:%s%n%n%b',
+ '%s...' % (upstream_branch)]).strip()
if not author:
author = RunGit(['config', 'user.email']).strip() or None
@@ -890,7 +879,7 @@
log_args = [args[0] + '..' + args[1]]
else:
log_args = args[:] # Hope for the best!
- return RunGit(['log', '--pretty=format:%s%n%n%b'] + log_args)
+ return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
def ConvertToInteger(inputval):
