19
from bzrlib.delta import compare_trees
20
23
from bzrlib.diff import _raise_if_nonexistent
21
from bzrlib.errors import NoSuchRevision
24
import bzrlib.errors as errors
22
25
from bzrlib.log import line_log
23
26
from bzrlib.osutils import is_inside_any
24
from bzrlib.symbol_versioning import *
27
from bzrlib.symbol_versioning import (deprecated_function,
29
from bzrlib.trace import warning
26
31
# TODO: when showing single-line logs, truncate to the width of the terminal
27
32
# if known, but only if really going to the terminal (not into a file)
30
@deprecated_function(zero_eight)
31
def show_status(branch, show_unchanged=False,
37
"""Display summary of changes.
39
Please use show_tree_status instead.
41
By default this compares the working tree to a previous revision.
42
If the revision argument is given, summarizes changes between the
43
working tree and another, or between two revisions.
45
The result is written out as Unicode and to_file should be able
49
If set, includes unchanged files.
52
If set, only show the status of files in this list.
55
If set, includes each file's id.
58
If set, write to this file (default stdout.)
61
If set, write pending merges.
64
If None the compare latest revision with working tree
65
If one revision show compared it with working tree.
66
If two revisions show status between first and second.
68
show_tree_status(branch.bzrdir.open_workingtree(), show_unchanged,
69
specific_files, show_ids, to_file, show_pending, revision)
72
def show_tree_status(wt, show_unchanged=False,
35
def show_tree_status(wt, show_unchanged=None,
73
36
specific_files=None,
78
43
"""Display summary of changes.
80
45
By default this compares the working tree to a previous revision.
87
52
If showing the status of a working tree, extra information is included
88
53
about unknown files, conflicts, and pending merges.
91
If set, includes unchanged files.
94
If set, a list of filenames whose status should be shown.
95
It is an error to give a filename that is not in the working
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
96
59
tree, or in the working inventory or in the basis inventory.
99
If set, includes each file's id.
102
If set, write to this file (default stdout.)
105
If set, write pending merges.
108
If None the compare latest revision with working tree
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.
109
65
If one revision show compared it with working tree.
110
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.
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)
113
75
to_file = sys.stdout
117
79
new_is_working_tree = True
118
80
if revision is None:
81
if wt.last_revision() != wt.branch.last_revision():
82
warning("working tree is out of date, run 'bzr update'")
120
84
old = new.basis_tree()
121
85
elif len(revision) > 0:
123
87
rev_id = revision[0].in_history(wt.branch).rev_id
124
88
old = wt.branch.repository.revision_tree(rev_id)
125
except NoSuchRevision, e:
126
raise BzrCommandError(str(e))
89
except errors.NoSuchRevision, e:
90
raise errors.BzrCommandError(str(e))
127
91
if (len(revision) > 1) and (revision[1].spec is not None):
129
93
rev_id = revision[1].in_history(wt.branch).rev_id
130
94
new = wt.branch.repository.revision_tree(rev_id)
131
95
new_is_working_tree = False
132
except NoSuchRevision, e:
133
raise BzrCommandError(str(e))
96
except errors.NoSuchRevision, e:
97
raise errors.BzrCommandError(str(e))
136
_raise_if_nonexistent(specific_files, old, new)
137
delta = compare_trees(old, new, want_unchanged=show_unchanged,
138
specific_files=specific_files)
141
show_unchanged=show_unchanged)
143
if new_is_working_tree:
144
list_paths('unknown', new.unknowns(), specific_files, to_file)
145
conflict_title = False
146
for conflict in wt.conflicts():
147
if conflict_title is False:
148
print >> to_file, "conflicts:"
149
conflict_title = True
150
print >> to_file, " %s" % conflict
151
if new_is_working_tree and show_pending:
152
show_pending_merges(new, to_file)
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
print >> to_file, "conflicts:"
131
for conflict in conflicts:
136
print >> to_file, "%s %s" % (prefix, conflict)
137
if new_is_working_tree and show_pending:
138
show_pending_merges(new, to_file, short)
156
def show_pending_merges(new, to_file):
145
def show_pending_merges(new, to_file, short=False):
157
146
"""Write out a display of pending merges in a working tree."""
158
pending = new.pending_merges()
147
parents = new.get_parent_ids()
150
pending = parents[1:]
159
151
branch = new.branch
160
if len(pending) == 0:
162
print >>to_file, 'pending merges:'
163
last_revision = branch.last_revision()
152
last_revision = parents[0]
154
print >>to_file, 'pending merges:'
164
155
if last_revision is not None:
165
ignore = set(branch.repository.get_ancestry(last_revision))
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])
167
164
ignore = set([None])
168
for merge in new.pending_merges():
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:
169
168
ignore.add(merge)
170
from bzrlib.osutils import terminal_width
171
width = terminal_width()
171
172
m_revision = branch.repository.get_revision(merge)
172
print >> to_file, ' ', line_log(m_revision, 77)
177
print >> to_file, prefix, line_log(m_revision, width - 4)
173
178
inner_merges = branch.repository.get_ancestry(merge)
174
assert inner_merges[0] == None
179
assert inner_merges[0] is None
175
180
inner_merges.pop(0)
176
181
inner_merges.reverse()
177
182
for mmerge in inner_merges:
178
183
if mmerge in ignore:
180
185
mm_revision = branch.repository.get_revision(mmerge)
181
print >> to_file, ' ', line_log(mm_revision, 75)
190
print >> to_file, prefix, line_log(mm_revision, width - 5)
182
191
ignore.add(mmerge)
183
except NoSuchRevision:
184
print >> to_file, ' ', merge
186
def list_paths(header, paths, specific_files, to_file):
189
if specific_files and not is_inside_any(specific_files, path):
192
print >>to_file, '%s:' % header
194
print >>to_file, ' ', path
192
except errors.NoSuchRevision:
197
print >> to_file, prefix, merge
added
removed
bzrlib/status.py
