/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4763.2.4 by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry.
1
# Copyright (C) 2005-2010 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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
362 by Martin Pool
- Import stat-cache code
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
5076.4.6 by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show())
37
def report_changes(to_file, old, new, specific_files, 
38
                   show_short_reporter, show_long_callback, 
39
                   short=False, want_unchanged=False, 
40
                   want_unversioned=False, show_ids=False):
5076.4.7 by Arnaud Jeansen
Add signature comments to report_changes in status.py
41
    """Display summary of changes.
42
43
    This compares two trees with regards to a list of files, and delegates 
44
    the display to underlying elements.
45
46
    For short output, it creates an iterator on all changes, and lets a given
47
    reporter display these changes.
48
49
    For stantard output, it creates a delta of the changes, and forwards it
50
    to a callback
51
52
    :param to_file: If set, write to this file (default stdout.)
53
    :param old: Start tree for the comparison
54
    :param end: End tree for the comparison
55
    :param specific_files: If set, a list of filenames whose status should be
56
        shown.  It is an error to give a filename that is not in the working
57
        tree, or in the working inventory or in the basis inventory.
58
    :param show_short_reporter: Reporter in charge of display for short output
59
    :param show_long_callback: Callback in charge of display for normal output
60
    :param short: If True, gives short SVN-style status lines.
61
    :param want_unchanged: Deprecated parameter. If set, includes unchanged
62
        files.
63
    :param show_ids: If set, includes each file's id.
64
    :param want_unversioned: If False, only shows versioned files.
65
    """
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
66
67
    if short:
68
        changes = new.iter_changes(old, want_unchanged, specific_files,
69
            require_versioned=False, want_unversioned=want_unversioned)
70
        _mod_delta.report_changes(changes, show_short_reporter)
71
        
72
    else:
73
        delta = new.changes_from(old, want_unchanged=want_unchanged,
74
                              specific_files=specific_files,
75
                              want_unversioned=want_unversioned)
76
        # filter out unknown files. We may want a tree method for
77
        # this
78
        delta.unversioned = [unversioned for unversioned in
79
            delta.unversioned if not new.is_ignored(unversioned[0])]
80
        show_long_callback(to_file, delta, 
81
                           show_ids=show_ids,
82
                           show_unchanged=want_unchanged)
5076.4.1 by Arnaud Jeansen
Extract show() from TreeDelta and pass a callback instead
83
84
1773.1.2 by Robert Collins
Remove --all option from status.
85
def show_tree_status(wt, show_unchanged=None,
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
86
                     specific_files=None,
87
                     show_ids=False,
88
                     to_file=None,
89
                     show_pending=True,
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
90
                     revision=None,
2318.2.1 by Kent Gibson
Apply status versioned patch
91
                     short=False,
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
92
                     verbose=False,
5076.4.1 by Arnaud Jeansen
Extract show() from TreeDelta and pass a callback instead
93
                     versioned=False,
5076.4.4 by Arnaud Jeansen
Add a unified report_delta method
94
                     show_long_callback=_mod_delta.report_delta):
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
95
    """Display summary of changes.
96
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
97
    By default this compares the working tree to a previous revision.
98
    If the revision argument is given, summarizes changes between the
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
99
    working tree and another, or between two revisions.
100
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
101
    The result is written out as Unicode and to_file should be able
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
102
    to encode that.
103
1662.1.9 by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
104
    If showing the status of a working tree, extra information is included
105
    about unknown files, conflicts, and pending merges.
106
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
107
    :param show_unchanged: Deprecated parameter. If set, includes unchanged
1773.1.2 by Robert Collins
Remove --all option from status.
108
        files.
109
    :param specific_files: If set, a list of filenames whose status should be
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
110
        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)
111
        tree, or in the working inventory or in the basis inventory.
1773.1.2 by Robert Collins
Remove --all option from status.
112
    :param show_ids: If set, includes each file's id.
113
    :param to_file: If set, write to this file (default stdout.)
114
    :param show_pending: If set, write pending merges.
3394.2.2 by Ian Clatworthy
show_tree_status docstring and deprecation cleanups
115
    :param revision: If None, compare latest revision with working tree
116
        If not None, it must be a RevisionSpec list.
117
        If one revision, compare with working tree.
118
        If two revisions, show status between first and second.
2318.2.1 by Kent Gibson
Apply status versioned patch
119
    :param short: If True, gives short SVN-style status lines.
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
120
    :param verbose: If True, show all merged revisions, not just
121
        the merge tips
2318.2.1 by Kent Gibson
Apply status versioned patch
122
    :param versioned: If True, only shows versioned files.
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
123
    :param show_long_callback: A callback: message = show_long_callback(to_file, delta, 
124
        show_ids, show_unchanged, indent, filter), only used with the long output
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
125
    """
1773.1.2 by Robert Collins
Remove --all option from status.
126
    if show_unchanged is not None:
3394.2.2 by Ian Clatworthy
show_tree_status docstring and deprecation cleanups
127
        warn("show_tree_status with show_unchanged has been deprecated "
1773.1.2 by Robert Collins
Remove --all option from status.
128
             "since bzrlib 0.9", DeprecationWarning, stacklevel=2)
129
130
    if to_file is None:
915 by Martin Pool
- add simple test case for bzr status
131
        to_file = sys.stdout
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
132
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
133
    wt.lock_read()
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
134
    try:
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
135
        new_is_working_tree = True
136
        if revision is None:
2091.4.1 by wang
Pushing to a remote branch does not currently update the remote working
137
            if wt.last_revision() != wt.branch.last_revision():
138
                warning("working tree is out of date, run 'bzr update'")
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
139
            new = wt
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
140
            old = new.basis_tree()
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
141
        elif len(revision) > 0:
142
            try:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
143
                old = revision[0].as_tree(wt.branch)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
144
            except errors.NoSuchRevision, e:
145
                raise errors.BzrCommandError(str(e))
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
146
            if (len(revision) > 1) and (revision[1].spec is not None):
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
147
                try:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
148
                    new = revision[1].as_tree(wt.branch)
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
149
                    new_is_working_tree = False
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
150
                except errors.NoSuchRevision, e:
151
                    raise errors.BzrCommandError(str(e))
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
152
            else:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
153
                new = wt
2255.2.80 by Robert Collins
In status, read lock the old and new trees being used to let data caching occur.
154
        old.lock_read()
155
        new.lock_read()
156
        try:
3930.2.2 by Karl Fogel
* bzrlib/status.py
157
            specific_files, nonexistents \
3930.2.4 by Karl Fogel
* bzrlib/status.py
158
                = _filter_nonexistent(specific_files, old, new)
2318.2.3 by Kent Gibson
merged bzr.dev
159
            want_unversioned = not versioned
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
160
161
            # Reporter used for short outputs
162
            reporter = _mod_delta._ChangeReporter(output_file=to_file,
163
                unversioned_filter=new.is_ignored)
5076.4.6 by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show())
164
            report_changes(to_file, old, new, specific_files, 
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
165
                           reporter, show_long_callback, 
166
                           short=short, want_unchanged=show_unchanged, 
167
                           want_unversioned=want_unversioned, show_ids=show_ids)
168
5137.2.5 by Arnaud Jeansen
Implement behaviour requested by mbp, in a way similar to the conflicts and non existent files' handling
169
            # show the ignored files among specific files (i.e. show the files
170
            # identified from input that we choose to ignore). 
171
            if specific_files is not None:
172
                # Ignored files is sorted because specific_files is already sorted
173
                ignored_files = [specific for specific in
174
                    specific_files if new.is_ignored(specific)]
175
                if len(ignored_files) > 0 and not short:
176
                    to_file.write("ignored:\n")
177
                    prefix = ' '
178
                else:
179
                    prefix = 'I  '
180
                for ignored_file in ignored_files:
181
                    to_file.write("%s %s\n" % (prefix, ignored_file))
182
1551.15.58 by Aaron Bentley
Status honours selected paths for conflicts (#127606)
183
            # show the new conflicts only for now. XXX: get them from the
184
            # delta.
185
            conflicts = new.conflicts()
186
            if specific_files is not None:
187
                conflicts = conflicts.select_conflicts(new, specific_files,
188
                    ignore_misses=True, recurse=True)[1]
189
            if len(conflicts) > 0 and not short:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
190
                to_file.write("conflicts:\n")
1551.15.58 by Aaron Bentley
Status honours selected paths for conflicts (#127606)
191
            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.
192
                if short:
2255.2.83 by John Arbash Meinel
[merge] bzr.dev 2294
193
                    prefix = 'C  '
2255.2.80 by Robert Collins
In status, read lock the old and new trees being used to let data caching occur.
194
                else:
195
                    prefix = ' '
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
196
                to_file.write("%s %s\n" % (prefix, conflict))
3930.2.2 by Karl Fogel
* bzrlib/status.py
197
            # Show files that were requested but don't exist (and are
198
            # not versioned).  We don't involve delta in this; these
199
            # paths are really the province of just the status
200
            # command, since they have more to do with how it was
201
            # invoked than with the tree it's operating on.
202
            if nonexistents and not short:
203
                to_file.write("nonexistent:\n")
204
            for nonexistent in nonexistents:
3992.1.1 by Ian Clatworthy
Handle non-existent files in status (Karl Fogel, #306394)
205
                # We could calculate prefix outside the loop but, given
206
                # how rarely this ought to happen, it's OK and arguably
207
                # slightly faster to do it here (ala conflicts above)
3930.2.2 by Karl Fogel
* bzrlib/status.py
208
                if short:
209
                    prefix = 'X  '
210
                else:
211
                    prefix = ' '
212
                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
213
            if (new_is_working_tree and show_pending):
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
214
                show_pending_merges(new, to_file, short, verbose=verbose)
4593.3.1 by Martin Pool
Avoid raising exceptions from inside finally blocks (see bug 403523)
215
            if nonexistents:
216
                raise errors.PathsDoNotExist(nonexistents)
2255.2.80 by Robert Collins
In status, read lock the old and new trees being used to let data caching occur.
217
        finally:
218
            old.unlock()
219
            new.unlock()
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
220
    finally:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
221
        wt.unlock()
1185.33.70 by Martin Pool
Refactor status display code.
222
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
223
224
def _get_sorted_revisions(tip_revision, revision_ids, parent_map):
225
    """Get an iterator which will return the revisions in merge sorted order.
226
227
    This will build up a list of all nodes, such that only nodes in the list
228
    are referenced. It then uses MergeSorter to return them in 'merge-sorted'
229
    order.
230
231
    :param revision_ids: A set of revision_ids
232
    :param parent_map: The parent information for each node. Revisions which
233
        are considered ghosts should not be present in the map.
3377.3.43 by John Arbash Meinel
Ian's review feedback
234
    :return: iterator from MergeSorter.iter_topo_order()
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
235
    """
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
236
    # MergeSorter requires that all nodes be present in the graph, so get rid
237
    # of any references pointing outside of this graph.
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
238
    parent_graph = {}
239
    for revision_id in revision_ids:
240
        if revision_id not in parent_map: # ghost
241
            parent_graph[revision_id] = []
242
        else:
243
            # Only include parents which are in this sub-graph
244
            parent_graph[revision_id] = [p for p in parent_map[revision_id]
245
                                            if p in revision_ids]
246
    sorter = tsort.MergeSorter(parent_graph, tip_revision)
247
    return sorter.iter_topo_order()
248
249
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
250
def show_pending_merges(new, to_file, short=False, verbose=False):
1185.33.70 by Martin Pool
Refactor status display code.
251
    """Write out a display of pending merges in a working tree."""
3377.3.43 by John Arbash Meinel
Ian's review feedback
252
    parents = new.get_parent_ids()
253
    if len(parents) < 2:
254
        return
255
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
256
    term_width = osutils.terminal_width()
257
    if term_width is not None:
258
        # we need one extra space for terminals that wrap on last char
259
        term_width = term_width - 1
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
260
    if short:
3377.3.42 by John Arbash Meinel
Get the tests to actually work, and get the code to go along with.
261
        first_prefix = 'P   '
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
262
        sub_prefix = 'P.   '
263
    else:
264
        first_prefix = '  '
265
        sub_prefix = '    '
3377.3.38 by John Arbash Meinel
Pull out terminal width from the inner loop of show_pending_merges
266
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
267
    def show_log_message(rev, prefix):
268
        if term_width is None:
269
            width = term_width
270
        else:
271
            width = term_width - len(prefix)
272
        log_message = log_formatter.log_string(None, rev, width, prefix=prefix)
273
        to_file.write(log_message + '\n')
274
1908.6.9 by Robert Collins
Fix status to not use pending_merges.
275
    pending = parents[1:]
1185.33.70 by Martin Pool
Refactor status display code.
276
    branch = new.branch
1908.6.9 by Robert Collins
Fix status to not use pending_merges.
277
    last_revision = parents[0]
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
278
    if not short:
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
279
        if verbose:
280
            to_file.write('pending merges:\n')
281
        else:
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
282
            to_file.write('pending merge tips:'
283
                          ' (use -v to see all merge revisions)\n')
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
284
    graph = branch.repository.get_graph()
3377.3.31 by John Arbash Meinel
change the status code to use find_unique_ancestors()
285
    other_revisions = [last_revision]
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
286
    log_formatter = log.LineLogFormatter(to_file)
1908.6.9 by Robert Collins
Fix status to not use pending_merges.
287
    for merge in pending:
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
288
        try:
289
            rev = branch.repository.get_revisions([merge])[0]
290
        except errors.NoSuchRevision:
291
            # 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
292
            to_file.write(first_prefix + '(ghost) ' + merge + '\n')
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
293
            other_revisions.append(merge)
294
            continue
295
296
        # Log the merge, as it gets a slightly different formatting
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
297
        show_log_message(rev, first_prefix)
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
298
        if not verbose:
299
            continue
300
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
301
        # Find all of the revisions in the merge source, which are not in the
302
        # last committed revision.
3377.3.31 by John Arbash Meinel
change the status code to use find_unique_ancestors()
303
        merge_extra = graph.find_unique_ancestors(merge, other_revisions)
304
        other_revisions.append(merge)
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
305
        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
306
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
307
        # Get a handle to all of the revisions we will need
1185.33.70 by Martin Pool
Refactor status display code.
308
        try:
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
309
            revisions = dict((rev.revision_id, rev) for rev in
310
                             branch.repository.get_revisions(merge_extra))
311
        except errors.NoSuchRevision:
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
312
            # One of the sub nodes is a ghost, check each one
313
            revisions = {}
314
            for revision_id in merge_extra:
315
                try:
3377.3.42 by John Arbash Meinel
Get the tests to actually work, and get the code to go along with.
316
                    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
317
                except errors.NoSuchRevision:
318
                    revisions[revision_id] = None
319
                else:
320
                    revisions[revision_id] = rev
321
322
        # Display the revisions brought in by this merge.
323
        rev_id_iterator = _get_sorted_revisions(merge, merge_extra,
324
                            branch.repository.get_parent_map(merge_extra))
325
        # Skip the first node
326
        num, first, depth, eom = rev_id_iterator.next()
327
        if first != merge:
328
            raise AssertionError('Somehow we misunderstood how'
329
                ' iter_topo_order works %s != %s' % (first, merge))
330
        for num, sub_merge, depth, eom in rev_id_iterator:
331
            rev = revisions[sub_merge]
332
            if rev is None:
333
                to_file.write(sub_prefix + '(ghost) ' + sub_merge + '\n')
334
                continue
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
335
            show_log_message(revisions[sub_merge], sub_prefix)
3224.5.19 by Andrew Bennetts
Move _raise_if_nonexistent into the only module that uses it, bzrlib.status.
336
337
3930.2.4 by Karl Fogel
* bzrlib/status.py
338
def _filter_nonexistent(orig_paths, old_tree, new_tree):
3930.2.15 by Karl Fogel
Part of bug #306394: Ensure sorted order for nonexistent file output.
339
    """Convert orig_paths to two sorted lists and return them.
3930.2.2 by Karl Fogel
* bzrlib/status.py
340
341
    The first is orig_paths paths minus the items in the second list,
342
    and the second list is paths that are not in either inventory or
343
    tree (they don't qualify if they exist in the tree's inventory, or
344
    if they exist in the tree but are not versioned.)
345
346
    If either of the two lists is empty, return it as an empty list.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
347
3224.5.19 by Andrew Bennetts
Move _raise_if_nonexistent into the only module that uses it, bzrlib.status.
348
    This can be used by operations such as bzr status that can accept
349
    unknown or ignored files.
350
    """
3930.2.2 by Karl Fogel
* bzrlib/status.py
351
    mutter("check paths: %r", orig_paths)
352
    if not orig_paths:
353
        return orig_paths, []
354
    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.
355
    s = new_tree.filter_unversioned_files(s)
3930.2.2 by Karl Fogel
* bzrlib/status.py
356
    nonexistent = [path for path in s if not new_tree.has_filename(path)]
357
    remaining   = [path for path in orig_paths if not path in nonexistent]
3930.2.15 by Karl Fogel
Part of bug #306394: Ensure sorted order for nonexistent file output.
358
    # Sorting the 'remaining' list doesn't have much effect in
359
    # practice, since the various status output sections will sort
360
    # their groups individually.  But for consistency of this
361
    # function's API, it's better to sort both than just 'nonexistent'.
362
    return sorted(remaining), sorted(nonexistent)