~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

# XXX: Can we do any better about making interrupted commits change

# nothing?  Perhaps the best approach is to integrate commit of

# AtomicFiles with releasing the lock on the Branch.

# TODO: Separate 'prepare' phase where we find a list of potentially

# committed files.  We then can then pause the commit to prompt for a

# commit message, knowing the summary will be the same as what's

# actually used for the commit.  (But perhaps simpler to simply get

# the tree status, then use that for a selective commit?)

# The newly committed revision is going to have a shape corresponding

# to that of the working inventory.  Files that are not in the

# working tree and that were in the predecessor are reported as

# removed --- this can include files that were either removed from the

# inventory or deleted in the working tree.  If they were only

# deleted from disk, they are removed from the working inventory.

# We then consider the remaining entries, which will be in the new

# version.  Directory entries are simply copied across.  File entries

# must be checked to see if a new version of the file should be

# recorded.  For each parent revision inventory, we check to see what

# version of the file was present.  If the file was present in at

# least one tree, and if it was the same version in all the trees,

# then we can just refer to that version.  Otherwise, a new version

# representing the merger of the file versions must be added.

# TODO: Update hashcache before and after - or does the WorkingTree

# look after that?

# TODO: Rather than mashing together the ancestry and storing it back,

# perhaps the weave should have single method which does it all in one

# go, avoiding a lot of redundant work.

# TODO: Perhaps give a warning if one of the revisions marked as

# merged is already in the ancestry, and then don't record it as a

# distinct parent.

# TODO: If the file is newly merged but unchanged from the version it

# merges from, then it should still be reported as newly added

# relative to the basis revision.

# TODO: Do checks that the tree can be committed *before* running the 

# editor; this should include checks for a pointless commit and for 

# unknown or missing files.

# TODO: If commit fails, leave the message in a file somewhere.

import os

import re

import sys

import time

import warnings

from cStringIO import StringIO

from bzrlib.atomicfile import AtomicFile

import bzrlib.config

import bzrlib.errors as errors

from bzrlib.errors import (BzrError, PointlessCommit,

                           ConflictsInTree,

                           StrictCommitFailed

                           )

from bzrlib.osutils import (kind_marker, isdir,isfile, is_inside_any, 

                            is_inside_or_parent_of_any,

                            quotefn, sha_file, split_lines)

from bzrlib.testament import Testament

from bzrlib.trace import mutter, note, warning

from bzrlib.xml5 import serializer_v5

from bzrlib.inventory import Inventory, ROOT_ID, InventoryEntry

from bzrlib.symbol_versioning import (deprecated_passed,

        deprecated_function,

        zero_seven,

        DEPRECATED_PARAMETER)

from bzrlib.workingtree import WorkingTree

@deprecated_function(zero_seven)

def commit(*args, **kwargs):

    """Commit a new revision to a branch.

    Function-style interface for convenience of old callers.

    New code should use the Commit class instead.

    """

    ## XXX: Remove this in favor of WorkingTree.commit?

    Commit().commit(*args, **kwargs)

class NullCommitReporter(object):

    """I report on progress of a commit."""

    def snapshot_change(self, change, path):

        pass

    def completed(self, revno, rev_id):

        pass

    def deleted(self, file_id):

        pass

    def escaped(self, escape_count, message):

        pass

    def missing(self, path):

        pass

    def renamed(self, change, old_path, new_path):

        pass

class ReportCommitToLog(NullCommitReporter):

    # this may be more useful if 'note' was replaced by an overridable

    # method on self, which would allow more trivial subclassing.

    # alternative, a callable could be passed in, allowing really trivial

    # reuse for some uis. RBC 20060511

    def snapshot_change(self, change, path):

        if change == 'unchanged':

            return

        note("%s %s", change, path)

    def completed(self, revno, rev_id):

        note('Committed revision %d.', revno)

    def deleted(self, file_id):

        note('deleted %s', file_id)

    def escaped(self, escape_count, message):

        note("replaced %d control characters in message", escape_count)

    def missing(self, path):

        note('missing %s', path)

    def renamed(self, change, old_path, new_path):

        note('%s %s => %s', change, old_path, new_path)

class Commit(object):

    """Task of committing a new revision.

    This is a MethodObject: it accumulates state as the commit is

    prepared, and then it is discarded.  It doesn't represent

    historical revisions, just the act of recording a new one.

            missing_ids

            Modified to hold a list of files that have been deleted from

            the working directory; these should be removed from the

            working inventory.

    """

    def __init__(self,

                 reporter=None,

                 config=None):

        if reporter is not None:

            self.reporter = reporter

        else:

            self.reporter = NullCommitReporter()

        if config is not None:

            self.config = config

        else:

            self.config = None

    def commit(self,

               branch=DEPRECATED_PARAMETER, message=None,

               timestamp=None,

               timezone=None,

               committer=None,

               specific_files=None,

               rev_id=None,

               allow_pointless=True,

               strict=False,

               verbose=False,

               revprops=None,

               working_tree=None,

               local=False,

               reporter=None,

               config=None):

        """Commit working copy as a new revision.

        branch -- the deprecated branch to commit to. New callers should pass in 

                  working_tree instead

        message -- the commit message, a mandatory parameter

        timestamp -- if not None, seconds-since-epoch for a

             postdated/predated commit.

        specific_files -- If true, commit only those files.

        rev_id -- If set, use this as the new revision id.

            Useful for test or import commands that need to tightly

            control what revisions are assigned.  If you duplicate

            a revision id that exists elsewhere it is your own fault.

            If null (default), a time/random revision id is generated.

        allow_pointless -- If true (default), commit even if nothing

            has changed and no merges are recorded.

        strict -- If true, don't allow a commit if the working tree

            contains unknown files.

        revprops -- Properties for new revision

        :param local: Perform a local only commit.

        """

        mutter('preparing to commit')

        if deprecated_passed(branch):

            warnings.warn("Commit.commit (branch, ...): The branch parameter is "

                 "deprecated as of bzr 0.8. Please use working_tree= instead.",

                 DeprecationWarning, stacklevel=2)

            self.branch = branch

            self.work_tree = self.branch.bzrdir.open_workingtree()

        elif working_tree is None:

            raise BzrError("One of branch and working_tree must be passed into commit().")

        else:

            self.work_tree = working_tree

            self.branch = self.work_tree.branch

        if message is None:

            raise BzrError("The message keyword parameter is required for commit().")

        self.bound_branch = None

        self.local = local

        self.master_branch = None

        self.master_locked = False

        self.rev_id = None

        self.specific_files = specific_files

        self.allow_pointless = allow_pointless

        if reporter is None and self.reporter is None:

            self.reporter = NullCommitReporter()

        elif reporter is not None:

            self.reporter = reporter

        self.work_tree.lock_write()

        self.pb = bzrlib.ui.ui_factory.nested_progress_bar()

        try:

            # Cannot commit with conflicts present.

            if len(self.work_tree.conflicts())>0:

                raise ConflictsInTree

            # setup the bound branch variables as needed.

            self._check_bound_branch()

            # check for out of date working trees

            # if we are bound, then self.branch is the master branch and this

            # test is thus all we need.

            if self.work_tree.last_revision() != self.master_branch.last_revision():

                raise errors.OutOfDateTree(self.work_tree)

            if strict:

                # raise an exception as soon as we find a single unknown.

                for unknown in self.work_tree.unknowns():

                    raise StrictCommitFailed()

            if self.config is None:

                self.config = self.branch.get_config()

            if isinstance(message, str):

                message = message.decode(bzrlib.user_encoding)

            assert isinstance(message, unicode), type(message)

            self.message = message

            self._escape_commit_message()

            self.work_inv = self.work_tree.inventory

            self.basis_tree = self.work_tree.basis_tree()

            self.basis_inv = self.basis_tree.inventory

            # one to finish, one for rev and inventory, and one for each

            # inventory entry, and the same for the new inventory.

            # note that this estimate is too long when we do a partial tree

            # commit which excludes some new files from being considered.

            # The estimate is corrected when we populate the new inv.

            self.pb_total = len(self.work_inv) + 5

            self.pb_count = 0

            self._gather_parents()

            if len(self.parents) > 1 and self.specific_files:

                raise NotImplementedError('selected-file commit of merges is not supported yet: files %r',

                        self.specific_files)

            self._check_parents_present()

            self.builder = self.branch.get_commit_builder(self.parents, 

                self.config, timestamp, timezone, committer, revprops, rev_id)

            self._remove_deleted()

            self._populate_new_inv()

            self._report_deletes()

            if not (self.allow_pointless

                    or len(self.parents) > 1

                    or self.builder.new_inventory != self.basis_inv):

                raise PointlessCommit()

            self._emit_progress_update()

            # TODO: Now the new inventory is known, check for conflicts and prompt the 

            # user for a commit message.

            self.builder.finish_inventory()

            self._emit_progress_update()

            self.rev_id = self.builder.commit(self.message)

            self._emit_progress_update()

            # revision data is in the local branch now.

            # upload revision data to the master.

            # this will propagate merged revisions too if needed.

            if self.bound_branch:

                self.master_branch.repository.fetch(self.branch.repository,

                                                    revision_id=self.rev_id)

                # now the master has the revision data

                # 'commit' to the master first so a timeout here causes the local

                # branch to be out of date

                self.master_branch.append_revision(self.rev_id)

            # and now do the commit locally.

            self.branch.append_revision(self.rev_id)

            self.work_tree.set_pending_merges([])

            self.work_tree.set_last_revision(self.rev_id)

            # now the work tree is up to date with the branch

            self.reporter.completed(self.branch.revno(), self.rev_id)

            if self.config.post_commit() is not None:

                hooks = self.config.post_commit().split(' ')

                # this would be nicer with twisted.python.reflect.namedAny

                for hook in hooks:

                    result = eval(hook + '(branch, rev_id)',

                                  {'branch':self.branch,

                                   'bzrlib':bzrlib,

                                   'rev_id':self.rev_id})

            self._emit_progress_update()

        finally:

            self._cleanup()

        return self.rev_id

    def _check_bound_branch(self):

        """Check to see if the local branch is bound.

        If it is bound, then most of the commit will actually be

        done using the remote branch as the target branch.

        Only at the end will the local branch be updated.

        """

        if self.local and not self.branch.get_bound_location():

            raise errors.LocalRequiresBoundBranch()

        if not self.local:

            self.master_branch = self.branch.get_master_branch()

        if not self.master_branch:

            # make this branch the reference branch for out of date checks.

            self.master_branch = self.branch

            return

        # If the master branch is bound, we must fail

        master_bound_location = self.master_branch.get_bound_location()

        if master_bound_location:

            raise errors.CommitToDoubleBoundBranch(self.branch,

                    self.master_branch, master_bound_location)

        # TODO: jam 20051230 We could automatically push local

        #       commits to the remote branch if they would fit.

        #       But for now, just require remote to be identical

        #       to local.

        # Make sure the local branch is identical to the master

        master_rh = self.master_branch.revision_history()

        local_rh = self.branch.revision_history()

        if local_rh != master_rh:

            raise errors.BoundBranchOutOfDate(self.branch,

                    self.master_branch)

        # Now things are ready to change the master branch

        # so grab the lock

        self.bound_branch = self.branch

        self.master_branch.lock_write()

        self.master_locked = True

    def _cleanup(self):

        """Cleanup any open locks, progress bars etc."""

        cleanups = [self._cleanup_bound_branch,

                    self.work_tree.unlock,

                    self.pb.finished]

        found_exception = None

        for cleanup in cleanups:

            try:

                cleanup()

            # we want every cleanup to run no matter what.

            # so we have a catchall here, but we will raise the

            # last encountered exception up the stack: and

            # typically this will be useful enough.

            except Exception, e:

                found_exception = e

        if found_exception is not None: 

            # don't do a plan raise, because the last exception may have been

            # trashed, e is our sure-to-work exception even though it loses the

            # full traceback. XXX: RBC 20060421 perhaps we could check the

            # exc_info and if its the same one do a plain raise otherwise 

            # 'raise e' as we do now.

            raise e

    def _cleanup_bound_branch(self):

        """Executed at the end of a try/finally to cleanup a bound branch.

        If the branch wasn't bound, this is a no-op.

        If it was, it resents self.branch to the local branch, instead

        of being the master.

        """

        if not self.bound_branch:

            return

        if self.master_locked:

            self.master_branch.unlock()

    def _escape_commit_message(self):

        """Replace xml-incompatible control characters."""

        # FIXME: RBC 20060419 this should be done by the revision

        # serialiser not by commit. Then we can also add an unescaper

        # in the deserializer and start roundtripping revision messages

        # precisely. See repository_implementations/test_repository.py

        # Python strings can include characters that can't be

        # represented in well-formed XML; escape characters that

        # aren't listed in the XML specification

        # (http://www.w3.org/TR/REC-xml/#NT-Char).

        self.message, escape_count = re.subn(

            u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+',

            lambda match: match.group(0).encode('unicode_escape'),

            self.message)

        if escape_count:

            self.reporter.escaped(escape_count, self.message)

    def _gather_parents(self):

        """Record the parents of a merge for merge detection."""

        # TODO: Make sure that this list doesn't contain duplicate 

        # entries and the order is preserved when doing this.

        self.parents = self.work_tree.get_parent_ids()

        self.parent_invs = []

        for revision in self.parents:

            if self.branch.repository.has_revision(revision):

                inventory = self.branch.repository.get_inventory(revision)

                self.parent_invs.append(inventory)

    def _check_parents_present(self):

        for parent_id in self.parents:

            mutter('commit parent revision {%s}', parent_id)

            if not self.branch.repository.has_revision(parent_id):

                if parent_id == self.branch.last_revision():

                    warning("parent is missing %r", parent_id)

                    raise BzrCheckError("branch %s is missing revision {%s}"

                            % (self.branch, parent_id))

    def _remove_deleted(self):

        """Remove deleted files from the working inventories.

        This is done prior to taking the working inventory as the

        basis for the new committed inventory.

        This returns true if any files

        *that existed in the basis inventory* were deleted.

        Files that were added and deleted

        in the working copy don't matter.

        """

        specific = self.specific_files

        deleted_ids = []

        for path, ie in self.work_inv.iter_entries():

            if specific and not is_inside_any(specific, path):

                continue

            if not self.work_tree.has_filename(path):

                self.reporter.missing(path)

                deleted_ids.append((path, ie.file_id))

        if deleted_ids:

            deleted_ids.sort(reverse=True)

            for path, file_id in deleted_ids:

                del self.work_inv[file_id]

            self.work_tree._write_inventory(self.work_inv)

    def _populate_new_inv(self):

        """Build revision inventory.

        This creates a new empty inventory. Depending on

        which files are selected for commit, and what is present in the

        current tree, the new inventory is populated. inventory entries 

        which are candidates for modification have their revision set to

        None; inventory entries that are carried over untouched have their

        revision set to their prior value.

        """

        mutter("Selecting files for commit with filter %s", self.specific_files)

        # iter_entries does not visit the ROOT_ID node so we need to call

        # self._emit_progress_update once by hand.

        self._emit_progress_update()

        for path, new_ie in self.work_inv.iter_entries():

            self._emit_progress_update()

            file_id = new_ie.file_id

            mutter('check %s {%s}', path, file_id)

            if (not self.specific_files or 

                is_inside_or_parent_of_any(self.specific_files, path)):

                    mutter('%s selected for commit', path)

                    ie = new_ie.copy()

                    ie.revision = None

            else:

                mutter('%s not selected for commit', path)

                if self.basis_inv.has_id(file_id):

                    ie = self.basis_inv[file_id].copy()

                else:

                    # this entry is new and not being committed

                    continue

            self.builder.record_entry_contents(ie, self.parent_invs, 

                path, self.work_tree)

            # describe the nature of the change that has occurred relative to

            # the basis inventory.

            if (self.basis_inv.has_id(ie.file_id)):

                basis_ie = self.basis_inv[ie.file_id]

            else:

                basis_ie = None

            change = ie.describe_change(basis_ie, ie)

            if change in (InventoryEntry.RENAMED, 

                InventoryEntry.MODIFIED_AND_RENAMED):

                old_path = self.basis_inv.id2path(ie.file_id)

                self.reporter.renamed(change, old_path, path)

            else:

                self.reporter.snapshot_change(change, path)

    def _emit_progress_update(self):

        """Emit an update to the progress bar."""

        self.pb.update("Committing", self.pb_count, self.pb_total)

        self.pb_count += 1

    def _report_deletes(self):

        for path, ie in self.basis_inv.iter_entries():

            if ie.file_id not in self.builder.new_inventory:

                self.reporter.deleted(path)