Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Jérome Perrin
erp5
Commits
423f805e
Commit
423f805e
authored
Jan 22, 2024
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
forge: python3 compatibility for git tab
parent
e612d009
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
bt5/erp5_forge/ModuleComponentTemplateItem/portal_components/module.erp5.Git.py
...omponentTemplateItem/portal_components/module.erp5.Git.py
+2
-2
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsDiff.py
...eItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsDiff.py
+3
-3
No files found.
bt5/erp5_forge/ModuleComponentTemplateItem/portal_components/module.erp5.Git.py
View file @
423f805e
...
...
@@ -211,7 +211,7 @@ class Git(WorkingCopy):
diff_dict
=
{}
if
out
:
out
=
iter
(
out
.
split
(
'
\
n
diff --git '
))
for
stat
in
out
.
next
(
).
splitlines
():
for
stat
in
next
(
out
).
splitlines
():
stat
,
path
=
stat
.
split
()[
4
:]
stat_dict
[
path
]
=
stat
# Emulate svn output for compatibility with erp5.component.module.DiffUtils
...
...
@@ -230,7 +230,7 @@ class Git(WorkingCopy):
path_dict
=
dict
.
fromkeys
(
self
.
git
(
'ls-files'
).
splitlines
(),
''
)
path_dict
.
update
(
self
.
_patch_with_raw
()[
0
])
node_dict
=
{}
path_list
=
path_dict
.
keys
(
)
path_list
=
list
(
path_dict
.
keys
()
)
for
path
in
path_list
:
status
=
path_dict
[
path
]
parent
=
os
.
path
.
dirname
(
path
)
...
...
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsDiff.py
View file @
423f805e
...
...
@@ -8,11 +8,11 @@ else:
print
(
'<div style="color: black">'
)
# XXX: ERP5VCS_doCreateJavaScriptStatus should send lists
if
isinstance
(
added
,
basestring
):
if
isinstance
(
added
,
str
):
added
=
added
!=
'none'
and
filter
(
None
,
added
.
split
(
','
))
or
()
if
isinstance
(
modified
,
basestring
):
if
isinstance
(
modified
,
str
):
modified
=
modified
!=
'none'
and
filter
(
None
,
modified
.
split
(
','
))
or
''
if
isinstance
(
removed
,
basestring
):
if
isinstance
(
removed
,
str
):
removed
=
removed
!=
'none'
and
filter
(
None
,
removed
.
split
(
','
))
or
()
for
f
in
modified
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment