/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2318.2.3 by Kent Gibson
merged bzr.dev
1
# Copyright (C) 2005, 2006, 2007 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,
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
21
    log,
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
22
    osutils,
1551.10.7 by Aaron Bentley
Use new-style output for status
23
    tree,
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
24
    tsort,
25
    revision as _mod_revision,
1551.10.7 by Aaron Bentley
Use new-style output for status
26
    )
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
27
import bzrlib.errors as errors
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
28
from bzrlib.osutils import is_inside_any
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
29
from bzrlib.symbol_versioning import (deprecated_function,
30
        )
3224.5.19 by Andrew Bennetts
Move _raise_if_nonexistent into the only module that uses it, bzrlib.status.
31
from bzrlib.trace import mutter, warning
362 by Martin Pool
- Import stat-cache code
32
1185.33.70 by Martin Pool
Refactor status display code.
33
# TODO: when showing single-line logs, truncate to the width of the terminal
34
# if known, but only if really going to the terminal (not into a file)
35
465 by Martin Pool
- Move show_status() out of Branch into a new function in
36
1773.1.2 by Robert Collins
Remove --all option from status.
37
def show_tree_status(wt, show_unchanged=None,
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
38
                     specific_files=None,
39
                     show_ids=False,
40
                     to_file=None,
41
                     show_pending=True,
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
42
                     revision=None,
2318.2.1 by Kent Gibson
Apply status versioned patch
43
                     short=False,
44
                     versioned=False):
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
45
    """Display summary of changes.
46
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.
53
1662.1.9 by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
54
    If showing the status of a working tree, extra information is included
55
    about unknown files, conflicts, and pending merges.
56
1773.1.2 by Robert Collins
Remove --all option from status.
57
    :param show_unchanged: Deprecated parameter. If set, includes unchanged 
58
        files.
59
    :param specific_files: If set, a list of filenames whose status should be
60
        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)
61
        tree, or in the working inventory or in the basis inventory.
1773.1.2 by Robert Collins
Remove --all option from status.
62
    :param show_ids: If set, includes each file's id.
63
    :param to_file: If set, write to this file (default stdout.)
64
    :param show_pending: If set, write pending merges.
3394.2.2 by Ian Clatworthy
show_tree_status docstring and deprecation cleanups
65
    :param revision: If None, compare latest revision with working tree
66
        If not None, it must be a RevisionSpec list.
67
        If one revision, compare with working tree.
68
        If two revisions, show status between first and second.
2318.2.1 by Kent Gibson
Apply status versioned patch
69
    :param short: If True, gives short SVN-style status lines.
70
    :param versioned: If True, only shows versioned files.
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
71
    """
1773.1.2 by Robert Collins
Remove --all option from status.
72
    if show_unchanged is not None:
3394.2.2 by Ian Clatworthy
show_tree_status docstring and deprecation cleanups
73
        warn("show_tree_status with show_unchanged has been deprecated "
1773.1.2 by Robert Collins
Remove --all option from status.
74
             "since bzrlib 0.9", DeprecationWarning, stacklevel=2)
75
76
    if to_file is None:
915 by Martin Pool
- add simple test case for bzr status
77
        to_file = sys.stdout
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
78
    
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
79
    wt.lock_read()
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
80
    try:
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
81
        new_is_working_tree = True
82
        if revision is None:
2091.4.1 by wang
Pushing to a remote branch does not currently update the remote working
83
            if wt.last_revision() != wt.branch.last_revision():
84
                warning("working tree is out of date, run 'bzr update'")
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
85
            new = wt
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
86
            old = new.basis_tree()
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
87
        elif len(revision) > 0:
88
            try:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
89
                old = revision[0].as_tree(wt.branch)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
90
            except errors.NoSuchRevision, e:
91
                raise errors.BzrCommandError(str(e))
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
92
            if (len(revision) > 1) and (revision[1].spec is not None):
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
93
                try:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
94
                    new = revision[1].as_tree(wt.branch)
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
95
                    new_is_working_tree = False
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
96
                except errors.NoSuchRevision, e:
97
                    raise errors.BzrCommandError(str(e))
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
98
            else:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
99
                new = wt
2255.2.80 by Robert Collins
In status, read lock the old and new trees being used to let data caching occur.
100
        old.lock_read()
101
        new.lock_read()
102
        try:
3930.2.2 by Karl Fogel
* bzrlib/status.py
103
            specific_files, nonexistents \
104
                = filter_nonexistent(specific_files, old, new)
2318.2.3 by Kent Gibson
merged bzr.dev
105
            want_unversioned = not versioned
2168.1.3 by John Arbash Meinel
The logic for when to display 'C' for conflicts was inverted.
106
            if short:
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
107
                changes = new.iter_changes(old, show_unchanged, specific_files,
2318.2.3 by Kent Gibson
merged bzr.dev
108
                    require_versioned=False, want_unversioned=want_unversioned)
1551.10.25 by Aaron Bentley
Make ChangeReporter private
109
                reporter = _mod_delta._ChangeReporter(output_file=to_file,
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
110
                    unversioned_filter=new.is_ignored)
2255.2.83 by John Arbash Meinel
[merge] bzr.dev 2294
111
                _mod_delta.report_changes(changes, reporter)
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
112
            else:
2255.2.83 by John Arbash Meinel
[merge] bzr.dev 2294
113
                delta = new.changes_from(old, want_unchanged=show_unchanged,
2255.7.91 by Robert Collins
Move unknown detection in long status into the delta creation, saving a tree-scan.
114
                                      specific_files=specific_files,
2318.2.3 by Kent Gibson
merged bzr.dev
115
                                      want_unversioned=want_unversioned)
2255.7.91 by Robert Collins
Move unknown detection in long status into the delta creation, saving a tree-scan.
116
                # filter out unknown files. We may want a tree method for
117
                # this
118
                delta.unversioned = [unversioned for unversioned in
119
                    delta.unversioned if not new.is_ignored(unversioned[0])]
2255.2.83 by John Arbash Meinel
[merge] bzr.dev 2294
120
                delta.show(to_file,
121
                           show_ids=show_ids,
122
                           show_unchanged=show_unchanged,
2255.7.91 by Robert Collins
Move unknown detection in long status into the delta creation, saving a tree-scan.
123
                           short_status=False)
1551.15.58 by Aaron Bentley
Status honours selected paths for conflicts (#127606)
124
            # show the new conflicts only for now. XXX: get them from the
125
            # delta.
126
            conflicts = new.conflicts()
127
            if specific_files is not None:
128
                conflicts = conflicts.select_conflicts(new, specific_files,
129
                    ignore_misses=True, recurse=True)[1]
130
            if len(conflicts) > 0 and not short:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
131
                to_file.write("conflicts:\n")
1551.15.58 by Aaron Bentley
Status honours selected paths for conflicts (#127606)
132
            for conflict in conflicts:
2255.2.80 by Robert Collins
In status, read lock the old and new trees being used to let data caching occur.
133
                if short:
2255.2.83 by John Arbash Meinel
[merge] bzr.dev 2294
134
                    prefix = 'C  '
2255.2.80 by Robert Collins
In status, read lock the old and new trees being used to let data caching occur.
135
                else:
136
                    prefix = ' '
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
137
                to_file.write("%s %s\n" % (prefix, conflict))
3930.2.2 by Karl Fogel
* bzrlib/status.py
138
            # Show files that were requested but don't exist (and are
139
            # not versioned).  We don't involve delta in this; these
140
            # paths are really the province of just the status
141
            # command, since they have more to do with how it was
142
            # invoked than with the tree it's operating on.
143
            if nonexistents and not short:
144
                to_file.write("nonexistent:\n")
145
            for nonexistent in nonexistents:
146
                if short:
147
                    prefix = 'X  '
148
                else:
149
                    prefix = ' '
150
                to_file.write("%s %s\n" % (prefix, nonexistent))
3636.1.1 by Robert Collins
Stop passing specific_file lists to show_tree_status when the specific
151
            if (new_is_working_tree and show_pending):
2255.2.80 by Robert Collins
In status, read lock the old and new trees being used to let data caching occur.
152
                show_pending_merges(new, to_file, short)
153
        finally:
154
            old.unlock()
155
            new.unlock()
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
156
    finally:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
157
        wt.unlock()
1185.33.70 by Martin Pool
Refactor status display code.
158
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
159
160
def _get_sorted_revisions(tip_revision, revision_ids, parent_map):
161
    """Get an iterator which will return the revisions in merge sorted order.
162
163
    This will build up a list of all nodes, such that only nodes in the list
164
    are referenced. It then uses MergeSorter to return them in 'merge-sorted'
165
    order.
166
167
    :param revision_ids: A set of revision_ids
168
    :param parent_map: The parent information for each node. Revisions which
169
        are considered ghosts should not be present in the map.
3377.3.43 by John Arbash Meinel
Ian's review feedback
170
    :return: iterator from MergeSorter.iter_topo_order()
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
171
    """
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
172
    # MergeSorter requires that all nodes be present in the graph, so get rid
173
    # of any references pointing outside of this graph.
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
174
    parent_graph = {}
175
    for revision_id in revision_ids:
176
        if revision_id not in parent_map: # ghost
177
            parent_graph[revision_id] = []
178
        else:
179
            # Only include parents which are in this sub-graph
180
            parent_graph[revision_id] = [p for p in parent_map[revision_id]
181
                                            if p in revision_ids]
182
    sorter = tsort.MergeSorter(parent_graph, tip_revision)
183
    return sorter.iter_topo_order()
184
185
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
186
def show_pending_merges(new, to_file, short=False):
1185.33.70 by Martin Pool
Refactor status display code.
187
    """Write out a display of pending merges in a working tree."""
3377.3.43 by John Arbash Meinel
Ian's review feedback
188
    parents = new.get_parent_ids()
189
    if len(parents) < 2:
190
        return
191
3377.3.38 by John Arbash Meinel
Pull out terminal width from the inner loop of show_pending_merges
192
    # we need one extra space for terminals that wrap on last char
193
    term_width = osutils.terminal_width() - 1
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
194
    if short:
3377.3.42 by John Arbash Meinel
Get the tests to actually work, and get the code to go along with.
195
        first_prefix = 'P   '
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
196
        sub_prefix = 'P.   '
197
    else:
198
        first_prefix = '  '
199
        sub_prefix = '    '
3377.3.38 by John Arbash Meinel
Pull out terminal width from the inner loop of show_pending_merges
200
1908.6.9 by Robert Collins
Fix status to not use pending_merges.
201
    pending = parents[1:]
1185.33.70 by Martin Pool
Refactor status display code.
202
    branch = new.branch
1908.6.9 by Robert Collins
Fix status to not use pending_merges.
203
    last_revision = parents[0]
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
204
    if not short:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
205
        to_file.write('pending merges:\n')
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
206
    graph = branch.repository.get_graph()
3377.3.31 by John Arbash Meinel
change the status code to use find_unique_ancestors()
207
    other_revisions = [last_revision]
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
208
    log_formatter = log.LineLogFormatter(to_file)
1908.6.9 by Robert Collins
Fix status to not use pending_merges.
209
    for merge in pending:
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
210
        try:
211
            rev = branch.repository.get_revisions([merge])[0]
212
        except errors.NoSuchRevision:
213
            # If we are missing a revision, just print out the revision id
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
214
            to_file.write(first_prefix + '(ghost) ' + merge + '\n')
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
215
            other_revisions.append(merge)
216
            continue
217
218
        # Log the merge, as it gets a slightly different formatting
219
        log_message = log_formatter.log_string(None, rev,
220
                        term_width - len(first_prefix))
221
        to_file.write(first_prefix + log_message + '\n')
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
222
        # Find all of the revisions in the merge source, which are not in the
223
        # last committed revision.
3377.3.31 by John Arbash Meinel
change the status code to use find_unique_ancestors()
224
        merge_extra = graph.find_unique_ancestors(merge, other_revisions)
225
        other_revisions.append(merge)
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
226
        merge_extra.discard(_mod_revision.NULL_REVISION)
3377.3.38 by John Arbash Meinel
Pull out terminal width from the inner loop of show_pending_merges
227
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
228
        # Get a handle to all of the revisions we will need
1185.33.70 by Martin Pool
Refactor status display code.
229
        try:
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
230
            revisions = dict((rev.revision_id, rev) for rev in
231
                             branch.repository.get_revisions(merge_extra))
232
        except errors.NoSuchRevision:
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
233
            # One of the sub nodes is a ghost, check each one
234
            revisions = {}
235
            for revision_id in merge_extra:
236
                try:
3377.3.42 by John Arbash Meinel
Get the tests to actually work, and get the code to go along with.
237
                    rev = branch.repository.get_revisions([revision_id])[0]
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
238
                except errors.NoSuchRevision:
239
                    revisions[revision_id] = None
240
                else:
241
                    revisions[revision_id] = rev
242
243
        # Display the revisions brought in by this merge.
244
        rev_id_iterator = _get_sorted_revisions(merge, merge_extra,
245
                            branch.repository.get_parent_map(merge_extra))
246
        # Skip the first node
247
        num, first, depth, eom = rev_id_iterator.next()
248
        if first != merge:
249
            raise AssertionError('Somehow we misunderstood how'
250
                ' iter_topo_order works %s != %s' % (first, merge))
251
        for num, sub_merge, depth, eom in rev_id_iterator:
252
            rev = revisions[sub_merge]
253
            if rev is None:
254
                to_file.write(sub_prefix + '(ghost) ' + sub_merge + '\n')
255
                continue
256
            log_message = log_formatter.log_string(None,
257
                            revisions[sub_merge],
258
                            term_width - len(sub_prefix))
259
            to_file.write(sub_prefix + log_message + '\n')
3224.5.19 by Andrew Bennetts
Move _raise_if_nonexistent into the only module that uses it, bzrlib.status.
260
261
3930.2.2 by Karl Fogel
* bzrlib/status.py
262
def filter_nonexistent(orig_paths, old_tree, new_tree):
263
    """Convert orig_paths to two lists and return them.
264
265
    The first is orig_paths paths minus the items in the second list,
266
    and the second list is paths that are not in either inventory or
267
    tree (they don't qualify if they exist in the tree's inventory, or
268
    if they exist in the tree but are not versioned.)
269
270
    If either of the two lists is empty, return it as an empty list.
271
3224.5.19 by Andrew Bennetts
Move _raise_if_nonexistent into the only module that uses it, bzrlib.status.
272
    This can be used by operations such as bzr status that can accept
273
    unknown or ignored files.
274
    """
3930.2.2 by Karl Fogel
* bzrlib/status.py
275
    mutter("check paths: %r", orig_paths)
276
    if not orig_paths:
277
        return orig_paths, []
278
    s = old_tree.filter_unversioned_files(orig_paths)
3224.5.19 by Andrew Bennetts
Move _raise_if_nonexistent into the only module that uses it, bzrlib.status.
279
    s = new_tree.filter_unversioned_files(s)
3930.2.2 by Karl Fogel
* bzrlib/status.py
280
    nonexistent = [path for path in s if not new_tree.has_filename(path)]
281
    remaining   = [path for path in orig_paths if not path in nonexistent]
282
    return remaining, nonexistent