~bzr-pqm/bzr/bzr.dev

# Copyright (C) 2005, 2006, 2007 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

import sys

from bzrlib import (

    delta as _mod_delta,

    log,

    osutils,

    tree,

    tsort,

    revision as _mod_revision,

    )

import bzrlib.errors as errors

from bzrlib.osutils import is_inside_any

from bzrlib.symbol_versioning import (deprecated_function,

        )

from bzrlib.trace import mutter, warning

# TODO: when showing single-line logs, truncate to the width of the terminal

# if known, but only if really going to the terminal (not into a file)

def show_tree_status(wt, show_unchanged=None,

                     specific_files=None,

                     show_ids=False,

                     to_file=None,

                     show_pending=True,

                     revision=None,

                     short=False,

                     verbose=False,

                     versioned=False):

    """Display summary of changes.

    By default this compares the working tree to a previous revision. 

    If the revision argument is given, summarizes changes between the 

    working tree and another, or between two revisions.

    The result is written out as Unicode and to_file should be able 

    to encode that.

    If showing the status of a working tree, extra information is included

    about unknown files, conflicts, and pending merges.

    :param show_unchanged: Deprecated parameter. If set, includes unchanged 

        files.

    :param specific_files: If set, a list of filenames whose status should be

        shown.  It is an error to give a filename that is not in the working 

        tree, or in the working inventory or in the basis inventory.

    :param show_ids: If set, includes each file's id.

    :param to_file: If set, write to this file (default stdout.)

    :param show_pending: If set, write pending merges.

    :param revision: If None, compare latest revision with working tree

        If not None, it must be a RevisionSpec list.

        If one revision, compare with working tree.

        If two revisions, show status between first and second.

    :param short: If True, gives short SVN-style status lines.

    :param verbose: If True, show all merged revisions, not just

        the merge tips

    :param versioned: If True, only shows versioned files.

    """

    if show_unchanged is not None:

        warn("show_tree_status with show_unchanged has been deprecated "

             "since bzrlib 0.9", DeprecationWarning, stacklevel=2)

    if to_file is None:

        to_file = sys.stdout

    wt.lock_read()

    try:

        new_is_working_tree = True

        if revision is None:

            if wt.last_revision() != wt.branch.last_revision():

                warning("working tree is out of date, run 'bzr update'")

            new = wt

            old = new.basis_tree()

        elif len(revision) > 0:

            try:

                old = revision[0].as_tree(wt.branch)

            except errors.NoSuchRevision, e:

                raise errors.BzrCommandError(str(e))

            if (len(revision) > 1) and (revision[1].spec is not None):

                try:

                    new = revision[1].as_tree(wt.branch)

                    new_is_working_tree = False

                except errors.NoSuchRevision, e:

                    raise errors.BzrCommandError(str(e))

            else:

                new = wt

        old.lock_read()

        new.lock_read()

        try:

            _raise_if_nonexistent(specific_files, old, new)

            want_unversioned = not versioned

            if short:

                changes = new.iter_changes(old, show_unchanged, specific_files,

                    require_versioned=False, want_unversioned=want_unversioned)

                reporter = _mod_delta._ChangeReporter(output_file=to_file,

                    unversioned_filter=new.is_ignored)

                _mod_delta.report_changes(changes, reporter)

            else:

                delta = new.changes_from(old, want_unchanged=show_unchanged,

                                      specific_files=specific_files,

                                      want_unversioned=want_unversioned)

                # filter out unknown files. We may want a tree method for

                # this

                delta.unversioned = [unversioned for unversioned in

                    delta.unversioned if not new.is_ignored(unversioned[0])]

                delta.show(to_file,

                           show_ids=show_ids,

                           show_unchanged=show_unchanged,

                           short_status=False)

            # show the new conflicts only for now. XXX: get them from the

            # delta.

            conflicts = new.conflicts()

            if specific_files is not None:

                conflicts = conflicts.select_conflicts(new, specific_files,

                    ignore_misses=True, recurse=True)[1]

            if len(conflicts) > 0 and not short:

                to_file.write("conflicts:\n")

            for conflict in conflicts:

                if short:

                    prefix = 'C  '

                else:

                    prefix = ' '

                to_file.write("%s %s\n" % (prefix, conflict))

            if (new_is_working_tree and show_pending):

                show_pending_merges(new, to_file, short, verbose=verbose)

        finally:

            old.unlock()

            new.unlock()

    finally:

        wt.unlock()

def _get_sorted_revisions(tip_revision, revision_ids, parent_map):

    """Get an iterator which will return the revisions in merge sorted order.

    This will build up a list of all nodes, such that only nodes in the list

    are referenced. It then uses MergeSorter to return them in 'merge-sorted'

    order.

    :param revision_ids: A set of revision_ids

    :param parent_map: The parent information for each node. Revisions which

        are considered ghosts should not be present in the map.

    :return: iterator from MergeSorter.iter_topo_order()

    """

    # MergeSorter requires that all nodes be present in the graph, so get rid

    # of any references pointing outside of this graph.

    parent_graph = {}

    for revision_id in revision_ids:

        if revision_id not in parent_map: # ghost

            parent_graph[revision_id] = []

        else:

            # Only include parents which are in this sub-graph

            parent_graph[revision_id] = [p for p in parent_map[revision_id]

                                            if p in revision_ids]

    sorter = tsort.MergeSorter(parent_graph, tip_revision)

    return sorter.iter_topo_order()

def show_pending_merges(new, to_file, short=False, verbose=False):

    """Write out a display of pending merges in a working tree."""

    parents = new.get_parent_ids()

    if len(parents) < 2:

        return

    # we need one extra space for terminals that wrap on last char

    term_width = osutils.terminal_width() - 1

    if short:

        first_prefix = 'P   '

        sub_prefix = 'P.   '

    else:

        first_prefix = '  '

        sub_prefix = '    '

    pending = parents[1:]

    branch = new.branch

    last_revision = parents[0]

    if not short:

        if verbose:

            to_file.write('pending merges:\n')

        else:

            to_file.write('pending merge tips: (use -v to see all merge revisions)\n')

    graph = branch.repository.get_graph()

    other_revisions = [last_revision]

    log_formatter = log.LineLogFormatter(to_file)

    for merge in pending:

        try:

            rev = branch.repository.get_revisions([merge])[0]

        except errors.NoSuchRevision:

            # If we are missing a revision, just print out the revision id

            to_file.write(first_prefix + '(ghost) ' + merge + '\n')

            other_revisions.append(merge)

            continue

        # Log the merge, as it gets a slightly different formatting

        log_message = log_formatter.log_string(None, rev,

                        term_width - len(first_prefix))

        to_file.write(first_prefix + log_message + '\n')

        if not verbose:

            continue

        # Find all of the revisions in the merge source, which are not in the

        # last committed revision.

        merge_extra = graph.find_unique_ancestors(merge, other_revisions)

        other_revisions.append(merge)

        merge_extra.discard(_mod_revision.NULL_REVISION)

        # Get a handle to all of the revisions we will need

        try:

            revisions = dict((rev.revision_id, rev) for rev in

                             branch.repository.get_revisions(merge_extra))

        except errors.NoSuchRevision:

            # One of the sub nodes is a ghost, check each one

            revisions = {}

            for revision_id in merge_extra:

                try:

                    rev = branch.repository.get_revisions([revision_id])[0]

                except errors.NoSuchRevision:

                    revisions[revision_id] = None

                else:

                    revisions[revision_id] = rev

        # Display the revisions brought in by this merge.

        rev_id_iterator = _get_sorted_revisions(merge, merge_extra,

                            branch.repository.get_parent_map(merge_extra))

        # Skip the first node

        num, first, depth, eom = rev_id_iterator.next()

        if first != merge:

            raise AssertionError('Somehow we misunderstood how'

                ' iter_topo_order works %s != %s' % (first, merge))

        for num, sub_merge, depth, eom in rev_id_iterator:

            rev = revisions[sub_merge]

            if rev is None:

                to_file.write(sub_prefix + '(ghost) ' + sub_merge + '\n')

                continue

            log_message = log_formatter.log_string(None,

                            revisions[sub_merge],

                            term_width - len(sub_prefix))

            to_file.write(sub_prefix + log_message + '\n')

def _raise_if_nonexistent(paths, old_tree, new_tree):

    """Complain if paths are not in either inventory or tree.

    It's OK with the files exist in either tree's inventory, or 

    if they exist in the tree but are not versioned.

    This can be used by operations such as bzr status that can accept

    unknown or ignored files.

    """

    mutter("check paths: %r", paths)

    if not paths:

        return

    s = old_tree.filter_unversioned_files(paths)

    s = new_tree.filter_unversioned_files(s)

    s = [path for path in s if not new_tree.has_filename(path)]

    if s:

        raise errors.PathsDoNotExist(sorted(s))