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.
19
def show_status(branch, show_unchanged=False,
25
"""Display status for non-ignored working files.
28
If set, includes unchanged files.
31
If set, only show the status of files in this list.
34
If set, includes each file's id.
37
If set, write to this file (default stdout.)
40
If set, write pending merges.
43
If None the compare latest revision with working tree
65
44
If one revision show compared it with working tree.
66
45
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.
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)
48
from bzrlib.delta import compare_trees
75
51
to_file = sys.stdout
79
55
new_is_working_tree = True
80
56
if revision is None:
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()
57
old = branch.basis_tree()
58
new = branch.working_tree()
85
59
elif len(revision) > 0:
87
rev_id = revision[0].as_revision_id(wt.branch)
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):
61
rev_id = revision[0].in_history(branch).rev_id
62
old = branch.revision_tree(rev_id)
63
except NoSuchRevision, e:
64
raise BzrCommandError(str(e))
93
rev_id = revision[1].as_revision_id(wt.branch)
94
new = wt.branch.repository.revision_tree(rev_id)
67
rev_id = revision[1].in_history(branch).rev_id
68
new = branch.revision_tree(rev_id)
95
69
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
and specific_files is None):
139
show_pending_merges(new, to_file, short)
70
except NoSuchRevision, e:
71
raise BzrCommandError(str(e))
73
new = branch.working_tree()
76
delta = compare_trees(old, new, want_unchanged=show_unchanged,
77
specific_files=specific_files)
81
show_unchanged=show_unchanged)
83
if new_is_working_tree:
84
unknowns = new.unknowns()
87
# FIXME: Should also match if the unknown file is within a
88
# specified directory.
90
if path not in specific_files:
93
print >>to_file, 'unknown:'
95
print >>to_file, ' ', path
96
if show_pending and len(branch.pending_merges()) > 0:
97
print >>to_file, 'pending merges:'
98
for merge in branch.pending_merges():
99
print >> to_file, ' ', merge
146
def show_pending_merges(new, to_file, short=False):
147
"""Write out a display of pending merges in a working tree."""
148
parents = new.get_parent_ids()
151
pending = parents[1:]
153
last_revision = parents[0]
155
to_file.write('pending merges:\n')
156
if last_revision is not None:
158
ignore = set(branch.repository.get_ancestry(last_revision,
160
except errors.NoSuchRevision:
161
# the last revision is a ghost : assume everything is new
163
ignore = set([None, last_revision])
166
# TODO: this could be improved using merge_sorted - we'd get the same
167
# output rather than one level of indent.
168
for merge in pending:
171
from bzrlib.osutils import terminal_width
172
width = terminal_width() - 1 # we need one extra space to avoid
174
m_revision = branch.repository.get_revision(merge)
179
to_file.write(prefix)
180
to_file.write(line_log(m_revision, width - len(prefix)))
182
inner_merges = branch.repository.get_ancestry(merge)
183
assert inner_merges[0] is None
185
inner_merges.reverse()
186
for mmerge in inner_merges:
189
mm_revision = branch.repository.get_revision(mmerge)
194
to_file.write(prefix)
195
to_file.write(line_log(mm_revision, width - len(prefix)))
198
except errors.NoSuchRevision:
203
to_file.write(prefix + ' ' + merge)
added
removed
bzrlib/status.py
