1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
|
# Copyright (C) 2005, 2006 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,
tree,
)
from bzrlib.diff import _raise_if_nonexistent
import bzrlib.errors as errors
from bzrlib.log import line_log
from bzrlib.osutils import is_inside_any
from bzrlib.symbol_versioning import (deprecated_function,
zero_eight,
)
from bzrlib.trace import 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)
@deprecated_function(zero_eight)
def show_status(branch, show_unchanged=None,
specific_files=None,
show_ids=False,
to_file=None,
show_pending=True,
revision=None):
"""Display summary of changes.
Please use show_tree_status instead.
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.
show_unchanged
If set, includes unchanged files.
specific_files
If set, only show the status of files in this list.
show_ids
If set, includes each file's id.
to_file
If set, write to this file (default stdout.)
show_pending
If set, write pending merges.
revision
If None the compare latest revision with working tree
If one revision show compared it with working tree.
If two revisions show status between first and second.
"""
show_tree_status(branch.bzrdir.open_workingtree(), show_unchanged,
specific_files, show_ids, to_file, show_pending, revision)
def show_tree_status(wt, show_unchanged=None,
specific_files=None,
show_ids=False,
to_file=None,
show_pending=True,
revision=None,
short=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 the compare latest revision with working tree
If not None it must be a RevisionSpec list.
If one revision show compared it with working tree.
If two revisions show status between first and second.
:param short: If True, gives short SVN-style status lines
"""
if show_unchanged is not None:
warn("show_status_trees 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:
rev_id = revision[0].in_history(wt.branch).rev_id
old = wt.branch.repository.revision_tree(rev_id)
except errors.NoSuchRevision, e:
raise errors.BzrCommandError(str(e))
if (len(revision) > 1) and (revision[1].spec is not None):
try:
rev_id = revision[1].in_history(wt.branch).rev_id
new = wt.branch.repository.revision_tree(rev_id)
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)
if short:
changes = new._iter_changes(old, show_unchanged, specific_files,
require_versioned=False)
reporter = _mod_delta.ChangeReporter(old.inventory,
output_file=to_file)
_mod_delta.report_changes(changes, reporter)
else:
delta = new.changes_from(old, want_unchanged=show_unchanged,
specific_files=specific_files)
delta.show(to_file,
show_ids=show_ids,
show_unchanged=show_unchanged,
short_status=short)
short_status_letter = '? '
if not short:
short_status_letter = ''
list_paths('unknown', new.unknowns(), specific_files, to_file,
short_status_letter)
conflict_title = False
# show the new conflicts only for now. XXX: get them from the delta.
for conflict in new.conflicts():
if not short and conflict_title is False:
print >> to_file, "conflicts:"
conflict_title = True
if short:
prefix = 'C '
else:
prefix = ' '
print >> to_file, "%s %s" % (prefix, conflict)
if new_is_working_tree and show_pending:
show_pending_merges(new, to_file, short)
finally:
old.unlock()
new.unlock()
finally:
wt.unlock()
def show_pending_merges(new, to_file, short=False):
"""Write out a display of pending merges in a working tree."""
parents = new.get_parent_ids()
if len(parents) < 2:
return
pending = parents[1:]
branch = new.branch
last_revision = parents[0]
if not short:
print >>to_file, 'pending merges:'
if last_revision is not None:
try:
ignore = set(branch.repository.get_ancestry(last_revision))
except errors.NoSuchRevision:
# the last revision is a ghost : assume everything is new
# except for it
ignore = set([None, last_revision])
else:
ignore = set([None])
# TODO: this could be improved using merge_sorted - we'd get the same
# output rather than one level of indent.
for merge in pending:
ignore.add(merge)
try:
from bzrlib.osutils import terminal_width
width = terminal_width()
m_revision = branch.repository.get_revision(merge)
if short:
prefix = 'P '
else:
prefix = ' '
print >> to_file, prefix, line_log(m_revision, width - 4)
inner_merges = branch.repository.get_ancestry(merge)
assert inner_merges[0] is None
inner_merges.pop(0)
inner_merges.reverse()
for mmerge in inner_merges:
if mmerge in ignore:
continue
mm_revision = branch.repository.get_revision(mmerge)
if short:
prefix = 'P. '
else:
prefix = ' '
print >> to_file, prefix, line_log(mm_revision, width - 5)
ignore.add(mmerge)
except errors.NoSuchRevision:
if short:
prefix = 'P '
else:
prefix = ' '
print >> to_file, prefix, merge
def list_paths(header, paths, specific_files, to_file, short_status_letter=''):
done_header = False
for path in paths:
if specific_files and not is_inside_any(specific_files, path):
continue
if not short_status_letter and not done_header:
print >>to_file, '%s:' % header
done_header = True
print >>to_file, '%s %s' % (short_status_letter, path)
|