/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1662.1.9 by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
1
# Copyright (C) 2005, 2006 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
1551.10.7 by Aaron Bentley
Use new-style output for status
19
from bzrlib import (
20
    delta as _mod_delta,
21
    tree,
22
    )
1662.1.9 by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
23
from bzrlib.diff import _raise_if_nonexistent
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
24
import bzrlib.errors as errors
1185.12.27 by Aaron Bentley
Use line log for pending merges
25
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()
26
from bzrlib.osutils import is_inside_any
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
27
from bzrlib.symbol_versioning import (deprecated_function,
28
        zero_eight,
29
        )
2091.4.1 by wang
Pushing to a remote branch does not currently update the remote working
30
from bzrlib.trace import warning
362 by Martin Pool
- Import stat-cache code
31
1185.33.70 by Martin Pool
Refactor status display code.
32
# TODO: when showing single-line logs, truncate to the width of the terminal
33
# if known, but only if really going to the terminal (not into a file)
34
465 by Martin Pool
- Move show_status() out of Branch into a new function in
35
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
36
@deprecated_function(zero_eight)
1773.1.2 by Robert Collins
Remove --all option from status.
37
def show_status(branch, show_unchanged=None,
483 by Martin Pool
- change 'file_list' to more explanatory 'specific_files'
38
                specific_files=None,
915 by Martin Pool
- add simple test case for bzr status
39
                show_ids=False,
974.1.48 by Aaron Bentley
Status command shows pending merges
40
                to_file=None,
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
41
                show_pending=True,
42
                revision=None):
1185.33.70 by Martin Pool
Refactor status display code.
43
    """Display summary of changes.
44
1551.2.11 by Aaron Bentley
Niced up the documentation
45
    Please use show_tree_status instead.
46
1185.33.70 by Martin Pool
Refactor status display code.
47
    By default this compares the working tree to a previous revision. 
48
    If the revision argument is given, summarizes changes between the 
49
    working tree and another, or between two revisions.
50
51
    The result is written out as Unicode and to_file should be able 
52
    to encode that.
465 by Martin Pool
- Move show_status() out of Branch into a new function in
53
1185.3.1 by Martin Pool
- docstring fix from Magnus Therning
54
    show_unchanged
55
        If set, includes unchanged files.
465 by Martin Pool
- Move show_status() out of Branch into a new function in
56
483 by Martin Pool
- change 'file_list' to more explanatory 'specific_files'
57
    specific_files
465 by Martin Pool
- Move show_status() out of Branch into a new function in
58
        If set, only show the status of files in this list.
915 by Martin Pool
- add simple test case for bzr status
59
1185.3.1 by Martin Pool
- docstring fix from Magnus Therning
60
    show_ids
61
        If set, includes each file's id.
62
915 by Martin Pool
- add simple test case for bzr status
63
    to_file
64
        If set, write to this file (default stdout.)
1185.3.1 by Martin Pool
- docstring fix from Magnus Therning
65
66
    show_pending
67
        If set, write pending merges.
1092.3.4 by Robert Collins
update symlink branch to integration
68
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
69
    revision
70
        If None the compare latest revision with working tree
71
        If one revision show compared it with working tree.
72
        If two revisions show status between first and second.
465 by Martin Pool
- Move show_status() out of Branch into a new function in
73
    """
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
74
    show_tree_status(branch.bzrdir.open_workingtree(), show_unchanged, 
75
                     specific_files, show_ids, to_file, show_pending, revision)
76
1551.2.11 by Aaron Bentley
Niced up the documentation
77
1773.1.2 by Robert Collins
Remove --all option from status.
78
def show_tree_status(wt, show_unchanged=None,
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
79
                     specific_files=None,
80
                     show_ids=False,
81
                     to_file=None,
82
                     show_pending=True,
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
83
                     revision=None,
84
                     short=False):
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
85
    """Display summary of changes.
86
87
    By default this compares the working tree to a previous revision. 
88
    If the revision argument is given, summarizes changes between the 
89
    working tree and another, or between two revisions.
90
91
    The result is written out as Unicode and to_file should be able 
92
    to encode that.
93
1662.1.9 by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
94
    If showing the status of a working tree, extra information is included
95
    about unknown files, conflicts, and pending merges.
96
1773.1.2 by Robert Collins
Remove --all option from status.
97
    :param show_unchanged: Deprecated parameter. If set, includes unchanged 
98
        files.
99
    :param specific_files: If set, a list of filenames whose status should be
100
        shown.  It is an error to give a filename that is not in the working 
1662.1.9 by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
101
        tree, or in the working inventory or in the basis inventory.
1773.1.2 by Robert Collins
Remove --all option from status.
102
    :param show_ids: If set, includes each file's id.
103
    :param to_file: If set, write to this file (default stdout.)
104
    :param show_pending: If set, write pending merges.
105
    :param revision: If None the compare latest revision with working tree
106
        If not None it must be a RevisionSpec list.
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
107
        If one revision show compared it with working tree.
108
        If two revisions show status between first and second.
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
109
    :param short: If True, gives short SVN-style status lines
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
110
    """
1773.1.2 by Robert Collins
Remove --all option from status.
111
    if show_unchanged is not None:
112
        warn("show_status_trees with show_unchanged has been deprecated "
113
             "since bzrlib 0.9", DeprecationWarning, stacklevel=2)
114
115
    if to_file is None:
915 by Martin Pool
- add simple test case for bzr status
116
        to_file = sys.stdout
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
117
    
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
118
    wt.lock_read()
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
119
    try:
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
120
        new_is_working_tree = True
121
        if revision is None:
2091.4.1 by wang
Pushing to a remote branch does not currently update the remote working
122
            if wt.last_revision() != wt.branch.last_revision():
123
                warning("working tree is out of date, run 'bzr update'")
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
124
            new = wt
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
125
            old = new.basis_tree()
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
126
        elif len(revision) > 0:
127
            try:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
128
                rev_id = revision[0].in_history(wt.branch).rev_id
129
                old = wt.branch.repository.revision_tree(rev_id)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
130
            except errors.NoSuchRevision, e:
131
                raise errors.BzrCommandError(str(e))
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
132
            if (len(revision) > 1) and (revision[1].spec is not None):
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
133
                try:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
134
                    rev_id = revision[1].in_history(wt.branch).rev_id
135
                    new = wt.branch.repository.revision_tree(rev_id)
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
136
                    new_is_working_tree = False
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
137
                except errors.NoSuchRevision, e:
138
                    raise errors.BzrCommandError(str(e))
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
139
            else:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
140
                new = wt
2255.2.80 by Robert Collins
In status, read lock the old and new trees being used to let data caching occur.
141
        old.lock_read()
142
        new.lock_read()
143
        try:
144
            _raise_if_nonexistent(specific_files, old, new)
2168.1.3 by John Arbash Meinel
The logic for when to display 'C' for conflicts was inverted.
145
            if short:
2255.2.102 by Robert Collins
Use Tree.path2ids in status operations.
146
                specific_file_ids = new.paths2ids(specific_files, [old],
147
                                                  require_versioned=False)
2255.2.83 by John Arbash Meinel
[merge] bzr.dev 2294
148
                changes = new._iter_changes(old, show_unchanged,
149
                                            specific_file_ids)
150
                reporter = _mod_delta.ChangeReporter(old.inventory,
151
                    output_file=to_file)
152
                _mod_delta.report_changes(changes, reporter)
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
153
            else:
2255.2.83 by John Arbash Meinel
[merge] bzr.dev 2294
154
                delta = new.changes_from(old, want_unchanged=show_unchanged,
155
                                      specific_files=specific_files)
156
                delta.show(to_file,
157
                           show_ids=show_ids,
158
                           show_unchanged=show_unchanged,
159
                           short_status=short)
160
            short_status_letter = '? '
2255.2.80 by Robert Collins
In status, read lock the old and new trees being used to let data caching occur.
161
            if not short:
162
                short_status_letter = ''
163
            list_paths('unknown', new.unknowns(), specific_files, to_file,
164
                       short_status_letter)
165
            conflict_title = False
166
            # show the new conflicts only for now. XXX: get them from the delta.
167
            for conflict in new.conflicts():
168
                if not short and conflict_title is False:
169
                    print >> to_file, "conflicts:"
170
                    conflict_title = True
171
                if short:
2255.2.83 by John Arbash Meinel
[merge] bzr.dev 2294
172
                    prefix = 'C  '
2255.2.80 by Robert Collins
In status, read lock the old and new trees being used to let data caching occur.
173
                else:
174
                    prefix = ' '
175
                print >> to_file, "%s %s" % (prefix, conflict)
176
            if new_is_working_tree and show_pending:
177
                show_pending_merges(new, to_file, short)
178
        finally:
179
            old.unlock()
180
            new.unlock()
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
181
    finally:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
182
        wt.unlock()
1185.33.70 by Martin Pool
Refactor status display code.
183
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
184
def show_pending_merges(new, to_file, short=False):
1185.33.70 by Martin Pool
Refactor status display code.
185
    """Write out a display of pending merges in a working tree."""
1908.6.9 by Robert Collins
Fix status to not use pending_merges.
186
    parents = new.get_parent_ids()
187
    if len(parents) < 2:
188
        return
189
    pending = parents[1:]
1185.33.70 by Martin Pool
Refactor status display code.
190
    branch = new.branch
1908.6.9 by Robert Collins
Fix status to not use pending_merges.
191
    last_revision = parents[0]
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
192
    if not short:
193
        print >>to_file, 'pending merges:'
1185.33.70 by Martin Pool
Refactor status display code.
194
    if last_revision is not None:
1908.6.12 by Robert Collins
Teach status to handle the base revision being a ghost.
195
        try:
196
            ignore = set(branch.repository.get_ancestry(last_revision))
197
        except errors.NoSuchRevision:
198
            # the last revision is a ghost : assume everything is new 
199
            # except for it
200
            ignore = set([None, last_revision])
1185.33.70 by Martin Pool
Refactor status display code.
201
    else:
1551.6.19 by Aaron Bentley
Fix pending merge status on empty trees
202
        ignore = set([None])
1908.6.9 by Robert Collins
Fix status to not use pending_merges.
203
    # TODO: this could be improved using merge_sorted - we'd get the same 
204
    # output rather than one level of indent.
205
    for merge in pending:
1185.33.70 by Martin Pool
Refactor status display code.
206
        ignore.add(merge)
207
        try:
1861.1.1 by Adeodato Simó
Really use terminal_width() for pending-merge display. r1707 mentioned
208
            from bzrlib.osutils import terminal_width
209
            width = terminal_width()
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
210
            m_revision = branch.repository.get_revision(merge)
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
211
            if short:
1551.10.7 by Aaron Bentley
Use new-style output for status
212
                prefix = 'P  '
2168.1.2 by John Arbash Meinel
The texts expected 2 blank spaces after P, so give it to them.
213
            else:
2147.2.4 by Keir Mierle
Make changes suggested by Aaron Bently
214
                prefix = ' '
215
            print >> to_file, prefix, line_log(m_revision, width - 4)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
216
            inner_merges = branch.repository.get_ancestry(merge)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
217
            assert inner_merges[0] is None
1668.1.14 by Martin Pool
merge olaf - InvalidRevisionId fixes
218
            inner_merges.pop(0)
1185.33.70 by Martin Pool
Refactor status display code.
219
            inner_merges.reverse()
220
            for mmerge in inner_merges:
221
                if mmerge in ignore:
222
                    continue
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
223
                mm_revision = branch.repository.get_revision(mmerge)
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
224
                if short:
1551.10.7 by Aaron Bentley
Use new-style output for status
225
                    prefix = 'P.  '
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
226
                else:
2147.2.4 by Keir Mierle
Make changes suggested by Aaron Bently
227
                    prefix = '   '
228
                print >> to_file, prefix, line_log(mm_revision, width - 5)
1185.33.70 by Martin Pool
Refactor status display code.
229
                ignore.add(mmerge)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
230
        except errors.NoSuchRevision:
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
231
            if short:
1551.10.7 by Aaron Bentley
Use new-style output for status
232
                prefix = 'P  '
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
233
            else:
2147.2.4 by Keir Mierle
Make changes suggested by Aaron Bently
234
                prefix = ' '
235
            print >> to_file, prefix, merge
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
236
        
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
237
def list_paths(header, paths, specific_files, to_file, short_status_letter=''):
1185.14.11 by Aaron Bentley
moved conflict listing into status and stopped monkey-patching
238
    done_header = False
239
    for path in paths:
240
        if specific_files and not is_inside_any(specific_files, path):
241
            continue
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
242
        if not short_status_letter and not done_header:
1185.14.11 by Aaron Bentley
moved conflict listing into status and stopped monkey-patching
243
            print >>to_file, '%s:' % header
244
            done_header = True
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
245
        print >>to_file, '%s  %s' % (short_status_letter, path)