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,
27
# TODO: when showing single-line logs, truncate to the width of the terminal
28
# if known, but only if really going to the terminal (not into a file)
31
@deprecated_function(zero_eight)
32
def show_status(branch, show_unchanged=None,
19
def show_status(branch, show_unchanged=False,
33
20
specific_files=None,
38
"""Display summary of changes.
40
Please use show_tree_status instead.
42
By default this compares the working tree to a previous revision.
43
If the revision argument is given, summarizes changes between the
44
working tree and another, or between two revisions.
46
The result is written out as Unicode and to_file should be able
25
"""Display status for non-ignored working files.
50
28
If set, includes unchanged files.
62
40
If set, write pending merges.
65
42
If None the compare latest revision with working tree
66
43
If one revision show compared it with working tree.
67
44
If two revisions show status between first and second.
69
show_tree_status(branch.bzrdir.open_workingtree(), show_unchanged,
70
specific_files, show_ids, to_file, show_pending, revision)
73
def show_tree_status(wt, show_unchanged=None,
79
"""Display summary of changes.
81
By default this compares the working tree to a previous revision.
82
If the revision argument is given, summarizes changes between the
83
working tree and another, or between two revisions.
85
The result is written out as Unicode and to_file should be able
88
If showing the status of a working tree, extra information is included
89
about unknown files, conflicts, and pending merges.
91
:param show_unchanged: Deprecated parameter. If set, includes unchanged
93
:param specific_files: If set, a list of filenames whose status should be
94
shown. It is an error to give a filename that is not in the working
95
tree, or in the working inventory or in the basis inventory.
96
:param show_ids: If set, includes each file's id.
97
:param to_file: If set, write to this file (default stdout.)
98
:param show_pending: If set, write pending merges.
99
:param revision: If None the compare latest revision with working tree
100
If not None it must be a RevisionSpec list.
101
If one revision show compared it with working tree.
102
If two revisions show status between first and second.
104
if show_unchanged is not None:
105
warn("show_status_trees with show_unchanged has been deprecated "
106
"since bzrlib 0.9", DeprecationWarning, stacklevel=2)
47
from bzrlib.delta import compare_trees
109
50
to_file = sys.stdout
113
54
new_is_working_tree = True
114
55
if revision is None:
116
old = new.basis_tree()
56
old = branch.basis_tree()
57
new = branch.working_tree()
117
58
elif len(revision) > 0:
119
rev_id = revision[0].in_history(wt.branch).rev_id
120
old = wt.branch.repository.revision_tree(rev_id)
121
except errors.NoSuchRevision, e:
122
raise errors.BzrCommandError(str(e))
123
if (len(revision) > 1) and (revision[1].spec is not None):
60
rev_id = revision[0].in_history(branch).rev_id
61
old = branch.revision_tree(rev_id)
62
except NoSuchRevision, e:
63
raise BzrCommandError(str(e))
125
rev_id = revision[1].in_history(wt.branch).rev_id
126
new = wt.branch.repository.revision_tree(rev_id)
66
rev_id = revision[1].in_history(branch).rev_id
67
new = branch.revision_tree(rev_id)
127
68
new_is_working_tree = False
128
except errors.NoSuchRevision, e:
129
raise errors.BzrCommandError(str(e))
69
except NoSuchRevision, e:
70
raise BzrCommandError(str(e))
132
_raise_if_nonexistent(specific_files, old, new)
133
delta = new.changes_from(old, want_unchanged=show_unchanged,
72
new = branch.working_tree()
75
delta = compare_trees(old, new, want_unchanged=show_unchanged,
134
76
specific_files=specific_files)
135
78
delta.show(to_file,
136
79
show_ids=show_ids,
137
80
show_unchanged=show_unchanged)
139
list_paths('unknown', new.unknowns(), specific_files, to_file)
140
conflict_title = False
141
# show the new conflicts only for now. XXX: get them from the delta.
142
for conflict in new.conflicts():
143
if conflict_title is False:
144
print >> to_file, "conflicts:"
145
conflict_title = True
146
print >> to_file, " %s" % conflict
147
if new_is_working_tree and show_pending:
148
show_pending_merges(new, to_file)
82
if new_is_working_tree:
83
unknowns = new.unknowns()
86
# FIXME: Should also match if the unknown file is within a
87
# specified directory.
89
if path not in specific_files:
92
print >>to_file, 'unknown:'
94
print >>to_file, ' ', path
95
if show_pending and len(branch.pending_merges()) > 0:
96
print >>to_file, 'pending merges:'
97
for merge in branch.pending_merges():
98
print >> to_file, ' ', merge
152
def show_pending_merges(new, to_file):
153
"""Write out a display of pending merges in a working tree."""
154
parents = new.get_parent_ids()
157
pending = parents[1:]
159
last_revision = parents[0]
160
print >>to_file, 'pending merges:'
161
if last_revision is not None:
163
ignore = set(branch.repository.get_ancestry(last_revision))
164
except errors.NoSuchRevision:
165
# the last revision is a ghost : assume everything is new
167
ignore = set([None, last_revision])
170
# TODO: this could be improved using merge_sorted - we'd get the same
171
# output rather than one level of indent.
172
for merge in pending:
175
from bzrlib.osutils import terminal_width
176
width = terminal_width()
177
m_revision = branch.repository.get_revision(merge)
178
print >> to_file, ' ', line_log(m_revision, width - 3)
179
inner_merges = branch.repository.get_ancestry(merge)
180
assert inner_merges[0] is None
182
inner_merges.reverse()
183
for mmerge in inner_merges:
186
mm_revision = branch.repository.get_revision(mmerge)
187
print >> to_file, ' ', line_log(mm_revision, width - 5)
189
except errors.NoSuchRevision:
190
print >> to_file, ' ', merge
192
def list_paths(header, paths, specific_files, to_file):
195
if specific_files and not is_inside_any(specific_files, path):
198
print >>to_file, '%s:' % header
200
print >>to_file, ' ', path
added
removed
bzrlib/status.py
