/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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
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.
41
42
    The result is written out as Unicode and to_file should be able 
43
    to encode that.
465 by Martin Pool
- Move show_status() out of Branch into a new function in
44
1185.3.1 by Martin Pool
- docstring fix from Magnus Therning
45
    show_unchanged
46
        If set, includes unchanged files.
465 by Martin Pool
- Move show_status() out of Branch into a new function in
47
483 by Martin Pool
- change 'file_list' to more explanatory 'specific_files'
48
    specific_files
465 by Martin Pool
- Move show_status() out of Branch into a new function in
49
        If set, only show the status of files in this list.
915 by Martin Pool
- add simple test case for bzr status
50
1185.3.1 by Martin Pool
- docstring fix from Magnus Therning
51
    show_ids
52
        If set, includes each file's id.
53
915 by Martin Pool
- add simple test case for bzr status
54
    to_file
55
        If set, write to this file (default stdout.)
1185.3.1 by Martin Pool
- docstring fix from Magnus Therning
56
57
    show_pending
58
        If set, write pending merges.
1092.3.4 by Robert Collins
update symlink branch to integration
59
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
60
    revision
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.
465 by Martin Pool
- Move show_status() out of Branch into a new function in
64
    """
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
65
    show_tree_status(branch.bzrdir.open_workingtree(), show_unchanged, 
66
                     specific_files, show_ids, to_file, show_pending, revision)
67
68
def show_tree_status(wt, show_unchanged=False,
69
                     specific_files=None,
70
                     show_ids=False,
71
                     to_file=None,
72
                     show_pending=True,
73
                     revision=None):
74
    """Display summary of changes.
75
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.
79
80
    The result is written out as Unicode and to_file should be able 
81
    to encode that.
82
83
    show_unchanged
84
        If set, includes unchanged files.
85
86
    specific_files
87
        If set, only show the status of files in this list.
88
89
    show_ids
90
        If set, includes each file's id.
91
92
    to_file
93
        If set, write to this file (default stdout.)
94
95
    show_pending
96
        If set, write pending merges.
97
98
    revision
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.
102
    """
915 by Martin Pool
- add simple test case for bzr status
103
    if to_file == None:
104
        to_file = sys.stdout
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
105
    
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
106
    wt.lock_read()
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
107
    try:
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
108
        new_is_working_tree = True
109
        if revision is None:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
110
            new = wt
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
111
            old = new.basis_tree()
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
112
        elif len(revision) > 0:
113
            try:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
114
                rev_id = revision[0].in_history(wt.branch).rev_id
115
                old = wt.branch.repository.revision_tree(rev_id)
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
116
            except NoSuchRevision, e:
117
                raise BzrCommandError(str(e))
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
118
            if (len(revision) > 1) and (revision[1].spec is not None):
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
119
                try:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
120
                    rev_id = revision[1].in_history(wt.branch).rev_id
121
                    new = wt.branch.repository.revision_tree(rev_id)
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
122
                    new_is_working_tree = False
123
                except NoSuchRevision, e:
124
                    raise BzrCommandError(str(e))
125
            else:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
126
                new = wt
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
127
                
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
128
        delta = compare_trees(old, new, want_unchanged=show_unchanged,
129
                              specific_files=specific_files)
915 by Martin Pool
- add simple test case for bzr status
130
        delta.show(to_file,
131
                   show_ids=show_ids,
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
132
                   show_unchanged=show_unchanged)
133
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
134
        if new_is_working_tree:
1185.33.70 by Martin Pool
Refactor status display code.
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)
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
139
    finally:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
140
        wt.unlock()
1185.33.70 by Martin Pool
Refactor status display code.
141
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()
145
    branch = new.branch
146
    if len(pending) == 0:
147
        return
148
    print >>to_file, 'pending merges:'
149
    last_revision = branch.last_revision()
150
    if last_revision is not None:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
151
        ignore = set(branch.repository.get_ancestry(last_revision))
1185.33.70 by Martin Pool
Refactor status display code.
152
    else:
153
        ignore = set()
154
    for merge in new.pending_merges():
155
        ignore.add(merge)
156
        try:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
157
            m_revision = branch.repository.get_revision(merge)
1185.33.70 by Martin Pool
Refactor status display code.
158
            print >> to_file, ' ', line_log(m_revision, 77)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
159
            inner_merges = branch.repository.get_ancestry(merge)
1185.33.70 by Martin Pool
Refactor status display code.
160
            inner_merges.reverse()
161
            for mmerge in inner_merges:
162
                if mmerge in ignore:
163
                    continue
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
164
                mm_revision = branch.repository.get_revision(mmerge)
1185.33.70 by Martin Pool
Refactor status display code.
165
                print >> to_file, '   ', line_log(mm_revision, 75)
166
                ignore.add(mmerge)
167
        except NoSuchRevision:
168
            print >> to_file, ' ', merge 
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
169
        
1185.14.11 by Aaron Bentley
moved conflict listing into status and stopped monkey-patching
170
def list_paths(header, paths, specific_files, to_file):
171
    done_header = False
172
    for path in paths:
173
        if specific_files and not is_inside_any(specific_files, path):
174
            continue
175
        if not done_header:
176
            print >>to_file, '%s:' % header
177
            done_header = True
178
        print >>to_file, ' ', path