Commit ee0f4519cd7 by Georges Racinet

Merge from heptapod-0-8 branch

Nothing really specific to 0.8 that should not be in the main branch.
And this should fix the CI of this branch.

--HG--
branch : heptapod
Pipeline #2759 failed with stage
in 5 minutes 31 seconds
......@@ -2,7 +2,8 @@ variables:
PYTHONPATH: /ci/repos/mercurial
before_script:
- apt-get update && apt-get -y install git-core subversion subversion-tools
- apt-get update
- apt-get -y install git-core subversion subversion-tools openssh-client
- PYTHONPATH= pip install --user dulwich==0.19.13 hg-evolve==9.2.1
tests-hg-default:
......
......@@ -40,3 +40,6 @@ d8654f5888efc276d507d22a67fbd4a858c85b3f heptapod-0.6.0
5b9cb9071024d7646981454c4396ee8a6ad3c6ee heptapod-0.6.1
68e1cb7f5d1d207f08d6d5476f6c12541f3c7c93 heptapod-0.6.2
eafaf29c48d1ad288fb63f1303e289be27db668a heptapod-0.7.0
9a735c2eb935ab3414690fe5569de64c2c85fa2a heptapod-0.8.0rc1
6dbe7d60e6696b5057cd0f76ea9cd206524370f2 heptapod-0.8.0rc2
777b1524df15027ea8751fab061a351c628bd54c heptapod-0.8.0rc3
......@@ -1134,11 +1134,14 @@ class GitHandler(object):
if not changed_refs:
return
quiet = self.repo.ui.quiet # typically again False in postclose
self.repo.ui.quiet = True
self.repo.ui.note("GitHandler.push_gitlab_branches, "
"pushing %r to remote %r " % (changed_refs, remote))
self.gitlab_apply_hook('pre-receive', old_refs, changed_refs)
self.upload_pack(remote, None, True, upload_git_refs=changed_refs)
self.gitlab_apply_hook('post-receive', old_refs, changed_refs)
self.repo.ui.quiet = quiet
def gitlab_apply_hook(self, name, old_refs, new_refs):
hook = self.gitlab_get_hook(name)
......@@ -1165,7 +1168,10 @@ class GitHandler(object):
code, name, err))
# useful messages such as motd, merge requests links etc.
quiet = ui.quiet
ui.quiet = False
ui.status(out)
ui.quiet = quiet
# PACK UPLOADING AND FETCHING
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment