upstream/mercurial-mirror Files · hgext/hooklib/reject_merge_commits.py

git: skeleton of a new extension to _directly_ operate on git repos...

git: skeleton of a new extension to _directly_ operate on git repos This is based in part of work I did years ago in hgit, but it's mostly new code since I'm using pygit2 instead of dulwich and the hg storage interfaces have improved. Some cleanup of old hgit code by Pulkit, which I greatly appreciate. test-git-interop.t does not cover a whole lot of cases, but it passes. It includes status, diff, making a new commit, and `hg annotate` working on the git repository. This is _not_ (yet) production quality code: this is an experiment. Known technical debt lurking in this implementation: * Writing bookmarks just totally ignores transactions. * The way progress is threaded down into the gitstore is awful. * Ideally we'd find a way to incrementally reindex DAGs. I'm not sure how to do that efficiently, so we might need a "known only fast-forwards" mode on the DAG indexer for use on `hg commit` and friends. * We don't even _try_ to do anything reasonable for `hg pull` or `hg push`. * Mercurial need an interface for the changelog type. Tests currently require git 2.24 as far as I'm aware: `git status` has some changed output that I didn't try and handle in a compatible way. This patch has produced some interesting cleanups, most recently on the manifest type. I expect continuing down this road will produce other meritorious cleanups throughout our code. Differential Revision: https://phab.mercurial-scm.org/D6734

Joerg Sonnenberger - - Load All Authors

File last commit:

r44897:4cabeea6 default


                r44961:ad718271

default

Download file

             reject_merge_commits.py
        
                    45 lines
            
             | 1.3 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / hooklib / reject_merge_commits.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # 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

                  )

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				# 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
				)