##// END OF EJS Templates
filectx: add an overlayfilectx class...
filectx: add an overlayfilectx class The end goal is to make it possible to avoid potential expensive fctx.data() when unnecessary. While memctx is useful for creating new file contexts, there are many cases where we could reuse an existing raw file revision (amend, histedit, rebase, process a revision constructed by a remote peer, etc). The overlayfilectx class is made to support such reuse cases. Together with a later patch, hash calculation and expensive flag processor could be avoided.

File last commit:

r29612:a234b32b stable
r32239:07da778f default
Show More
bzr.py
297 lines | 11.3 KiB | text/x-python | PythonLexer
Martin Geisler
convert: add copyright and license headers to back-ends
r8250 # bzr.py - bzr support for the convert extension
#
# Copyright 2008, 2009 Marek Kubica <marek@xivilization.net> and others
#
# 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.
Martin Geisler
convert: add copyright and license headers to back-ends
r8250
Marek Kubica
convert: add bzr source
r7053 # This module is for handling 'bzr', that was formerly known as Bazaar-NG;
# it cannot access 'bar' repositories, but they were never used very much
timeless
convert: bzr use absolute_import
r28411 from __future__ import absolute_import
Marek Kubica
convert: add bzr source
r7053
import os
Yuya Nishihara
py3: move up symbol imports to enforce import-checker rules...
r29205
from mercurial.i18n import _
timeless
convert: bzr use absolute_import
r28411 from mercurial import (
demandimport,
error
)
from . import common
Marek Kubica
convert: add bzr source
r7053 # these do not work with demandimport, blacklist
demandimport.ignore.extend([
'bzrlib.transactions',
'bzrlib.urlutils',
Pierre-Yves David
Add ElementPath to the list of package ignored by demand import...
r10560 'ElementPath',
Marek Kubica
convert: add bzr source
r7053 ])
try:
# bazaar imports
timeless
convert: bzr use absolute_import
r28479 import bzrlib.bzrdir
import bzrlib.errors
import bzrlib.revision
import bzrlib.revisionspec.RevisionSpec
bzrdir = bzrlib.bzrdir
errors = bzrlib.errors
revision = bzrlib.revision
revisionspec = bzrlib.revisionspec
Marek Kubica
convert: add bzr source
r7053 except ImportError:
pass
Patrick Mezard
convert/bzr: fix file rename replaced by a dir case (issue1583)...
r8045 supportedkinds = ('file', 'symlink')
timeless
convert: bzr use absolute_import
r28411 class bzr_source(common.converter_source):
Marek Kubica
convert: add bzr source
r7053 """Reads Bazaar repositories by using the Bazaar Python libraries"""
Durham Goode
convert: add support for specifying multiple revs...
r25748 def __init__(self, ui, path, revs=None):
super(bzr_source, self).__init__(ui, path, revs=revs)
Marek Kubica
convert: add bzr source
r7053
Matt Mackall
convert: attempt to check repo type before checking for tool
r7973 if not os.path.exists(os.path.join(path, '.bzr')):
timeless
convert: bzr use absolute_import
r28411 raise common.NoRepo(_('%s does not look like a Bazaar repository')
% path)
Matt Mackall
convert: attempt to check repo type before checking for tool
r7973
Marek Kubica
convert: add bzr source
r7053 try:
# access bzrlib stuff
Patrick Mezard
convert/bzr: convert all branches (issue3229) (BC)...
r16060 bzrdir
Marek Kubica
convert: add bzr source
r7053 except NameError:
timeless
convert: bzr use absolute_import
r28411 raise common.NoRepo(_('Bazaar modules could not be loaded'))
Marek Kubica
convert: add bzr source
r7053
path = os.path.abspath(path)
Patrick Mezard
convert/bzr: warn when source is a lightweight checkout (issue1647)
r8470 self._checkrepotype(path)
Patrick Mezard
convert/bzr: convert all branches (issue3229) (BC)...
r16060 try:
self.sourcerepo = bzrdir.BzrDir.open(path).open_repository()
except errors.NoRepositoryPresent:
timeless
convert: bzr use absolute_import
r28411 raise common.NoRepo(_('%s does not look like a Bazaar repository')
% path)
Marek Kubica
convert: add bzr source
r7053 self._parentids = {}
Patrick Mezard
convert/bzr: warn when source is a lightweight checkout (issue1647)
r8470 def _checkrepotype(self, path):
# Lightweight checkouts detection is informational but probably
# fragile at API level. It should not terminate the conversion.
try:
dir = bzrdir.BzrDir.open_containing(path)[0]
try:
tree = dir.open_workingtree(recommend_upgrade=False)
branch = tree.branch
Brodie Rao
cleanup: remove unused variables
r12063 except (errors.NoWorkingTree, errors.NotLocalUrl):
Patrick Mezard
convert/bzr: warn when source is a lightweight checkout (issue1647)
r8470 tree = None
branch = dir.open_branch()
if (tree is not None and tree.bzrdir.root_transport.base !=
branch.bzrdir.root_transport.base):
self.ui.warn(_('warning: lightweight checkouts may cause '
'conversion failures, try with a regular '
'branch instead.\n'))
Brodie Rao
cleanup: replace naked excepts with except Exception: ...
r16689 except Exception:
Patrick Mezard
convert/bzr: warn when source is a lightweight checkout (issue1647)
r8470 self.ui.note(_('bzr source type could not be determined\n'))
Marek Kubica
convert: add bzr source
r7053 def before(self):
"""Before the conversion begins, acquire a read lock
for all the operations that might need it. Fortunately
read locks don't block other reads or writes to the
repository, so this shouldn't have any impact on the usage of
the source repository.
The alternative would be locking on every operation that
needs locks (there are currently two: getting the file and
getting the parent map) and releasing immediately after,
but this approach can take even 40% longer."""
self.sourcerepo.lock_read()
def after(self):
self.sourcerepo.unlock()
Patrick Mezard
convert/bzr: ignore nested repos when listing branches (issue3254)...
r16099 def _bzrbranches(self):
return self.sourcerepo.find_branches(using=True)
Marek Kubica
convert: add bzr source
r7053 def getheads(self):
Durham Goode
convert: add support for specifying multiple revs...
r25748 if not self.revs:
Patrick Mezard
convert/bzr: ignore nested repos when listing branches (issue3254)...
r16099 # Set using=True to avoid nested repositories (see issue3254)
heads = sorted([b.last_revision() for b in self._bzrbranches()])
Patrick Mezard
convert/bzr: convert all branches (issue3229) (BC)...
r16060 else:
revid = None
Patrick Mezard
convert/bzr: ignore nested repos when listing branches (issue3254)...
r16099 for branch in self._bzrbranches():
Patrick Mezard
convert/bzr: convert all branches (issue3229) (BC)...
r16060 try:
timeless
convert: bzr use absolute_import
r28479 r = revisionspec.RevisionSpec.from_string(self.revs[0])
Patrick Mezard
convert/bzr: convert all branches (issue3229) (BC)...
r16060 info = r.in_history(branch)
except errors.BzrError:
pass
revid = info.rev_id
if revid is None:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('%s is not a valid revision')
% self.revs[0])
Patrick Mezard
convert/bzr: convert all branches (issue3229) (BC)...
r16060 heads = [revid]
Patrick Mezard
convert/bzr: handle empty bzr repositories (issue3233)
r16061 # Empty repositories return 'null:', which cannot be retrieved
heads = [h for h in heads if h != 'null:']
Patrick Mezard
convert/bzr: convert all branches (issue3229) (BC)...
r16060 return heads
Marek Kubica
convert: add bzr source
r7053
def getfile(self, name, rev):
revtree = self.sourcerepo.revision_tree(rev)
Brendan Cully
bzr convert: restore paths to source encoding. Closes issue1692.
r8783 fileid = revtree.path2id(name.decode(self.encoding or 'utf-8'))
Patrick Mezard
convert/bzr: fix symlinks target (issue1626/2)
r8423 kind = None
if fileid is not None:
kind = revtree.kind(fileid)
if kind not in supportedkinds:
Marek Kubica
convert: add bzr source
r7053 # the file is not available anymore - was deleted
Mads Kiilerich
convert: use None value for missing files instead of overloading IOError...
r22296 return None, None
Patrick Mezard
convert: merge sources getmode() into getfile()
r11134 mode = self._modecache[(name, rev)]
Patrick Mezard
convert/bzr: fix symlinks target (issue1626/2)
r8423 if kind == 'symlink':
target = revtree.get_symlink_target(fileid)
if target is None:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('%s.%s symlink has no target')
Patrick Mezard
convert/bzr: fix symlinks target (issue1626/2)
r8423 % (name, rev))
Patrick Mezard
convert: merge sources getmode() into getfile()
r11134 return target, mode
Patrick Mezard
convert/bzr: fix symlinks target (issue1626/2)
r8423 else:
sio = revtree.get_file(fileid)
Patrick Mezard
convert: merge sources getmode() into getfile()
r11134 return sio.read(), mode
Marek Kubica
convert: add bzr source
r7053
Mads Kiilerich
convert: introduce --full for converting all files...
r22300 def getchanges(self, version, full):
if full:
timeless@mozdev.org
grammar: use does instead of do where appropriate
r26779 raise error.Abort(_("convert from cvs does not support --full"))
Marek Kubica
convert: add bzr source
r7053 self._modecache = {}
self._revtree = self.sourcerepo.revision_tree(version)
# get the parentids from the cache
parentids = self._parentids.pop(version)
# only diff against first parent id
prevtree = self.sourcerepo.revision_tree(parentids[0])
Mads Kiilerich
convert: optimize convert of files that are unmodified from p2 in merges...
r24395 files, changes = self._gettreechanges(self._revtree, prevtree)
return files, changes, set()
Marek Kubica
convert: add bzr source
r7053
def getcommit(self, version):
rev = self.sourcerepo.get_revision(version)
# populate parent id cache
if not rev.parent_ids:
parents = []
self._parentids[version] = (revision.NULL_REVISION,)
else:
parents = self._filterghosts(rev.parent_ids)
self._parentids[version] = parents
Patrick Mezard
convert/bzr: convert all branches (issue3229) (BC)...
r16060 branch = self.recode(rev.properties.get('branch-nick', u'default'))
if branch == 'trunk':
branch = 'default'
timeless
convert: bzr use absolute_import
r28411 return common.commit(parents=parents,
Greg Ward
convert/bzr: handle Bazaar timestamps correctly (issue1652).
r8305 date='%d %d' % (rev.timestamp, -rev.timezone),
Marek Kubica
convert: add bzr source
r7053 author=self.recode(rev.committer),
desc=self.recode(rev.message),
Patrick Mezard
convert/bzr: convert all branches (issue3229) (BC)...
r16060 branch=branch,
Marek Kubica
convert: add bzr source
r7053 rev=version)
def gettags(self):
bytetags = {}
Patrick Mezard
convert/bzr: ignore nested repos when listing branches (issue3254)...
r16099 for branch in self._bzrbranches():
Patrick Mezard
convert/bzr: convert all branches (issue3229) (BC)...
r16060 if not branch.supports_tags():
return {}
tagdict = branch.tags.get_tag_dict()
for name, rev in tagdict.iteritems():
bytetags[self.recode(name)] = rev
Marek Kubica
convert: add bzr source
r7053 return bytetags
def getchangedfiles(self, rev, i):
self._modecache = {}
curtree = self.sourcerepo.revision_tree(rev)
if i is not None:
Patrick Mezard
convert/bzr: make it work with filemaps (issue1631)...
r8165 parentid = self._parentids[rev][i]
Marek Kubica
convert: add bzr source
r7053 else:
# no parent id, get the empty revision
parentid = revision.NULL_REVISION
prevtree = self.sourcerepo.revision_tree(parentid)
changes = [e[0] for e in self._gettreechanges(curtree, prevtree)[0]]
return changes
def _gettreechanges(self, current, origin):
Benoit Boissinot
fix coding style (reported by pylint)
r10394 revid = current._revision_id
Marek Kubica
convert: add bzr source
r7053 changes = []
renames = {}
Patrick Mezard
convert/bzr: correctly handle divergent nested renames (issue3089)...
r15461 seen = set()
# Process the entries by reverse lexicographic name order to
# handle nested renames correctly, most specific first.
curchanges = sorted(current.iter_changes(origin),
key=lambda c: c[1][0] or c[1][1],
reverse=True)
Marek Kubica
convert: add bzr source
r7053 for (fileid, paths, changed_content, versioned, parent, name,
Patrick Mezard
convert/bzr: correctly handle divergent nested renames (issue3089)...
r15461 kind, executable) in curchanges:
Marek Kubica
convert: add bzr source
r7053
if paths[0] == u'' or paths[1] == u'':
# ignore changes to tree root
continue
# bazaar tracks directories, mercurial does not, so
# we have to rename the directory contents
if kind[1] == 'directory':
Patrick Mezard
convert/bzr: handle files replaced by directories (issue1623)
r8126 if kind[0] not in (None, 'directory'):
# Replacing 'something' with a directory, record it
# so it can be removed.
changes.append((self.recode(paths[0]), revid))
Patrick Mezard
convert/bzr: correctly handle divergent nested renames (issue3089)...
r15461 if kind[0] == 'directory' and None not in paths:
renaming = paths[0] != paths[1]
Marek Kubica
convert: add bzr source
r7053 # neither an add nor an delete - a move
# rename all directory contents manually
Kevin Bullock
convert: update use of deprecated bzrlib property...
r29612 subdir = origin.root_inventory.path2id(paths[0])
Marek Kubica
convert: add bzr source
r7053 # get all child-entries of the directory
Kevin Bullock
convert: update use of deprecated bzrlib property...
r29612 for name, entry in origin.root_inventory.iter_entries(
subdir):
Marek Kubica
convert: add bzr source
r7053 # hg does not track directory renames
if entry.kind == 'directory':
continue
frompath = self.recode(paths[0] + '/' + name)
Patrick Mezard
convert/bzr: correctly handle divergent nested renames (issue3089)...
r15461 if frompath in seen:
# Already handled by a more specific change entry
# This is important when you have:
# a => b
# a/c => a/c
# Here a/c must not be renamed into b/c
continue
seen.add(frompath)
if not renaming:
continue
Marek Kubica
convert: add bzr source
r7053 topath = self.recode(paths[1] + '/' + name)
# register the files as changed
changes.append((frompath, revid))
changes.append((topath, revid))
# add to mode cache
Matt Mackall
many, many trivial check-code fixups
r10282 mode = ((entry.executable and 'x')
or (entry.kind == 'symlink' and 's')
Marek Kubica
convert: add bzr source
r7053 or '')
self._modecache[(topath, revid)] = mode
# register the change as move
renames[topath] = frompath
Mads Kiilerich
fix trivial spelling errors
r17424 # no further changes, go to the next change
Marek Kubica
convert: add bzr source
r7053 continue
# we got unicode paths, need to convert them
Patrick Mezard
convert/bzr: expect unicode metadata, encode in UTF-8 (issue3232)...
r16059 path, topath = paths
if path is not None:
path = self.recode(path)
if topath is not None:
topath = self.recode(topath)
Patrick Mezard
convert/bzr: correctly handle divergent nested renames (issue3089)...
r15461 seen.add(path or topath)
Marek Kubica
convert: add bzr source
r7053
if topath is None:
# file deleted
changes.append((path, revid))
continue
# renamed
if path and path != topath:
renames[topath] = path
Xavier ALT
convert: remove renamed source files (issue1505)
r8035 changes.append((path, revid))
Marek Kubica
convert: add bzr source
r7053
# populate the mode cache
kind, executable = [e[1] for e in (kind, executable)]
Patrick Mezard
convert/bzr: fix symlink handling (issue1626)
r8148 mode = ((executable and 'x') or (kind == 'symlink' and 'l')
Marek Kubica
convert: add bzr source
r7053 or '')
self._modecache[(topath, revid)] = mode
changes.append((topath, revid))
return changes, renames
def _filterghosts(self, ids):
"""Filters out ghost revisions which hg does not support, see
<http://bazaar-vcs.org/GhostRevision>
"""
parentmap = self.sourcerepo.get_parent_map(ids)
Dirkjan Ochtman
convert: fixed python2.3 incompatibility in bzr source (generator expression)
r7060 parents = tuple([parent for parent in ids if parent in parentmap])
Marek Kubica
convert: add bzr source
r7053 return parents