From: Shoaib Meenai <smeenai@fb.com>
Date: Sun, 10 Mar 2019 01:34:42 +0000 (+0000)
Subject: [git-llvm] Only use --force-interactive when supported
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df9bea7129f8a6fa52ad36cee53534d8353295c9;p=llvm

[git-llvm] Only use --force-interactive when supported

The --force-interactive option was introduced in SVN 1.8, and trying to
pass it to older SVN clients causes an error; CentOS 7 includes SVN 1.7,
for example, so this makes `git llvm` not usable out of the box. Older
clients would be interactive by default anyway [1], so just don't pass
the option if it's not supported.

An alternative would be to check the version instead of checking the
help text, but I think directly detecting the presence of the option is
more direct.

[1] http://svn.apache.org/viewvc?view=revision&revision=1424037

Differential Revision: https://reviews.llvm.org/D59161

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@355782 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/utils/git-svn/git-llvm b/utils/git-svn/git-llvm
index 4b17aca6e95..c66787a1580 100755
--- a/utils/git-svn/git-llvm
+++ b/utils/git-svn/git-llvm
@@ -345,7 +345,10 @@ def svn_push_one_rev(svn_repo, rev, dry_run):
     # Now we're ready to commit.
     commit_msg = git('show', '--pretty=%B', '--quiet', rev)
     if not dry_run:
-        log(svn(svn_repo, 'commit', '-m', commit_msg, '--force-interactive'))
+        commit_args = ['commit', '-m', commit_msg]
+        if '--force-interactive' in svn(svn_repo, 'commit', '--help'):
+            commit_args.append('--force-interactive')
+        log(svn(svn_repo, *commit_args))
         log('Committed %s to svn.' % rev)
     else:
         log("Would have committed %s to svn, if this weren't a dry run." % rev)