From 4ddfbcd86e71278ff87240a98db243651a872ce1 Mon Sep 17 00:00:00 2001 From: Rene Pfeuffer Date: Fri, 6 Mar 2020 16:17:47 +0100 Subject: [PATCH] Sort directories correctly --- .../src/main/resources/sonia/scm/hg/ext/fileview.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/hg/ext/fileview.py b/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/hg/ext/fileview.py index b303b2f3d4..7c43ae65ae 100644 --- a/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/hg/ext/fileview.py +++ b/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/hg/ext/fileview.py @@ -153,7 +153,7 @@ class File_Walker: return path def walk(self, structure, parent = ""): - sortedItems = sorted(structure.iteritems(), key = lambda item: item[1]) + sortedItems = sorted(structure.iteritems(), key = lambda item: self.sortKey(item)) for key, value in sortedItems: if key == FILE_MARKER: if value: @@ -166,6 +166,12 @@ class File_Walker: else: self.visit_directory(self.create_path(parent, value)) + def sortKey(self, item): + if (item[0] == FILE_MARKER): + return "2" + else: + return "1" + item[0] + class SubRepository: url = None revision = None