/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
7045.3.1 by Jelmer Vernooij
Fix another ~500 tests.
132
    with wt.lock_read():
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
133
        new_is_working_tree = True
134
        if revision is None:
2091.4.1 by wang
Pushing to a remote branch does not currently update the remote working
135
            if wt.last_revision() != wt.branch.last_revision():
6622.1.30 by Jelmer Vernooij
Some more test fixes.
136
                warning("working tree is out of date, run 'brz update'")
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
137
            new = wt
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
138
            old = new.basis_tree()
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
139
        elif len(revision) > 0:
140
            try:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
141
                old = revision[0].as_tree(wt.branch)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
142
            except errors.NoSuchRevision as e:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
143
                raise errors.BzrCommandError(str(e))
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
144
            if (len(revision) > 1) and (revision[1].spec is not None):
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
145
                try:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
146
                    new = revision[1].as_tree(wt.branch)
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
147
                    new_is_working_tree = False
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
148
                except errors.NoSuchRevision as e:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
149
                    raise errors.BzrCommandError(str(e))
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
150
            else:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
151
                new = wt
7045.3.1 by Jelmer Vernooij
Fix another ~500 tests.
152
        with old.lock_read(), new.lock_read():
5393.3.7 by Parth Malwankar
added pre_status hook
153
            for hook in hooks['pre_status']:
154
                hook(StatusHookParams(old, new, to_file, versioned,
6282.4.1 by Francis Devereux
Pass specific_files to status hooks
155
                    show_ids, short, verbose, specific_files=specific_files))
5393.3.7 by Parth Malwankar
added pre_status hook
156
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,
5945.2.2 by Martin von Gagern
Change from no_decorate to classify as name for the argument.
163
                unversioned_filter=new.is_ignored, classify=classify)
6786.2.4 by Jelmer Vernooij
Add TODO, mutter.
164
            report_changes(to_file, old, new, specific_files,
165
                           reporter, show_long_callback,
6835 by Jelmer Vernooij
Merge lp:~jelmer/brz/268573-outf
166
                           short=short, want_unversioned=want_unversioned,
167
                           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.
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
6786.2.4 by Jelmer Vernooij
Add TODO, mutter.
170
            # 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
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 = ' '
6996 by Jelmer Vernooij
Merge lp:~jelmer/brz/python3-e
196
                to_file.write("%s %s\n" % (prefix, conflict.describe()))
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)
5393.3.1 by Parth Malwankar
initial post_status hook is now working
217
            for hook in hooks['post_status']:
5393.3.7 by Parth Malwankar
added pre_status hook
218
                hook(StatusHookParams(old, new, to_file, versioned,
6282.4.1 by Francis Devereux
Pass specific_files to status hooks
219
                    show_ids, short, verbose, specific_files=specific_files))
1185.33.70 by Martin Pool
Refactor status display code.
220
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
221
222
def _get_sorted_revisions(tip_revision, revision_ids, parent_map):
223
    """Get an iterator which will return the revisions in merge sorted order.
224
225
    This will build up a list of all nodes, such that only nodes in the list
226
    are referenced. It then uses MergeSorter to return them in 'merge-sorted'
227
    order.
228
229
    :param revision_ids: A set of revision_ids
230
    :param parent_map: The parent information for each node. Revisions which
231
        are considered ghosts should not be present in the map.
3377.3.43 by John Arbash Meinel
Ian's review feedback
232
    :return: iterator from MergeSorter.iter_topo_order()
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
233
    """
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
234
    # MergeSorter requires that all nodes be present in the graph, so get rid
235
    # of any references pointing outside of this graph.
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
236
    parent_graph = {}
237
    for revision_id in revision_ids:
238
        if revision_id not in parent_map: # ghost
239
            parent_graph[revision_id] = []
240
        else:
241
            # Only include parents which are in this sub-graph
242
            parent_graph[revision_id] = [p for p in parent_map[revision_id]
243
                                            if p in revision_ids]
244
    sorter = tsort.MergeSorter(parent_graph, tip_revision)
245
    return sorter.iter_topo_order()
246
247
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
248
def show_pending_merges(new, to_file, short=False, verbose=False):
1185.33.70 by Martin Pool
Refactor status display code.
249
    """Write out a display of pending merges in a working tree."""
3377.3.43 by John Arbash Meinel
Ian's review feedback
250
    parents = new.get_parent_ids()
251
    if len(parents) < 2:
252
        return
253
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
254
    term_width = osutils.terminal_width()
255
    if term_width is not None:
256
        # we need one extra space for terminals that wrap on last char
257
        term_width = term_width - 1
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
258
    if short:
3377.3.42 by John Arbash Meinel
Get the tests to actually work, and get the code to go along with.
259
        first_prefix = 'P   '
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
260
        sub_prefix = 'P.   '
261
    else:
262
        first_prefix = '  '
263
        sub_prefix = '    '
3377.3.38 by John Arbash Meinel
Pull out terminal width from the inner loop of show_pending_merges
264
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
265
    def show_log_message(rev, prefix):
266
        if term_width is None:
267
            width = term_width
268
        else:
269
            width = term_width - len(prefix)
270
        log_message = log_formatter.log_string(None, rev, width, prefix=prefix)
271
        to_file.write(log_message + '\n')
272
1908.6.9 by Robert Collins
Fix status to not use pending_merges.
273
    pending = parents[1:]
1185.33.70 by Martin Pool
Refactor status display code.
274
    branch = new.branch
1908.6.9 by Robert Collins
Fix status to not use pending_merges.
275
    last_revision = parents[0]
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
276
    if not short:
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
277
        if verbose:
278
            to_file.write('pending merges:\n')
279
        else:
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
280
            to_file.write('pending merge tips:'
281
                          ' (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.
282
    graph = branch.repository.get_graph()
3377.3.31 by John Arbash Meinel
change the status code to use find_unique_ancestors()
283
    other_revisions = [last_revision]
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
284
    log_formatter = log.LineLogFormatter(to_file)
1908.6.9 by Robert Collins
Fix status to not use pending_merges.
285
    for merge in pending:
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
286
        try:
6714.1.4 by Jelmer Vernooij
More use of iter_revisions.
287
            rev = branch.repository.get_revision(merge)
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
288
        except errors.NoSuchRevision:
289
            # If we are missing a revision, just print out the revision id
7045.2.17 by Jelmer Vernooij
Some more.
290
            to_file.write(first_prefix + '(ghost) ' + merge.decode('utf-8') + '\n')
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
291
            other_revisions.append(merge)
292
            continue
293
294
        # Log the merge, as it gets a slightly different formatting
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
295
        show_log_message(rev, first_prefix)
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
296
        if not verbose:
297
            continue
298
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
299
        # Find all of the revisions in the merge source, which are not in the
300
        # last committed revision.
3377.3.31 by John Arbash Meinel
change the status code to use find_unique_ancestors()
301
        merge_extra = graph.find_unique_ancestors(merge, other_revisions)
302
        other_revisions.append(merge)
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
303
        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
304
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
305
        # Get a handle to all of the revisions we will need
6714.1.4 by Jelmer Vernooij
More use of iter_revisions.
306
        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
307
308
        # Display the revisions brought in by this merge.
309
        rev_id_iterator = _get_sorted_revisions(merge, merge_extra,
310
                            branch.repository.get_parent_map(merge_extra))
311
        # Skip the first node
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
312
        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
313
        if first != merge:
314
            raise AssertionError('Somehow we misunderstood how'
315
                ' iter_topo_order works %s != %s' % (first, merge))
316
        for num, sub_merge, depth, eom in rev_id_iterator:
317
            rev = revisions[sub_merge]
318
            if rev is None:
7058.4.1 by Jelmer Vernooij
Fix another 40 tests.
319
                to_file.write(sub_prefix + '(ghost) ' + sub_merge.decode('utf-8') + '\n')
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
320
                continue
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
321
            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.
322
323
3930.2.4 by Karl Fogel
* bzrlib/status.py
324
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.
325
    """Convert orig_paths to two sorted lists and return them.
3930.2.2 by Karl Fogel
* bzrlib/status.py
326
327
    The first is orig_paths paths minus the items in the second list,
328
    and the second list is paths that are not in either inventory or
329
    tree (they don't qualify if they exist in the tree's inventory, or
330
    if they exist in the tree but are not versioned.)
331
332
    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
333
6622.1.30 by Jelmer Vernooij
Some more test fixes.
334
    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.
335
    unknown or ignored files.
336
    """
3930.2.2 by Karl Fogel
* bzrlib/status.py
337
    mutter("check paths: %r", orig_paths)
338
    if not orig_paths:
339
        return orig_paths, []
340
    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.
341
    s = new_tree.filter_unversioned_files(s)
3930.2.2 by Karl Fogel
* bzrlib/status.py
342
    nonexistent = [path for path in s if not new_tree.has_filename(path)]
343
    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.
344
    # Sorting the 'remaining' list doesn't have much effect in
345
    # practice, since the various status output sections will sort
346
    # their groups individually.  But for consistency of this
347
    # function's API, it's better to sort both than just 'nonexistent'.
348
    return sorted(remaining), sorted(nonexistent)
5393.3.1 by Parth Malwankar
initial post_status hook is now working
349
350
351
class StatusHooks(_mod_hooks.Hooks):
352
    """A dictionary mapping hook name to a list of callables for status hooks.
353
354
    e.g. ['post_status'] Is the list of items to be called when the
355
    status command has finished printing the status.
356
    """
357
5622.3.10 by Jelmer Vernooij
Don't require arguments to hooks.
358
    def __init__(self):
5393.3.1 by Parth Malwankar
initial post_status hook is now working
359
        """Create the default hooks.
360
361
        These are all empty initially, because by default nothing should get
362
        notified.
363
        """
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
364
        _mod_hooks.Hooks.__init__(self, "breezy.status", "hooks")
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
365
        self.add_hook('post_status',
5393.3.7 by Parth Malwankar
added pre_status hook
366
            "Called with argument StatusHookParams after Bazaar has "
367
            "displayed the status. StatusHookParams has the attributes "
368
            "(old_tree, new_tree, to_file, versioned, show_ids, short, "
369
            "verbose). The last four arguments correspond to the command "
370
            "line options specified by the user for the status command. "
371
            "to_file is the output stream for writing.",
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
372
            (2, 3))
373
        self.add_hook('pre_status',
5393.3.7 by Parth Malwankar
added pre_status hook
374
            "Called with argument StatusHookParams before Bazaar "
375
            "displays the status. StatusHookParams has the attributes "
5393.3.6 by Parth Malwankar
verbose arg is now passed to post_status hook
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))
5393.3.1 by Parth Malwankar
initial post_status hook is now working
381
382
5393.3.7 by Parth Malwankar
added pre_status hook
383
class StatusHookParams(object):
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
384
    """Object holding parameters passed to post_status hooks.
385
386
    :ivar old_tree: Start tree (basis tree) for comparison.
387
    :ivar new_tree: Working tree.
5393.3.5 by Parth Malwankar
post_status hook now provies to_file as argument
388
    :ivar to_file: If set, write to this file.
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
389
    :ivar versioned: Show only versioned files.
390
    :ivar show_ids: Show internal object ids.
391
    :ivar short: Use short status indicators.
5393.3.6 by Parth Malwankar
verbose arg is now passed to post_status hook
392
    :ivar verbose: Verbose flag.
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
393
    """
394
5393.3.6 by Parth Malwankar
verbose arg is now passed to post_status hook
395
    def __init__(self, old_tree, new_tree, to_file, versioned, show_ids,
6282.4.1 by Francis Devereux
Pass specific_files to status hooks
396
            short, verbose, specific_files=None):
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
397
        """Create a group of post_status hook parameters.
398
399
        :param old_tree: Start tree (basis tree) for comparison.
400
        :param new_tree: Working tree.
5393.3.5 by Parth Malwankar
post_status hook now provies to_file as argument
401
        :param to_file: If set, write to this file.
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
402
        :param versioned: Show only versioned files.
403
        :param show_ids: Show internal object ids.
404
        :param short: Use short status indicators.
5393.3.6 by Parth Malwankar
verbose arg is now passed to post_status hook
405
        :param verbose: Verbose flag.
6282.4.1 by Francis Devereux
Pass specific_files to status hooks
406
        :param specific_files: If set, a list of filenames whose status should be
407
            shown.  It is an error to give a filename that is not in the working
408
            tree, or in the working inventory or in the basis inventory.
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
409
        """
410
        self.old_tree = old_tree
411
        self.new_tree = new_tree
5393.3.5 by Parth Malwankar
post_status hook now provies to_file as argument
412
        self.to_file = to_file
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
413
        self.versioned = versioned
414
        self.show_ids = show_ids
415
        self.short = short
5393.3.6 by Parth Malwankar
verbose arg is now passed to post_status hook
416
        self.verbose = verbose
6282.4.1 by Francis Devereux
Pass specific_files to status hooks
417
        self.specific_files = specific_files
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
418
419
    def __eq__(self, other):
420
        return self.__dict__ == other.__dict__
421
422
    def __repr__(self):
6282.4.1 by Francis Devereux
Pass specific_files to status hooks
423
        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
424
            self.old_tree, self.new_tree, self.to_file, self.versioned,
6282.4.1 by Francis Devereux
Pass specific_files to status hooks
425
            self.show_ids, self.short, self.verbose, self.specific_files)
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
426
5418.4.1 by Parth Malwankar
post_status hook added to show shelve summary.
427
428
def _show_shelve_summary(params):
429
    """post_status hook to display a summary of shelves.
430
431
    :param params: StatusHookParams.
432
    """
6282.4.2 by Francis Devereux
Only show shelves in "bzr status" if no there are no file arguments
433
    # Don't show shelves if status of specific files is being shown, only if
434
    # no file arguments have been passed
435
    if params.specific_files:
436
        return
6788 by Jelmer Vernooij
Merge lp:~jelmer/brz/supports-shelving.
437
    get_shelf_manager = getattr(params.new_tree, 'get_shelf_manager', None)
438
    if get_shelf_manager is None:
439
        return
6786.2.2 by Jelmer Vernooij
Add test for shelf manager expectations.
440
    try:
6788 by Jelmer Vernooij
Merge lp:~jelmer/brz/supports-shelving.
441
        manager = get_shelf_manager()
6786.2.2 by Jelmer Vernooij
Add test for shelf manager expectations.
442
    except ShelvingUnsupported:
6786.2.4 by Jelmer Vernooij
Add TODO, mutter.
443
        mutter('shelving not supported by tree, not displaying shelves.')
6786.2.2 by Jelmer Vernooij
Add test for shelf manager expectations.
444
    else:
445
        shelves = manager.active_shelves()
446
        if shelves:
447
            singular = '%d shelf exists. '
448
            plural = '%d shelves exist. '
449
            if len(shelves) == 1:
450
                fmt = singular
451
            else:
452
                fmt = plural
453
            params.to_file.write(fmt % len(shelves))
454
            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.
455
456
5622.3.10 by Jelmer Vernooij
Don't require arguments to hooks.
457
hooks = StatusHooks()
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
458
5622.3.11 by Jelmer Vernooij
Revert some unnecessary changes.
459
460
hooks.install_named_hook('post_status', _show_shelve_summary,
6622.1.30 by Jelmer Vernooij
Some more test fixes.
461
    'brz status')
5622.3.11 by Jelmer Vernooij
Revert some unnecessary changes.
462