There will be about 1h of downtime on 2020-03-02 at 13:00 UTC+1 (change of servers and upgrade to Heptapod 0.20.0 final)

Commit 2effeb28 authored by Georges Racinet's avatar Georges Racinet 🦑

exportable heads finalization: reduce indent

parent 4f896fe202dc
Pipeline #13579 passed with stages
in 1 minute and 56 seconds
......@@ -330,18 +330,17 @@ class HeptapodGitHandler(GitHandler):
ui = self.repo.ui
if len(hg_shas) == 1:
result_sha = next(iter(hg_shas))
elif not allow_multiple:
# taken straight from `headchecking.enforcesinglehead`
# that is disabled in Heptapod just to avoid calling
# the expensive _filter_obsolete_heads twice per branch
msg = _(b'rejecting multiple heads on branch "%s"')
msg %= branchmap_branch
hint = _(b'%d heads: %s')
hint %= (len(hg_shas),
scmutil.nodesummaries(repo, hg_shas))
raise error.Abort(msg, hint=hint)
else:
if not allow_multiple:
# taken straight from `headchecking.enforcesinglehead`
# that is disabled in Heptapod just to avoid calling
# the expensive _filter_obsolete_heads twice per branch
msg = _(b'rejecting multiple heads on branch "%s"')
msg %= branchmap_branch
hint = _(b'%d heads: %s')
hint %= (len(hg_shas),
scmutil.nodesummaries(repo, hg_shas))
raise error.Abort(msg, hint=hint)
result_sha = self.multiple_heads_choose(hg_shas, branchmap_branch)
if result_sha is None:
ui.error(logprefix,
......
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