From 21347b29013b6b6a97d1d800add7c5b54a657fb7 Mon Sep 17 00:00:00 2001
From: Raphael Isemann <teemperor@gmail.com>
Date: Tue, 12 Mar 2019 07:40:54 +0000
Subject: [PATCH] Fix git-llvm crashing when trying to remove directory while
 cleaning

Summary:
I'm trying to push D59198 but it seems that `git-llvm push` can't handle the fact
that I add a new directory in the patch:

```
> git llvm push -n
Pushing 1 commit:
  e7c0a9bd136 Correctly look up declarations in inline namespaces
Traceback (most recent call last):
  File "llvm/utils/git-svn//git-llvm", line 431, in <module>
    args.func(args)
  File "llvm/utils/git-svn//git-llvm", line 385, in cmd_push
    clean_svn(svn_root)
  File "llvm/utils/git-svn//git-llvm", line 201, in clean_svn
    os.remove(os.path.join(svn_repo, filename))
IsADirectoryError: [Errno 21] Is a directory: '.git/llvm-upstream-svn/lldb/trunk/packages/Python/lldbsuite/test/expression_command/inline-namespace'
```

This patch just uses shutil to delete the directory instead of trying to use `os.remove`
which only works for files.

Reviewers: mehdi_amini, jlebar

Reviewed By: jlebar

Subscribers: llvm-commits

Tags: #llvm

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

llvm-svn: 355896
---
 llvm/utils/git-svn/git-llvm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/llvm/utils/git-svn/git-llvm b/llvm/utils/git-svn/git-llvm
index c66787a15806..d93f58533fe2 100755
--- a/llvm/utils/git-svn/git-llvm
+++ b/llvm/utils/git-svn/git-llvm
@@ -22,6 +22,7 @@ import contextlib
 import errno
 import os
 import re
+import shutil
 import subprocess
 import sys
 import tempfile
@@ -198,7 +199,18 @@ def clean_svn(svn_repo):
         if not line.startswith('?'):
             continue
         filename = line[1:].strip()
-        os.remove(os.path.join(svn_repo, filename))
+        filepath = os.path.abspath(os.path.join(svn_repo, filename))
+        abs_svn_repo = os.path.abspath(svn_repo)
+        # Safety check that the directory we are about to delete is
+        # actually within our svn staging dir.
+        if not filepath.startswith(abs_svn_repo):
+            die("Path to clean (%s) is not in svn staging dir (%s)"
+                % (filepath, abs_svn_repo))
+
+        if os.path.isdir(filepath):
+            shutil.rmtree(filepath)
+        else:
+            os.remove(filepath)
 
 
 def svn_init(svn_root):
-- 
GitLab