~bzr-pqm/bzr/bzr.dev

# Copyright (C) 2005, 2006 Canonical Ltd

#

# This program is free software; you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by

# the Free Software Foundation; either version 2 of the License, or

# (at your option) any later version.

#

# This program is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

# GNU General Public License for more details.

#

# You should have received a copy of the GNU General Public License

# along with this program; if not, write to the Free Software

# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

from copy import deepcopy

from cStringIO import StringIO

import errno

import os

import shutil

import sys

from unittest import TestSuite

from warnings import warn

# FIXME: saxutils is (no longer) used in this module; might be better

# off checking it in the place it is actually used

try:

    import xml.sax.saxutils

except ImportError:

    raise ImportError("We were unable to import 'xml.sax.saxutils',"

                      " most likely you have an xml.pyc or xml.pyo file"

                      " lying around in your bzrlib directory."

                      " Please remove it.")

import bzrlib

import bzrlib.bzrdir as bzrdir

from bzrlib.config import TreeConfig

from bzrlib.decorators import needs_read_lock, needs_write_lock

from bzrlib.delta import compare_trees

import bzrlib.errors as errors

from bzrlib.errors import (BzrError, InvalidRevisionNumber, InvalidRevisionId,

                           NoSuchRevision, HistoryMissing, NotBranchError,

                           DivergedBranches, LockError,

                           UninitializableFormat,

                           UnlistableStore,

                           UnlistableBranch, NoSuchFile, NotVersionedError,

                           NoWorkingTree)

import bzrlib.inventory as inventory

from bzrlib.inventory import Inventory

from bzrlib.lockable_files import LockableFiles, TransportLock

from bzrlib.lockdir import LockDir

from bzrlib.osutils import (isdir, quotefn,

                            rename, splitpath, sha_file,

                            file_kind, abspath, normpath, pathjoin,

                            safe_unicode,

                            )

from bzrlib.textui import show_status

from bzrlib.trace import mutter, note

from bzrlib.tree import EmptyTree, RevisionTree

from bzrlib.repository import Repository

from bzrlib.revision import (

                             get_intervening_revisions,

                             is_ancestor,

                             NULL_REVISION,

                             Revision,

                             )

from bzrlib.store import copy_all

from bzrlib.symbol_versioning import *

import bzrlib.transactions as transactions

from bzrlib.transport import Transport, get_transport

from bzrlib.tree import EmptyTree, RevisionTree

import bzrlib.ui

import bzrlib.xml5

BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"

BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"

BZR_BRANCH_FORMAT_6 = "Bazaar-NG branch, format 6\n"

# TODO: Maybe include checks for common corruption of newlines, etc?

# TODO: Some operations like log might retrieve the same revisions

# repeatedly to calculate deltas.  We could perhaps have a weakref

# cache in memory to make this faster.  In general anything can be

# cached in memory between lock and unlock operations. .. nb thats

# what the transaction identity map provides

######################################################################

# branch objects

class Branch(object):

    """Branch holding a history of revisions.

    base

        Base directory/url of the branch.

    """

    # this is really an instance variable - FIXME move it there

    # - RBC 20060112

    base = None

    def __init__(self, *ignored, **ignored_too):

        raise NotImplementedError('The Branch class is abstract')

    @staticmethod

    @deprecated_method(zero_eight)

    def open_downlevel(base):

        """Open a branch which may be of an old format."""

        return Branch.open(base, _unsupported=True)

    @staticmethod

    def open(base, _unsupported=False):

        """Open the repository rooted at base.

        For instance, if the repository is at URL/.bzr/repository,

        Repository.open(URL) -> a Repository instance.

        """

        control = bzrdir.BzrDir.open(base, _unsupported)

        return control.open_branch(_unsupported)

    @staticmethod

    def open_containing(url):

        """Open an existing branch which contains url.

        This probes for a branch at url, and searches upwards from there.

        Basically we keep looking up until we find the control directory or

        run into the root.  If there isn't one, raises NotBranchError.

        If there is one and it is either an unrecognised format or an unsupported 

        format, UnknownFormatError or UnsupportedFormatError are raised.

        If there is one, it is returned, along with the unused portion of url.

        """

        control, relpath = bzrdir.BzrDir.open_containing(url)

        return control.open_branch(), relpath

    @staticmethod

    @deprecated_function(zero_eight)

    def initialize(base):

        """Create a new working tree and branch, rooted at 'base' (url)

        NOTE: This will soon be deprecated in favour of creation

        through a BzrDir.

        """

        return bzrdir.BzrDir.create_standalone_workingtree(base).branch

    def setup_caching(self, cache_root):

        """Subclasses that care about caching should override this, and set

        up cached stores located under cache_root.

        """

        # seems to be unused, 2006-01-13 mbp

        warn('%s is deprecated' % self.setup_caching)

        self.cache_root = cache_root

    def _get_nick(self):

        cfg = self.tree_config()

        return cfg.get_option(u"nickname", default=self.base.split('/')[-2])

    def _set_nick(self, nick):

        cfg = self.tree_config()

        cfg.set_option(nick, "nickname")

        assert cfg.get_option("nickname") == nick

    nick = property(_get_nick, _set_nick)

    def lock_write(self):

        raise NotImplementedError('lock_write is abstract')

    def lock_read(self):

        raise NotImplementedError('lock_read is abstract')

    def unlock(self):

        raise NotImplementedError('unlock is abstract')

    def peek_lock_mode(self):

        """Return lock mode for the Branch: 'r', 'w' or None"""

        raise NotImplementedError(self.peek_lock_mode)

    def abspath(self, name):

        """Return absolute filename for something in the branch

        XXX: Robert Collins 20051017 what is this used for? why is it a branch

        method and not a tree method.

        """

        raise NotImplementedError('abspath is abstract')

    def bind(self, other):

        """Bind the local branch the other branch.

        :param other: The branch to bind to

        :type other: Branch

        """

        raise errors.UpgradeRequired(self.base)

    @needs_write_lock

    def fetch(self, from_branch, last_revision=None, pb=None):

        """Copy revisions from from_branch into this branch.

        :param from_branch: Where to copy from.

        :param last_revision: What revision to stop at (None for at the end

                              of the branch.

        :param pb: An optional progress bar to use.

        Returns the copied revision count and the failed revisions in a tuple:

        (copied, failures).

        """

        if self.base == from_branch.base:

            raise Exception("can't fetch from a branch to itself %s, %s" % 

                            (self.base, to_branch.base))

        if pb is None:

            pb = bzrlib.ui.ui_factory.progress_bar()

        from_branch.lock_read()

        try:

            if last_revision is None:

                pb.update('get source history')

                from_history = from_branch.revision_history()

                if from_history:

                    last_revision = from_history[-1]

                else:

                    # no history in the source branch

                    last_revision = NULL_REVISION

            return self.repository.fetch(from_branch.repository,

                                         revision_id=last_revision,

                                         pb=pb)

        finally:

            from_branch.unlock()

    def get_bound_location(self):

        """Return the URL of the rbanch we are bound to.

        Older format branches cannot bind, please be sure to use a metadir

        branch.

        """

        return None

    def get_master_branch(self):

        """Return the branch we are bound to.

        :return: Either a Branch, or None

        """

        return None

    def get_root_id(self):

        """Return the id of this branches root"""

        raise NotImplementedError('get_root_id is abstract')

    def print_file(self, file, revision_id):

        """Print `file` to stdout."""

        raise NotImplementedError('print_file is abstract')

    def append_revision(self, *revision_ids):

        raise NotImplementedError('append_revision is abstract')

    def set_revision_history(self, rev_history):

        raise NotImplementedError('set_revision_history is abstract')

    def revision_history(self):

        """Return sequence of revision hashes on to this branch."""

        raise NotImplementedError('revision_history is abstract')

    def revno(self):

        """Return current revision number for this branch.

        That is equivalent to the number of revisions committed to

        this branch.

        """

        return len(self.revision_history())

    def unbind(self):

        """Older format branches cannot bind or unbind."""

        raise errors.UpgradeRequired(self.base)

    def last_revision(self):

        """Return last patch hash, or None if no history."""

        ph = self.revision_history()

        if ph:

            return ph[-1]

        else:

            return None

    def missing_revisions(self, other, stop_revision=None):

        """Return a list of new revisions that would perfectly fit.

        If self and other have not diverged, return a list of the revisions

        present in other, but missing from self.

        >>> from bzrlib.workingtree import WorkingTree

        >>> bzrlib.trace.silent = True

        >>> d1 = bzrdir.ScratchDir()

        >>> br1 = d1.open_branch()

        >>> wt1 = d1.open_workingtree()

        >>> d2 = bzrdir.ScratchDir()

        >>> br2 = d2.open_branch()

        >>> wt2 = d2.open_workingtree()

        >>> br1.missing_revisions(br2)

        []

        >>> wt2.commit("lala!", rev_id="REVISION-ID-1")

        >>> br1.missing_revisions(br2)

        [u'REVISION-ID-1']

        >>> br2.missing_revisions(br1)

        []

        >>> wt1.commit("lala!", rev_id="REVISION-ID-1")

        >>> br1.missing_revisions(br2)

        []

        >>> wt2.commit("lala!", rev_id="REVISION-ID-2A")

        >>> br1.missing_revisions(br2)

        [u'REVISION-ID-2A']

        >>> wt1.commit("lala!", rev_id="REVISION-ID-2B")

        >>> br1.missing_revisions(br2)

        Traceback (most recent call last):

        DivergedBranches: These branches have diverged.  Try merge.

        """

        self_history = self.revision_history()

        self_len = len(self_history)

        other_history = other.revision_history()

        other_len = len(other_history)

        common_index = min(self_len, other_len) -1

        if common_index >= 0 and \

            self_history[common_index] != other_history[common_index]:

            raise DivergedBranches(self, other)

        if stop_revision is None:

            stop_revision = other_len

        else:

            assert isinstance(stop_revision, int)

            if stop_revision > other_len:

                raise bzrlib.errors.NoSuchRevision(self, stop_revision)

        return other_history[self_len:stop_revision]

    def update_revisions(self, other, stop_revision=None):

        """Pull in new perfect-fit revisions.

        :param other: Another Branch to pull from

        :param stop_revision: Updated until the given revision

        :return: None

        """

        raise NotImplementedError('update_revisions is abstract')

    def pullable_revisions(self, other, stop_revision):

        raise NotImplementedError('pullable_revisions is abstract')

    def revision_id_to_revno(self, revision_id):

        """Given a revision id, return its revno"""

        if revision_id is None:

            return 0

        history = self.revision_history()

        try:

            return history.index(revision_id) + 1

        except ValueError:

            raise bzrlib.errors.NoSuchRevision(self, revision_id)

    def get_rev_id(self, revno, history=None):

        """Find the revision id of the specified revno."""

        if revno == 0:

            return None

        if history is None:

            history = self.revision_history()

        elif revno <= 0 or revno > len(history):

            raise bzrlib.errors.NoSuchRevision(self, revno)

        return history[revno - 1]

    def pull(self, source, overwrite=False, stop_revision=None):

        raise NotImplementedError('pull is abstract')

    def basis_tree(self):

        """Return `Tree` object for last revision.

        If there are no revisions yet, return an `EmptyTree`.

        """

        return self.repository.revision_tree(self.last_revision())

    def rename_one(self, from_rel, to_rel):

        """Rename one file.

        This can change the directory or the filename or both.

        """

        raise NotImplementedError('rename_one is abstract')

    def move(self, from_paths, to_name):

        """Rename files.

        to_name must exist as a versioned directory.

        If to_name exists and is a directory, the files are moved into

        it, keeping their old names.  If it is a directory, 

        Note that to_name is only the last component of the new name;

        this doesn't change the directory.

        This returns a list of (from_path, to_path) pairs for each

        entry that is moved.

        """

        raise NotImplementedError('move is abstract')

    def get_parent(self):

        """Return the parent location of the branch.

        This is the default location for push/pull/missing.  The usual

        pattern is that the user can override it by specifying a

        location.

        """

        raise NotImplementedError('get_parent is abstract')

    def get_push_location(self):

        """Return the None or the location to push this branch to."""

        raise NotImplementedError('get_push_location is abstract')

    def set_push_location(self, location):

        """Set a new push location for this branch."""

        raise NotImplementedError('set_push_location is abstract')

    def set_parent(self, url):

        raise NotImplementedError('set_parent is abstract')

    @needs_write_lock

    def update(self):

        """Synchronise this branch with the master branch if any. 

        :return: None or the last_revision pivoted out during the update.

        """

        return None

    def check_revno(self, revno):

        """\

        Check whether a revno corresponds to any revision.

        Zero (the NULL revision) is considered valid.

        """

        if revno != 0:

            self.check_real_revno(revno)

    def check_real_revno(self, revno):

        """\

        Check whether a revno corresponds to a real revision.

        Zero (the NULL revision) is considered invalid

        """

        if revno < 1 or revno > self.revno():

            raise InvalidRevisionNumber(revno)

    @needs_read_lock

    def clone(self, *args, **kwargs):

        """Clone this branch into to_bzrdir preserving all semantic values.

        revision_id: if not None, the revision history in the new branch will

                     be truncated to end with revision_id.

        """

        # for API compatability, until 0.8 releases we provide the old api:

        # def clone(self, to_location, revision=None, basis_branch=None, to_branch_format=None):

        # after 0.8 releases, the *args and **kwargs should be changed:

        # def clone(self, to_bzrdir, revision_id=None):

        if (kwargs.get('to_location', None) or

            kwargs.get('revision', None) or

            kwargs.get('basis_branch', None) or

            (len(args) and isinstance(args[0], basestring))):

            # backwards compatability api:

            warn("Branch.clone() has been deprecated for BzrDir.clone() from"

                 " bzrlib 0.8.", DeprecationWarning, stacklevel=3)

            # get basis_branch

            if len(args) > 2:

                basis_branch = args[2]

            else:

                basis_branch = kwargs.get('basis_branch', None)

            if basis_branch:

                basis = basis_branch.bzrdir

            else:

                basis = None

            # get revision

            if len(args) > 1:

                revision_id = args[1]

            else:

                revision_id = kwargs.get('revision', None)

            # get location

            if len(args):

                url = args[0]

            else:

                # no default to raise if not provided.

                url = kwargs.get('to_location')

            return self.bzrdir.clone(url,

                                     revision_id=revision_id,

                                     basis=basis).open_branch()

        # new cleaner api.

        # generate args by hand 

        if len(args) > 1:

            revision_id = args[1]

        else:

            revision_id = kwargs.get('revision_id', None)

        if len(args):

            to_bzrdir = args[0]

        else:

            # no default to raise if not provided.

            to_bzrdir = kwargs.get('to_bzrdir')

        result = self._format.initialize(to_bzrdir)

        self.copy_content_into(result, revision_id=revision_id)

        return  result

    @needs_read_lock

    def sprout(self, to_bzrdir, revision_id=None):

        """Create a new line of development from the branch, into to_bzrdir.

        revision_id: if not None, the revision history in the new branch will

                     be truncated to end with revision_id.

        """

        result = self._format.initialize(to_bzrdir)

        self.copy_content_into(result, revision_id=revision_id)

        result.set_parent(self.bzrdir.root_transport.base)

        return result

    @needs_read_lock

    def copy_content_into(self, destination, revision_id=None):

        """Copy the content of self into destination.

        revision_id: if not None, the revision history in the new branch will

                     be truncated to end with revision_id.

        """

        new_history = self.revision_history()

        if revision_id is not None:

            try:

                new_history = new_history[:new_history.index(revision_id) + 1]

            except ValueError:

                rev = self.repository.get_revision(revision_id)

                new_history = rev.get_history(self.repository)[1:]

        destination.set_revision_history(new_history)

        parent = self.get_parent()

        if parent:

            destination.set_parent(parent)

class BranchFormat(object):

    """An encapsulation of the initialization and open routines for a format.

    Formats provide three things:

     * An initialization routine,

     * a format string,

     * an open routine.

    Formats are placed in an dict by their format string for reference 

    during branch opening. Its not required that these be instances, they

    can be classes themselves with class methods - it simply depends on 

    whether state is needed for a given format or not.

    Once a format is deprecated, just deprecate the initialize and open

    methods on the format class. Do not deprecate the object, as the 

    object will be created every time regardless.

    """

    _default_format = None

    """The default format used for new branches."""

    _formats = {}

    """The known formats."""

    @classmethod

    def find_format(klass, a_bzrdir):

        """Return the format for the branch object in a_bzrdir."""

        try:

            transport = a_bzrdir.get_branch_transport(None)

            format_string = transport.get("format").read()

            return klass._formats[format_string]

        except NoSuchFile:

            raise NotBranchError(path=transport.base)

        except KeyError:

            raise errors.UnknownFormatError(format_string)

    @classmethod

    def get_default_format(klass):

        """Return the current default format."""

        return klass._default_format

    def get_format_string(self):

        """Return the ASCII format string that identifies this format."""

        raise NotImplementedError(self.get_format_string)

    def initialize(self, a_bzrdir):

        """Create a branch of this format in a_bzrdir."""

        raise NotImplementedError(self.initialized)

    def is_supported(self):

        """Is this format supported?

        Supported formats can be initialized and opened.

        Unsupported formats may not support initialization or committing or 

        some other features depending on the reason for not being supported.

        """

        return True

    def open(self, a_bzrdir, _found=False):

        """Return the branch object for a_bzrdir

        _found is a private parameter, do not use it. It is used to indicate

               if format probing has already be done.

        """

        raise NotImplementedError(self.open)

    @classmethod

    def register_format(klass, format):

        klass._formats[format.get_format_string()] = format

    @classmethod

    def set_default_format(klass, format):

        klass._default_format = format

    @classmethod

    def unregister_format(klass, format):

        assert klass._formats[format.get_format_string()] is format

        del klass._formats[format.get_format_string()]

class BzrBranchFormat4(BranchFormat):

    """Bzr branch format 4.

    This format has:

     - a revision-history file.

     - a branch-lock lock file [ to be shared with the bzrdir ]

    """

    def initialize(self, a_bzrdir):

        """Create a branch of this format in a_bzrdir."""

        mutter('creating branch in %s', a_bzrdir.transport.base)

        branch_transport = a_bzrdir.get_branch_transport(self)

        utf8_files = [('revision-history', ''),

                      ('branch-name', ''),

                      ]

        control_files = LockableFiles(branch_transport, 'branch-lock',

                                      TransportLock)

        control_files.create_lock()

        control_files.lock_write()

        try:

            for file, content in utf8_files:

                control_files.put_utf8(file, content)

        finally:

            control_files.unlock()

        return self.open(a_bzrdir, _found=True)

    def __init__(self):

        super(BzrBranchFormat4, self).__init__()

        self._matchingbzrdir = bzrdir.BzrDirFormat6()

    def open(self, a_bzrdir, _found=False):

        """Return the branch object for a_bzrdir

        _found is a private parameter, do not use it. It is used to indicate

               if format probing has already be done.

        """

        if not _found:

            # we are being called directly and must probe.

            raise NotImplementedError

        return BzrBranch(_format=self,

                         _control_files=a_bzrdir._control_files,

                         a_bzrdir=a_bzrdir,

                         _repository=a_bzrdir.open_repository())

class BzrBranchFormat5(BranchFormat):

    """Bzr branch format 5.

    This format has:

     - a revision-history file.

     - a format string

     - a lock dir guarding the branch itself

     - all of this stored in a branch/ subdirectory

     - works with shared repositories.

    This format is new in bzr 0.8.

    """

    def get_format_string(self):

        """See BranchFormat.get_format_string()."""

        return "Bazaar-NG branch format 5\n"

    def initialize(self, a_bzrdir):

        """Create a branch of this format in a_bzrdir."""

        mutter('creating branch %r in %s', self, a_bzrdir.transport.base)

        branch_transport = a_bzrdir.get_branch_transport(self)

        utf8_files = [('revision-history', ''),

                      ('branch-name', ''),

                      ]

        control_files = LockableFiles(branch_transport, 'lock', LockDir)

        control_files.create_lock()

        control_files.lock_write()

        control_files.put_utf8('format', self.get_format_string())

        try:

            for file, content in utf8_files:

                control_files.put_utf8(file, content)

        finally:

            control_files.unlock()

        return self.open(a_bzrdir, _found=True, )

    def __init__(self):

        super(BzrBranchFormat5, self).__init__()

        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()

    def open(self, a_bzrdir, _found=False):

        """Return the branch object for a_bzrdir

        _found is a private parameter, do not use it. It is used to indicate

               if format probing has already be done.

        """

        if not _found:

            format = BranchFormat.find_format(a_bzrdir)

            assert format.__class__ == self.__class__

        transport = a_bzrdir.get_branch_transport(None)

        control_files = LockableFiles(transport, 'lock', LockDir)

        return BzrBranch5(_format=self,

                          _control_files=control_files,

                          a_bzrdir=a_bzrdir,

                          _repository=a_bzrdir.find_repository())

    def __str__(self):

        return "Bazaar-NG Metadir branch format 5"

class BranchReferenceFormat(BranchFormat):

    """Bzr branch reference format.

    Branch references are used in implementing checkouts, they

    act as an alias to the real branch which is at some other url.

    This format has:

     - A location file

     - a format string

    """

    def get_format_string(self):

        """See BranchFormat.get_format_string()."""

        return "Bazaar-NG Branch Reference Format 1\n"

    def initialize(self, a_bzrdir, target_branch=None):

        """Create a branch of this format in a_bzrdir."""

        if target_branch is None:

            # this format does not implement branch itself, thus the implicit

            # creation contract must see it as uninitializable

            raise errors.UninitializableFormat(self)

        mutter('creating branch reference in %s', a_bzrdir.transport.base)

        branch_transport = a_bzrdir.get_branch_transport(self)

        # FIXME rbc 20060209 one j-a-ms encoding branch lands this str() cast is not needed.

        branch_transport.put('location', StringIO(str(target_branch.bzrdir.root_transport.base)))

        branch_transport.put('format', StringIO(self.get_format_string()))

        return self.open(a_bzrdir, _found=True)

    def __init__(self):

        super(BranchReferenceFormat, self).__init__()

        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()

    def _make_reference_clone_function(format, a_branch):

        """Create a clone() routine for a branch dynamically."""

        def clone(to_bzrdir, revision_id=None):

            """See Branch.clone()."""

            return format.initialize(to_bzrdir, a_branch)

            # cannot obey revision_id limits when cloning a reference ...

            # FIXME RBC 20060210 either nuke revision_id for clone, or

            # emit some sort of warning/error to the caller ?!

        return clone

    def open(self, a_bzrdir, _found=False):

        """Return the branch that the branch reference in a_bzrdir points at.