4763.2.4
by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry. |
1 |
# Copyright (C) 2005-2010 Canonical Ltd
|
1185.13.2
by Robert Collins
Merge Aarons conflict plugin for 0.1rc1 |
2 |
#
|
362
by Martin Pool
- Import stat-cache code |
3 |
# This program is free software; you can redistribute it and/or modify
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
1185.13.2
by Robert Collins
Merge Aarons conflict plugin for 0.1rc1 |
7 |
#
|
362
by Martin Pool
- Import stat-cache code |
8 |
# This program is distributed in the hope that it will be useful,
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
1185.13.2
by Robert Collins
Merge Aarons conflict plugin for 0.1rc1 |
12 |
#
|
362
by Martin Pool
- Import stat-cache code |
13 |
# You should have received a copy of the GNU General Public License
|
14 |
# along with this program; if not, write to the Free Software
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
362
by Martin Pool
- Import stat-cache code |
16 |
|
1185.13.2
by Robert Collins
Merge Aarons conflict plugin for 0.1rc1 |
17 |
import sys |
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
18 |
|
1551.10.7
by Aaron Bentley
Use new-style output for status |
19 |
from bzrlib import ( |
20 |
delta as _mod_delta, |
|
5393.3.1
by Parth Malwankar
initial post_status hook is now working |
21 |
hooks as _mod_hooks, |
3377.3.39
by John Arbash Meinel
More tweaks for show_pending_merges |
22 |
log, |
3074.3.1
by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations. |
23 |
osutils, |
24 |
tsort, |
|
25 |
revision as _mod_revision, |
|
1551.10.7
by Aaron Bentley
Use new-style output for status |
26 |
)
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
27 |
import bzrlib.errors as errors |
3224.5.19
by Andrew Bennetts
Move _raise_if_nonexistent into the only module that uses it, bzrlib.status. |
28 |
from bzrlib.trace import mutter, warning |
362
by Martin Pool
- Import stat-cache code |
29 |
|
1185.33.70
by Martin Pool
Refactor status display code. |
30 |
# TODO: when showing single-line logs, truncate to the width of the terminal
|
31 |
# if known, but only if really going to the terminal (not into a file)
|
|
32 |
||
465
by Martin Pool
- Move show_status() out of Branch into a new function in |
33 |
|
5076.4.6
by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show()) |
34 |
def report_changes(to_file, old, new, specific_files, |
35 |
show_short_reporter, show_long_callback, |
|
36 |
short=False, want_unchanged=False, |
|
5945.2.2
by Martin von Gagern
Change from no_decorate to classify as name for the argument. |
37 |
want_unversioned=False, show_ids=False, classify=True): |
5076.4.7
by Arnaud Jeansen
Add signature comments to report_changes in status.py |
38 |
"""Display summary of changes.
|
39 |
||
40 |
This compares two trees with regards to a list of files, and delegates
|
|
41 |
the display to underlying elements.
|
|
42 |
||
43 |
For short output, it creates an iterator on all changes, and lets a given
|
|
44 |
reporter display these changes.
|
|
45 |
||
46 |
For stantard output, it creates a delta of the changes, and forwards it
|
|
47 |
to a callback
|
|
48 |
||
49 |
:param to_file: If set, write to this file (default stdout.)
|
|
50 |
:param old: Start tree for the comparison
|
|
51 |
:param end: End tree for the comparison
|
|
52 |
:param specific_files: If set, a list of filenames whose status should be
|
|
53 |
shown. It is an error to give a filename that is not in the working
|
|
54 |
tree, or in the working inventory or in the basis inventory.
|
|
55 |
:param show_short_reporter: Reporter in charge of display for short output
|
|
56 |
:param show_long_callback: Callback in charge of display for normal output
|
|
57 |
:param short: If True, gives short SVN-style status lines.
|
|
58 |
:param want_unchanged: Deprecated parameter. If set, includes unchanged
|
|
59 |
files.
|
|
60 |
:param show_ids: If set, includes each file's id.
|
|
61 |
:param want_unversioned: If False, only shows versioned files.
|
|
5945.2.2
by Martin von Gagern
Change from no_decorate to classify as name for the argument. |
62 |
:param classify: Add special symbols to indicate file kind.
|
5076.4.7
by Arnaud Jeansen
Add signature comments to report_changes in status.py |
63 |
"""
|
5076.4.2
by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks. |
64 |
|
65 |
if short: |
|
66 |
changes = new.iter_changes(old, want_unchanged, specific_files, |
|
67 |
require_versioned=False, want_unversioned=want_unversioned) |
|
68 |
_mod_delta.report_changes(changes, show_short_reporter) |
|
69 |
||
70 |
else: |
|
71 |
delta = new.changes_from(old, want_unchanged=want_unchanged, |
|
72 |
specific_files=specific_files, |
|
73 |
want_unversioned=want_unversioned) |
|
74 |
# filter out unknown files. We may want a tree method for
|
|
75 |
# this
|
|
76 |
delta.unversioned = [unversioned for unversioned in |
|
77 |
delta.unversioned if not new.is_ignored(unversioned[0])] |
|
78 |
show_long_callback(to_file, delta, |
|
79 |
show_ids=show_ids, |
|
5945.2.1
by Martin von Gagern
Make kind markers optional. |
80 |
show_unchanged=want_unchanged, |
5945.2.2
by Martin von Gagern
Change from no_decorate to classify as name for the argument. |
81 |
classify=classify) |
5076.4.1
by Arnaud Jeansen
Extract show() from TreeDelta and pass a callback instead |
82 |
|
83 |
||
1773.1.2
by Robert Collins
Remove --all option from status. |
84 |
def show_tree_status(wt, show_unchanged=None, |
1551.2.9
by Aaron Bentley
Fix status to work with checkouts |
85 |
specific_files=None, |
86 |
show_ids=False, |
|
87 |
to_file=None, |
|
88 |
show_pending=True, |
|
2147.2.1
by Keir Mierle
Add a --short flag to status to get svn-style status |
89 |
revision=None, |
2318.2.1
by Kent Gibson
Apply status versioned patch |
90 |
short=False, |
3936.2.1
by Ian Clatworthy
verbose flag for status - code & tests |
91 |
verbose=False, |
5076.4.1
by Arnaud Jeansen
Extract show() from TreeDelta and pass a callback instead |
92 |
versioned=False, |
5945.2.2
by Martin von Gagern
Change from no_decorate to classify as name for the argument. |
93 |
classify=True, |
5076.4.4
by Arnaud Jeansen
Add a unified report_delta method |
94 |
show_long_callback=_mod_delta.report_delta): |
1551.2.9
by Aaron Bentley
Fix status to work with checkouts |
95 |
"""Display summary of changes.
|
96 |
||
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
97 |
By default this compares the working tree to a previous revision.
|
98 |
If the revision argument is given, summarizes changes between the
|
|
1551.2.9
by Aaron Bentley
Fix status to work with checkouts |
99 |
working tree and another, or between two revisions.
|
100 |
||
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
101 |
The result is written out as Unicode and to_file should be able
|
1551.2.9
by Aaron Bentley
Fix status to work with checkouts |
102 |
to encode that.
|
103 |
||
1662.1.9
by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619) |
104 |
If showing the status of a working tree, extra information is included
|
105 |
about unknown files, conflicts, and pending merges.
|
|
106 |
||
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
107 |
:param show_unchanged: Deprecated parameter. If set, includes unchanged
|
1773.1.2
by Robert Collins
Remove --all option from status. |
108 |
files.
|
109 |
:param specific_files: If set, a list of filenames whose status should be
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
110 |
shown. It is an error to give a filename that is not in the working
|
1662.1.9
by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619) |
111 |
tree, or in the working inventory or in the basis inventory.
|
1773.1.2
by Robert Collins
Remove --all option from status. |
112 |
:param show_ids: If set, includes each file's id.
|
113 |
:param to_file: If set, write to this file (default stdout.)
|
|
114 |
:param show_pending: If set, write pending merges.
|
|
3394.2.2
by Ian Clatworthy
show_tree_status docstring and deprecation cleanups |
115 |
:param revision: If None, compare latest revision with working tree
|
116 |
If not None, it must be a RevisionSpec list.
|
|
117 |
If one revision, compare with working tree.
|
|
118 |
If two revisions, show status between first and second.
|
|
2318.2.1
by Kent Gibson
Apply status versioned patch |
119 |
:param short: If True, gives short SVN-style status lines.
|
3936.2.1
by Ian Clatworthy
verbose flag for status - code & tests |
120 |
:param verbose: If True, show all merged revisions, not just
|
121 |
the merge tips
|
|
2318.2.1
by Kent Gibson
Apply status versioned patch |
122 |
:param versioned: If True, only shows versioned files.
|
5945.2.2
by Martin von Gagern
Change from no_decorate to classify as name for the argument. |
123 |
:param classify: Add special symbols to indicate file kind.
|
5076.4.2
by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks. |
124 |
:param show_long_callback: A callback: message = show_long_callback(to_file, delta,
|
125 |
show_ids, show_unchanged, indent, filter), only used with the long output
|
|
1551.2.9
by Aaron Bentley
Fix status to work with checkouts |
126 |
"""
|
1773.1.2
by Robert Collins
Remove --all option from status. |
127 |
if show_unchanged is not None: |
3394.2.2
by Ian Clatworthy
show_tree_status docstring and deprecation cleanups |
128 |
warn("show_tree_status with show_unchanged has been deprecated " |
1773.1.2
by Robert Collins
Remove --all option from status. |
129 |
"since bzrlib 0.9", DeprecationWarning, stacklevel=2) |
130 |
||
131 |
if to_file is None: |
|
915
by Martin Pool
- add simple test case for bzr status |
132 |
to_file = sys.stdout |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
133 |
|
1551.2.9
by Aaron Bentley
Fix status to work with checkouts |
134 |
wt.lock_read() |
580
by Martin Pool
- Use explicit lock methods on a branch, rather than doing it |
135 |
try: |
1185.1.35
by Robert Collins
Heikki Paajanen's status -r patch |
136 |
new_is_working_tree = True |
137 |
if revision is None: |
|
2091.4.1
by wang
Pushing to a remote branch does not currently update the remote working |
138 |
if wt.last_revision() != wt.branch.last_revision(): |
139 |
warning("working tree is out of date, run 'bzr update'") |
|
1551.2.9
by Aaron Bentley
Fix status to work with checkouts |
140 |
new = wt |
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
141 |
old = new.basis_tree() |
1185.1.35
by Robert Collins
Heikki Paajanen's status -r patch |
142 |
elif len(revision) > 0: |
143 |
try: |
|
3655.3.1
by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH` |
144 |
old = revision[0].as_tree(wt.branch) |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
145 |
except errors.NoSuchRevision, e: |
146 |
raise errors.BzrCommandError(str(e)) |
|
1540.2.6
by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1' |
147 |
if (len(revision) > 1) and (revision[1].spec is not None): |
1185.1.35
by Robert Collins
Heikki Paajanen's status -r patch |
148 |
try: |
3655.3.1
by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH` |
149 |
new = revision[1].as_tree(wt.branch) |
1185.1.35
by Robert Collins
Heikki Paajanen's status -r patch |
150 |
new_is_working_tree = False |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
151 |
except errors.NoSuchRevision, e: |
152 |
raise errors.BzrCommandError(str(e)) |
|
1185.1.35
by Robert Collins
Heikki Paajanen's status -r patch |
153 |
else: |
1551.2.9
by Aaron Bentley
Fix status to work with checkouts |
154 |
new = wt |
2255.2.80
by Robert Collins
In status, read lock the old and new trees being used to let data caching occur. |
155 |
old.lock_read() |
156 |
new.lock_read() |
|
157 |
try: |
|
5393.3.7
by Parth Malwankar
added pre_status hook |
158 |
for hook in hooks['pre_status']: |
159 |
hook(StatusHookParams(old, new, to_file, versioned, |
|
160 |
show_ids, short, verbose)) |
|
161 |
||
3930.2.2
by Karl Fogel
* bzrlib/status.py |
162 |
specific_files, nonexistents \ |
3930.2.4
by Karl Fogel
* bzrlib/status.py |
163 |
= _filter_nonexistent(specific_files, old, new) |
2318.2.3
by Kent Gibson
merged bzr.dev |
164 |
want_unversioned = not versioned |
5076.4.2
by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks. |
165 |
|
166 |
# Reporter used for short outputs
|
|
167 |
reporter = _mod_delta._ChangeReporter(output_file=to_file, |
|
5945.2.2
by Martin von Gagern
Change from no_decorate to classify as name for the argument. |
168 |
unversioned_filter=new.is_ignored, classify=classify) |
5076.4.6
by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show()) |
169 |
report_changes(to_file, old, new, specific_files, |
5076.4.2
by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks. |
170 |
reporter, show_long_callback, |
171 |
short=short, want_unchanged=show_unchanged, |
|
5945.2.1
by Martin von Gagern
Make kind markers optional. |
172 |
want_unversioned=want_unversioned, show_ids=show_ids, |
5945.2.2
by Martin von Gagern
Change from no_decorate to classify as name for the argument. |
173 |
classify=classify) |
5076.4.2
by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks. |
174 |
|
5137.2.5
by Arnaud Jeansen
Implement behaviour requested by mbp, in a way similar to the conflicts and non existent files' handling |
175 |
# show the ignored files among specific files (i.e. show the files
|
176 |
# identified from input that we choose to ignore).
|
|
177 |
if specific_files is not None: |
|
178 |
# Ignored files is sorted because specific_files is already sorted
|
|
179 |
ignored_files = [specific for specific in |
|
180 |
specific_files if new.is_ignored(specific)] |
|
181 |
if len(ignored_files) > 0 and not short: |
|
182 |
to_file.write("ignored:\n") |
|
183 |
prefix = ' ' |
|
184 |
else: |
|
185 |
prefix = 'I ' |
|
186 |
for ignored_file in ignored_files: |
|
187 |
to_file.write("%s %s\n" % (prefix, ignored_file)) |
|
188 |
||
1551.15.58
by Aaron Bentley
Status honours selected paths for conflicts (#127606) |
189 |
# show the new conflicts only for now. XXX: get them from the
|
190 |
# delta.
|
|
191 |
conflicts = new.conflicts() |
|
192 |
if specific_files is not None: |
|
193 |
conflicts = conflicts.select_conflicts(new, specific_files, |
|
194 |
ignore_misses=True, recurse=True)[1] |
|
195 |
if len(conflicts) > 0 and not short: |
|
2911.6.1
by Blake Winton
Change 'print >> f,'s to 'f.write('s. |
196 |
to_file.write("conflicts:\n") |
1551.15.58
by Aaron Bentley
Status honours selected paths for conflicts (#127606) |
197 |
for conflict in conflicts: |
2255.2.80
by Robert Collins
In status, read lock the old and new trees being used to let data caching occur. |
198 |
if short: |
2255.2.83
by John Arbash Meinel
[merge] bzr.dev 2294 |
199 |
prefix = 'C ' |
2255.2.80
by Robert Collins
In status, read lock the old and new trees being used to let data caching occur. |
200 |
else: |
201 |
prefix = ' ' |
|
5898.1.6
by Martin
Avoid implicit str casting in trace methods by calling unicode() on conflict objects first |
202 |
to_file.write("%s %s\n" % (prefix, unicode(conflict))) |
3930.2.2
by Karl Fogel
* bzrlib/status.py |
203 |
# Show files that were requested but don't exist (and are
|
204 |
# not versioned). We don't involve delta in this; these
|
|
205 |
# paths are really the province of just the status
|
|
206 |
# command, since they have more to do with how it was
|
|
207 |
# invoked than with the tree it's operating on.
|
|
208 |
if nonexistents and not short: |
|
209 |
to_file.write("nonexistent:\n") |
|
210 |
for nonexistent in nonexistents: |
|
3992.1.1
by Ian Clatworthy
Handle non-existent files in status (Karl Fogel, #306394) |
211 |
# We could calculate prefix outside the loop but, given
|
212 |
# how rarely this ought to happen, it's OK and arguably
|
|
213 |
# slightly faster to do it here (ala conflicts above)
|
|
3930.2.2
by Karl Fogel
* bzrlib/status.py |
214 |
if short: |
215 |
prefix = 'X ' |
|
216 |
else: |
|
217 |
prefix = ' ' |
|
218 |
to_file.write("%s %s\n" % (prefix, nonexistent)) |
|
3636.1.1
by Robert Collins
Stop passing specific_file lists to show_tree_status when the specific |
219 |
if (new_is_working_tree and show_pending): |
3936.2.1
by Ian Clatworthy
verbose flag for status - code & tests |
220 |
show_pending_merges(new, to_file, short, verbose=verbose) |
4593.3.1
by Martin Pool
Avoid raising exceptions from inside finally blocks (see bug 403523) |
221 |
if nonexistents: |
222 |
raise errors.PathsDoNotExist(nonexistents) |
|
5393.3.1
by Parth Malwankar
initial post_status hook is now working |
223 |
for hook in hooks['post_status']: |
5393.3.7
by Parth Malwankar
added pre_status hook |
224 |
hook(StatusHookParams(old, new, to_file, versioned, |
5393.3.6
by Parth Malwankar
verbose arg is now passed to post_status hook |
225 |
show_ids, short, verbose)) |
2255.2.80
by Robert Collins
In status, read lock the old and new trees being used to let data caching occur. |
226 |
finally: |
227 |
old.unlock() |
|
228 |
new.unlock() |
|
580
by Martin Pool
- Use explicit lock methods on a branch, rather than doing it |
229 |
finally: |
1551.2.9
by Aaron Bentley
Fix status to work with checkouts |
230 |
wt.unlock() |
1185.33.70
by Martin Pool
Refactor status display code. |
231 |
|
3377.3.39
by John Arbash Meinel
More tweaks for show_pending_merges |
232 |
|
233 |
def _get_sorted_revisions(tip_revision, revision_ids, parent_map): |
|
234 |
"""Get an iterator which will return the revisions in merge sorted order.
|
|
235 |
||
236 |
This will build up a list of all nodes, such that only nodes in the list
|
|
237 |
are referenced. It then uses MergeSorter to return them in 'merge-sorted'
|
|
238 |
order.
|
|
239 |
||
240 |
:param revision_ids: A set of revision_ids
|
|
241 |
:param parent_map: The parent information for each node. Revisions which
|
|
242 |
are considered ghosts should not be present in the map.
|
|
3377.3.43
by John Arbash Meinel
Ian's review feedback |
243 |
:return: iterator from MergeSorter.iter_topo_order()
|
3377.3.39
by John Arbash Meinel
More tweaks for show_pending_merges |
244 |
"""
|
3377.3.40
by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled |
245 |
# MergeSorter requires that all nodes be present in the graph, so get rid
|
246 |
# of any references pointing outside of this graph.
|
|
3377.3.39
by John Arbash Meinel
More tweaks for show_pending_merges |
247 |
parent_graph = {} |
248 |
for revision_id in revision_ids: |
|
249 |
if revision_id not in parent_map: # ghost |
|
250 |
parent_graph[revision_id] = [] |
|
251 |
else: |
|
252 |
# Only include parents which are in this sub-graph
|
|
253 |
parent_graph[revision_id] = [p for p in parent_map[revision_id] |
|
254 |
if p in revision_ids] |
|
255 |
sorter = tsort.MergeSorter(parent_graph, tip_revision) |
|
256 |
return sorter.iter_topo_order() |
|
257 |
||
258 |
||
3936.2.1
by Ian Clatworthy
verbose flag for status - code & tests |
259 |
def show_pending_merges(new, to_file, short=False, verbose=False): |
1185.33.70
by Martin Pool
Refactor status display code. |
260 |
"""Write out a display of pending merges in a working tree."""
|
3377.3.43
by John Arbash Meinel
Ian's review feedback |
261 |
parents = new.get_parent_ids() |
262 |
if len(parents) < 2: |
|
263 |
return
|
|
264 |
||
4747.3.6
by Vincent Ladeuil
terminal_width can now returns None. |
265 |
term_width = osutils.terminal_width() |
266 |
if term_width is not None: |
|
267 |
# we need one extra space for terminals that wrap on last char
|
|
268 |
term_width = term_width - 1 |
|
3377.3.39
by John Arbash Meinel
More tweaks for show_pending_merges |
269 |
if short: |
3377.3.42
by John Arbash Meinel
Get the tests to actually work, and get the code to go along with. |
270 |
first_prefix = 'P ' |
3377.3.39
by John Arbash Meinel
More tweaks for show_pending_merges |
271 |
sub_prefix = 'P. ' |
272 |
else: |
|
273 |
first_prefix = ' ' |
|
274 |
sub_prefix = ' ' |
|
3377.3.38
by John Arbash Meinel
Pull out terminal width from the inner loop of show_pending_merges |
275 |
|
4747.3.6
by Vincent Ladeuil
terminal_width can now returns None. |
276 |
def show_log_message(rev, prefix): |
277 |
if term_width is None: |
|
278 |
width = term_width |
|
279 |
else: |
|
280 |
width = term_width - len(prefix) |
|
281 |
log_message = log_formatter.log_string(None, rev, width, prefix=prefix) |
|
282 |
to_file.write(log_message + '\n') |
|
283 |
||
1908.6.9
by Robert Collins
Fix status to not use pending_merges. |
284 |
pending = parents[1:] |
1185.33.70
by Martin Pool
Refactor status display code. |
285 |
branch = new.branch |
1908.6.9
by Robert Collins
Fix status to not use pending_merges. |
286 |
last_revision = parents[0] |
2147.2.2
by Keir Mierle
Fix spacing error and add tests for status --short command flag. |
287 |
if not short: |
3936.2.1
by Ian Clatworthy
verbose flag for status - code & tests |
288 |
if verbose: |
289 |
to_file.write('pending merges:\n') |
|
290 |
else: |
|
4747.3.6
by Vincent Ladeuil
terminal_width can now returns None. |
291 |
to_file.write('pending merge tips:' |
292 |
' (use -v to see all merge revisions)\n') |
|
3074.3.1
by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations. |
293 |
graph = branch.repository.get_graph() |
3377.3.31
by John Arbash Meinel
change the status code to use find_unique_ancestors() |
294 |
other_revisions = [last_revision] |
3377.3.39
by John Arbash Meinel
More tweaks for show_pending_merges |
295 |
log_formatter = log.LineLogFormatter(to_file) |
1908.6.9
by Robert Collins
Fix status to not use pending_merges. |
296 |
for merge in pending: |
3377.3.39
by John Arbash Meinel
More tweaks for show_pending_merges |
297 |
try: |
298 |
rev = branch.repository.get_revisions([merge])[0] |
|
299 |
except errors.NoSuchRevision: |
|
300 |
# If we are missing a revision, just print out the revision id
|
|
3377.3.40
by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled |
301 |
to_file.write(first_prefix + '(ghost) ' + merge + '\n') |
3377.3.39
by John Arbash Meinel
More tweaks for show_pending_merges |
302 |
other_revisions.append(merge) |
303 |
continue
|
|
304 |
||
305 |
# Log the merge, as it gets a slightly different formatting
|
|
4747.3.6
by Vincent Ladeuil
terminal_width can now returns None. |
306 |
show_log_message(rev, first_prefix) |
3936.2.1
by Ian Clatworthy
verbose flag for status - code & tests |
307 |
if not verbose: |
308 |
continue
|
|
309 |
||
3074.3.1
by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations. |
310 |
# Find all of the revisions in the merge source, which are not in the
|
311 |
# last committed revision.
|
|
3377.3.31
by John Arbash Meinel
change the status code to use find_unique_ancestors() |
312 |
merge_extra = graph.find_unique_ancestors(merge, other_revisions) |
313 |
other_revisions.append(merge) |
|
3074.3.1
by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations. |
314 |
merge_extra.discard(_mod_revision.NULL_REVISION) |
3377.3.38
by John Arbash Meinel
Pull out terminal width from the inner loop of show_pending_merges |
315 |
|
3074.3.1
by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations. |
316 |
# Get a handle to all of the revisions we will need
|
1185.33.70
by Martin Pool
Refactor status display code. |
317 |
try: |
3074.3.1
by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations. |
318 |
revisions = dict((rev.revision_id, rev) for rev in |
319 |
branch.repository.get_revisions(merge_extra)) |
|
320 |
except errors.NoSuchRevision: |
|
3377.3.40
by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled |
321 |
# One of the sub nodes is a ghost, check each one
|
322 |
revisions = {} |
|
323 |
for revision_id in merge_extra: |
|
324 |
try: |
|
3377.3.42
by John Arbash Meinel
Get the tests to actually work, and get the code to go along with. |
325 |
rev = branch.repository.get_revisions([revision_id])[0] |
3377.3.40
by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled |
326 |
except errors.NoSuchRevision: |
327 |
revisions[revision_id] = None |
|
328 |
else: |
|
329 |
revisions[revision_id] = rev |
|
330 |
||
331 |
# Display the revisions brought in by this merge.
|
|
332 |
rev_id_iterator = _get_sorted_revisions(merge, merge_extra, |
|
333 |
branch.repository.get_parent_map(merge_extra)) |
|
334 |
# Skip the first node
|
|
335 |
num, first, depth, eom = rev_id_iterator.next() |
|
336 |
if first != merge: |
|
337 |
raise AssertionError('Somehow we misunderstood how' |
|
338 |
' iter_topo_order works %s != %s' % (first, merge)) |
|
339 |
for num, sub_merge, depth, eom in rev_id_iterator: |
|
340 |
rev = revisions[sub_merge] |
|
341 |
if rev is None: |
|
342 |
to_file.write(sub_prefix + '(ghost) ' + sub_merge + '\n') |
|
343 |
continue
|
|
4747.3.6
by Vincent Ladeuil
terminal_width can now returns None. |
344 |
show_log_message(revisions[sub_merge], sub_prefix) |
3224.5.19
by Andrew Bennetts
Move _raise_if_nonexistent into the only module that uses it, bzrlib.status. |
345 |
|
346 |
||
3930.2.4
by Karl Fogel
* bzrlib/status.py |
347 |
def _filter_nonexistent(orig_paths, old_tree, new_tree): |
3930.2.15
by Karl Fogel
Part of bug #306394: Ensure sorted order for nonexistent file output. |
348 |
"""Convert orig_paths to two sorted lists and return them.
|
3930.2.2
by Karl Fogel
* bzrlib/status.py |
349 |
|
350 |
The first is orig_paths paths minus the items in the second list,
|
|
351 |
and the second list is paths that are not in either inventory or
|
|
352 |
tree (they don't qualify if they exist in the tree's inventory, or
|
|
353 |
if they exist in the tree but are not versioned.)
|
|
354 |
||
355 |
If either of the two lists is empty, return it as an empty list.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
356 |
|
3224.5.19
by Andrew Bennetts
Move _raise_if_nonexistent into the only module that uses it, bzrlib.status. |
357 |
This can be used by operations such as bzr status that can accept
|
358 |
unknown or ignored files.
|
|
359 |
"""
|
|
3930.2.2
by Karl Fogel
* bzrlib/status.py |
360 |
mutter("check paths: %r", orig_paths) |
361 |
if not orig_paths: |
|
362 |
return orig_paths, [] |
|
363 |
s = old_tree.filter_unversioned_files(orig_paths) |
|
3224.5.19
by Andrew Bennetts
Move _raise_if_nonexistent into the only module that uses it, bzrlib.status. |
364 |
s = new_tree.filter_unversioned_files(s) |
3930.2.2
by Karl Fogel
* bzrlib/status.py |
365 |
nonexistent = [path for path in s if not new_tree.has_filename(path)] |
366 |
remaining = [path for path in orig_paths if not path in nonexistent] |
|
3930.2.15
by Karl Fogel
Part of bug #306394: Ensure sorted order for nonexistent file output. |
367 |
# Sorting the 'remaining' list doesn't have much effect in
|
368 |
# practice, since the various status output sections will sort
|
|
369 |
# their groups individually. But for consistency of this
|
|
370 |
# function's API, it's better to sort both than just 'nonexistent'.
|
|
371 |
return sorted(remaining), sorted(nonexistent) |
|
5393.3.1
by Parth Malwankar
initial post_status hook is now working |
372 |
|
373 |
||
374 |
class StatusHooks(_mod_hooks.Hooks): |
|
375 |
"""A dictionary mapping hook name to a list of callables for status hooks.
|
|
376 |
||
377 |
e.g. ['post_status'] Is the list of items to be called when the
|
|
378 |
status command has finished printing the status.
|
|
379 |
"""
|
|
380 |
||
5622.3.10
by Jelmer Vernooij
Don't require arguments to hooks. |
381 |
def __init__(self): |
5393.3.1
by Parth Malwankar
initial post_status hook is now working |
382 |
"""Create the default hooks.
|
383 |
||
384 |
These are all empty initially, because by default nothing should get
|
|
385 |
notified.
|
|
386 |
"""
|
|
5622.3.10
by Jelmer Vernooij
Don't require arguments to hooks. |
387 |
_mod_hooks.Hooks.__init__(self, "bzrlib.status", "hooks") |
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
388 |
self.add_hook('post_status', |
5393.3.7
by Parth Malwankar
added pre_status hook |
389 |
"Called with argument StatusHookParams after Bazaar has "
|
390 |
"displayed the status. StatusHookParams has the attributes "
|
|
391 |
"(old_tree, new_tree, to_file, versioned, show_ids, short, "
|
|
392 |
"verbose). The last four arguments correspond to the command "
|
|
393 |
"line options specified by the user for the status command. "
|
|
394 |
"to_file is the output stream for writing.", |
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
395 |
(2, 3)) |
396 |
self.add_hook('pre_status', |
|
5393.3.7
by Parth Malwankar
added pre_status hook |
397 |
"Called with argument StatusHookParams before Bazaar "
|
398 |
"displays the status. StatusHookParams has the attributes "
|
|
5393.3.6
by Parth Malwankar
verbose arg is now passed to post_status hook |
399 |
"(old_tree, new_tree, to_file, versioned, show_ids, short, "
|
400 |
"verbose). The last four arguments correspond to the command "
|
|
401 |
"line options specified by the user for the status command. "
|
|
402 |
"to_file is the output stream for writing.", |
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
403 |
(2, 3)) |
5393.3.1
by Parth Malwankar
initial post_status hook is now working |
404 |
|
405 |
||
5393.3.7
by Parth Malwankar
added pre_status hook |
406 |
class StatusHookParams(object): |
5393.3.2
by Parth Malwankar
added StatusPostHookParams and test cases |
407 |
"""Object holding parameters passed to post_status hooks.
|
408 |
||
409 |
:ivar old_tree: Start tree (basis tree) for comparison.
|
|
410 |
:ivar new_tree: Working tree.
|
|
5393.3.5
by Parth Malwankar
post_status hook now provies to_file as argument |
411 |
:ivar to_file: If set, write to this file.
|
5393.3.2
by Parth Malwankar
added StatusPostHookParams and test cases |
412 |
:ivar versioned: Show only versioned files.
|
413 |
:ivar show_ids: Show internal object ids.
|
|
414 |
:ivar short: Use short status indicators.
|
|
5393.3.6
by Parth Malwankar
verbose arg is now passed to post_status hook |
415 |
:ivar verbose: Verbose flag.
|
5393.3.2
by Parth Malwankar
added StatusPostHookParams and test cases |
416 |
"""
|
417 |
||
5393.3.6
by Parth Malwankar
verbose arg is now passed to post_status hook |
418 |
def __init__(self, old_tree, new_tree, to_file, versioned, show_ids, |
419 |
short, verbose): |
|
5393.3.2
by Parth Malwankar
added StatusPostHookParams and test cases |
420 |
"""Create a group of post_status hook parameters.
|
421 |
||
422 |
:param old_tree: Start tree (basis tree) for comparison.
|
|
423 |
:param new_tree: Working tree.
|
|
5393.3.5
by Parth Malwankar
post_status hook now provies to_file as argument |
424 |
:param to_file: If set, write to this file.
|
5393.3.2
by Parth Malwankar
added StatusPostHookParams and test cases |
425 |
:param versioned: Show only versioned files.
|
426 |
:param show_ids: Show internal object ids.
|
|
427 |
:param short: Use short status indicators.
|
|
5393.3.6
by Parth Malwankar
verbose arg is now passed to post_status hook |
428 |
:param verbose: Verbose flag.
|
5393.3.2
by Parth Malwankar
added StatusPostHookParams and test cases |
429 |
"""
|
430 |
self.old_tree = old_tree |
|
431 |
self.new_tree = new_tree |
|
5393.3.5
by Parth Malwankar
post_status hook now provies to_file as argument |
432 |
self.to_file = to_file |
5393.3.2
by Parth Malwankar
added StatusPostHookParams and test cases |
433 |
self.versioned = versioned |
434 |
self.show_ids = show_ids |
|
435 |
self.short = short |
|
5393.3.6
by Parth Malwankar
verbose arg is now passed to post_status hook |
436 |
self.verbose = verbose |
5393.3.2
by Parth Malwankar
added StatusPostHookParams and test cases |
437 |
|
438 |
def __eq__(self, other): |
|
439 |
return self.__dict__ == other.__dict__ |
|
440 |
||
441 |
def __repr__(self): |
|
5393.3.6
by Parth Malwankar
verbose arg is now passed to post_status hook |
442 |
return "<%s(%s, %s, %s, %s, %s, %s, %s)>" % (self.__class__.__name__, |
5393.3.5
by Parth Malwankar
post_status hook now provies to_file as argument |
443 |
self.old_tree, self.new_tree, self.to_file, self.versioned, |
5393.3.6
by Parth Malwankar
verbose arg is now passed to post_status hook |
444 |
self.show_ids, self.short, self.verbose) |
5393.3.2
by Parth Malwankar
added StatusPostHookParams and test cases |
445 |
|
5418.4.1
by Parth Malwankar
post_status hook added to show shelve summary. |
446 |
|
447 |
def _show_shelve_summary(params): |
|
448 |
"""post_status hook to display a summary of shelves.
|
|
449 |
||
450 |
:param params: StatusHookParams.
|
|
451 |
"""
|
|
5508.1.1
by John Arbash Meinel
Fix bug #662053, 'bzr status' shouldn't fail |
452 |
get_shelf_manager = getattr(params.new_tree, 'get_shelf_manager', None) |
453 |
if get_shelf_manager is None: |
|
454 |
return
|
|
455 |
manager = get_shelf_manager() |
|
5418.4.6
by Parth Malwankar
used active_shelves instead of creating a new function for listing shelves |
456 |
shelves = manager.active_shelves() |
5418.4.1
by Parth Malwankar
post_status hook added to show shelve summary. |
457 |
if shelves: |
5609.11.2
by Alexander Belchenko
correct singular form, thanks John |
458 |
singular = '%d shelf exists. ' |
5609.11.1
by Alexander Belchenko
use proper plural form to print status message about existing shelves. |
459 |
plural = '%d shelves exist. ' |
460 |
if len(shelves) == 1: |
|
461 |
fmt = singular |
|
462 |
else: |
|
463 |
fmt = plural |
|
464 |
params.to_file.write(fmt % len(shelves)) |
|
465 |
params.to_file.write('See "bzr shelve --list" for details.\n') |
|
5418.4.1
by Parth Malwankar
post_status hook added to show shelve summary. |
466 |
|
467 |
||
5622.3.10
by Jelmer Vernooij
Don't require arguments to hooks. |
468 |
hooks = StatusHooks() |
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
469 |
|
5622.3.11
by Jelmer Vernooij
Revert some unnecessary changes. |
470 |
|
471 |
hooks.install_named_hook('post_status', _show_shelve_summary, |
|
472 |
'bzr status') |
|
473 |