upstream/mercurial-mirror Files · hgext/largefiles/wirestore.py

rebase: also include commit of collapsed commits in single transaction...

rebase: also include commit of collapsed commits in single transaction When rebase.singletransaction is set, we still used to create a second transaction when committing with --collapse. It's simpler to create a single transaction. Note that in the affected .t file, the test that uses --collapse still appears to create two transactions (it prints "rebase status stored" twice). However, only a single transaction is actually created and the second printout comes from cmdutil.commitforceeditor() that explicitly calls tr.writepending(). Also note the that we now roll back any commits if the user closes the commit message editor with an error code (or leaves the message empty). That might be unfortunate, but it's consistent with how we behave in the --no-collapse case (if the user passed --edit). If we want to change that, I think it should be done consistently in a separate patch. Differential Revision: https://phab.mercurial-scm.org/D2728

liscju - - Load All Authors

File last commit:

r29316:28dfcf3d default


                r36945:17a744c5

default

Download file

             wirestore.py
        
                    39 lines
            
             | 1.3 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / largefiles / wirestore.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # Copyright 2010-2011 Fog Creek Software

      #

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

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

      '''largefile store working over Mercurial's wire protocol'''

      from __future__ import absolute_import

      from . import (

          lfutil,

          remotestore,

      )

      class wirestore(remotestore.remotestore):

          def __init__(self, ui, repo, remote):

              cap = remote.capable('largefiles')

              if not cap:

                  raise lfutil.storeprotonotcapable([])

              storetypes = cap.split(',')

              if 'serve' not in storetypes:

                  raise lfutil.storeprotonotcapable(storetypes)

              self.remote = remote

              super(wirestore, self).__init__(ui, repo, remote.url())

          def _put(self, hash, fd):

              return self.remote.putlfile(hash, fd)

          def _get(self, hash):

              return self.remote.getlfile(hash)

          def _stat(self, hashes):

              '''For each hash, return 0 if it is available, other values if not.

              It is usually 2 if the largefile is missing, but might be 1 the server

              has a corrupted copy.'''

              batch = self.remote.iterbatch()

              for hash in hashes:

                  batch.statlfile(hash)

              batch.submit()

              return dict(zip(hashes, batch.results()))

	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 2010-2011 Fog Creek Software
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				'''largefile store working over Mercurial's wire protocol'''
				from __future__ import absolute_import

				from . import (
				lfutil,
				remotestore,
				)

				class wirestore(remotestore.remotestore):
				def __init__(self, ui, repo, remote):
				cap = remote.capable('largefiles')
				if not cap:
				raise lfutil.storeprotonotcapable([])
				storetypes = cap.split(',')
				if 'serve' not in storetypes:
				raise lfutil.storeprotonotcapable(storetypes)
				self.remote = remote
				super(wirestore, self).__init__(ui, repo, remote.url())

				def _put(self, hash, fd):
				return self.remote.putlfile(hash, fd)

				def _get(self, hash):
				return self.remote.getlfile(hash)

				def _stat(self, hashes):
				'''For each hash, return 0 if it is available, other values if not.
				It is usually 2 if the largefile is missing, but might be 1 the server
				has a corrupted copy.'''
				batch = self.remote.iterbatch()
				for hash in hashes:
				batch.statlfile(hash)
				batch.submit()
				return dict(zip(hashes, batch.results()))