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