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

run-tests: include non-activated venv packages in `PYTHONPATH`...

run-tests: include non-activated venv packages in `PYTHONPATH` If a venv is activated since afa9d73780e1, `hghave` would see the packages installed in it, and enable related tests. If the python interpreter was launched directly however, none of them were seen. In addition to getting consistent behavior, it's also easier to manage in CI if the venv doesn't need activation.

Matt Harbison - - Load All Authors

File last commit:

r52756:f4733654 default


                r52901:d7e9503c

default

Download file

             mergeutil.py
        
                    19 lines
            
             | 498 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / mergeutil.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # mergeutil.py - help for merge processing in mercurial

      #

      # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>

      #

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

      from .i18n import _

      from . import error

      def checkunresolved(ms):

          if ms.unresolvedcount():

              raise error.StateError(

                  _(b"unresolved merge conflicts (see 'hg help resolve')")

              )

	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

				# mergeutil.py - help for merge processing in mercurial
				#
				# Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
				#
				# 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 annotations

				from .i18n import _

				from . import error


				def checkunresolved(ms):
				if ms.unresolvedcount():
				raise error.StateError(
				_(b"unresolved merge conflicts (see 'hg help resolve')")
				)