/brz/remove-bazaar

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