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
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
46
45
"""Display summary of changes.
48
By default this compares the working tree to a previous revision.
49
If the revision argument is given, summarizes changes between the
47
By default this compares the working tree to a previous revision.
48
If the revision argument is given, summarizes changes between the
50
49
working tree and another, or between two revisions.
52
The result is written out as Unicode and to_file should be able
51
The result is written out as Unicode and to_file should be able
55
54
If showing the status of a working tree, extra information is included
56
55
about unknown files, conflicts, and pending merges.
58
:param show_unchanged: Deprecated parameter. If set, includes unchanged
57
:param show_unchanged: Deprecated parameter. If set, includes unchanged
60
59
:param specific_files: If set, a list of filenames whose status should be
61
shown. It is an error to give a filename that is not in the working
60
shown. It is an error to give a filename that is not in the working
62
61
tree, or in the working inventory or in the basis inventory.
63
62
:param show_ids: If set, includes each file's id.
64
63
:param to_file: If set, write to this file (default stdout.)
68
67
If one revision, compare with working tree.
69
68
If two revisions, show status between first and second.
70
69
:param short: If True, gives short SVN-style status lines.
71
:param verbose: If True, show all merged revisions, not just
73
70
:param versioned: If True, only shows versioned files.
75
72
if show_unchanged is not None:
106
specific_files, nonexistents \
107
= _filter_nonexistent(specific_files, old, new)
103
_raise_if_nonexistent(specific_files, old, new)
108
104
want_unversioned = not versioned
110
106
changes = new.iter_changes(old, show_unchanged, specific_files,
140
136
to_file.write("%s %s\n" % (prefix, conflict))
141
# Show files that were requested but don't exist (and are
142
# not versioned). We don't involve delta in this; these
143
# paths are really the province of just the status
144
# command, since they have more to do with how it was
145
# invoked than with the tree it's operating on.
146
if nonexistents and not short:
147
to_file.write("nonexistent:\n")
148
for nonexistent in nonexistents:
149
# We could calculate prefix outside the loop but, given
150
# how rarely this ought to happen, it's OK and arguably
151
# slightly faster to do it here (ala conflicts above)
156
to_file.write("%s %s\n" % (prefix, nonexistent))
157
137
if (new_is_working_tree and show_pending):
158
show_pending_merges(new, to_file, short, verbose=verbose)
138
show_pending_merges(new, to_file, short)
163
raise errors.PathsDoNotExist(nonexistents)
191
169
return sorter.iter_topo_order()
194
def show_pending_merges(new, to_file, short=False, verbose=False):
172
def show_pending_merges(new, to_file, short=False):
195
173
"""Write out a display of pending merges in a working tree."""
196
174
parents = new.get_parent_ids()
197
175
if len(parents) < 2:
210
188
branch = new.branch
211
189
last_revision = parents[0]
214
to_file.write('pending merges:\n')
216
to_file.write('pending merge tips: (use -v to see all merge revisions)\n')
191
to_file.write('pending merges:\n')
217
192
graph = branch.repository.get_graph()
218
193
other_revisions = [last_revision]
219
194
log_formatter = log.LineLogFormatter(to_file)
230
205
log_message = log_formatter.log_string(None, rev,
231
206
term_width - len(first_prefix))
232
207
to_file.write(first_prefix + log_message + '\n')
236
208
# Find all of the revisions in the merge source, which are not in the
237
209
# last committed revision.
238
210
merge_extra = graph.find_unique_ancestors(merge, other_revisions)
273
245
to_file.write(sub_prefix + log_message + '\n')
276
def _filter_nonexistent(orig_paths, old_tree, new_tree):
277
"""Convert orig_paths to two sorted lists and return them.
279
The first is orig_paths paths minus the items in the second list,
280
and the second list is paths that are not in either inventory or
281
tree (they don't qualify if they exist in the tree's inventory, or
282
if they exist in the tree but are not versioned.)
284
If either of the two lists is empty, return it as an empty list.
248
def _raise_if_nonexistent(paths, old_tree, new_tree):
249
"""Complain if paths are not in either inventory or tree.
251
It's OK with the files exist in either tree's inventory, or
252
if they exist in the tree but are not versioned.
286
254
This can be used by operations such as bzr status that can accept
287
255
unknown or ignored files.
289
mutter("check paths: %r", orig_paths)
291
return orig_paths, []
292
s = old_tree.filter_unversioned_files(orig_paths)
257
mutter("check paths: %r", paths)
260
s = old_tree.filter_unversioned_files(paths)
293
261
s = new_tree.filter_unversioned_files(s)
294
nonexistent = [path for path in s if not new_tree.has_filename(path)]
295
remaining = [path for path in orig_paths if not path in nonexistent]
296
# Sorting the 'remaining' list doesn't have much effect in
297
# practice, since the various status output sections will sort
298
# their groups individually. But for consistency of this
299
# function's API, it's better to sort both than just 'nonexistent'.
300
return sorted(remaining), sorted(nonexistent)
262
s = [path for path in s if not new_tree.has_filename(path)]
264
raise errors.PathsDoNotExist(sorted(s))
added
removed
bzrlib/status.py
