~bzr-pqm/bzr/bzr.dev

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