Browse Source

fixed renaming a repository into a new subfolder failed (issue 33)

tags/v0.8.0
James Moger 12 years ago
parent
commit
c1a4cc7028
2 changed files with 6 additions and 0 deletions
  1. 1
    0
      docs/04_releases.mkd
  2. 5
    0
      src/com/gitblit/GitBlit.java

+ 1
- 0
docs/04_releases.mkd View File

@@ -29,6 +29,7 @@ The original `users.properties` file and it's corresponding implementation are *
- added: filters menu to repositories page and activity page. You can filter by federation set, team, and simple custom regular expressions (issue 27)
**New:** *web.customFilters=*
- fixed: several a bugs in FileUserService related to cleaning up old repository permissions on a rename or delete
- fixed: renaming a repository into a new subfolder failed (issue 33)
- added: optional flash-based 1-step *copy to clipboard* of the primary repository url
- added: javascript-based 3-step (click, ctrl+c, enter) *copy to clipboard* of the primary repository url
**New:** *web.allowFlashCopyToClipboard = true*

+ 5
- 0
src/com/gitblit/GitBlit.java View File

@@ -905,6 +905,11 @@ public class GitBlit implements ServletContextListener {
.format("Can not rename repository ''{0}'' to ''{1}'' because ''{1}'' already exists.",
repositoryName, repository.name));
}
File parentFile = destFolder.getParentFile();
if (!parentFile.exists() && !parentFile.mkdirs()) {
throw new GitBlitException(MessageFormat.format(
"Failed to create folder ''{0}''", parentFile.getAbsolutePath()));
}
if (!folder.renameTo(destFolder)) {
throw new GitBlitException(MessageFormat.format(
"Failed to rename repository ''{0}'' to ''{1}''.", repositoryName,

Loading…
Cancel
Save