1
# Copyright (C) 2005, 2006 Canonical Ltd
1
# (C) 2005 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
23
from bzrlib.diff import _raise_if_nonexistent
24
import bzrlib.errors as errors
25
from bzrlib.log import line_log
26
from bzrlib.osutils import is_inside_any
27
from bzrlib.symbol_versioning import (deprecated_function,
30
from bzrlib.trace import warning
32
# TODO: when showing single-line logs, truncate to the width of the terminal
33
# if known, but only if really going to the terminal (not into a file)
36
@deprecated_function(zero_eight)
37
def show_status(branch, show_unchanged=None,
19
def show_status(branch, show_unchanged=False,
38
20
specific_files=None,
43
"""Display summary of changes.
45
Please use show_tree_status instead.
47
By default this compares the working tree to a previous revision.
48
If the revision argument is given, summarizes changes between the
49
working tree and another, or between two revisions.
51
The result is written out as Unicode and to_file should be able
55
If set, includes unchanged files.
22
"""Display single-line status for non-ignored working files.
25
If true, show unmodified files too.
58
28
If set, only show the status of files in this list.
61
If set, includes each file's id.
64
If set, write to this file (default stdout.)
67
If set, write pending merges.
70
If None the compare latest revision with working tree
71
If one revision show compared it with working tree.
72
If two revisions show status between first and second.
74
show_tree_status(branch.bzrdir.open_workingtree(), show_unchanged,
75
specific_files, show_ids, to_file, show_pending, revision)
78
def show_tree_status(wt, show_unchanged=None,
85
"""Display summary of changes.
87
By default this compares the working tree to a previous revision.
88
If the revision argument is given, summarizes changes between the
89
working tree and another, or between two revisions.
91
The result is written out as Unicode and to_file should be able
94
If showing the status of a working tree, extra information is included
95
about unknown files, conflicts, and pending merges.
97
:param show_unchanged: Deprecated parameter. If set, includes unchanged
99
:param specific_files: If set, a list of filenames whose status should be
100
shown. It is an error to give a filename that is not in the working
101
tree, or in the working inventory or in the basis inventory.
102
:param show_ids: If set, includes each file's id.
103
:param to_file: If set, write to this file (default stdout.)
104
:param show_pending: If set, write pending merges.
105
:param revision: If None the compare latest revision with working tree
106
If not None it must be a RevisionSpec list.
107
If one revision show compared it with working tree.
108
If two revisions show status between first and second.
109
:param short: If True, gives short SVN-style status lines
111
if show_unchanged is not None:
112
warn("show_status_trees with show_unchanged has been deprecated "
113
"since bzrlib 0.9", DeprecationWarning, stacklevel=2)
31
from bzrlib.diff import compare_trees
120
new_is_working_tree = True
122
if wt.last_revision() != wt.branch.last_revision():
123
warning("working tree is out of date, run 'bzr update'")
125
old = new.basis_tree()
126
elif len(revision) > 0:
128
rev_id = revision[0].in_history(wt.branch).rev_id
129
old = wt.branch.repository.revision_tree(rev_id)
130
except errors.NoSuchRevision, e:
131
raise errors.BzrCommandError(str(e))
132
if (len(revision) > 1) and (revision[1].spec is not None):
134
rev_id = revision[1].in_history(wt.branch).rev_id
135
new = wt.branch.repository.revision_tree(rev_id)
136
new_is_working_tree = False
137
except errors.NoSuchRevision, e:
138
raise errors.BzrCommandError(str(e))
144
_raise_if_nonexistent(specific_files, old, new)
146
changes = new._iter_changes(old, show_unchanged, specific_files,
147
require_versioned=False)
148
reporter = _mod_delta.ChangeReporter(old.inventory,
150
_mod_delta.report_changes(changes, reporter)
152
delta = new.changes_from(old, want_unchanged=show_unchanged,
153
specific_files=specific_files)
156
show_unchanged=show_unchanged,
158
short_status_letter = '? '
160
short_status_letter = ''
161
list_paths('unknown', new.unknowns(), specific_files, to_file,
163
conflict_title = False
164
# show the new conflicts only for now. XXX: get them from the delta.
165
for conflict in new.conflicts():
166
if not short and conflict_title is False:
167
print >> to_file, "conflicts:"
168
conflict_title = True
173
print >> to_file, "%s %s" % (prefix, conflict)
174
if new_is_working_tree and show_pending:
175
show_pending_merges(new, to_file, short)
36
old = branch.basis_tree()
37
new = branch.working_tree()
39
delta = compare_trees(old, new, want_unchanged=show_unchanged,
40
specific_files=specific_files)
42
delta.show(sys.stdout, show_ids=show_ids,
43
show_unchanged=show_unchanged)
45
unknowns = new.unknowns()
48
# FIXME: Should also match if the unknown file is within a
49
# specified directory.
51
if path not in specific_files:
182
def show_pending_merges(new, to_file, short=False):
183
"""Write out a display of pending merges in a working tree."""
184
parents = new.get_parent_ids()
187
pending = parents[1:]
189
last_revision = parents[0]
191
print >>to_file, 'pending merges:'
192
if last_revision is not None:
194
ignore = set(branch.repository.get_ancestry(last_revision))
195
except errors.NoSuchRevision:
196
# the last revision is a ghost : assume everything is new
198
ignore = set([None, last_revision])
201
# TODO: this could be improved using merge_sorted - we'd get the same
202
# output rather than one level of indent.
203
for merge in pending:
206
from bzrlib.osutils import terminal_width
207
width = terminal_width()
208
m_revision = branch.repository.get_revision(merge)
213
print >> to_file, prefix, line_log(m_revision, width - 4)
214
inner_merges = branch.repository.get_ancestry(merge)
215
assert inner_merges[0] is None
217
inner_merges.reverse()
218
for mmerge in inner_merges:
221
mm_revision = branch.repository.get_revision(mmerge)
226
print >> to_file, prefix, line_log(mm_revision, width - 5)
228
except errors.NoSuchRevision:
233
print >> to_file, prefix, merge
235
def list_paths(header, paths, specific_files, to_file, short_status_letter=''):
238
if specific_files and not is_inside_any(specific_files, path):
240
if not short_status_letter and not done_header:
241
print >>to_file, '%s:' % header
243
print >>to_file, '%s %s' % (short_status_letter, path)
added
removed
bzrlib/status.py
