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

push: add a way to allow concurrent pushes on unrelated heads...

push: add a way to allow concurrent pushes on unrelated heads Client has a mechanism for the server to check that nothing changed server side since the client prepared a push. That check is wide and any head changed on the server will lead to an aborted push. We introduce a way for the client to send a less strict checking. That logic will check that no heads impacted by the push have been affected. If other unrelated heads (including named branches heads) have been affected, the push will proceed. This is very helpful for repositories with high developers traffic on different heads, a common setup. That behavior is currently controlled by an experimental option. The config should live in the "server" section but bike-shedding of the name will happen in the next changesets. Servers advertise this capability through a new bundle2 capability 'checkeads', using the value 'related'. The 'test-push-race.t' is updated to check that new capabilities on the documented cases.

Yuya Nishihara - - Load All Authors

File last commit:

r32684:af854b1b default


                r32709:16ada4cb

default

Download file

             node.py
        
                    35 lines
            
             | 917 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / node.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # node.py - basic nodeid manipulation for mercurial

      #

      # Copyright 2005, 2006 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

      import binascii

      # This ugly style has a noticeable effect in manifest parsing

      hex = binascii.hexlify

      bin = binascii.unhexlify

      nullrev = -1

      nullid = b"\0" * 20

      nullhex = hex(nullid)

      # Phony node value to stand-in for new files in some uses of

      # manifests.

      newnodeid = '!' * 20

      addednodeid = ('0' * 15) + 'added'

      modifiednodeid = ('0' * 12) + 'modified'

      wdirnodes = {newnodeid, addednodeid, modifiednodeid}

      # pseudo identifiers for working directory

      # (they are experimental, so don't add too many dependencies on them)

      wdirrev = 0x7fffffff

      wdirid = b"\xff" * 20

      wdirhex = hex(wdirid)

      def short(node):

          return hex(node[:6])

	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

				# node.py - basic nodeid manipulation for mercurial
				#
				# Copyright 2005, 2006 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

				import binascii

				# This ugly style has a noticeable effect in manifest parsing
				hex = binascii.hexlify
				bin = binascii.unhexlify

				nullrev = -1
				nullid = b"\0" * 20
				nullhex = hex(nullid)

				# Phony node value to stand-in for new files in some uses of
				# manifests.
				newnodeid = '!' * 20
				addednodeid = ('0' * 15) + 'added'
				modifiednodeid = ('0' * 12) + 'modified'

				wdirnodes = {newnodeid, addednodeid, modifiednodeid}

				# pseudo identifiers for working directory
				# (they are experimental, so don't add too many dependencies on them)
				wdirrev = 0x7fffffff
				wdirid = b"\xff" * 20
				wdirhex = hex(wdirid)

				def short(node):
				return hex(node[:6])