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

lfs: check content length after downloading content...

lfs: check content length after downloading content Adapted from the Facebook repo[1]. The intent is to distinguish between the connection dying and getting served a corrupt blob. The original message: HTTP makes no provision to tell your client that you failed halfway through producing your response and won't have the answer they're looking for. So, if a LFS server fails while producing a response, then we'll report an OID mismatch. We can do a little better and disambiguate between "the server sent us the wrong blob" (very scary) and "the server crashed" (merely annoying) by looking at the content length of the response we got back. If it's not what was advertised, we can reasonably safely assume the server crashed. [1] https://github.com/facebookexperimental/eden/commit/2a4a6fab4e882ed89b948bfc1e7d56d7c3c99dd2 Differential Revision: https://phab.mercurial-scm.org/D7881

Martin von Zweigbergk - - Load All Authors

File last commit:

r43387:8ff1ecfa default


                r44544:0ee0a3f6

default

Download file

             mergeutil.py
        
                    24 lines
            
             | 697 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 Matt Mackall <mpm@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 absolute_import

      from .i18n import _

      from . import error

      def checkunresolved(ms):

          if list(ms.unresolved()):

              raise error.Abort(

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

              )

          if ms.mdstate() != b's' or list(ms.driverresolved()):

              raise error.Abort(

                  _(b'driver-resolved merge conflicts'),

                  hint=_(b'run "hg resolve --all" to 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 Matt Mackall <mpm@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 absolute_import

				from .i18n import _

				from . import error


				def checkunresolved(ms):
				if list(ms.unresolved()):
				raise error.Abort(
				_(b"unresolved merge conflicts (see 'hg help resolve')")
				)
				if ms.mdstate() != b's' or list(ms.driverresolved()):
				raise error.Abort(
				_(b'driver-resolved merge conflicts'),
				hint=_(b'run "hg resolve --all" to resolve'),
				)