##// END OF EJS Templates
rebase: allow aborting if last-message.txt is missing...
rebase: allow aborting if last-message.txt is missing Previously, if .hg/rebasestate existed but .hg/last-message.txt was missing, 'hg rebase --abort' would say there's no rebase in progress but 'hg checkout foo' would say 'abort: rebase in progress'. It turns out loading the collapse message will throw a "no rebase in progress" error if the file doesn't exist, even though .hg/rebasestate obviously indicates a rebase is in progress. The fix is to only throw an exception if we're trying to --continue, and to just eat the issues if we're doing --abort. This issue is exposed by us writing the rebase state earlier in the process. This will be used by later patches to ensure the user can appropriately 'hg rebase --abort' if there's a crash before the first the first commit has finished rebasing. Tests cover all of this. The only negative affect is we now require a hg rebase --abort in a very specific exception case, as shown in the test.

File last commit:

r28354:00f31778 default
r31225:749b057b 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)