From b51fba22822412e036c06c51b5c27f7540a176ee Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 6 Jun 2017 08:14:04 +0200
Subject: [PATCH] fix repository browsing with mercurial 4.x

---
 .hgignore                                     |  1 +
 scm-plugins/scm-hg-plugin/pom.xml             |  2 +-
 .../resources/sonia/scm/hg/ext/fileview.py    | 25 +++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.hgignore b/.hgignore
index a49329d7a5..6ff185f670 100644
--- a/.hgignore
+++ b/.hgignore
@@ -28,3 +28,4 @@ Desktop DF$
 \.idea$
 # jrebel
 rebel.xml
+\.pyc
diff --git a/scm-plugins/scm-hg-plugin/pom.xml b/scm-plugins/scm-hg-plugin/pom.xml
index 170fb089ed..5a69847a7a 100644
--- a/scm-plugins/scm-hg-plugin/pom.xml
+++ b/scm-plugins/scm-hg-plugin/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>com.aragost.javahg</groupId>
       <artifactId>javahg</artifactId>
-      <version>0.7</version>
+      <version>0.8-scm1</version>
       <exclusions>
         <exclusion>
           <groupId>com.google.guava</groupId>
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 907ae5f411..518f229011 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
@@ -32,7 +32,10 @@
 
 Prints date, size and last message of files.
 """
-from mercurial import util
+from mercurial import cmdutil,util
+
+cmdtable = {}
+command = cmdutil.command(cmdtable)
 
 class SubRepository:
   url = None
@@ -133,6 +136,14 @@ def printFile(ui, repo, file, disableLastCommit, transport):
     format = 'f%s\n%i %s %s\0'
   ui.write( format % (file.path(), file.size(), date, description) )
 
+@command('fileview', [
+    ('r', 'revision', 'tip', 'revision to print'),
+    ('p', 'path', '', 'path to print'),
+    ('c', 'recursive', False, 'browse repository recursive'),
+    ('d', 'disableLastCommit', False, 'disables last commit description and date'),
+    ('s', 'disableSubRepositoryDetection', False, 'disables detection of sub repositories'),
+    ('t', 'transport', False, 'format the output for command server'),
+  ])
 def fileview(ui, repo, **opts):
   files = []
   directories = []
@@ -154,15 +165,3 @@ def fileview(ui, repo, **opts):
     printDirectory(ui, d, transport)
   for f in files:
     printFile(ui, repo, f, opts['disableLastCommit'], transport)
-  
-cmdtable = {
-  # cmd name        function call
-  'fileview': (fileview,[
-    ('r', 'revision', 'tip', 'revision to print'),
-    ('p', 'path', '', 'path to print'),
-    ('c', 'recursive', False, 'browse repository recursive'),
-    ('d', 'disableLastCommit', False, 'disables last commit description and date'),
-    ('s', 'disableSubRepositoryDetection', False, 'disables detection of sub repositories'),
-    ('t', 'transport', False, 'format the output for command server'),
-  ])
-}
\ No newline at end of file