1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
|
# (C) 2005 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
import sys
from bzrlib.osutils import is_inside_any
from bzrlib.delta import compare_trees
from bzrlib.log import line_log
from bzrlib.errors import NoSuchRevision
def show_status(branch, show_unchanged=False,
specific_files=None,
show_ids=False,
to_file=None,
show_pending=True,
revision=None):
"""Display status for non-ignored working files.
show_unchanged
If set, includes unchanged files.
specific_files
If set, only show the status of files in this list.
show_ids
If set, includes each file's id.
to_file
If set, write to this file (default stdout.)
show_pending
If set, write pending merges.
revision
If None the compare latest revision with working tree
If one revision show compared it with working tree.
If two revisions show status between first and second.
"""
if to_file == None:
to_file = sys.stdout
branch.lock_read()
try:
new_is_working_tree = True
if revision is None:
old = branch.basis_tree()
new = branch.working_tree()
elif len(revision) > 0:
try:
rev_id = revision[0].in_history(branch).rev_id
old = branch.revision_tree(rev_id)
except NoSuchRevision, e:
raise BzrCommandError(str(e))
if len(revision) > 1:
try:
rev_id = revision[1].in_history(branch).rev_id
new = branch.revision_tree(rev_id)
new_is_working_tree = False
except NoSuchRevision, e:
raise BzrCommandError(str(e))
else:
new = branch.working_tree()
delta = compare_trees(old, new, want_unchanged=show_unchanged,
specific_files=specific_files)
delta.show(to_file,
show_ids=show_ids,
show_unchanged=show_unchanged)
if new_is_working_tree:
conflicts = new.iter_conflicts()
unknowns = new.unknowns()
list_paths('unknown', unknowns, specific_files, to_file)
list_paths('conflicts', conflicts, specific_files, to_file)
if show_pending and len(new.pending_merges()) > 0:
print >>to_file, 'pending merges:'
last_revision = branch.last_revision()
if last_revision is not None:
ignore = set(branch.get_ancestry(last_revision))
else:
ignore = set()
for merge in new.pending_merges():
ignore.add(merge)
try:
m_revision = branch.get_revision(merge)
print >> to_file, ' ', line_log(m_revision, 77)
inner_merges = branch.get_ancestry(merge)
inner_merges.reverse()
for mmerge in inner_merges:
if mmerge in ignore:
continue
mm_revision = branch.get_revision(mmerge)
print >> to_file, ' ', line_log(mm_revision, 75)
ignore.add(mmerge)
except NoSuchRevision:
print >> to_file, ' ', merge
finally:
branch.unlock()
def list_paths(header, paths, specific_files, to_file):
done_header = False
for path in paths:
if specific_files and not is_inside_any(specific_files, path):
continue
if not done_header:
print >>to_file, '%s:' % header
done_header = True
print >>to_file, ' ', path
|