Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
py-heptapod
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
heptapod
py-heptapod
Commits
12c5dfd70bb3
Commit
12c5dfd70bb3
authored
3 years ago
by
Georges Racinet
Browse files
Options
Downloads
Plain Diff
Merged oldstable branch into stable
parents
2d424dd7b201
0db46e66b9fd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#29036
passed
3 years ago
Stage: main
Stage: downstream
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.hgtags
+1
-0
1 addition, 0 deletions
.hgtags
hgext3rd/heptapod/state_maintainer.py
+8
-2
8 additions, 2 deletions
hgext3rd/heptapod/state_maintainer.py
with
9 additions
and
2 deletions
.hgtags
+
1
−
0
View file @
12c5dfd7
...
...
@@ -64,6 +64,7 @@
131edf9f32d7777b0403ecf935eb4ee5ec8f4b3e 2.6.2
d565573e5f5225f54af5940af2dd49f104e433a9 2.6.3
246d8e94f9d836a74138bd9c98b2146f6b44995e 2.6.4
daebc9767519bcca72ae8e3487e2cd0daedb9d45 2.6.5
7201235d9a19a07b17b6c9ff8969a521f9b6b645 2.7.0
31c522be065e5c52736334ae77650ac36dd50add 2.7,1
d79eb77434372f20c23ef58df261d220e1986ebf 2.7.2
...
...
This diff is collapsed.
Click to expand it.
hgext3rd/heptapod/state_maintainer.py
+
8
−
2
View file @
12c5dfd7
...
...
@@ -903,6 +903,7 @@
def
heptapod_notify_gitlab
(
self
,
hook
,
prune_reasons
,
changes
,
push_options
=
None
,
additional_error_message
=
b
""
,
allow_error
=
False
):
if
not
changes
and
not
prune_reasons
:
return
...
...
@@ -951,8 +952,9 @@
pycompat
.
sysbytes
(
repr
(
code
)),
hook
,
err
))
quiet
=
ui
.
quiet
ui
.
quiet
=
False
ui
.
status
(
b
"
GitLab update error:
'
%s
'
. Because of this, some
"
b
"
changes won
'
t be visible in the web interface
"
%
err
)
msg
=
b
"
GitLab update error:
'
%s
'
, %s
"
%
(
err
,
additional_error_message
)
ui
.
status
(
msg
)
ui
.
quiet
=
quiet
if
not
allow_error
:
raise
error
.
Abort
(
err
.
strip
())
...
...
@@ -1080,6 +1082,10 @@
self
.
heptapod_notify_gitlab
(
PostReceive
(
self
.
repo
),
prune_reasons
,
changes
,
additional_error_message
=
(
b
"
Because of this, some changes may not be visible
"
b
"
in the interface, and some expected server-side actions
"
b
"
may not have been triggered.
"
),
push_options
=
push_opts
if
push_opts
else
None
)
txn
=
self
.
repo
.
currenttransaction
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment