Mercurial > hg
view hgext/hooklib/reject_merge_commits.py @ 44820:f71c8eea7161 stable
bash_completion: do not use aliased hg if it sources a script (issue6308)
I have an alias that sources a script around hg. Mercurial's bash_completion
script tries to use this as its main hg binary. But sourcing a wrapper breaks
Bash's completion. So this patch disables using the alias as the hg binary if
it starts with "source ".
Alias resolution was introduced in rev 191ab08e7099 for users with
"alias hg='hg --some_opts'".
See https://www.mercurial-scm.org/repo/hg/rev/191ab08e7099
author | Peter Arrenbrecht <peter@arrenbrecht.ch> |
---|---|
date | Mon, 11 May 2020 08:13:40 +0200 |
parents | 4cabeea6d214 |
children | 6000f5b25c9b |
line wrap: on
line source
# Copyright 2020 Joerg Sonnenberger <joerg@bec.de> # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. """reject_merge_commits is a hook to check new changesets for merge commits. Merge commits are allowed only between different branches, i.e. merging a feature branch into the main development branch. This can be used to enforce policies for linear commit histories. Usage: [hooks] pretxnchangegroup.reject_merge_commits = \ python:hgext.hooklib.reject_merge_commits.hook """ from __future__ import absolute_import from mercurial.i18n import _ from mercurial import ( error, pycompat, ) def hook(ui, repo, hooktype, node=None, **kwargs): if hooktype != b"pretxnchangegroup": raise error.Abort( _(b'Unsupported hook type %r') % pycompat.bytestr(hooktype) ) ctx = repo.unfiltered()[node] for rev in repo.changelog.revs(start=ctx.rev()): rev = repo[rev] parents = rev.parents() if len(parents) < 2: continue if all(repo[p].branch() == rev.branch() for p in parents): raise error.Abort( _( b'%s rejected as merge on the same branch. ' b'Please consider rebase.' ) % rev )