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,
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=None,
81
"""Display summary of changes.
83
By default this compares the working tree to a previous revision.
84
If the revision argument is given, summarizes changes between the
85
working tree and another, or between two revisions.
87
The result is written out as Unicode and to_file should be able
90
If showing the status of a working tree, extra information is included
91
about unknown files, conflicts, and pending merges.
93
:param show_unchanged: Deprecated parameter. If set, includes unchanged
95
:param specific_files: If set, a list of filenames whose status should be
96
shown. It is an error to give a filename that is not in the working
97
tree, or in the working inventory or in the basis inventory.
98
:param show_ids: If set, includes each file's id.
99
:param to_file: If set, write to this file (default stdout.)
100
:param show_pending: If set, write pending merges.
101
:param revision: If None the compare latest revision with working tree
102
If not None it must be a RevisionSpec list.
103
If one revision show compared it with working tree.
104
If two revisions show status between first and second.
105
:param short: If True, gives short SVN-style status lines
107
if show_unchanged is not None:
108
warn("show_status_trees with show_unchanged has been deprecated "
109
"since bzrlib 0.9", DeprecationWarning, stacklevel=2)
19
def find_modified(branch):
20
"""Return a list of files that have been modified in the working copy.
22
This does not consider renames and does not include files added or
25
Each modified file is returned as (PATH, ENTRY).
29
inv = branch.read_working_inventory()
30
cc = cache.update_cache(branch, inv)
31
basis_inv = branch.basis_tree().inventory
116
new_is_working_tree = True
118
if wt.last_revision() != wt.branch.last_revision():
119
warning("working tree is out of date, run 'bzr update'")
121
old = new.basis_tree()
122
elif len(revision) > 0:
124
rev_id = revision[0].in_history(wt.branch).rev_id
125
old = wt.branch.repository.revision_tree(rev_id)
126
except errors.NoSuchRevision, e:
127
raise errors.BzrCommandError(str(e))
128
if (len(revision) > 1) and (revision[1].spec is not None):
130
rev_id = revision[1].in_history(wt.branch).rev_id
131
new = wt.branch.repository.revision_tree(rev_id)
132
new_is_working_tree = False
133
except errors.NoSuchRevision, e:
134
raise errors.BzrCommandError(str(e))
137
_raise_if_nonexistent(specific_files, old, new)
138
delta = new.changes_from(old, want_unchanged=show_unchanged,
139
specific_files=specific_files)
142
show_unchanged=show_unchanged,
144
short_status_letter = '?'
146
short_status_letter = ''
147
list_paths('unknown', new.unknowns(), specific_files, to_file,
149
conflict_title = False
150
# show the new conflicts only for now. XXX: get them from the delta.
151
for conflict in new.conflicts():
152
if not short and conflict_title is False:
153
print >> to_file, "conflicts:"
154
conflict_title = True
159
print >> to_file, "%s %s" % (prefix, conflict)
160
if new_is_working_tree and show_pending:
161
show_pending_merges(new, to_file, short)
165
def show_pending_merges(new, to_file, short=False):
166
"""Write out a display of pending merges in a working tree."""
167
parents = new.get_parent_ids()
170
pending = parents[1:]
172
last_revision = parents[0]
174
print >>to_file, 'pending merges:'
175
if last_revision is not None:
177
ignore = set(branch.repository.get_ancestry(last_revision))
178
except errors.NoSuchRevision:
179
# the last revision is a ghost : assume everything is new
181
ignore = set([None, last_revision])
184
# TODO: this could be improved using merge_sorted - we'd get the same
185
# output rather than one level of indent.
186
for merge in pending:
189
from bzrlib.osutils import terminal_width
190
width = terminal_width()
191
m_revision = branch.repository.get_revision(merge)
196
print >> to_file, prefix, line_log(m_revision, width - 4)
197
inner_merges = branch.repository.get_ancestry(merge)
198
assert inner_merges[0] is None
200
inner_merges.reverse()
201
for mmerge in inner_merges:
204
mm_revision = branch.repository.get_revision(mmerge)
209
print >> to_file, prefix, line_log(mm_revision, width - 5)
211
except errors.NoSuchRevision:
216
print >> to_file, prefix, merge
218
def list_paths(header, paths, specific_files, to_file, short_status_letter=''):
221
if specific_files and not is_inside_any(specific_files, path):
223
if not short_status_letter and not done_header:
224
print >>to_file, '%s:' % header
226
print >>to_file, '%s %s' % (short_status_letter, path)
33
for path, entry in inv.iter_entries():
34
if entry.kind != 'file':
37
file_id = entry.file_id
40
continue # not in working dir
42
if file_id not in basis_inv:
43
continue # newly added
45
old_entry = basis_inv[file_id]
47
if (old_entry.text_size == ce[3]
48
and old_entry.text_sha1 == ce[1]):
added
removed
bzrlib/status.py
