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.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=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
25
"""Display status for non-ignored working files.
51
28
If set, includes unchanged files.
67
44
If one revision show compared it with working tree.
68
45
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)
48
from bzrlib.osutils import is_inside_any
49
from bzrlib.delta import compare_trees
110
52
to_file = sys.stdout
114
56
new_is_working_tree = True
115
57
if revision is None:
117
old = new.basis_tree()
58
old = branch.basis_tree()
59
new = branch.working_tree()
118
60
elif len(revision) > 0:
120
rev_id = revision[0].in_history(wt.branch).rev_id
121
old = wt.branch.repository.revision_tree(rev_id)
122
except errors.NoSuchRevision, e:
123
raise errors.BzrCommandError(str(e))
124
if (len(revision) > 1) and (revision[1].spec is not None):
62
rev_id = revision[0].in_history(branch).rev_id
63
old = branch.revision_tree(rev_id)
64
except NoSuchRevision, e:
65
raise BzrCommandError(str(e))
126
rev_id = revision[1].in_history(wt.branch).rev_id
127
new = wt.branch.repository.revision_tree(rev_id)
68
rev_id = revision[1].in_history(branch).rev_id
69
new = branch.revision_tree(rev_id)
128
70
new_is_working_tree = False
129
except errors.NoSuchRevision, e:
130
raise errors.BzrCommandError(str(e))
71
except NoSuchRevision, e:
72
raise BzrCommandError(str(e))
133
_raise_if_nonexistent(specific_files, old, new)
74
new = branch.working_tree()
134
77
delta = compare_trees(old, new, want_unchanged=show_unchanged,
135
78
specific_files=specific_files)
136
80
delta.show(to_file,
137
81
show_ids=show_ids,
138
82
show_unchanged=show_unchanged)
140
84
if new_is_working_tree:
141
list_paths('unknown', new.unknowns(), specific_files, to_file)
142
conflict_title = False
143
for conflict in wt.conflicts():
144
if conflict_title is False:
145
print >> to_file, "conflicts:"
146
conflict_title = True
147
print >> to_file, " %s" % conflict
148
if new_is_working_tree and show_pending:
149
show_pending_merges(new, to_file)
85
unknowns = new.unknowns()
88
if specific_files and not is_inside_any(specific_files, path):
91
print >>to_file, 'unknown:'
93
print >>to_file, ' ', path
94
if show_pending and len(branch.pending_merges()) > 0:
95
print >>to_file, 'pending merges:'
96
for merge in branch.pending_merges():
97
print >> to_file, ' ', merge
153
def show_pending_merges(new, to_file):
154
"""Write out a display of pending merges in a working tree."""
155
pending = new.pending_merges()
157
if len(pending) == 0:
159
print >>to_file, 'pending merges:'
160
last_revision = branch.last_revision()
161
if last_revision is not None:
162
ignore = set(branch.repository.get_ancestry(last_revision))
165
for merge in new.pending_merges():
168
m_revision = branch.repository.get_revision(merge)
169
print >> to_file, ' ', line_log(m_revision, 77)
170
inner_merges = branch.repository.get_ancestry(merge)
171
assert inner_merges[0] == None
173
inner_merges.reverse()
174
for mmerge in inner_merges:
177
mm_revision = branch.repository.get_revision(mmerge)
178
print >> to_file, ' ', line_log(mm_revision, 75)
180
except errors.NoSuchRevision:
181
print >> to_file, ' ', merge
183
def list_paths(header, paths, specific_files, to_file):
186
if specific_files and not is_inside_any(specific_files, path):
189
print >>to_file, '%s:' % header
191
print >>to_file, ' ', path
added
removed
bzrlib/status.py
