##// END OF EJS Templates
convert: keep branch switching merges with ancestors (issue3340)...
convert: keep branch switching merges with ancestors (issue3340) When running convert with a filemap, merge parents which are ancestors of other parents are ignored. This is hardly a problem when parents belong to the same branch, but the result could be confusing when named branches are involved. With: -o-a1-a2-a3... <- A \ \ b1-b2-b3...-m- <- B If all b* revisions are discarded, it is useful to preserve 'm' even if it is empty after filtering to record the branch switch. This patch makes filemap preserve "ancestor parents" if there is no "non-ancestor parent" on the same branch than the merge revision. Remarks: - I am not completely convinced by the reasons given above and those detailed by Matt in this thread: http://selenic.com/pipermail/mercurial-devel/2012-May/040627.html The properties we try to preserve are not clearly defined. That said, I know this patch already helped someone on IRC and the tests output look reasonable. - This is a new version of the original "convert: filemap must preserve fast-forward merges" patch. It has exactly the same output for 2 parents merges, the additional complexity is here to handle more than two parents.

File last commit:

r16919:51932c83 stable
r17103:5146de7b default
Show More
archival.py
289 lines | 9.3 KiB | text/x-python | PythonLexer
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 # archival.py - revision archival for mercurial
#
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
#
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112
Matt Mackall
Simplify i18n imports
r3891 from i18n import _
Joel Rosdahl
Expand import * to allow Pyflakes to find problems
r6211 from node import hex
Gilles Moris
archive: add branch and tag informations to the .hg_archival.txt file...
r9614 import cmdutil
Adrian Buehlmann
move opener from util to scmutil
r13970 import scmutil, util, encoding
Markus F.X.J. Oberhumer
archive: use hardcoded constants when creating .zip archives...
r13668 import cStringIO, os, tarfile, time, zipfile
csaba.henk@creo.hu
timestamp of gzip archives taken from changeset context
r4652 import zlib, gzip
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112
Martin Geisler
archival: remove prefix argument from archivers...
r11558 def tidyprefix(dest, kind, prefix):
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 '''choose prefix to use for names in archive. make sure prefix is
safe for consumers.'''
if prefix:
Shun-ichi GOTO
Use util.normpath() instead of direct path string operation....
r5842 prefix = util.normpath(prefix)
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 else:
if not isinstance(dest, str):
raise ValueError('dest must be string if no prefix')
prefix = os.path.basename(dest)
lower = prefix.lower()
Martin Geisler
archival: remove prefix argument from archivers...
r11558 for sfx in exts.get(kind, []):
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 if lower.endswith(sfx):
prefix = prefix[:-len(sfx)]
break
lpfx = os.path.normpath(util.localpath(prefix))
prefix = util.pconvert(lpfx)
if not prefix.endswith('/'):
prefix += '/'
if prefix.startswith('../') or os.path.isabs(lpfx) or '/../' in prefix:
raise util.Abort(_('archive prefix contains illegal components'))
return prefix
Martin Geisler
archival: move commands.archive.guess_type to archival.guesskind...
r11557 exts = {
'tar': ['.tar'],
'tbz2': ['.tbz2', '.tar.bz2'],
'tgz': ['.tgz', '.tar.gz'],
'zip': ['.zip'],
}
def guesskind(dest):
for kind, extensions in exts.iteritems():
if util.any(dest.endswith(ext) for ext in extensions):
return kind
return None
Benoit Boissinot
use new style classes
r8778 class tarit(object):
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 '''write archive to tar file or stream. can write uncompressed,
or compress with gzip or bzip2.'''
csaba.henk@creo.hu
timestamp of gzip archives taken from changeset context
r4652 class GzipFileWithTime(gzip.GzipFile):
def __init__(self, *args, **kw):
timestamp = None
if 'timestamp' in kw:
timestamp = kw.pop('timestamp')
Martin Geisler
use 'x is None' instead of 'x == None'...
r8527 if timestamp is None:
csaba.henk@creo.hu
timestamp of gzip archives taken from changeset context
r4652 self.timestamp = time.time()
else:
self.timestamp = timestamp
gzip.GzipFile.__init__(self, *args, **kw)
def _write_gzip_header(self):
self.fileobj.write('\037\213') # magic header
self.fileobj.write('\010') # compression method
Dirkjan Ochtman
python-2.6: deprecation of GzipFile.filename
r6495 # Python 2.6 deprecates self.filename
Thomas Arendsen Hein
Remove trailing space
r6498 fname = getattr(self, 'name', None) or self.filename
Brodie Rao
archival: don't set gzip filename header when there's no filename...
r13102 if fname and fname.endswith('.gz'):
fname = fname[:-3]
csaba.henk@creo.hu
timestamp of gzip archives taken from changeset context
r4652 flags = 0
if fname:
flags = gzip.FNAME
self.fileobj.write(chr(flags))
gzip.write32u(self.fileobj, long(self.timestamp))
self.fileobj.write('\002')
self.fileobj.write('\377')
if fname:
self.fileobj.write(fname + '\000')
Martin Geisler
archival: remove prefix argument from archivers...
r11558 def __init__(self, dest, mtime, kind=''):
Vadim Gelfer
use commit time as mtime for file archives....
r2477 self.mtime = mtime
Dan Villiom Podlaski Christiansen
explicitly close files...
r13400 self.fileobj = None
csaba.henk@creo.hu
timestamp of gzip archives taken from changeset context
r4652
def taropen(name, mode, fileobj=None):
if kind == 'gz':
mode = mode[0]
if not fileobj:
csaba.henk@creo.hu
Fix tgz archival on Windows....
r4731 fileobj = open(name, mode + 'b')
csaba.henk@creo.hu
timestamp of gzip archives taken from changeset context
r4652 gzfileobj = self.GzipFileWithTime(name, mode + 'b',
zlib.Z_BEST_COMPRESSION,
fileobj, timestamp=mtime)
Dan Villiom Podlaski Christiansen
explicitly close files...
r13400 self.fileobj = gzfileobj
csaba.henk@creo.hu
timestamp of gzip archives taken from changeset context
r4652 return tarfile.TarFile.taropen(name, mode, gzfileobj)
else:
Dan Villiom Podlaski Christiansen
explicitly close files...
r13400 self.fileobj = fileobj
csaba.henk@creo.hu
timestamp of gzip archives taken from changeset context
r4652 return tarfile.open(name, mode + kind, fileobj)
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 if isinstance(dest, str):
csaba.henk@creo.hu
timestamp of gzip archives taken from changeset context
r4652 self.z = taropen(dest, mode='w:')
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 else:
Brendan Cully
Work around python 2.5.1 tarfile regression
r4357 # Python 2.5-2.5.1 have a regression that requires a name arg
csaba.henk@creo.hu
timestamp of gzip archives taken from changeset context
r4652 self.z = taropen(name='', mode='w|', fileobj=dest)
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112
Alexis S. L. Carvalho
archive: add symlink support
r4831 def addfile(self, name, mode, islink, data):
Martin Geisler
archival: remove prefix argument from archivers...
r11558 i = tarfile.TarInfo(name)
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 i.mtime = self.mtime
i.size = len(data)
Alexis S. L. Carvalho
archive: add symlink support
r4831 if islink:
i.type = tarfile.SYMTYPE
i.mode = 0777
i.linkname = data
data = None
Peter van Dijk
fix disappearing symlinks [issue1509]
r7770 i.size = 0
Alexis S. L. Carvalho
archive: add symlink support
r4831 else:
i.mode = mode
data = cStringIO.StringIO(data)
self.z.addfile(i, data)
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112
def done(self):
self.z.close()
Dan Villiom Podlaski Christiansen
explicitly close files...
r13400 if self.fileobj:
self.fileobj.close()
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112
Benoit Boissinot
use new style classes
r8778 class tellable(object):
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 '''provide tell method for zipfile.ZipFile when writing to http
response file object.'''
def __init__(self, fp):
self.fp = fp
self.offset = 0
def __getattr__(self, key):
return getattr(self.fp, key)
def write(self, s):
self.fp.write(s)
self.offset += len(s)
def tell(self):
return self.offset
Benoit Boissinot
use new style classes
r8778 class zipit(object):
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 '''write archive to zip file or stream. can write uncompressed,
or compressed with deflate.'''
Martin Geisler
archival: remove prefix argument from archivers...
r11558 def __init__(self, dest, mtime, compress=True):
Colin McMillen
Proper check to see if zip dest needs to be wrapped in tellable...
r2168 if not isinstance(dest, str):
try:
dest.tell()
Thomas Arendsen Hein
Combine catching exceptions added in dd4ec4576cc8 in one except statement.
r2169 except (AttributeError, IOError):
Colin McMillen
Proper check to see if zip dest needs to be wrapped in tellable...
r2168 dest = tellable(dest)
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 self.z = zipfile.ZipFile(dest, 'w',
compress and zipfile.ZIP_DEFLATED or
zipfile.ZIP_STORED)
Martin Geisler
archive: set date to 1980 for very old zip files...
r12319
# Python's zipfile module emits deprecation warnings if we try
# to store files with a date before 1980.
epoch = 315532800 # calendar.timegm((1980, 1, 1, 0, 0, 0, 1, 1, 0))
if mtime < epoch:
mtime = epoch
Vadim Gelfer
use commit time as mtime for file archives....
r2477 self.date_time = time.gmtime(mtime)[:6]
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112
Alexis S. L. Carvalho
archive: add symlink support
r4831 def addfile(self, name, mode, islink, data):
Martin Geisler
archival: remove prefix argument from archivers...
r11558 i = zipfile.ZipInfo(name, self.date_time)
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 i.compress_type = self.z.compression
# unzip will not honor unix file modes unless file creator is
# set to unix (id 3).
i.create_system = 3
Markus F.X.J. Oberhumer
archive: use hardcoded constants when creating .zip archives...
r13668 ftype = 0x8000 # UNX_IFREG in unzip source code
Alexis S. L. Carvalho
archive: add symlink support
r4831 if islink:
mode = 0777
Markus F.X.J. Oberhumer
archive: use hardcoded constants when creating .zip archives...
r13668 ftype = 0xa000 # UNX_IFLNK in unzip source code
Alexis S. L. Carvalho
archive: add symlink support
r4831 i.external_attr = (mode | ftype) << 16L
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 self.z.writestr(i, data)
def done(self):
self.z.close()
Benoit Boissinot
use new style classes
r8778 class fileit(object):
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 '''write archive as files in directory.'''
Martin Geisler
archival: remove prefix argument from archivers...
r11558 def __init__(self, name, mtime):
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 self.basedir = name
Adrian Buehlmann
move opener from util to scmutil
r13970 self.opener = scmutil.opener(self.basedir)
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112
Alexis S. L. Carvalho
archive: add symlink support
r4831 def addfile(self, name, mode, islink, data):
if islink:
self.opener.symlink(data, name)
return
Alexis S. L. Carvalho
archive: use util.opener when archiving files....
r4830 f = self.opener(name, "w", atomictemp=True)
f.write(data)
Greg Ward
atomictempfile: make close() consistent with other file-like objects....
r15057 f.close()
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 destfile = os.path.join(self.basedir, name)
Alexis S. L. Carvalho
archive: use util.opener when archiving files....
r4830 os.chmod(destfile, mode)
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112
def done(self):
pass
archivers = {
'files': fileit,
'tar': tarit,
Martin Geisler
archival: remove prefix argument from archivers...
r11558 'tbz2': lambda name, mtime: tarit(name, mtime, 'bz2'),
'tgz': lambda name, mtime: tarit(name, mtime, 'gz'),
'uzip': lambda name, mtime: zipit(name, mtime, False),
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 'zip': zipit,
}
def archive(repo, dest, node, kind, decode=True, matchfn=None,
Martin Geisler
subrepo: add support for 'hg archive'
r12323 prefix=None, mtime=None, subrepos=False):
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 '''create archive of repo as it was at node.
dest can be name of directory, name of archive file, or file
object to write archive to.
kind is type of archive to create.
decode tells whether to put files through decode filters from
hgrc.
matchfn is function to filter names of files to write to archive.
prefix is name of path to put before every archive member.'''
Martin Geisler
archival: remove prefix argument from archivers...
r11558 if kind == 'files':
if prefix:
raise util.Abort(_('cannot give prefix when archiving to files'))
else:
prefix = tidyprefix(dest, kind, prefix)
Alexis S. L. Carvalho
archive: delay extraction of file revisions...
r4951 def write(name, mode, islink, getdata):
data = getdata()
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 if decode:
Matt Mackall
replace filehandle version of wwrite with wwritedata
r4005 data = repo.wwritedata(name, data)
Martin Geisler
archival: remove prefix argument from archivers...
r11558 archiver.addfile(prefix + name, mode, islink, data)
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112
Dirkjan Ochtman
cleanly abort on unknown archive type (issue966)
r6019 if kind not in archivers:
Martin Geisler
move % out of translatable strings...
r6913 raise util.Abort(_("unknown archive type '%s'") % kind)
Matt Mackall
manifest: remove execf/linkf methods
r6749
ctx = repo[node]
Martin Geisler
archival: remove prefix argument from archivers...
r11558 archiver = archivers[kind](dest, mtime or ctx.date()[0])
Matt Mackall
manifest: remove execf/linkf methods
r6749
Thomas Arendsen Hein
Add config option to disable putting .hg_archival.txt inside archives.
r6183 if repo.ui.configbool("ui", "archivemeta", True):
Gilles Moris
archive: add branch and tag informations to the .hg_archival.txt file...
r9614 def metadata():
base = 'repo: %s\nnode: %s\nbranch: %s\n' % (
Matt Mackall
branch: operate on branch names in local string space where possible...
r13047 repo[0].hex(), hex(node), encoding.fromlocal(ctx.branch()))
Gilles Moris
archive: add branch and tag informations to the .hg_archival.txt file...
r9614
tags = ''.join('tag: %s\n' % t for t in ctx.tags()
if repo.tagtype(t) == 'global')
if not tags:
repo.ui.pushbuffer()
opts = {'template': '{latesttag}\n{latesttagdistance}',
'style': '', 'patch': None, 'git': None}
cmdutil.show_changeset(repo.ui, repo, opts).show(ctx)
ltags, dist = repo.ui.popbuffer().split('\n')
tags = ''.join('latesttag: %s\n' % t for t in ltags.split(':'))
tags += 'latesttagdistance: %s\n' % dist
return base + tags
Thomas Arendsen Hein
archive: make progress only show files that are actually archived...
r16919 name = '.hg_archival.txt'
if not matchfn or matchfn(name):
write(name, 0644, False, metadata)
Gilles Moris
archive: add branch and tag informations to the .hg_archival.txt file...
r9614
Thomas Arendsen Hein
archive: make progress only show files that are actually archived...
r16919 if matchfn:
files = [f for f in ctx.manifest().keys() if matchfn(f)]
else:
files = ctx.manifest().keys()
files.sort()
total = len(files)
Martin Geisler
archive: add support for progress extension
r13143 repo.ui.progress(_('archiving'), 0, unit=_('files'), total=total)
Thomas Arendsen Hein
archive: make progress only show files that are actually archived...
r16919 for i, f in enumerate(files):
Matt Mackall
manifest: remove execf/linkf methods
r6749 ff = ctx.flags(f)
write(f, 'x' in ff and 0755 or 0644, 'l' in ff, ctx[f].data)
Martin Geisler
archive: add support for progress extension
r13143 repo.ui.progress(_('archiving'), i + 1, item=f,
unit=_('files'), total=total)
repo.ui.progress(_('archiving'), None)
Martin Geisler
subrepo: add support for 'hg archive'
r12323
if subrepos:
for subpath in ctx.substate:
sub = ctx.sub(subpath)
Martin Geisler
subrepo: add progress bar support to archive
r13144 sub.archive(repo.ui, archiver, prefix)
Martin Geisler
subrepo: add support for 'hg archive'
r12323
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 archiver.done()