Skip to content
Snippets Groups Projects
Commit 09f8807e authored by Georges Racinet's avatar Georges Racinet
Browse files

Merged oldstable branch into stable

Contains the fix to heptapod#714
parents 362b7350 fb05140f
Branches
Tags
2 merge requests!106Merge stable branch,!105Merged oldstable branch into stable
Pipeline #85768 passed
Pipeline: hgitaly

#85769

    ......@@ -63,6 +63,9 @@
    def get_default_gitlab_branch(repo):
    """Return the default GitLab branch name, or ``None`` if not set."""
    shared_from = hg.sharedreposource(repo)
    if shared_from is not None:
    repo = shared_from
    branch = repo.vfs.tryread(DEFAULT_GITLAB_BRANCH_FILE_NAME)
    # (hg 5.4) tryread returns empty strings for missing files
    if not branch:
    ......
    ......@@ -91,6 +91,7 @@
    gl_branch = get_default_gitlab_branch(self.repo)
    if gl_branch is not None:
    res = gitlab_branch_ref(gl_branch)
    self._default_git_ref = res
    return res
    def set_default_gitlab_ref(self, new_default_ref):
    ......
    ......@@ -39,3 +39,4 @@
    assert get_default_gitlab_branch(main.repo) is None
    set_default_gitlab_branch(share.repo, b'branch/default')
    assert get_default_gitlab_branch(main.repo) == b'branch/default'
    assert get_default_gitlab_branch(share.repo) == b'branch/default'
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment