1
# Copyright (C) 2005, 2006 Canonical Ltd
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.
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.
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
from bzrlib.delta import compare_trees
20
from bzrlib.diff import _raise_if_nonexistent
21
from bzrlib.errors import NoSuchRevision
22
from bzrlib.log import line_log
23
from bzrlib.osutils import is_inside_any
24
from bzrlib.symbol_versioning import *
26
# TODO: when showing single-line logs, truncate to the width of the terminal
27
# 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=None,
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=None,
78
"""Display summary of changes.
80
By default this compares the working tree to a previous revision.
81
If the revision argument is given, summarizes changes between the
82
working tree and another, or between two revisions.
84
The result is written out as Unicode and to_file should be able
87
If showing the status of a working tree, extra information is included
88
about unknown files, conflicts, and pending merges.
90
:param show_unchanged: Deprecated parameter. If set, includes unchanged
92
:param specific_files: If set, a list of filenames whose status should be
93
shown. It is an error to give a filename that is not in the working
94
tree, or in the working inventory or in the basis inventory.
95
:param show_ids: If set, includes each file's id.
96
:param to_file: If set, write to this file (default stdout.)
97
:param show_pending: If set, write pending merges.
98
:param revision: If None the compare latest revision with working tree
99
If not None it must be a RevisionSpec list.
100
If one revision show compared it with working tree.
101
If two revisions show status between first and second.
103
if show_unchanged is not None:
104
warn("show_status_trees with show_unchanged has been deprecated "
105
"since bzrlib 0.9", DeprecationWarning, stacklevel=2)
112
new_is_working_tree = True
115
old = new.basis_tree()
116
elif len(revision) > 0:
118
rev_id = revision[0].in_history(wt.branch).rev_id
119
old = wt.branch.repository.revision_tree(rev_id)
120
except NoSuchRevision, e:
121
raise BzrCommandError(str(e))
122
if (len(revision) > 1) and (revision[1].spec is not None):
124
rev_id = revision[1].in_history(wt.branch).rev_id
125
new = wt.branch.repository.revision_tree(rev_id)
126
new_is_working_tree = False
127
except NoSuchRevision, e:
128
raise BzrCommandError(str(e))
131
_raise_if_nonexistent(specific_files, old, new)
132
delta = compare_trees(old, new, want_unchanged=show_unchanged,
133
specific_files=specific_files)
136
show_unchanged=show_unchanged)
138
if new_is_working_tree:
139
list_paths('unknown', new.unknowns(), specific_files, to_file)
140
conflict_title = False
141
for conflict in wt.conflicts():
142
if conflict_title is False:
143
print >> to_file, "conflicts:"
144
conflict_title = True
145
print >> to_file, " %s" % conflict
146
if new_is_working_tree and show_pending:
147
show_pending_merges(new, to_file)
151
def show_pending_merges(new, to_file):
152
"""Write out a display of pending merges in a working tree."""
153
pending = new.pending_merges()
155
if len(pending) == 0:
157
print >>to_file, 'pending merges:'
158
last_revision = branch.last_revision()
159
if last_revision is not None:
160
ignore = set(branch.repository.get_ancestry(last_revision))
163
for merge in new.pending_merges():
166
m_revision = branch.repository.get_revision(merge)
167
print >> to_file, ' ', line_log(m_revision, 77)
168
inner_merges = branch.repository.get_ancestry(merge)
169
assert inner_merges[0] == None
171
inner_merges.reverse()
172
for mmerge in inner_merges:
175
mm_revision = branch.repository.get_revision(mmerge)
176
print >> to_file, ' ', line_log(mm_revision, 75)
178
except NoSuchRevision:
179
print >> to_file, ' ', merge
181
def list_paths(header, paths, specific_files, to_file):
184
if specific_files and not is_inside_any(specific_files, path):
187
print >>to_file, '%s:' % header
189
print >>to_file, ' ', path
added
removed
bzrlib/status.py
