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
18
from bzrlib.osutils import is_inside_any
19
from bzrlib.delta import compare_trees
20
from bzrlib.log import line_log
21
from bzrlib.errors import NoSuchRevision
23
# TODO: when showing single-line logs, truncate to the width of the terminal
24
# if known, but only if really going to the terminal (not into a file)
27
19
def show_status(branch, show_unchanged=False,
28
20
specific_files=None,
33
"""Display summary of changes.
35
By default this compares the working tree to a previous revision.
36
If the revision argument is given, summarizes changes between the
37
working tree and another, or between two revisions.
39
The result is written out as Unicode and to_file should be able
43
If set, includes unchanged files.
22
"""Display single-line status for non-ignored working files.
25
If true, show unmodified files too.
46
28
If set, only show the status of files in this list.
49
If set, includes each file's id.
52
If set, write to this file (default stdout.)
55
If set, write pending merges.
58
If None the compare latest revision with working tree
59
If one revision show compared it with working tree.
60
If two revisions show status between first and second.
31
from bzrlib.diff import compare_trees
67
new_is_working_tree = True
69
old = branch.basis_tree()
70
new = branch.working_tree()
71
elif len(revision) > 0:
73
rev_id = revision[0].in_history(branch).rev_id
74
old = branch.revision_tree(rev_id)
75
except NoSuchRevision, e:
76
raise BzrCommandError(str(e))
79
rev_id = revision[1].in_history(branch).rev_id
80
new = branch.revision_tree(rev_id)
81
new_is_working_tree = False
82
except NoSuchRevision, e:
83
raise BzrCommandError(str(e))
85
new = branch.working_tree()
36
old = branch.basis_tree()
37
new = branch.working_tree()
88
39
delta = compare_trees(old, new, want_unchanged=show_unchanged,
89
40
specific_files=specific_files)
42
delta.show(sys.stdout, show_ids=show_ids,
93
43
show_unchanged=show_unchanged)
95
if new_is_working_tree:
96
list_paths('unknown', new.unknowns(), specific_files, to_file)
97
list_paths('conflicts', new.iter_conflicts(), specific_files, to_file)
98
if new_is_working_tree and show_pending:
99
show_pending_merges(new, to_file)
45
unknowns = new.unknowns()
48
# FIXME: Should also match if the unknown file is within a
49
# specified directory.
51
if path not in specific_files:
103
def show_pending_merges(new, to_file):
104
"""Write out a display of pending merges in a working tree."""
105
pending = new.pending_merges()
107
if len(pending) == 0:
109
print >>to_file, 'pending merges:'
110
last_revision = branch.last_revision()
111
if last_revision is not None:
112
ignore = set(branch.get_ancestry(last_revision))
115
for merge in new.pending_merges():
118
m_revision = branch.get_revision(merge)
119
print >> to_file, ' ', line_log(m_revision, 77)
120
inner_merges = branch.get_ancestry(merge)
121
inner_merges.reverse()
122
for mmerge in inner_merges:
125
mm_revision = branch.get_revision(mmerge)
126
print >> to_file, ' ', line_log(mm_revision, 75)
128
except NoSuchRevision:
129
print >> to_file, ' ', merge
131
def list_paths(header, paths, specific_files, to_file):
134
if specific_files and not is_inside_any(specific_files, path):
137
print >>to_file, '%s:' % header
139
print >>to_file, ' ', path
added
removed
bzrlib/status.py
