Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-01 02:55:56 +01:00
Code Issues Packages Projects Releases Activity

Sort git files

Browse Source
This commit is contained in:
Rene Pfeuffer
2020-02-21 14:29:09 +01:00
parent 4a82c541b2
commit 736ea3d93f
5 changed files with 78 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBrowseCommand.java
View File

@@ -134,7 +134,7 @@ public class SvnBrowseCommand extends AbstractSvnCommand
throws SVNException
{
List<SVNDirEntry> entries = new ArrayList<>(svnRepository.getDir(parent.getPath(), revisionNumber, null, (Collection) null));
entries.sort(comparing(SVNDirEntry::getName));
sort(entries, entry -> entry.getKind() == SVNNodeKind.DIR, SVNDirEntry::getName);
for (Iterator<SVNDirEntry> iterator = entries.iterator(); resultCount < request.getLimit() + request.getOffset() && iterator.hasNext(); ++resultCount) {
SVNDirEntry entry = iterator.next();
FileObject child = createFileObject(request, svnRepository, revisionNumber, entry, basePath);

6
scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnBrowseCommandTest.java
View File

@@ -79,8 +79,8 @@ public class SvnBrowseCommandTest extends AbstractSvnCommandTestBase
Collection<FileObject> foList = foList1;
Iterator<FileObject> iterator = foList.iterator();
FileObject a = iterator.next();
FileObject c = iterator.next();
FileObject a = iterator.next();
assertFalse(a.isDirectory());
assertEquals("a.txt", a.getName());
@@ -189,7 +189,7 @@ public class SvnBrowseCommandTest extends AbstractSvnCommandTestBase
Collection<FileObject> foList = result.getFile().getChildren();
assertThat(foList).extracting("name").containsExactly("a.txt");
assertThat(foList).extracting("name").containsExactly("c");
assertThat(result.getFile().isTruncated()).isTrue();
}
@@ -203,7 +203,7 @@ public class SvnBrowseCommandTest extends AbstractSvnCommandTestBase
Collection<FileObject> foList = result.getFile().getChildren();
assertThat(foList).extracting("name").containsExactly("c");
assertThat(foList).extracting("name").containsExactly("a.txt");
}
/**