Skip to content

The Unified and Autonomous Development Platform

Overwrite file when upload files or create new file for convenience purpose

Robin Shen889961504acd
diff --git a/core/src/main/java/com/gitplex/server/git/BlobEdits.java b/core/src/main/java/com/gitplex/server/git/BlobEdits.java
index 5ac7b0bc4e..b5d93ac001 100644
--- a/core/src/main/java/com/gitplex/server/git/BlobEdits.java
+++ b/core/src/main/java/com/gitplex/server/git/BlobEdits.java
@@ -78,14 +78,19 @@ public class BlobEdits implements Serializable {
String name = treeWalk.getNameString();
if (currentOldPaths.contains(name)) {
currentOldPaths.remove(name);
- BlobContent currentNewBlob = currentNewBlobs.get(name);
+ BlobContent currentNewBlob = currentNewBlobs.remove(name);
if (currentNewBlob != null) {
- currentNewBlobs.remove(name);
ObjectId blobId = inserter.insert(Constants.OBJ_BLOB, currentNewBlob.getBytes());
entries.add(new TreeFormatterEntry(name, currentNewBlob.getMode(), blobId));
}
} else if (currentNewBlobs.containsKey(name)) {
- throw new ObjectAlreadyExistsException("Path already exist: " + treeWalk.getPathString());
+ if ((treeWalk.getRawMode(0) & FileMode.TYPE_MASK) == FileMode.TYPE_TREE) {
+ throw new ObjectAlreadyExistsException("Path already exist: " + treeWalk.getPathString());
+ } else {
+ BlobContent currentNewBlob = currentNewBlobs.remove(name);
+ ObjectId blobId = inserter.insert(Constants.OBJ_BLOB, currentNewBlob.getBytes());
+ entries.add(new TreeFormatterEntry(name, currentNewBlob.getMode(), blobId));
+ }
} else {
Set<String> childOldPaths = new HashSet<>();
for (Iterator<String> it = currentOldPaths.iterator(); it.hasNext();) {
@@ -149,7 +154,7 @@ public class BlobEdits implements Serializable {
String blobPath = topLevelPathSegment;
if (parentPath != null)
blobPath = parentPath + "/" + path;
- throw new ObjectAlreadyExistsException("Blob path already exists: " + blobPath);
+ throw new ObjectAlreadyExistsException("Overlapped blob path: " + blobPath);
} else {
topLevelPathSegments.add(topLevelPathSegment);
}
diff --git a/core/src/test/java/com/gitplex/server/git/BlobEditsTest.java b/core/src/test/java/com/gitplex/server/git/BlobEditsTest.java
index 992e94e0d3..a8ce027aad 100644
--- a/core/src/test/java/com/gitplex/server/git/BlobEditsTest.java
+++ b/core/src/test/java/com/gitplex/server/git/BlobEditsTest.java
@@ -305,7 +305,7 @@ public class BlobEditsTest extends AbstractGitTest {
}
@Test
- public void testAddExistFile() throws IOException {
+ public void testOverwriteExistFile() throws IOException {
createDir("client");
addFileAndCommit("client/a.java", "a", "add a");
addFileAndCommit("client/b.java", "b", "add b");
@@ -317,15 +317,33 @@ public class BlobEditsTest extends AbstractGitTest {
String refName = "refs/heads/master";
ObjectId oldCommitId = git.getRepository().resolve(refName);
-
+
+ Set<String> oldPaths = Sets.newHashSet("server/src/com/example/b/b.java");
Map<String, BlobContent> newBlobs = new HashMap<>();
newBlobs.put("client/a.java", new BlobContent.Immutable("a".getBytes(), FileMode.REGULAR_FILE));
- BlobEdits edits = new BlobEdits(Sets.newHashSet(), newBlobs);
- try {
- edits.commit(git.getRepository(), refName, oldCommitId, oldCommitId, user, "test rename tree");
- assertTrue("An ObjectAlreadyExistException should be thrown", false);
- } catch (ObjectAlreadyExistsException e) {
+ newBlobs.put("server/src/a.java", new BlobContent.Immutable("a".getBytes(), FileMode.REGULAR_FILE));
+ newBlobs.put("server/src/com/example/b/b.java", new BlobContent.Immutable("a".getBytes(), FileMode.REGULAR_FILE));
+
+ BlobEdits edits = new BlobEdits(oldPaths, newBlobs);
+ ObjectId newCommitId = edits.commit(git.getRepository(), refName,
+ oldCommitId, oldCommitId, user, "test rename tree");
+
+ List<String> paths = new ArrayList<>();
+ try ( RevWalk revWalk = new RevWalk(git.getRepository());
+ TreeWalk treeWalk = new TreeWalk(git.getRepository());) {
+ treeWalk.addTree(revWalk.parseCommit(newCommitId).getTree());
+ treeWalk.setRecursive(true);
+ while (treeWalk.next()) {
+ paths.add(treeWalk.getPathString());
+ }
}
+
+ assertEquals(5, paths.size());
+ assertEquals("client/a.java", paths.get(0));
+ assertEquals("client/b.java", paths.get(1));
+ assertEquals("server/src/a.java", paths.get(2));
+ assertEquals("server/src/com/example/a/a.java", paths.get(3));
+ assertEquals("server/src/com/example/b/b.java", paths.get(4));
}
@Test
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
index d9a062e48d..63adebd1c4 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
@@ -349,7 +349,7 @@ public class CommitOptionPanel extends Panel {
newCommitId = new BlobEdits(oldPaths, newBlobs).commit(repository, refName,
prevCommitId, prevCommitId, user.asPerson(), commitMessage);
} catch (ObjectAlreadyExistsException e) {
- CommitOptionPanel.this.error("A file with same name already exists. "
+ CommitOptionPanel.this.error("A path with same name already exists. "
+ "Please choose a different name and try again.");
target.add(feedback);
break;