##// END OF EJS Templates
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.

File last commit:

r28354:00f31778 default
r32709:16ada4cb default
Show More
fixpax.py
64 lines | 1.6 KiB | text/x-python | PythonLexer
timeless
contrib: add execute bit for fixpax.py
r27495 #!/usr/bin/env python
Mads Kiilerich
osx: patch .pax.gz files in pkg bundles so they extract as root (issue4081)...
r23940 # fixpax - fix ownership in bdist_mpkg output
#
# Copyright 2015 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
# MIT license (http://opensource.org/licenses/MIT)
"""Set file ownership to 0 in an Archive.pax.gz.
Suitable for fixing files bdist_mpkg output:
*.mpkg/Contents/Packages/*.pkg/Contents/Archive.pax.gz
"""
Pulkit Goyal
fixpax: use absolute_import and print_function
r28354 from __future__ import absolute_import, print_function
import gzip
import os
import sys
Mads Kiilerich
osx: patch .pax.gz files in pkg bundles so they extract as root (issue4081)...
r23940
def fixpax(iname, oname):
i = gzip.GzipFile(iname)
o = gzip.GzipFile(oname, "w")
while True:
magic = i.read(6)
dev = i.read(6)
ino = i.read(6)
mode = i.read(6)
i.read(6) # uid
i.read(6) # gid
nlink = i.read(6)
rdev = i.read(6)
mtime = i.read(11)
namesize = i.read(6)
filesize = i.read(11)
name = i.read(int(namesize, 8))
data = i.read(int(filesize, 8))
o.write(magic)
o.write(dev)
o.write(ino)
o.write(mode)
o.write("000000")
o.write("000000")
o.write(nlink)
o.write(rdev)
o.write(mtime)
o.write(namesize)
o.write(filesize)
o.write(name)
o.write(data)
if name.startswith("TRAILER!!!"):
o.write(i.read())
break
o.close()
i.close()
if __name__ == '__main__':
for iname in sys.argv[1:]:
Pulkit Goyal
fixpax: use absolute_import and print_function
r28354 print('fixing file ownership in %s' % iname)
Mads Kiilerich
osx: patch .pax.gz files in pkg bundles so they extract as root (issue4081)...
r23940 oname = sys.argv[1] + '.tmp'
fixpax(iname, oname)
os.rename(oname, iname)