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
import bzrlib.errors as errors
22
from bzrlib.log import line_log
23
from bzrlib.osutils import is_inside_any
24
from bzrlib.symbol_versioning import (deprecated_function,
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=False,
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.
54
If set, only show the status of files in this list.
57
If set, includes each file's id.
60
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=False,
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.
93
If set, includes unchanged files.
96
If set, a list of filenames whose status should be shown.
97
It is an error to give a filename that is not in the working
98
tree, or in the working inventory or in the basis inventory.
101
If set, includes each file's id.
104
If set, write to this file (default stdout.)
107
If set, write pending merges.
110
If None the compare latest revision with working tree
111
If one revision show compared it with working tree.
112
If two revisions show status between first and second.
119
new_is_working_tree = True
122
old = new.basis_tree()
123
elif len(revision) > 0:
125
rev_id = revision[0].in_history(wt.branch).rev_id
126
old = wt.branch.repository.revision_tree(rev_id)
127
except errors.NoSuchRevision, e:
128
raise errors.BzrCommandError(str(e))
129
if (len(revision) > 1) and (revision[1].spec is not None):
131
rev_id = revision[1].in_history(wt.branch).rev_id
132
new = wt.branch.repository.revision_tree(rev_id)
133
new_is_working_tree = False
134
except errors.NoSuchRevision, e:
135
raise errors.BzrCommandError(str(e))
138
_raise_if_nonexistent(specific_files, old, new)
139
delta = compare_trees(old, new, want_unchanged=show_unchanged,
140
specific_files=specific_files)
143
show_unchanged=show_unchanged)
145
if new_is_working_tree:
146
list_paths('unknown', new.unknowns(), specific_files, to_file)
147
conflict_title = False
148
for conflict in wt.conflicts():
149
if conflict_title is False:
150
print >> to_file, "conflicts:"
151
conflict_title = True
152
print >> to_file, " %s" % conflict
153
if new_is_working_tree and show_pending:
154
show_pending_merges(new, to_file)
158
def show_pending_merges(new, to_file):
159
"""Write out a display of pending merges in a working tree."""
160
pending = new.pending_merges()
162
if len(pending) == 0:
164
print >>to_file, 'pending merges:'
165
last_revision = branch.last_revision()
166
if last_revision is not None:
167
ignore = set(branch.repository.get_ancestry(last_revision))
170
for merge in new.pending_merges():
173
m_revision = branch.repository.get_revision(merge)
174
print >> to_file, ' ', line_log(m_revision, 77)
175
inner_merges = branch.repository.get_ancestry(merge)
176
assert inner_merges[0] == None
178
inner_merges.reverse()
179
for mmerge in inner_merges:
182
mm_revision = branch.repository.get_revision(mmerge)
183
print >> to_file, ' ', line_log(mm_revision, 75)
185
except errors.NoSuchRevision:
186
print >> to_file, ' ', merge
188
def list_paths(header, paths, specific_files, to_file):
191
if specific_files and not is_inside_any(specific_files, path):
194
print >>to_file, '%s:' % header
196
print >>to_file, ' ', path
added
removed
bzrlib/status.py
