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