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

clonebundles: add support for inline (streaming) clonebundles...

clonebundles: add support for inline (streaming) clonebundles The idea behind inline clonebundles is to send them through the ssh or https connection to the Mercurial server. We've been using this specifically for streaming clonebundles, although it works for 'regular' clonebundles as well (but is less relevant, since pullbundles exist). We've had this enabled for around 9 months for a part of our users. A few benefits are: - no need to secure an external system, since everything goes through the same Mercurial server - easier scaling (in our case: no risk of inconsistencies between multiple mercurial-server mirrors and nginx clonebundles hosts) Remaining topics/questions right now: - The inline clonebundles don't work for https yet. This is because httppeer doesn't seem to support sending client capabilities. I didn't focus on that as my main goal was to get this working for ssh.

Gregory Szorc - - Load All Authors

File last commit:

r49730:6000f5b2 default


                r51559:60f9602b

default

Download file

             mergeutil.py
        
                    18 lines
            
             | 463 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 .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 .i18n import _

				from . import error


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