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
18
from bzrlib.osutils import is_inside_any
19
from bzrlib.delta import compare_trees
25
20
from bzrlib.log import line_log
26
from bzrlib.osutils import is_inside_any
27
from bzrlib.symbol_versioning import (deprecated_function,
30
from bzrlib.trace import warning
32
# TODO: when showing single-line logs, truncate to the width of the terminal
33
# if known, but only if really going to the terminal (not into a file)
36
@deprecated_function(zero_eight)
37
def show_status(branch, show_unchanged=None,
21
from bzrlib.errors import NoSuchRevision
24
def show_status(branch, show_unchanged=False,
38
25
specific_files=None,
43
"""Display summary of changes.
45
Please use show_tree_status instead.
47
By default this compares the working tree to a previous revision.
48
If the revision argument is given, summarizes changes between the
49
working tree and another, or between two revisions.
51
The result is written out as Unicode and to_file should be able
30
"""Display status for non-ignored working files.
55
33
If set, includes unchanged files.
71
49
If one revision show compared it with working tree.
72
50
If two revisions show status between first and second.
74
show_tree_status(branch.bzrdir.open_workingtree(), show_unchanged,
75
specific_files, show_ids, to_file, show_pending, revision)
78
def show_tree_status(wt, show_unchanged=None,
86
"""Display summary of changes.
88
By default this compares the working tree to a previous revision.
89
If the revision argument is given, summarizes changes between the
90
working tree and another, or between two revisions.
92
The result is written out as Unicode and to_file should be able
95
If showing the status of a working tree, extra information is included
96
about unknown files, conflicts, and pending merges.
98
:param show_unchanged: Deprecated parameter. If set, includes unchanged
100
:param specific_files: If set, a list of filenames whose status should be
101
shown. It is an error to give a filename that is not in the working
102
tree, or in the working inventory or in the basis inventory.
103
:param show_ids: If set, includes each file's id.
104
:param to_file: If set, write to this file (default stdout.)
105
:param show_pending: If set, write pending merges.
106
:param revision: If None the compare latest revision with working tree
107
If not None it must be a RevisionSpec list.
108
If one revision show compared it with working tree.
109
If two revisions show status between first and second.
110
:param short: If True, gives short SVN-style status lines.
111
:param versioned: If True, only shows versioned files.
113
if show_unchanged is not None:
114
warn("show_status_trees with show_unchanged has been deprecated "
115
"since bzrlib 0.9", DeprecationWarning, stacklevel=2)
118
53
to_file = sys.stdout
122
57
new_is_working_tree = True
123
58
if revision is None:
124
if wt.last_revision() != wt.branch.last_revision():
125
warning("working tree is out of date, run 'bzr update'")
127
old = new.basis_tree()
59
old = branch.basis_tree()
60
new = branch.working_tree()
128
61
elif len(revision) > 0:
130
rev_id = revision[0].in_history(wt.branch).rev_id
131
old = wt.branch.repository.revision_tree(rev_id)
132
except errors.NoSuchRevision, e:
133
raise errors.BzrCommandError(str(e))
134
if (len(revision) > 1) and (revision[1].spec is not None):
63
rev_id = revision[0].in_history(branch).rev_id
64
old = branch.revision_tree(rev_id)
65
except NoSuchRevision, e:
66
raise BzrCommandError(str(e))
136
rev_id = revision[1].in_history(wt.branch).rev_id
137
new = wt.branch.repository.revision_tree(rev_id)
69
rev_id = revision[1].in_history(branch).rev_id
70
new = branch.revision_tree(rev_id)
138
71
new_is_working_tree = False
139
except errors.NoSuchRevision, e:
140
raise errors.BzrCommandError(str(e))
146
_raise_if_nonexistent(specific_files, old, new)
147
want_unversioned = not versioned
149
changes = new._iter_changes(old, show_unchanged, specific_files,
150
require_versioned=False, want_unversioned=want_unversioned)
151
reporter = _mod_delta._ChangeReporter(output_file=to_file,
152
unversioned_filter=new.is_ignored)
153
_mod_delta.report_changes(changes, reporter)
155
delta = new.changes_from(old, want_unchanged=show_unchanged,
156
specific_files=specific_files,
157
want_unversioned=want_unversioned)
158
# filter out unknown files. We may want a tree method for
160
delta.unversioned = [unversioned for unversioned in
161
delta.unversioned if not new.is_ignored(unversioned[0])]
164
show_unchanged=show_unchanged,
166
conflict_title = False
167
# show the new conflicts only for now. XXX: get them from the delta.
168
for conflict in new.conflicts():
169
if not short and conflict_title is False:
170
print >> to_file, "conflicts:"
171
conflict_title = True
72
except NoSuchRevision, e:
73
raise BzrCommandError(str(e))
75
new = branch.working_tree()
78
delta = compare_trees(old, new, want_unchanged=show_unchanged,
79
specific_files=specific_files)
83
show_unchanged=show_unchanged)
85
if new_is_working_tree:
86
conflicts = new.iter_conflicts()
87
unknowns = new.unknowns()
88
list_paths('unknown', unknowns, specific_files, to_file)
89
list_paths('conflicts', conflicts, specific_files, to_file)
90
if show_pending and len(new.pending_merges()) > 0:
91
print >>to_file, 'pending merges:'
92
last_revision = branch.last_revision()
93
if last_revision is not None:
94
ignore = set(branch.get_ancestry(last_revision))
176
print >> to_file, "%s %s" % (prefix, conflict)
177
if new_is_working_tree and show_pending:
178
show_pending_merges(new, to_file, short)
97
for merge in new.pending_merges():
100
m_revision = branch.get_revision(merge)
101
print >> to_file, ' ', line_log(m_revision, 77)
102
inner_merges = branch.get_ancestry(merge)
103
inner_merges.reverse()
104
for mmerge in inner_merges:
107
mm_revision = branch.get_revision(mmerge)
108
print >> to_file, ' ', line_log(mm_revision, 75)
111
except NoSuchRevision:
112
print >> to_file, ' ', merge
185
def show_pending_merges(new, to_file, short=False):
186
"""Write out a display of pending merges in a working tree."""
187
parents = new.get_parent_ids()
190
pending = parents[1:]
192
last_revision = parents[0]
194
print >>to_file, 'pending merges:'
195
if last_revision is not None:
197
ignore = set(branch.repository.get_ancestry(last_revision))
198
except errors.NoSuchRevision:
199
# the last revision is a ghost : assume everything is new
201
ignore = set([None, last_revision])
204
# TODO: this could be improved using merge_sorted - we'd get the same
205
# output rather than one level of indent.
206
for merge in pending:
209
from bzrlib.osutils import terminal_width
210
width = terminal_width()
211
m_revision = branch.repository.get_revision(merge)
216
print >> to_file, prefix, line_log(m_revision, width - 4)
217
inner_merges = branch.repository.get_ancestry(merge)
218
assert inner_merges[0] is None
220
inner_merges.reverse()
221
for mmerge in inner_merges:
224
mm_revision = branch.repository.get_revision(mmerge)
229
print >> to_file, prefix, line_log(mm_revision, width - 5)
231
except errors.NoSuchRevision:
236
print >> to_file, prefix, merge
117
def list_paths(header, paths, specific_files, to_file):
120
if specific_files and not is_inside_any(specific_files, path):
123
print >>to_file, '%s:' % header
125
print >>to_file, ' ', path
added
removed
bzrlib/status.py
