##// END OF EJS Templates
dirstate: ignore symlinks when fs cannot handle them (issue1888)...
dirstate: ignore symlinks when fs cannot handle them (issue1888) When the filesystem cannot handle the executable bit, we currently ignore it completely when looking for modified files. Similarly, it is impossible to set or clear the bit when the filesystem ignores it. This patch makes Mercurial treat symbolic links the same way. Symlinks are a little different since they manifest themselves as small files containing a filename (the symlink target). On Windows, these files show up as regular files, and on Linux and Mac they show up as real symlinks. Issue1888 presents a case where the symlink files are better ignored from the Windows side. A Linux client creates symlinks in a working copy which is shared over a network between Linux and Windows clients. The Samba server is helpful and defererences the symlink when the Windows client looks at it. This means that Mercurial on the Windows side sees file content instead of a file name in the symlink, and hence flags the link as modified. Ignoring the change would be much more helpful, similarly to how Mercurial does not report any changes when executable bits are ignored in a checkout on Windows. An initial checkout of a symbolic link on a file system that cannot handle symbolic links will still result in a regular file containing the target file name as its content. Sharing such a checkout with a Linux client will not turn the file into a symlink automatically, but 'hg revert' can fix that. After the revert, the Windows client will see the correct file content (provided by the Samba server when it follows the link on the Linux side) and otherwise ignore the change. Running 'hg perfstatus' 10 times gives these results: Before: After: min: 0.544703 min: 0.546549 med: 0.547592 med: 0.548881 avg: 0.549146 avg: 0.548549 max: 0.564112 max: 0.551504 The median time is increased about 0.24%.

File last commit:

r11558:d8f64584 default
r11769:ca6cebd8 stable
Show More
archival.py
244 lines | 8.1 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
Simon Heimberg
separate import lines from mercurial and general python modules
r8312 import util
import cStringIO, os, stat, 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
def tidyprefix(dest, prefix, suffixes):
'''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()
for sfx in suffixes:
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
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
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')
Vadim Gelfer
use commit time as mtime for file archives....
r2477 def __init__(self, dest, prefix, mtime, kind=''):
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 self.prefix = tidyprefix(dest, prefix, ['.tar', '.tar.bz2', '.tar.gz',
Thomas Arendsen Hein
Fixed directory name having an extra dot on "hg archive -t tbz2 foo.tbz2"....
r3615 '.tgz', '.tbz2'])
Vadim Gelfer
use commit time as mtime for file archives....
r2477 self.mtime = mtime
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)
return tarfile.TarFile.taropen(name, mode, gzfileobj)
else:
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):
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 i = tarfile.TarInfo(self.prefix + name)
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()
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.'''
Vadim Gelfer
use commit time as mtime for file archives....
r2477 def __init__(self, dest, prefix, mtime, compress=True):
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 self.prefix = tidyprefix(dest, prefix, ('.zip',))
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)
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):
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 i = zipfile.ZipInfo(self.prefix + name, self.date_time)
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
Alexis S. L. Carvalho
archive: add symlink support
r4831 ftype = stat.S_IFREG
if islink:
mode = 0777
ftype = stat.S_IFLNK
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.'''
Vadim Gelfer
use commit time as mtime for file archives....
r2477 def __init__(self, name, prefix, mtime):
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 if prefix:
raise util.Abort(_('cannot give prefix when archiving to files'))
self.basedir = name
Alexis S. L. Carvalho
archive: use util.opener when archiving files....
r4830 self.opener = util.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)
f.rename()
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,
Vadim Gelfer
use commit time as mtime for file archives....
r2477 'tbz2': lambda name, prefix, mtime: tarit(name, prefix, mtime, 'bz2'),
'tgz': lambda name, prefix, mtime: tarit(name, prefix, mtime, 'gz'),
'uzip': lambda name, prefix, mtime: zipit(name, prefix, 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,
Vadim Gelfer
use commit time as mtime for file archives....
r2477 prefix=None, mtime=None):
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.'''
Alexis S. L. Carvalho
archive: delay extraction of file revisions...
r4951 def write(name, mode, islink, getdata):
Matt Mackall
many, many trivial check-code fixups
r10282 if matchfn and not matchfn(name):
return
Alexis S. L. Carvalho
archive: delay extraction of file revisions...
r4951 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)
Alexis S. L. Carvalho
archive: add symlink support
r4831 archiver.addfile(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]
Benoit Boissinot
archival.py: use contexts
r3968 archiver = archivers[kind](dest, prefix, 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' % (
hex(repo.changelog.node(0)), hex(node), ctx.branch())
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
write('.hg_archival.txt', 0644, False, metadata)
Matt Mackall
manifest: remove execf/linkf methods
r6749 for f in ctx:
ff = ctx.flags(f)
write(f, 'x' in ff and 0755 or 0644, 'l' in ff, ctx[f].data)
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 archiver.done()