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

Revert "added support for python3"

Browse Source 
This reverts commit c924d73115.
This commit is contained in:
Sebastian Sdorra
2020-06-04 09:53:26 +02:00
parent 8a1496f8da
commit ef8317d30b
1 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/hg/ext/fileview.py
View File

@@ -48,7 +48,7 @@ except ImportError:
from mercurial import util from mercurial import util
_parsedate = util.parsedate _parsedate = util.parsedate
FILE_MARKER = b'<files>' FILE_MARKER = '<files>'
class File_Collector: class File_Collector:
@@ -56,13 +56,13 @@ class File_Collector:
self.recursive = recursive self.recursive = recursive
self.structure = defaultdict(dict, ((FILE_MARKER, []),)) self.structure = defaultdict(dict, ((FILE_MARKER, []),))
def collect(self, paths, path = b"", dir_only = False): def collect(self, paths, path = "", dir_only = False):
for p in paths: for p in paths:
if p.startswith(path): if p.startswith(path):
self.attach(self.extract_name_without_parent(path, p), self.structure, dir_only) self.attach(self.extract_name_without_parent(path, p), self.structure, dir_only)
def attach(self, branch, trunk, dir_only = False): def attach(self, branch, trunk, dir_only = False):
parts = branch.split(b'/', 1) parts = branch.split('/', 1)
if len(parts) == 1: # branch is a file if len(parts) == 1: # branch is a file
if dir_only: if dir_only:
trunk[parts[0]] = defaultdict(dict, ((FILE_MARKER, []),)) trunk[parts[0]] = defaultdict(dict, ((FILE_MARKER, []),))
@@ -78,7 +78,7 @@ class File_Collector:
def extract_name_without_parent(self, parent, name_with_parent): def extract_name_without_parent(self, parent, name_with_parent):
if len(parent) > 0: if len(parent) > 0:
name_without_parent = name_with_parent[len(parent):] name_without_parent = name_with_parent[len(parent):]
if name_without_parent.startswith(b"/"): if name_without_parent.startswith("/"):
name_without_parent = name_without_parent[1:] name_without_parent = name_without_parent[1:]
return name_without_parent return name_without_parent
return name_with_parent return name_with_parent
@@ -91,11 +91,11 @@ class File_Object:
self.sub_repository = None self.sub_repository = None
def get_name(self): def get_name(self):
parts = self.path.split(b"/") parts = self.path.split("/")
return parts[len(parts) - 1] return parts[len(parts) - 1]
def get_parent(self): def get_parent(self):
idx = self.path.rfind(b"/") idx = self.path.rfind("/")
if idx > 0: if idx > 0:
return self.path[0:idx] return self.path[0:idx]
return "" return ""
@@ -143,11 +143,11 @@ class File_Walker:
def create_path(self, parent, path): def create_path(self, parent, path):
if len(parent) > 0: if len(parent) > 0:
return parent + b"/" + path return parent + "/" + path
return path return path
def walk(self, structure, parent = b""): def walk(self, structure, parent = ""):
sortedItems = sorted(structure.items(), key = lambda item: self.sortKey(item)) sortedItems = sorted(structure.iteritems(), key = lambda item: self.sortKey(item))
for key, value in sortedItems: for key, value in sortedItems:
if key == FILE_MARKER: if key == FILE_MARKER:
if value: if value:
@@ -162,9 +162,9 @@ class File_Walker:
def sortKey(self, item): def sortKey(self, item):
if (item[0] == FILE_MARKER): if (item[0] == FILE_MARKER):
return b"2" return "2"
else: else:
return b"1" + item[0] return "1" + item[0]
class SubRepository: class SubRepository:
url = None url = None
@@ -173,9 +173,9 @@ class SubRepository:
def collect_sub_repositories(revCtx): def collect_sub_repositories(revCtx):
subrepos = {} subrepos = {}
try: try:
hgsub = revCtx.filectx(b'.hgsub').data().split('\n') hgsub = revCtx.filectx('.hgsub').data().split('\n')
for line in hgsub: for line in hgsub:
parts = line.split(b'=') parts = line.split('=')
if len(parts) > 1: if len(parts) > 1:
subrepo = SubRepository() subrepo = SubRepository()
subrepo.url = parts[1].strip() subrepo.url = parts[1].strip()
@@ -184,9 +184,9 @@ def collect_sub_repositories(revCtx):
pass pass
try: try:
hgsubstate = revCtx.filectx(b'.hgsubstate').data().split('\n') hgsubstate = revCtx.filectx('.hgsubstate').data().split('\n')
for line in hgsubstate: for line in hgsubstate:
parts = line.split(b' ') parts = line.split(' ')
if len(parts) > 1: if len(parts) > 1:
subrev = parts[0].strip() subrev = parts[0].strip()
subrepo = subrepos[parts[1].strip()] subrepo = subrepos[parts[1].strip()]
@@ -219,31 +219,31 @@ class File_Printer:
def print_directory(self, path): def print_directory(self, path):
if not self.initial_path_printed or self.offset == 0 or self.shouldPrintResult(): if not self.initial_path_printed or self.offset == 0 or self.shouldPrintResult():
self.initial_path_printed = True self.initial_path_printed = True
format = b'%s/\n' format = '%s/\n'
if self.transport: if self.transport:
format = b'd%s/\0' format = 'd%s/\0'
self.writer.write( format % path) self.writer.write( format % path)
def print_file(self, path): def print_file(self, path):
self.result_count += 1 self.result_count += 1
if self.shouldPrintResult(): if self.shouldPrintResult():
file = self.revCtx[path] file = self.revCtx[path]
date = b'0 0' date = '0 0'
description = b'n/a' description = 'n/a'
if not self.disableLastCommit: if not self.disableLastCommit:
linkrev = self.repo[file.linkrev()] linkrev = self.repo[file.linkrev()]
date = b'%d %d' % _parsedate(linkrev.date()) date = '%d %d' % _parsedate(linkrev.date())
description = linkrev.description() description = linkrev.description()
format = b'%s %i %s %s\n' format = '%s %i %s %s\n'
if self.transport: if self.transport:
format = b'f%s\n%i %s %s\0' format = 'f%s\n%i %s %s\0'
self.writer.write( format % (file.path(), file.size(), date, description) ) self.writer.write( format % (file.path(), file.size(), date, description) )
def print_sub_repository(self, path, subrepo): def print_sub_repository(self, path, subrepo):
if self.shouldPrintResult(): if self.shouldPrintResult():
format = b'%s/ %s %s\n' format = '%s/ %s %s\n'
if self.transport: if self.transport:
format = b's%s/\n%s %s\0' format = 's%s/\n%s %s\0'
self.writer.write( format % (path, subrepo.revision, subrepo.url)) self.writer.write( format % (path, subrepo.revision, subrepo.url))
def visit(self, file): def visit(self, file):
@@ -263,9 +263,9 @@ class File_Printer:
def finish(self): def finish(self):
if self.isTruncated(): if self.isTruncated():
if self.transport: if self.transport:
self.writer.write(b"t") self.writer.write( "t")
else: else:
self.writer.write(b"truncated") self.writer.write("truncated")
class File_Viewer: class File_Viewer:
def __init__(self, revCtx, visitor): def __init__(self, revCtx, visitor):
@@ -275,11 +275,11 @@ class File_Viewer:
self.recursive = False self.recursive = False
def remove_ending_slash(self, path): def remove_ending_slash(self, path):
if path.endswith(b"/"): if path.endswith("/"):
return path[:-1] return path[:-1]
return path return path
def view(self, path = b""): def view(self, path = ""):
manifest = self.revCtx.manifest() manifest = self.revCtx.manifest()
if len(path) > 0 and path in manifest: if len(path) > 0 and path in manifest:
self.visitor.visit(File_Object(False, path)) self.visitor.visit(File_Object(False, path))
@@ -294,15 +294,15 @@ class File_Viewer:
collector.collect(self.sub_repositories.keys(), p, True) collector.collect(self.sub_repositories.keys(), p, True)
walker.walk(collector.structure, p) walker.walk(collector.structure, p)
@command(b'fileview', [ @command('fileview', [
(b'r', b'revision', b'tip', b'revision to print'), ('r', 'revision', 'tip', 'revision to print'),
(b'p', b'path', b'', b'path to print'), ('p', 'path', '', 'path to print'),
(b'c', b'recursive', False, b'browse repository recursive'), ('c', 'recursive', False, 'browse repository recursive'),
(b'd', b'disableLastCommit', False, b'disables last commit description and date'), ('d', 'disableLastCommit', False, 'disables last commit description and date'),
(b's', b'disableSubRepositoryDetection', False, b'disables detection of sub repositories'), ('s', 'disableSubRepositoryDetection', False, 'disables detection of sub repositories'),
(b't', b'transport', False, b'format the output for command server'), ('t', 'transport', False, 'format the output for command server'),
(b'l', b'limit', 100, b'limit the number of results'), ('l', 'limit', 100, 'limit the number of results'),
(b'o', b'offset', 0, b'proceed from the given result number (zero based)'), ('o', 'offset', 0, 'proceed from the given result number (zero based)'),
]) ])
def fileview(ui, repo, **opts): def fileview(ui, repo, **opts):
revCtx = scmutil.revsingle(repo, opts["revision"]) revCtx = scmutil.revsingle(repo, opts["revision"])