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,
23
"""Display single-line status for non-ignored working files.
26
If true, show unmodified files too.
29
If set, only show the status of files in this list.
32
If set, write to this file (default stdout.)
35
from bzrlib.delta import compare_trees
36
"""Display summary of changes.
38
By default this compares the working tree to a previous revision.
39
If the revision argument is given, summarizes changes between the
40
working tree and another, or between two revisions.
42
The result is written out as Unicode and to_file should be able
46
If set, includes unchanged files.
49
If set, only show the status of files in this list.
52
If set, includes each file's id.
55
If set, write to this file (default stdout.)
58
If set, write pending merges.
61
If None the compare latest revision with working tree
62
If one revision show compared it with working tree.
63
If two revisions show status between first and second.
65
show_tree_status(branch.bzrdir.open_workingtree(), show_unchanged,
66
specific_files, show_ids, to_file, show_pending, revision)
68
def show_tree_status(wt, show_unchanged=False,
74
"""Display summary of changes.
76
By default this compares the working tree to a previous revision.
77
If the revision argument is given, summarizes changes between the
78
working tree and another, or between two revisions.
80
The result is written out as Unicode and to_file should be able
84
If set, includes unchanged files.
87
If set, only show the status of files in this list.
90
If set, includes each file's id.
93
If set, write to this file (default stdout.)
96
If set, write pending merges.
99
If None the compare latest revision with working tree
100
If one revision show compared it with working tree.
101
If two revisions show status between first and second.
37
103
if to_file == None:
38
104
to_file = sys.stdout
43
old = branch.basis_tree()
44
new = branch.working_tree()
108
new_is_working_tree = True
111
old = new.basis_tree()
112
elif len(revision) > 0:
114
rev_id = revision[0].in_history(wt.branch).rev_id
115
old = wt.branch.repository.revision_tree(rev_id)
116
except NoSuchRevision, e:
117
raise BzrCommandError(str(e))
118
if (len(revision) > 1) and (revision[1].spec is not None):
120
rev_id = revision[1].in_history(wt.branch).rev_id
121
new = wt.branch.repository.revision_tree(rev_id)
122
new_is_working_tree = False
123
except NoSuchRevision, e:
124
raise BzrCommandError(str(e))
46
128
delta = compare_trees(old, new, want_unchanged=show_unchanged,
47
129
specific_files=specific_files)
49
130
delta.show(to_file,
50
131
show_ids=show_ids,
51
132
show_unchanged=show_unchanged)
53
unknowns = new.unknowns()
56
# FIXME: Should also match if the unknown file is within a
57
# specified directory.
59
if path not in specific_files:
134
if new_is_working_tree:
135
list_paths('unknown', new.unknowns(), specific_files, to_file)
136
list_paths('conflicts', new.iter_conflicts(), specific_files, to_file)
137
if new_is_working_tree and show_pending:
138
show_pending_merges(new, to_file)
142
def show_pending_merges(new, to_file):
143
"""Write out a display of pending merges in a working tree."""
144
pending = new.pending_merges()
146
if len(pending) == 0:
148
print >>to_file, 'pending merges:'
149
last_revision = branch.last_revision()
150
if last_revision is not None:
151
ignore = set(branch.repository.get_ancestry(last_revision))
154
for merge in new.pending_merges():
157
m_revision = branch.repository.get_revision(merge)
158
print >> to_file, ' ', line_log(m_revision, 77)
159
inner_merges = branch.repository.get_ancestry(merge)
160
inner_merges.reverse()
161
for mmerge in inner_merges:
62
print >>to_file, 'unknown:'
64
print >>to_file, ' ', path
164
mm_revision = branch.repository.get_revision(mmerge)
165
print >> to_file, ' ', line_log(mm_revision, 75)
167
except NoSuchRevision:
168
print >> to_file, ' ', merge
170
def list_paths(header, paths, specific_files, to_file):
173
if specific_files and not is_inside_any(specific_files, path):
176
print >>to_file, '%s:' % header
178
print >>to_file, ' ', path
added
removed
bzrlib/status.py
