1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
1
# (C) 2005 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
23
from bzrlib.diff import _raise_if_nonexistent
24
import bzrlib.errors as errors
25
from bzrlib.log import line_log
26
from bzrlib.osutils import is_inside_any
27
from bzrlib.symbol_versioning import (deprecated_function,
29
from bzrlib.trace import warning
31
# TODO: when showing single-line logs, truncate to the width of the terminal
32
# if known, but only if really going to the terminal (not into a file)
35
def show_tree_status(wt, show_unchanged=None,
43
"""Display summary of changes.
45
By default this compares the working tree to a previous revision.
46
If the revision argument is given, summarizes changes between the
47
working tree and another, or between two revisions.
49
The result is written out as Unicode and to_file should be able
52
If showing the status of a working tree, extra information is included
53
about unknown files, conflicts, and pending merges.
55
:param show_unchanged: Deprecated parameter. If set, includes unchanged
57
:param specific_files: If set, a list of filenames whose status should be
58
shown. It is an error to give a filename that is not in the working
59
tree, or in the working inventory or in the basis inventory.
60
:param show_ids: If set, includes each file's id.
61
:param to_file: If set, write to this file (default stdout.)
62
:param show_pending: If set, write pending merges.
63
:param revision: If None the compare latest revision with working tree
64
If not None it must be a RevisionSpec list.
65
If one revision show compared it with working tree.
66
If two revisions show status between first and second.
67
:param short: If True, gives short SVN-style status lines.
68
:param versioned: If True, only shows versioned files.
19
def show_status(branch, show_unchanged=False,
22
"""Display single-line status for non-ignored working files.
25
If true, show unmodified files too.
28
If set, only show the status of files in this list.
70
if show_unchanged is not None:
71
warn("show_status_trees with show_unchanged has been deprecated "
72
"since bzrlib 0.9", DeprecationWarning, stacklevel=2)
79
new_is_working_tree = True
81
if wt.last_revision() != wt.branch.last_revision():
82
warning("working tree is out of date, run 'bzr update'")
84
old = new.basis_tree()
85
elif len(revision) > 0:
87
rev_id = revision[0].in_history(wt.branch).rev_id
88
old = wt.branch.repository.revision_tree(rev_id)
89
except errors.NoSuchRevision, e:
90
raise errors.BzrCommandError(str(e))
91
if (len(revision) > 1) and (revision[1].spec is not None):
93
rev_id = revision[1].in_history(wt.branch).rev_id
94
new = wt.branch.repository.revision_tree(rev_id)
95
new_is_working_tree = False
96
except errors.NoSuchRevision, e:
97
raise errors.BzrCommandError(str(e))
103
_raise_if_nonexistent(specific_files, old, new)
104
want_unversioned = not versioned
106
changes = new._iter_changes(old, show_unchanged, specific_files,
107
require_versioned=False, want_unversioned=want_unversioned)
108
reporter = _mod_delta._ChangeReporter(output_file=to_file,
109
unversioned_filter=new.is_ignored)
110
_mod_delta.report_changes(changes, reporter)
112
delta = new.changes_from(old, want_unchanged=show_unchanged,
113
specific_files=specific_files,
114
want_unversioned=want_unversioned)
115
# filter out unknown files. We may want a tree method for
117
delta.unversioned = [unversioned for unversioned in
118
delta.unversioned if not new.is_ignored(unversioned[0])]
121
show_unchanged=show_unchanged,
123
# show the new conflicts only for now. XXX: get them from the
125
conflicts = new.conflicts()
126
if specific_files is not None:
127
conflicts = conflicts.select_conflicts(new, specific_files,
128
ignore_misses=True, recurse=True)[1]
129
if len(conflicts) > 0 and not short:
130
to_file.write("conflicts:\n")
131
for conflict in conflicts:
136
to_file.write("%s %s\n" % (prefix, conflict))
137
if new_is_working_tree and show_pending:
138
show_pending_merges(new, to_file, short)
145
def show_pending_merges(new, to_file, short=False):
146
"""Write out a display of pending merges in a working tree."""
147
parents = new.get_parent_ids()
150
pending = parents[1:]
152
last_revision = parents[0]
154
to_file.write('pending merges:\n')
155
if last_revision is not None:
157
ignore = set(branch.repository.get_ancestry(last_revision,
159
except errors.NoSuchRevision:
160
# the last revision is a ghost : assume everything is new
162
ignore = set([None, last_revision])
165
# TODO: this could be improved using merge_sorted - we'd get the same
166
# output rather than one level of indent.
167
for merge in pending:
170
from bzrlib.osutils import terminal_width
171
width = terminal_width()
172
m_revision = branch.repository.get_revision(merge)
177
to_file.write(prefix + ' ' + line_log(m_revision, width - 4))
179
inner_merges = branch.repository.get_ancestry(merge)
180
assert inner_merges[0] is None
182
inner_merges.reverse()
183
for mmerge in inner_merges:
186
mm_revision = branch.repository.get_revision(mmerge)
191
to_file.write(prefix + ' ' + line_log(mm_revision, width - 5))
194
except errors.NoSuchRevision:
199
to_file.write(prefix + ' ' + merge)
33
branch._need_readlock()
35
old = branch.basis_tree()
36
new = branch.working_tree()
38
delta = diff.compare_trees(old, new, want_unchanged=show_unchanged,
39
specific_files=specific_files)
41
delta.show(sys.stdout, show_ids=show_ids,
42
show_unchanged=show_unchanged)
44
unknowns = new.unknowns()
47
# FIXME: Should also match if the unknown file is within a
48
# specified directory.
50
if path not in specific_files:
added
removed
bzrlib/status.py
