[llvm] r366671 - Add location of SVN staging dir to git-llvm error output

[Stefan Granitz via llvm-commits]

Author: stefan.graenitz
Date: Mon Jul 22 02:47:40 2019
New Revision: 366671

URL: http://llvm.org/viewvc/llvm-project?rev=366671&view=rev
Log:
Add location of SVN staging dir to git-llvm error output

Summary:
In pre-monorepo times the svn staging directory was `.git/svn`. The below error message wasn't mentioning the new name yet.

Example before:
```
Can't push git rev 104cfa289d9 because svn status is not empty:
!     llvm/trunk/include/llvm
```

Example after:
```
Can't push git rev 104cfa289d9 because status in svn staging dir (.git/llvm-upstream-svn) is not empty:
!     llvm/trunk/include/llvm
```

Reviewers: mehdi_amini, jlebar, teemperor

Reviewed By: mehdi_amini

Subscribers: llvm-commits, #llvm

Tags: #llvm

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

Modified:
    llvm/trunk/utils/git-svn/git-llvm

Modified: llvm/trunk/utils/git-svn/git-llvm
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/git-svn/git-llvm?rev=366671&r1=366670&r2=366671&view=diff
==============================================================================
--- llvm/trunk/utils/git-svn/git-llvm (original)
+++ llvm/trunk/utils/git-svn/git-llvm Mon Jul 22 02:47:40 2019
@@ -312,8 +312,8 @@ def svn_push_one_rev(svn_repo, rev, git_
 
     status = svn(svn_repo, 'status', '--no-ignore')
     if status:
-        die("Can't push git rev %s because svn status is not empty:\n%s" %
-            (rev, status))
+        die("Can't push git rev %s because status in svn staging dir (%s) is "
+            "not empty:\n%s" % (rev, svn_repo, status))
 
     svn_dirs_to_update = set()
     for sr, files in iteritems(subrepo_files):