~bzr-pqm/bzr/bzr.dev

362 by Martin Pool
- Import stat-cache code
1
# (C) 2005 Canonical Ltd
1185.13.2 by Robert Collins
Merge Aarons conflict plugin for 0.1rc1
2
#
362 by Martin Pool
- Import stat-cache code
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1185.13.2 by Robert Collins
Merge Aarons conflict plugin for 0.1rc1
7
#
362 by Martin Pool
- Import stat-cache code
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1185.13.2 by Robert Collins
Merge Aarons conflict plugin for 0.1rc1
12
#
362 by Martin Pool
- Import stat-cache code
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1185.13.2 by Robert Collins
Merge Aarons conflict plugin for 0.1rc1
17
import sys
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
18
1185.13.2 by Robert Collins
Merge Aarons conflict plugin for 0.1rc1
19
from bzrlib.delta import compare_trees
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
20
from bzrlib.errors import NoSuchRevision
1185.12.27 by Aaron Bentley
Use line log for pending merges
21
from bzrlib.log import line_log
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
22
from bzrlib.osutils import is_inside_any
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
23
from bzrlib.symbol_versioning import *
362 by Martin Pool
- Import stat-cache code
24
1185.33.70 by Martin Pool
Refactor status display code.
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)
27
465 by Martin Pool
- Move show_status() out of Branch into a new function in
28
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
29
@deprecated_function(zero_eight)
465 by Martin Pool
- Move show_status() out of Branch into a new function in
30
def show_status(branch, show_unchanged=False,
483 by Martin Pool
- change 'file_list' to more explanatory 'specific_files'
31
                specific_files=None,
915 by Martin Pool
- add simple test case for bzr status
32
                show_ids=False,
974.1.48 by Aaron Bentley
Status command shows pending merges
33
                to_file=None,
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
34
                show_pending=True,
35
                revision=None):
1185.33.70 by Martin Pool
Refactor status display code.
36
    """Display summary of changes.
37
1551.2.11 by Aaron Bentley
Niced up the documentation
38
    Please use show_tree_status instead.
39
1185.33.70 by Martin Pool
Refactor status display code.
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.
43
44
    The result is written out as Unicode and to_file should be able 
45
    to encode that.
465 by Martin Pool
- Move show_status() out of Branch into a new function in
46
1185.3.1 by Martin Pool
- docstring fix from Magnus Therning
47
    show_unchanged
48
        If set, includes unchanged files.
465 by Martin Pool
- Move show_status() out of Branch into a new function in
49
483 by Martin Pool
- change 'file_list' to more explanatory 'specific_files'
50
    specific_files
465 by Martin Pool
- Move show_status() out of Branch into a new function in
51
        If set, only show the status of files in this list.
915 by Martin Pool
- add simple test case for bzr status
52
1185.3.1 by Martin Pool
- docstring fix from Magnus Therning
53
    show_ids
54
        If set, includes each file's id.
55
915 by Martin Pool
- add simple test case for bzr status
56
    to_file
57
        If set, write to this file (default stdout.)
1185.3.1 by Martin Pool
- docstring fix from Magnus Therning
58
59
    show_pending
60
        If set, write pending merges.
1092.3.4 by Robert Collins
update symlink branch to integration
61
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
62
    revision
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.
465 by Martin Pool
- Move show_status() out of Branch into a new function in
66
    """
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
67
    show_tree_status(branch.bzrdir.open_workingtree(), show_unchanged, 
68
                     specific_files, show_ids, to_file, show_pending, revision)
69
1551.2.11 by Aaron Bentley
Niced up the documentation
70
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
71
def show_tree_status(wt, show_unchanged=False,
72
                     specific_files=None,
73
                     show_ids=False,
74
                     to_file=None,
75
                     show_pending=True,
76
                     revision=None):
77
    """Display summary of changes.
78
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.
82
83
    The result is written out as Unicode and to_file should be able 
84
    to encode that.
85
86
    show_unchanged
87
        If set, includes unchanged files.
88
89
    specific_files
90
        If set, only show the status of files in this list.
91
92
    show_ids
93
        If set, includes each file's id.
94
95
    to_file
96
        If set, write to this file (default stdout.)
97
98
    show_pending
99
        If set, write pending merges.
100
101
    revision
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.
105
    """
915 by Martin Pool
- add simple test case for bzr status
106
    if to_file == None:
107
        to_file = sys.stdout
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
108
    
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
109
    wt.lock_read()
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
110
    try:
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
111
        new_is_working_tree = True
112
        if revision is None:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
113
            new = wt
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
114
            old = new.basis_tree()
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
115
        elif len(revision) > 0:
116
            try:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
117
                rev_id = revision[0].in_history(wt.branch).rev_id
118
                old = wt.branch.repository.revision_tree(rev_id)
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
119
            except NoSuchRevision, e:
120
                raise BzrCommandError(str(e))
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
121
            if (len(revision) > 1) and (revision[1].spec is not None):
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
122
                try:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
123
                    rev_id = revision[1].in_history(wt.branch).rev_id
124
                    new = wt.branch.repository.revision_tree(rev_id)
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
125
                    new_is_working_tree = False
126
                except NoSuchRevision, e:
127
                    raise BzrCommandError(str(e))
128
            else:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
129
                new = wt
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
130
                
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
131
        delta = compare_trees(old, new, want_unchanged=show_unchanged,
132
                              specific_files=specific_files)
915 by Martin Pool
- add simple test case for bzr status
133
        delta.show(to_file,
134
                   show_ids=show_ids,
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
135
                   show_unchanged=show_unchanged)
136
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
137
        if new_is_working_tree:
1185.33.70 by Martin Pool
Refactor status display code.
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)
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
142
    finally:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
143
        wt.unlock()
1185.33.70 by Martin Pool
Refactor status display code.
144
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()
148
    branch = new.branch
149
    if len(pending) == 0:
150
        return
151
    print >>to_file, 'pending merges:'
152
    last_revision = branch.last_revision()
153
    if last_revision is not None:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
154
        ignore = set(branch.repository.get_ancestry(last_revision))
1185.33.70 by Martin Pool
Refactor status display code.
155
    else:
156
        ignore = set()
157
    for merge in new.pending_merges():
158
        ignore.add(merge)
159
        try:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
160
            m_revision = branch.repository.get_revision(merge)
1185.33.70 by Martin Pool
Refactor status display code.
161
            print >> to_file, ' ', line_log(m_revision, 77)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
162
            inner_merges = branch.repository.get_ancestry(merge)
1185.33.70 by Martin Pool
Refactor status display code.
163
            inner_merges.reverse()
164
            for mmerge in inner_merges:
165
                if mmerge in ignore:
166
                    continue
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
167
                mm_revision = branch.repository.get_revision(mmerge)
1185.33.70 by Martin Pool
Refactor status display code.
168
                print >> to_file, '   ', line_log(mm_revision, 75)
169
                ignore.add(mmerge)
170
        except NoSuchRevision:
171
            print >> to_file, ' ', merge 
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
172
        
1185.14.11 by Aaron Bentley
moved conflict listing into status and stopped monkey-patching
173
def list_paths(header, paths, specific_files, to_file):
174
    done_header = False
175
    for path in paths:
176
        if specific_files and not is_inside_any(specific_files, path):
177
            continue
178
        if not done_header:
179
            print >>to_file, '%s:' % header
180
            done_header = True
181
        print >>to_file, ' ', path