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
19
from bzrlib.diff import _raise_if_nonexistent
20
import bzrlib.errors as errors
21
from bzrlib.log import line_log
22
from bzrlib.osutils import is_inside_any
23
from bzrlib.symbol_versioning import (deprecated_function,
26
from bzrlib.trace import warning
28
# TODO: when showing single-line logs, truncate to the width of the terminal
29
# if known, but only if really going to the terminal (not into a file)
32
@deprecated_function(zero_eight)
33
def show_status(branch, show_unchanged=None,
19
def show_status(branch, show_unchanged=False,
34
20
specific_files=None,
39
"""Display summary of changes.
41
Please use show_tree_status instead.
43
By default this compares the working tree to a previous revision.
44
If the revision argument is given, summarizes changes between the
45
working tree and another, or between two revisions.
47
The result is written out as Unicode and to_file should be able
51
If set, includes unchanged files.
24
"""Display single-line status for non-ignored working files.
27
If true, show unmodified files too.
54
30
If set, only show the status of files in this list.
57
If set, includes each file's id.
60
33
If set, write to this file (default stdout.)
63
If set, write pending merges.
66
If None the compare latest revision with working tree
67
If one revision show compared it with working tree.
68
If two revisions show status between first and second.
70
show_tree_status(branch.bzrdir.open_workingtree(), show_unchanged,
71
specific_files, show_ids, to_file, show_pending, revision)
74
def show_tree_status(wt, show_unchanged=None,
80
"""Display summary of changes.
82
By default this compares the working tree to a previous revision.
83
If the revision argument is given, summarizes changes between the
84
working tree and another, or between two revisions.
86
The result is written out as Unicode and to_file should be able
89
If showing the status of a working tree, extra information is included
90
about unknown files, conflicts, and pending merges.
92
:param show_unchanged: Deprecated parameter. If set, includes unchanged
94
:param specific_files: If set, a list of filenames whose status should be
95
shown. It is an error to give a filename that is not in the working
96
tree, or in the working inventory or in the basis inventory.
97
:param show_ids: If set, includes each file's id.
98
:param to_file: If set, write to this file (default stdout.)
99
:param show_pending: If set, write pending merges.
100
:param revision: If None the compare latest revision with working tree
101
If not None it must be a RevisionSpec list.
102
If one revision show compared it with working tree.
103
If two revisions show status between first and second.
105
if show_unchanged is not None:
106
warn("show_status_trees with show_unchanged has been deprecated "
107
"since bzrlib 0.9", DeprecationWarning, stacklevel=2)
36
from bzrlib.delta import compare_trees
110
39
to_file = sys.stdout
114
new_is_working_tree = True
116
if wt.last_revision() != wt.branch.last_revision():
117
warning("working tree is out of date, run 'bzr update'")
119
old = new.basis_tree()
120
elif len(revision) > 0:
122
rev_id = revision[0].in_history(wt.branch).rev_id
123
old = wt.branch.repository.revision_tree(rev_id)
124
except errors.NoSuchRevision, e:
125
raise errors.BzrCommandError(str(e))
126
if (len(revision) > 1) and (revision[1].spec is not None):
128
rev_id = revision[1].in_history(wt.branch).rev_id
129
new = wt.branch.repository.revision_tree(rev_id)
130
new_is_working_tree = False
131
except errors.NoSuchRevision, e:
132
raise errors.BzrCommandError(str(e))
135
_raise_if_nonexistent(specific_files, old, new)
136
delta = new.changes_from(old, want_unchanged=show_unchanged,
44
old = branch.basis_tree()
45
new = branch.working_tree()
47
delta = compare_trees(old, new, want_unchanged=show_unchanged,
137
48
specific_files=specific_files)
138
50
delta.show(to_file,
139
51
show_ids=show_ids,
140
52
show_unchanged=show_unchanged)
142
list_paths('unknown', new.unknowns(), specific_files, to_file)
143
conflict_title = False
144
# show the new conflicts only for now. XXX: get them from the delta.
145
for conflict in new.conflicts():
146
if conflict_title is False:
147
print >> to_file, "conflicts:"
148
conflict_title = True
149
print >> to_file, " %s" % conflict
150
if new_is_working_tree and show_pending:
151
show_pending_merges(new, to_file)
54
unknowns = new.unknowns()
57
# FIXME: Should also match if the unknown file is within a
58
# specified directory.
60
if path not in specific_files:
63
print >>to_file, 'unknown:'
65
print >>to_file, ' ', path
66
if show_pending and len(branch.pending_merges()) > 0:
67
print >>to_file, 'pending merges:'
68
for merge in branch.pending_merges():
69
print >> to_file, ' ', merge
155
def show_pending_merges(new, to_file):
156
"""Write out a display of pending merges in a working tree."""
157
parents = new.get_parent_ids()
160
pending = parents[1:]
162
last_revision = parents[0]
163
print >>to_file, 'pending merges:'
164
if last_revision is not None:
166
ignore = set(branch.repository.get_ancestry(last_revision))
167
except errors.NoSuchRevision:
168
# the last revision is a ghost : assume everything is new
170
ignore = set([None, last_revision])
173
# TODO: this could be improved using merge_sorted - we'd get the same
174
# output rather than one level of indent.
175
for merge in pending:
178
from bzrlib.osutils import terminal_width
179
width = terminal_width()
180
m_revision = branch.repository.get_revision(merge)
181
print >> to_file, ' ', line_log(m_revision, width - 3)
182
inner_merges = branch.repository.get_ancestry(merge)
183
assert inner_merges[0] is None
185
inner_merges.reverse()
186
for mmerge in inner_merges:
189
mm_revision = branch.repository.get_revision(mmerge)
190
print >> to_file, ' ', line_log(mm_revision, width - 5)
192
except errors.NoSuchRevision:
193
print >> to_file, ' ', merge
195
def list_paths(header, paths, specific_files, to_file):
198
if specific_files and not is_inside_any(specific_files, path):
201
print >>to_file, '%s:' % header
203
print >>to_file, ' ', path
added
removed
bzrlib/status.py
