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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Rafael Monnerat
erp5
Commits
63254fe4
Commit
63254fe4
authored
Aug 15, 2023
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Plain Diff
erp5_forge: Display failure to push as error
See merge request
nexedi/erp5!1812
parents
c2a7e1e8
e5e7c834
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
7 deletions
+10
-7
bt5/erp5_forge/ModuleComponentTemplateItem/portal_components/module.erp5.Git.py
...omponentTemplateItem/portal_components/module.erp5.Git.py
+10
-7
No files found.
bt5/erp5_forge/ModuleComponentTemplateItem/portal_components/module.erp5.Git.py
View file @
63254fe4
...
@@ -381,15 +381,18 @@ class Git(WorkingCopy):
...
@@ -381,15 +381,18 @@ class Git(WorkingCopy):
self.git('
reset
', '
--
soft
', '
@
{
%
u
}
' % reset)
self.git('
reset
', '
--
soft
', '
@
{
%
u
}
' % reset)
if isinstance(e, GitLoginError):
if isinstance(e, GitLoginError):
raise
raise
portal_status_message = str(e)
keep_items_dict = dict(
portal_status_message = str(e),
portal_status_level = '
error
'
)
else:
else:
head = self.git('
rev
-
parse
', '
--
short
', '
HEAD
')
head = self.git('
rev
-
parse
', '
--
short
', '
HEAD
')
portal_status_message = translateString
(
keep_items_dict = dict
(
'
Files
committed
successfully
in
revision
$
{
revision
}
',
portal_status_message = translateString(
mapping=dict(revision=head))
'
Files
committed
successfully
in
revision
$
{
revision
}
',
return context.Base_redirect('
view
', keep_items={
mapping=dict(revision=head))
'
portal_status_message
': portal_status_message
)
}
)
return context.Base_redirect('
view
', keep_items=keep_items_dict
)
def log(self, path='
.
'):
def log(self, path='
.
'):
log = []
log = []
...
...
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