upstream/mercurial-mirror Files · mercurial/rewriteutil.py

tests: make the grep pattern in remotefilelog-gcrepack portable (issue6122)...

tests: make the grep pattern in remotefilelog-gcrepack portable (issue6122) test-remotefilelog-gcrepack was using "\" to escape "|" in the grep pattern. The most of implementations ignore "\" when it is followed by "|", so the regex works. However, OpenBSD doesn't ignore "\" and considers "|" part of the text instead of create two branches. Neither of both behaviors violate POSIX. This change removes the unnecessary escape character and changes grep to egrep, so the extended regular expression works on every unix. This is part of the bug 6122. Tested on OpenBSD, GNU, FreeBSD, NetBSD, Solaris 11 and BusyBox. Credits to Todd C. Miller, Paul de Weerd and Ingo Schwarze for helping me with it.

av6 - - Load All Authors

File last commit:

r40672:8c6329fa default


                r42545:f2213131

default

Download file

             rewriteutil.py
        
                    53 lines
            
             | 1.6 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / rewriteutil.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # rewriteutil.py - utility functions for rewriting changesets

      #

      # Copyright 2017 Octobus <contact@octobus.net>

      #

      # This software may be used and distributed according to the terms of the

      # GNU General Public License version 2 or any later version.

      from __future__ import absolute_import

      from .i18n import _

      from . import (

          error,

          node,

          obsolete,

          revset,

      )

      def precheck(repo, revs, action='rewrite'):

          """check if revs can be rewritten

          action is used to control the error message.

          Make sure this function is called after taking the lock.

          """

          if node.nullrev in revs:

              msg = _("cannot %s null changeset") % (action)

              hint = _("no changeset checked out")

              raise error.Abort(msg, hint=hint)

          if len(repo[None].parents()) > 1:

              raise error.Abort(_("cannot %s while merging") % action)

          publicrevs = repo.revs('%ld and public()', revs)

          if publicrevs:

              msg = _("cannot %s public changesets") % (action)

              hint = _("see 'hg help phases' for details")

              raise error.Abort(msg, hint=hint)

          newunstable = disallowednewunstable(repo, revs)

          if newunstable:

              raise error.Abort(_("cannot %s changeset with children") % action)

      def disallowednewunstable(repo, revs):

          """Checks whether editing the revs will create new unstable changesets and

          are we allowed to create them.

          To allow new unstable changesets, set the config:

              `experimental.evolution.allowunstable=True`

          """

          allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)

          if allowunstable:

              return revset.baseset()

          return repo.revs("(%ld::) - %ld", revs, revs)

	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

				# rewriteutil.py - utility functions for rewriting changesets
				#
				# Copyright 2017 Octobus <contact@octobus.net>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				from __future__ import absolute_import

				from .i18n import _

				from . import (
				error,
				node,
				obsolete,
				revset,
				)

				def precheck(repo, revs, action='rewrite'):
				"""check if revs can be rewritten
				action is used to control the error message.

				Make sure this function is called after taking the lock.
				"""
				if node.nullrev in revs:
				msg = _("cannot %s null changeset") % (action)
				hint = _("no changeset checked out")
				raise error.Abort(msg, hint=hint)

				if len(repo[None].parents()) > 1:
				raise error.Abort(_("cannot %s while merging") % action)

				publicrevs = repo.revs('%ld and public()', revs)
				if publicrevs:
				msg = _("cannot %s public changesets") % (action)
				hint = _("see 'hg help phases' for details")
				raise error.Abort(msg, hint=hint)

				newunstable = disallowednewunstable(repo, revs)
				if newunstable:
				raise error.Abort(_("cannot %s changeset with children") % action)

				def disallowednewunstable(repo, revs):
				"""Checks whether editing the revs will create new unstable changesets and
				are we allowed to create them.

				To allow new unstable changesets, set the config:
				`experimental.evolution.allowunstable=True`
				"""
				allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
				if allowunstable:
				return revset.baseset()
				return repo.revs("(%ld::) - %ld", revs, revs)