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
from bzrlib.errors import NoSuchRevision
22
from bzrlib.log import line_log
23
from bzrlib.osutils import is_inside_any
24
from bzrlib.symbol_versioning import *
26
# TODO: when showing single-line logs, truncate to the width of the terminal
27
# if known, but only if really going to the terminal (not into a file)
30
@deprecated_function(zero_eight)
31
19
def show_status(branch, show_unchanged=False,
32
20
specific_files=None,
37
"""Display summary of changes.
39
Please use show_tree_status instead.
41
By default this compares the working tree to a previous revision.
42
If the revision argument is given, summarizes changes between the
43
working tree and another, or between two revisions.
45
The result is written out as Unicode and to_file should be able
25
"""Display status for non-ignored working files.
49
28
If set, includes unchanged files.
61
40
If set, write pending merges.
64
If None the compare latest revision with working tree
65
If one revision show compared it with working tree.
66
If two revisions show status between first and second.
68
show_tree_status(branch.bzrdir.open_workingtree(), show_unchanged,
69
specific_files, show_ids, to_file, show_pending, revision)
72
def show_tree_status(wt, show_unchanged=False,
78
"""Display summary of changes.
80
By default this compares the working tree to a previous revision.
81
If the revision argument is given, summarizes changes between the
82
working tree and another, or between two revisions.
84
The result is written out as Unicode and to_file should be able
87
If showing the status of a working tree, extra information is included
88
about unknown files, conflicts, and pending merges.
91
If set, includes unchanged files.
94
If set, a list of filenames whose status should be shown.
95
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.
99
If set, includes each file's id.
102
If set, write to this file (default stdout.)
105
If set, write pending merges.
108
If None the compare latest revision with working tree
109
If one revision show compared it with working tree.
110
If two revisions show status between first and second.
42
If None the compare latest revision with working tree
43
If one revision show compared it with working tree.
44
If two revisions show status between first and second.
47
from bzrlib.delta import compare_trees
112
49
if to_file == None:
113
50
to_file = sys.stdout
117
54
new_is_working_tree = True
118
55
if revision is None:
120
old = new.basis_tree()
56
old = branch.basis_tree()
57
new = branch.working_tree()
121
58
elif len(revision) > 0:
123
rev_id = revision[0].in_history(wt.branch).rev_id
124
old = wt.branch.repository.revision_tree(rev_id)
60
rev_id = revision[0].in_history(branch).rev_id
61
old = branch.revision_tree(rev_id)
125
62
except NoSuchRevision, e:
126
63
raise BzrCommandError(str(e))
127
if (len(revision) > 1) and (revision[1].spec is not None):
129
rev_id = revision[1].in_history(wt.branch).rev_id
130
new = wt.branch.repository.revision_tree(rev_id)
66
rev_id = revision[1].in_history(branch).rev_id
67
new = branch.revision_tree(rev_id)
131
68
new_is_working_tree = False
132
69
except NoSuchRevision, e:
133
70
raise BzrCommandError(str(e))
136
_raise_if_nonexistent(specific_files, old, new)
72
new = branch.working_tree()
137
75
delta = compare_trees(old, new, want_unchanged=show_unchanged,
138
76
specific_files=specific_files)
139
78
delta.show(to_file,
140
79
show_ids=show_ids,
141
80
show_unchanged=show_unchanged)
143
82
if new_is_working_tree:
144
list_paths('unknown', new.unknowns(), specific_files, to_file)
145
conflict_title = False
146
for conflict in wt.conflicts():
147
if conflict_title is False:
148
print >> to_file, "conflicts:"
149
conflict_title = True
150
print >> to_file, " %s" % conflict
151
if new_is_working_tree and show_pending:
152
show_pending_merges(new, to_file)
83
unknowns = new.unknowns()
86
# FIXME: Should also match if the unknown file is within a
87
# specified directory.
89
if path not in specific_files:
92
print >>to_file, 'unknown:'
94
print >>to_file, ' ', path
95
if show_pending and len(branch.pending_merges()) > 0:
96
print >>to_file, 'pending merges:'
97
for merge in branch.pending_merges():
98
print >> to_file, ' ', merge
156
def show_pending_merges(new, to_file):
157
"""Write out a display of pending merges in a working tree."""
158
pending = new.pending_merges()
160
if len(pending) == 0:
162
print >>to_file, 'pending merges:'
163
last_revision = branch.last_revision()
164
if last_revision is not None:
165
ignore = set(branch.repository.get_ancestry(last_revision))
168
for merge in new.pending_merges():
171
m_revision = branch.repository.get_revision(merge)
172
print >> to_file, ' ', line_log(m_revision, 77)
173
inner_merges = branch.repository.get_ancestry(merge)
174
inner_merges.reverse()
175
for mmerge in inner_merges:
178
mm_revision = branch.repository.get_revision(mmerge)
179
print >> to_file, ' ', line_log(mm_revision, 75)
181
except NoSuchRevision:
182
print >> to_file, ' ', merge
184
def list_paths(header, paths, specific_files, to_file):
187
if specific_files and not is_inside_any(specific_files, path):
190
print >>to_file, '%s:' % header
192
print >>to_file, ' ', path
added
removed
bzrlib/status.py
