##// END OF EJS Templates
rebase: move actual rebase into a single transaction...
rebase: move actual rebase into a single transaction Previously, rebasing would open several transaction over the course of rebasing several commits. Opening a transaction can have notable overhead (like copying the dirstate) which can add up when rebasing many commits. This patch adds a single large transaction around the actual commit rebase operation, with a catch for intervention which serializes the current state if we need to drop back to the terminal for user intervention. Amazingly, almost all the tests seem to pass. On large repos with large working copies, this can speed up rebasing 7 commits by 25%. I'd expect the percentage to be a bit larger for rebasing even more commits. There are minor test changes because we're rolling back the entire transaction during unexpected exceptions instead of just stopping mid-rebase, so there's no more backup bundle. It also leave an unknown file in the working copy, since our clean up 'hg update' doesn't delete unknown files.

File last commit:

r28354:00f31778 default
r31226:cf8ad0e6 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)