1
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.errors import NoSuchRevision
21
from bzrlib.log import line_log
22
from bzrlib.osutils import is_inside_any
23
from bzrlib.symbol_versioning import *
25
# TODO: when showing single-line logs, truncate to the width of the terminal
26
# if known, but only if really going to the terminal (not into a file)
29
@deprecated_function(zero_eight)
19
30
def show_status(branch, show_unchanged=False,
20
31
specific_files=None,
24
"""Display single-line status for non-ignored working files.
27
If true, show unmodified files too.
30
If set, only show the status of files in this list.
33
If set, write to this file (default stdout.)
36
from bzrlib.delta import compare_trees
36
"""Display summary of changes.
38
Please use show_tree_status instead.
40
By default this compares the working tree to a previous revision.
41
If the revision argument is given, summarizes changes between the
42
working tree and another, or between two revisions.
44
The result is written out as Unicode and to_file should be able
48
If set, includes unchanged files.
51
If set, only show the status of files in this list.
54
If set, includes each file's id.
57
If set, write to this file (default stdout.)
60
If set, write pending merges.
63
If None the compare latest revision with working tree
64
If one revision show compared it with working tree.
65
If two revisions show status between first and second.
67
show_tree_status(branch.bzrdir.open_workingtree(), show_unchanged,
68
specific_files, show_ids, to_file, show_pending, revision)
71
def show_tree_status(wt, show_unchanged=False,
77
"""Display summary of changes.
79
By default this compares the working tree to a previous revision.
80
If the revision argument is given, summarizes changes between the
81
working tree and another, or between two revisions.
83
The result is written out as Unicode and to_file should be able
87
If set, includes unchanged files.
90
If set, only show the status of files in this list.
93
If set, includes each file's id.
96
If set, write to this file (default stdout.)
99
If set, write pending merges.
102
If None the compare latest revision with working tree
103
If one revision show compared it with working tree.
104
If two revisions show status between first and second.
38
106
if to_file == None:
39
107
to_file = sys.stdout
44
old = branch.basis_tree()
45
new = branch.working_tree()
111
new_is_working_tree = True
114
old = new.basis_tree()
115
elif len(revision) > 0:
117
rev_id = revision[0].in_history(wt.branch).rev_id
118
old = wt.branch.repository.revision_tree(rev_id)
119
except NoSuchRevision, e:
120
raise BzrCommandError(str(e))
121
if (len(revision) > 1) and (revision[1].spec is not None):
123
rev_id = revision[1].in_history(wt.branch).rev_id
124
new = wt.branch.repository.revision_tree(rev_id)
125
new_is_working_tree = False
126
except NoSuchRevision, e:
127
raise BzrCommandError(str(e))
47
131
delta = compare_trees(old, new, want_unchanged=show_unchanged,
48
132
specific_files=specific_files)
50
133
delta.show(to_file,
51
134
show_ids=show_ids,
52
135
show_unchanged=show_unchanged)
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:
137
if new_is_working_tree:
138
list_paths('unknown', new.unknowns(), specific_files, to_file)
139
list_paths('conflicts', new.iter_conflicts(), specific_files, to_file)
140
if new_is_working_tree and show_pending:
141
show_pending_merges(new, to_file)
145
def show_pending_merges(new, to_file):
146
"""Write out a display of pending merges in a working tree."""
147
pending = new.pending_merges()
149
if len(pending) == 0:
151
print >>to_file, 'pending merges:'
152
last_revision = branch.last_revision()
153
if last_revision is not None:
154
ignore = set(branch.repository.get_ancestry(last_revision))
157
for merge in new.pending_merges():
160
m_revision = branch.repository.get_revision(merge)
161
print >> to_file, ' ', line_log(m_revision, 77)
162
inner_merges = branch.repository.get_ancestry(merge)
163
inner_merges.reverse()
164
for mmerge in inner_merges:
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
167
mm_revision = branch.repository.get_revision(mmerge)
168
print >> to_file, ' ', line_log(mm_revision, 75)
170
except NoSuchRevision:
171
print >> to_file, ' ', merge
173
def list_paths(header, paths, specific_files, to_file):
176
if specific_files and not is_inside_any(specific_files, path):
179
print >>to_file, '%s:' % header
181
print >>to_file, ' ', path
added
removed
bzrlib/status.py
