/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
6379.6.3 by Jelmer Vernooij
Use absolute_import.
17
from __future__ import absolute_import
18
1185.13.2 by Robert Collins
Merge Aarons conflict plugin for 0.1rc1
19
import sys
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
20
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
21
from . import (
1551.10.7 by Aaron Bentley
Use new-style output for status
22
    delta as _mod_delta,
5393.3.1 by Parth Malwankar
initial post_status hook is now working
23
    hooks as _mod_hooks,
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
24
    log,
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
25
    osutils,
26
    tsort,
27
    revision as _mod_revision,
1551.10.7 by Aaron Bentley
Use new-style output for status
28
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
29
from . import errors as errors
6973.6.2 by Jelmer Vernooij
Fix more tests.
30
from .sixish import text_type
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
31
from .trace import mutter, warning
6786.2.2 by Jelmer Vernooij
Add test for shelf manager expectations.
32
from .workingtree import ShelvingUnsupported
33
362 by Martin Pool
- Import stat-cache code
34
1185.33.70 by Martin Pool
Refactor status display code.
35
# TODO: when showing single-line logs, truncate to the width of the terminal
36
# if known, but only if really going to the terminal (not into a file)
37
465 by Martin Pool
- Move show_status() out of Branch into a new function in
38
6786.2.4 by Jelmer Vernooij
Add TODO, mutter.
39
def report_changes(to_file, old, new, specific_files,
40
                   show_short_reporter, show_long_callback,
41
                   short=False, want_unchanged=False,
5945.2.2 by Martin von Gagern
Change from no_decorate to classify as name for the argument.
42
                   want_unversioned=False, show_ids=False, classify=True):
5076.4.7 by Arnaud Jeansen
Add signature comments to report_changes in status.py
43
    """Display summary of changes.
44
6786.2.4 by Jelmer Vernooij
Add TODO, mutter.
45
    This compares two trees with regards to a list of files, and delegates
5076.4.7 by Arnaud Jeansen
Add signature comments to report_changes in status.py
46
    the display to underlying elements.
47
48
    For short output, it creates an iterator on all changes, and lets a given
49
    reporter display these changes.
50
51
    For stantard output, it creates a delta of the changes, and forwards it
52
    to a callback
53
54
    :param to_file: If set, write to this file (default stdout.)
55
    :param old: Start tree for the comparison
56
    :param end: End tree for the comparison
57
    :param specific_files: If set, a list of filenames whose status should be
58
        shown.  It is an error to give a filename that is not in the working
59
        tree, or in the working inventory or in the basis inventory.
60
    :param show_short_reporter: Reporter in charge of display for short output
61
    :param show_long_callback: Callback in charge of display for normal output
62
    :param short: If True, gives short SVN-style status lines.
63
    :param want_unchanged: Deprecated parameter. If set, includes unchanged
64
        files.
65
    :param show_ids: If set, includes each file's id.
66
    :param want_unversioned: If False, only shows versioned files.
5945.2.2 by Martin von Gagern
Change from no_decorate to classify as name for the argument.
67
    :param classify: Add special symbols to indicate file kind.
5076.4.7 by Arnaud Jeansen
Add signature comments to report_changes in status.py
68
    """
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.
69
70
    if short:
71
        changes = new.iter_changes(old, want_unchanged, specific_files,
72
            require_versioned=False, want_unversioned=want_unversioned)
73
        _mod_delta.report_changes(changes, show_short_reporter)
74
    else:
75
        delta = new.changes_from(old, want_unchanged=want_unchanged,
76
                              specific_files=specific_files,
77
                              want_unversioned=want_unversioned)
78
        # filter out unknown files. We may want a tree method for
79
        # this
80
        delta.unversioned = [unversioned for unversioned in
81
            delta.unversioned if not new.is_ignored(unversioned[0])]
6786.2.4 by Jelmer Vernooij
Add TODO, mutter.
82
        show_long_callback(to_file, delta,
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.
83
                           show_ids=show_ids,
5945.2.1 by Martin von Gagern
Make kind markers optional.
84
                           show_unchanged=want_unchanged,
5945.2.2 by Martin von Gagern
Change from no_decorate to classify as name for the argument.
85
                           classify=classify)
5076.4.1 by Arnaud Jeansen
Extract show() from TreeDelta and pass a callback instead
86
87
6833.2.3 by Jelmer Vernooij
Remove deprecated parameter.
88
def show_tree_status(wt,
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
89
                     specific_files=None,
90
                     show_ids=False,
91
                     to_file=None,
92
                     show_pending=True,
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
93
                     revision=None,
2318.2.1 by Kent Gibson
Apply status versioned patch
94
                     short=False,
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
95
                     verbose=False,
5076.4.1 by Arnaud Jeansen
Extract show() from TreeDelta and pass a callback instead
96
                     versioned=False,
5945.2.2 by Martin von Gagern
Change from no_decorate to classify as name for the argument.
97
                     classify=True,
5076.4.4 by Arnaud Jeansen
Add a unified report_delta method
98
                     show_long_callback=_mod_delta.report_delta):
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
99
    """Display summary of changes.
100
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
101
    By default this compares the working tree to a previous revision.
102
    If the revision argument is given, summarizes changes between the
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
103
    working tree and another, or between two revisions.
104
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
105
    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
106
    to encode that.
107
1662.1.9 by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
108
    If showing the status of a working tree, extra information is included
109
    about unknown files, conflicts, and pending merges.
110
1773.1.2 by Robert Collins
Remove --all option from status.
111
    :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
112
        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)
113
        tree, or in the working inventory or in the basis inventory.
1773.1.2 by Robert Collins
Remove --all option from status.
114
    :param show_ids: If set, includes each file's id.
115
    :param to_file: If set, write to this file (default stdout.)
116
    :param show_pending: If set, write pending merges.
3394.2.2 by Ian Clatworthy
show_tree_status docstring and deprecation cleanups
117
    :param revision: If None, compare latest revision with working tree
118
        If not None, it must be a RevisionSpec list.
119
        If one revision, compare with working tree.
120
        If two revisions, show status between first and second.
2318.2.1 by Kent Gibson
Apply status versioned patch
121
    :param short: If True, gives short SVN-style status lines.
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
122
    :param verbose: If True, show all merged revisions, not just
123
        the merge tips
2318.2.1 by Kent Gibson
Apply status versioned patch
124
    :param versioned: If True, only shows versioned files.
5945.2.2 by Martin von Gagern
Change from no_decorate to classify as name for the argument.
125
    :param classify: Add special symbols to indicate file kind.
6786.2.4 by Jelmer Vernooij
Add TODO, mutter.
126
    :param show_long_callback: A callback: message = show_long_callback(to_file, delta,
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.
127
        show_ids, show_unchanged, indent, filter), only used with the long output
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
128
    """
1773.1.2 by Robert Collins
Remove --all option from status.
129
    if to_file is None:
915 by Martin Pool
- add simple test case for bzr status
130
        to_file = sys.stdout
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
131
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
132
    wt.lock_read()
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
133
    try:
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
134
        new_is_working_tree = True
135
        if revision is None:
2091.4.1 by wang
Pushing to a remote branch does not currently update the remote working
136
            if wt.last_revision() != wt.branch.last_revision():
6622.1.30 by Jelmer Vernooij
Some more test fixes.
137
                warning("working tree is out of date, run 'brz update'")
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
138
            new = wt
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
139
            old = new.basis_tree()
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
140
        elif len(revision) > 0:
141
            try:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
142
                old = revision[0].as_tree(wt.branch)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
143
            except errors.NoSuchRevision as e:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
144
                raise errors.BzrCommandError(str(e))
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
145
            if (len(revision) > 1) and (revision[1].spec is not None):
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
146
                try:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
147
                    new = revision[1].as_tree(wt.branch)
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
148
                    new_is_working_tree = False
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
149
                except errors.NoSuchRevision as e:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
150
                    raise errors.BzrCommandError(str(e))
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
151
            else:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
152
                new = wt
2255.2.80 by Robert Collins
In status, read lock the old and new trees being used to let data caching occur.
153
        old.lock_read()
154
        new.lock_read()
155
        try:
5393.3.7 by Parth Malwankar
added pre_status hook
156
            for hook in hooks['pre_status']:
157
                hook(StatusHookParams(old, new, to_file, versioned,
6282.4.1 by Francis Devereux
Pass specific_files to status hooks
158
                    show_ids, short, verbose, specific_files=specific_files))
5393.3.7 by Parth Malwankar
added pre_status hook
159
3930.2.2 by Karl Fogel
* bzrlib/status.py
160
            specific_files, nonexistents \
3930.2.4 by Karl Fogel
* bzrlib/status.py
161
                = _filter_nonexistent(specific_files, old, new)
2318.2.3 by Kent Gibson
merged bzr.dev
162
            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.
163
164
            # Reporter used for short outputs
165
            reporter = _mod_delta._ChangeReporter(output_file=to_file,
5945.2.2 by Martin von Gagern
Change from no_decorate to classify as name for the argument.
166
                unversioned_filter=new.is_ignored, classify=classify)
6786.2.4 by Jelmer Vernooij
Add TODO, mutter.
167
            report_changes(to_file, old, new, specific_files,
168
                           reporter, show_long_callback,
6835 by Jelmer Vernooij
Merge lp:~jelmer/brz/268573-outf
169
                           short=short, want_unversioned=want_unversioned,
170
                           show_ids=show_ids, classify=classify)
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.
171
5137.2.5 by Arnaud Jeansen
Implement behaviour requested by mbp, in a way similar to the conflicts and non existent files' handling
172
            # show the ignored files among specific files (i.e. show the files
6786.2.4 by Jelmer Vernooij
Add TODO, mutter.
173
            # identified from input that we choose to ignore).
5137.2.5 by Arnaud Jeansen
Implement behaviour requested by mbp, in a way similar to the conflicts and non existent files' handling
174
            if specific_files is not None:
175
                # Ignored files is sorted because specific_files is already sorted
176
                ignored_files = [specific for specific in
177
                    specific_files if new.is_ignored(specific)]
178
                if len(ignored_files) > 0 and not short:
179
                    to_file.write("ignored:\n")
180
                    prefix = ' '
181
                else:
182
                    prefix = 'I  '
183
                for ignored_file in ignored_files:
184
                    to_file.write("%s %s\n" % (prefix, ignored_file))
185
1551.15.58 by Aaron Bentley
Status honours selected paths for conflicts (#127606)
186
            # show the new conflicts only for now. XXX: get them from the
187
            # delta.
188
            conflicts = new.conflicts()
189
            if specific_files is not None:
190
                conflicts = conflicts.select_conflicts(new, specific_files,
191
                    ignore_misses=True, recurse=True)[1]
192
            if len(conflicts) > 0 and not short:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
193
                to_file.write("conflicts:\n")
1551.15.58 by Aaron Bentley
Status honours selected paths for conflicts (#127606)
194
            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.
195
                if short:
2255.2.83 by John Arbash Meinel
[merge] bzr.dev 2294
196
                    prefix = 'C  '
2255.2.80 by Robert Collins
In status, read lock the old and new trees being used to let data caching occur.
197
                else:
198
                    prefix = ' '
6996 by Jelmer Vernooij
Merge lp:~jelmer/brz/python3-e
199
                to_file.write("%s %s\n" % (prefix, conflict.describe()))
3930.2.2 by Karl Fogel
* bzrlib/status.py
200
            # Show files that were requested but don't exist (and are
201
            # not versioned).  We don't involve delta in this; these
202
            # paths are really the province of just the status
203
            # command, since they have more to do with how it was
204
            # invoked than with the tree it's operating on.
205
            if nonexistents and not short:
206
                to_file.write("nonexistent:\n")
207
            for nonexistent in nonexistents:
3992.1.1 by Ian Clatworthy
Handle non-existent files in status (Karl Fogel, #306394)
208
                # We could calculate prefix outside the loop but, given
209
                # how rarely this ought to happen, it's OK and arguably
210
                # slightly faster to do it here (ala conflicts above)
3930.2.2 by Karl Fogel
* bzrlib/status.py
211
                if short:
212
                    prefix = 'X  '
213
                else:
214
                    prefix = ' '
215
                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
216
            if (new_is_working_tree and show_pending):
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
217
                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)
218
            if nonexistents:
219
                raise errors.PathsDoNotExist(nonexistents)
5393.3.1 by Parth Malwankar
initial post_status hook is now working
220
            for hook in hooks['post_status']:
5393.3.7 by Parth Malwankar
added pre_status hook
221
                hook(StatusHookParams(old, new, to_file, versioned,
6282.4.1 by Francis Devereux
Pass specific_files to status hooks
222
                    show_ids, short, verbose, specific_files=specific_files))
2255.2.80 by Robert Collins
In status, read lock the old and new trees being used to let data caching occur.
223
        finally:
224
            old.unlock()
225
            new.unlock()
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
226
    finally:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
227
        wt.unlock()
1185.33.70 by Martin Pool
Refactor status display code.
228
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
229
230
def _get_sorted_revisions(tip_revision, revision_ids, parent_map):
231
    """Get an iterator which will return the revisions in merge sorted order.
232
233
    This will build up a list of all nodes, such that only nodes in the list
234
    are referenced. It then uses MergeSorter to return them in 'merge-sorted'
235
    order.
236
237
    :param revision_ids: A set of revision_ids
238
    :param parent_map: The parent information for each node. Revisions which
239
        are considered ghosts should not be present in the map.
3377.3.43 by John Arbash Meinel
Ian's review feedback
240
    :return: iterator from MergeSorter.iter_topo_order()
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
241
    """
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
242
    # MergeSorter requires that all nodes be present in the graph, so get rid
243
    # of any references pointing outside of this graph.
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
244
    parent_graph = {}
245
    for revision_id in revision_ids:
246
        if revision_id not in parent_map: # ghost
247
            parent_graph[revision_id] = []
248
        else:
249
            # Only include parents which are in this sub-graph
250
            parent_graph[revision_id] = [p for p in parent_map[revision_id]
251
                                            if p in revision_ids]
252
    sorter = tsort.MergeSorter(parent_graph, tip_revision)
253
    return sorter.iter_topo_order()
254
255
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
256
def show_pending_merges(new, to_file, short=False, verbose=False):
1185.33.70 by Martin Pool
Refactor status display code.
257
    """Write out a display of pending merges in a working tree."""
3377.3.43 by John Arbash Meinel
Ian's review feedback
258
    parents = new.get_parent_ids()
259
    if len(parents) < 2:
260
        return
261
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
262
    term_width = osutils.terminal_width()
263
    if term_width is not None:
264
        # we need one extra space for terminals that wrap on last char
265
        term_width = term_width - 1
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
266
    if short:
3377.3.42 by John Arbash Meinel
Get the tests to actually work, and get the code to go along with.
267
        first_prefix = 'P   '
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
268
        sub_prefix = 'P.   '
269
    else:
270
        first_prefix = '  '
271
        sub_prefix = '    '
3377.3.38 by John Arbash Meinel
Pull out terminal width from the inner loop of show_pending_merges
272
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
273
    def show_log_message(rev, prefix):
274
        if term_width is None:
275
            width = term_width
276
        else:
277
            width = term_width - len(prefix)
278
        log_message = log_formatter.log_string(None, rev, width, prefix=prefix)
279
        to_file.write(log_message + '\n')
280
1908.6.9 by Robert Collins
Fix status to not use pending_merges.
281
    pending = parents[1:]
1185.33.70 by Martin Pool
Refactor status display code.
282
    branch = new.branch
1908.6.9 by Robert Collins
Fix status to not use pending_merges.
283
    last_revision = parents[0]
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
284
    if not short:
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
285
        if verbose:
286
            to_file.write('pending merges:\n')
287
        else:
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
288
            to_file.write('pending merge tips:'
289
                          ' (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.
290
    graph = branch.repository.get_graph()
3377.3.31 by John Arbash Meinel
change the status code to use find_unique_ancestors()
291
    other_revisions = [last_revision]
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
292
    log_formatter = log.LineLogFormatter(to_file)
1908.6.9 by Robert Collins
Fix status to not use pending_merges.
293
    for merge in pending:
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
294
        try:
6714.1.4 by Jelmer Vernooij
More use of iter_revisions.
295
            rev = branch.repository.get_revision(merge)
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
296
        except errors.NoSuchRevision:
297
            # If we are missing a revision, just print out the revision id
7045.2.17 by Jelmer Vernooij
Some more.
298
            to_file.write(first_prefix + '(ghost) ' + merge.decode('utf-8') + '\n')
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
299
            other_revisions.append(merge)
300
            continue
301
302
        # Log the merge, as it gets a slightly different formatting
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
303
        show_log_message(rev, first_prefix)
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
304
        if not verbose:
305
            continue
306
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
307
        # Find all of the revisions in the merge source, which are not in the
308
        # last committed revision.
3377.3.31 by John Arbash Meinel
change the status code to use find_unique_ancestors()
309
        merge_extra = graph.find_unique_ancestors(merge, other_revisions)
310
        other_revisions.append(merge)
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
311
        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
312
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
313
        # Get a handle to all of the revisions we will need
6714.1.4 by Jelmer Vernooij
More use of iter_revisions.
314
        revisions = dict(branch.repository.iter_revisions(merge_extra))
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
315
316
        # Display the revisions brought in by this merge.
317
        rev_id_iterator = _get_sorted_revisions(merge, merge_extra,
318
                            branch.repository.get_parent_map(merge_extra))
319
        # Skip the first node
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
320
        num, first, depth, eom = next(rev_id_iterator)
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
321
        if first != merge:
322
            raise AssertionError('Somehow we misunderstood how'
323
                ' iter_topo_order works %s != %s' % (first, merge))
324
        for num, sub_merge, depth, eom in rev_id_iterator:
325
            rev = revisions[sub_merge]
326
            if rev is None:
327
                to_file.write(sub_prefix + '(ghost) ' + sub_merge + '\n')
328
                continue
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
329
            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.
330
331
3930.2.4 by Karl Fogel
* bzrlib/status.py
332
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.
333
    """Convert orig_paths to two sorted lists and return them.
3930.2.2 by Karl Fogel
* bzrlib/status.py
334
335
    The first is orig_paths paths minus the items in the second list,
336
    and the second list is paths that are not in either inventory or
337
    tree (they don't qualify if they exist in the tree's inventory, or
338
    if they exist in the tree but are not versioned.)
339
340
    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
341
6622.1.30 by Jelmer Vernooij
Some more test fixes.
342
    This can be used by operations such as brz status that can accept
3224.5.19 by Andrew Bennetts
Move _raise_if_nonexistent into the only module that uses it, bzrlib.status.
343
    unknown or ignored files.
344
    """
3930.2.2 by Karl Fogel
* bzrlib/status.py
345
    mutter("check paths: %r", orig_paths)
346
    if not orig_paths:
347
        return orig_paths, []
348
    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.
349
    s = new_tree.filter_unversioned_files(s)
3930.2.2 by Karl Fogel
* bzrlib/status.py
350
    nonexistent = [path for path in s if not new_tree.has_filename(path)]
351
    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.
352
    # Sorting the 'remaining' list doesn't have much effect in
353
    # practice, since the various status output sections will sort
354
    # their groups individually.  But for consistency of this
355
    # function's API, it's better to sort both than just 'nonexistent'.
356
    return sorted(remaining), sorted(nonexistent)
5393.3.1 by Parth Malwankar
initial post_status hook is now working
357
358
359
class StatusHooks(_mod_hooks.Hooks):
360
    """A dictionary mapping hook name to a list of callables for status hooks.
361
362
    e.g. ['post_status'] Is the list of items to be called when the
363
    status command has finished printing the status.
364
    """
365
5622.3.10 by Jelmer Vernooij
Don't require arguments to hooks.
366
    def __init__(self):
5393.3.1 by Parth Malwankar
initial post_status hook is now working
367
        """Create the default hooks.
368
369
        These are all empty initially, because by default nothing should get
370
        notified.
371
        """
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
372
        _mod_hooks.Hooks.__init__(self, "breezy.status", "hooks")
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
373
        self.add_hook('post_status',
5393.3.7 by Parth Malwankar
added pre_status hook
374
            "Called with argument StatusHookParams after Bazaar has "
375
            "displayed the status. StatusHookParams has the attributes "
376
            "(old_tree, new_tree, to_file, versioned, show_ids, short, "
377
            "verbose). The last four arguments correspond to the command "
378
            "line options specified by the user for the status command. "
379
            "to_file is the output stream for writing.",
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
380
            (2, 3))
381
        self.add_hook('pre_status',
5393.3.7 by Parth Malwankar
added pre_status hook
382
            "Called with argument StatusHookParams before Bazaar "
383
            "displays the status. StatusHookParams has the attributes "
5393.3.6 by Parth Malwankar
verbose arg is now passed to post_status hook
384
            "(old_tree, new_tree, to_file, versioned, show_ids, short, "
385
            "verbose). The last four arguments correspond to the command "
386
            "line options specified by the user for the status command. "
387
            "to_file is the output stream for writing.",
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
388
            (2, 3))
5393.3.1 by Parth Malwankar
initial post_status hook is now working
389
390
5393.3.7 by Parth Malwankar
added pre_status hook
391
class StatusHookParams(object):
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
392
    """Object holding parameters passed to post_status hooks.
393
394
    :ivar old_tree: Start tree (basis tree) for comparison.
395
    :ivar new_tree: Working tree.
5393.3.5 by Parth Malwankar
post_status hook now provies to_file as argument
396
    :ivar to_file: If set, write to this file.
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
397
    :ivar versioned: Show only versioned files.
398
    :ivar show_ids: Show internal object ids.
399
    :ivar short: Use short status indicators.
5393.3.6 by Parth Malwankar
verbose arg is now passed to post_status hook
400
    :ivar verbose: Verbose flag.
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
401
    """
402
5393.3.6 by Parth Malwankar
verbose arg is now passed to post_status hook
403
    def __init__(self, old_tree, new_tree, to_file, versioned, show_ids,
6282.4.1 by Francis Devereux
Pass specific_files to status hooks
404
            short, verbose, specific_files=None):
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
405
        """Create a group of post_status hook parameters.
406
407
        :param old_tree: Start tree (basis tree) for comparison.
408
        :param new_tree: Working tree.
5393.3.5 by Parth Malwankar
post_status hook now provies to_file as argument
409
        :param to_file: If set, write to this file.
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
410
        :param versioned: Show only versioned files.
411
        :param show_ids: Show internal object ids.
412
        :param short: Use short status indicators.
5393.3.6 by Parth Malwankar
verbose arg is now passed to post_status hook
413
        :param verbose: Verbose flag.
6282.4.1 by Francis Devereux
Pass specific_files to status hooks
414
        :param specific_files: If set, a list of filenames whose status should be
415
            shown.  It is an error to give a filename that is not in the working
416
            tree, or in the working inventory or in the basis inventory.
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
417
        """
418
        self.old_tree = old_tree
419
        self.new_tree = new_tree
5393.3.5 by Parth Malwankar
post_status hook now provies to_file as argument
420
        self.to_file = to_file
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
421
        self.versioned = versioned
422
        self.show_ids = show_ids
423
        self.short = short
5393.3.6 by Parth Malwankar
verbose arg is now passed to post_status hook
424
        self.verbose = verbose
6282.4.1 by Francis Devereux
Pass specific_files to status hooks
425
        self.specific_files = specific_files
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
426
427
    def __eq__(self, other):
428
        return self.__dict__ == other.__dict__
429
430
    def __repr__(self):
6282.4.1 by Francis Devereux
Pass specific_files to status hooks
431
        return "<%s(%s, %s, %s, %s, %s, %s, %s, %s)>" % (self.__class__.__name__,
5393.3.5 by Parth Malwankar
post_status hook now provies to_file as argument
432
            self.old_tree, self.new_tree, self.to_file, self.versioned,
6282.4.1 by Francis Devereux
Pass specific_files to status hooks
433
            self.show_ids, self.short, self.verbose, self.specific_files)
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
434
5418.4.1 by Parth Malwankar
post_status hook added to show shelve summary.
435
436
def _show_shelve_summary(params):
437
    """post_status hook to display a summary of shelves.
438
439
    :param params: StatusHookParams.
440
    """
6282.4.2 by Francis Devereux
Only show shelves in "bzr status" if no there are no file arguments
441
    # Don't show shelves if status of specific files is being shown, only if
442
    # no file arguments have been passed
443
    if params.specific_files:
444
        return
6788 by Jelmer Vernooij
Merge lp:~jelmer/brz/supports-shelving.
445
    get_shelf_manager = getattr(params.new_tree, 'get_shelf_manager', None)
446
    if get_shelf_manager is None:
447
        return
6786.2.2 by Jelmer Vernooij
Add test for shelf manager expectations.
448
    try:
6788 by Jelmer Vernooij
Merge lp:~jelmer/brz/supports-shelving.
449
        manager = get_shelf_manager()
6786.2.2 by Jelmer Vernooij
Add test for shelf manager expectations.
450
    except ShelvingUnsupported:
6786.2.4 by Jelmer Vernooij
Add TODO, mutter.
451
        mutter('shelving not supported by tree, not displaying shelves.')
6786.2.2 by Jelmer Vernooij
Add test for shelf manager expectations.
452
    else:
453
        shelves = manager.active_shelves()
454
        if shelves:
455
            singular = '%d shelf exists. '
456
            plural = '%d shelves exist. '
457
            if len(shelves) == 1:
458
                fmt = singular
459
            else:
460
                fmt = plural
461
            params.to_file.write(fmt % len(shelves))
462
            params.to_file.write('See "brz shelve --list" for details.\n')
5418.4.1 by Parth Malwankar
post_status hook added to show shelve summary.
463
464
5622.3.10 by Jelmer Vernooij
Don't require arguments to hooks.
465
hooks = StatusHooks()
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
466
5622.3.11 by Jelmer Vernooij
Revert some unnecessary changes.
467
468
hooks.install_named_hook('post_status', _show_shelve_summary,
6622.1.30 by Jelmer Vernooij
Some more test fixes.
469
    'brz status')
5622.3.11 by Jelmer Vernooij
Revert some unnecessary changes.
470