/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
1551.10.7 by Aaron Bentley
Use new-style output for status
19
from bzrlib import (
20
    delta as _mod_delta,
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
21
    log,
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
22
    osutils,
23
    tsort,
24
    revision as _mod_revision,
1551.10.7 by Aaron Bentley
Use new-style output for status
25
    )
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
26
import bzrlib.errors as errors
3224.5.19 by Andrew Bennetts
Move _raise_if_nonexistent into the only module that uses it, bzrlib.status.
27
from bzrlib.trace import mutter, warning
362 by Martin Pool
- Import stat-cache code
28
1185.33.70 by Martin Pool
Refactor status display code.
29
# TODO: when showing single-line logs, truncate to the width of the terminal
30
# if known, but only if really going to the terminal (not into a file)
31
465 by Martin Pool
- Move show_status() out of Branch into a new function in
32
1773.1.2 by Robert Collins
Remove --all option from status.
33
def show_tree_status(wt, show_unchanged=None,
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
34
                     specific_files=None,
35
                     show_ids=False,
36
                     to_file=None,
37
                     show_pending=True,
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
38
                     revision=None,
2318.2.1 by Kent Gibson
Apply status versioned patch
39
                     short=False,
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
40
                     verbose=False,
2318.2.1 by Kent Gibson
Apply status versioned patch
41
                     versioned=False):
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
42
    """Display summary of changes.
43
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
44
    By default this compares the working tree to a previous revision.
45
    If the revision argument is given, summarizes changes between the
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
46
    working tree and another, or between two revisions.
47
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
48
    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
49
    to encode that.
50
1662.1.9 by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
51
    If showing the status of a working tree, extra information is included
52
    about unknown files, conflicts, and pending merges.
53
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
54
    :param show_unchanged: Deprecated parameter. If set, includes unchanged
1773.1.2 by Robert Collins
Remove --all option from status.
55
        files.
56
    :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
57
        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)
58
        tree, or in the working inventory or in the basis inventory.
1773.1.2 by Robert Collins
Remove --all option from status.
59
    :param show_ids: If set, includes each file's id.
60
    :param to_file: If set, write to this file (default stdout.)
61
    :param show_pending: If set, write pending merges.
3394.2.2 by Ian Clatworthy
show_tree_status docstring and deprecation cleanups
62
    :param revision: If None, compare latest revision with working tree
63
        If not None, it must be a RevisionSpec list.
64
        If one revision, compare with working tree.
65
        If two revisions, show status between first and second.
2318.2.1 by Kent Gibson
Apply status versioned patch
66
    :param short: If True, gives short SVN-style status lines.
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
67
    :param verbose: If True, show all merged revisions, not just
68
        the merge tips
2318.2.1 by Kent Gibson
Apply status versioned patch
69
    :param versioned: If True, only shows versioned files.
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
70
    """
1773.1.2 by Robert Collins
Remove --all option from status.
71
    if show_unchanged is not None:
3394.2.2 by Ian Clatworthy
show_tree_status docstring and deprecation cleanups
72
        warn("show_tree_status with show_unchanged has been deprecated "
1773.1.2 by Robert Collins
Remove --all option from status.
73
             "since bzrlib 0.9", DeprecationWarning, stacklevel=2)
74
75
    if to_file is None:
915 by Martin Pool
- add simple test case for bzr status
76
        to_file = sys.stdout
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
77
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
78
    wt.lock_read()
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
79
    try:
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
80
        new_is_working_tree = True
81
        if revision is None:
2091.4.1 by wang
Pushing to a remote branch does not currently update the remote working
82
            if wt.last_revision() != wt.branch.last_revision():
83
                warning("working tree is out of date, run 'bzr update'")
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
84
            new = wt
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
85
            old = new.basis_tree()
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
86
        elif len(revision) > 0:
87
            try:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
88
                old = revision[0].as_tree(wt.branch)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
89
            except errors.NoSuchRevision, e:
90
                raise errors.BzrCommandError(str(e))
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
91
            if (len(revision) > 1) and (revision[1].spec is not None):
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
92
                try:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
93
                    new = revision[1].as_tree(wt.branch)
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
94
                    new_is_working_tree = False
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
95
                except errors.NoSuchRevision, e:
96
                    raise errors.BzrCommandError(str(e))
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
97
            else:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
98
                new = wt
2255.2.80 by Robert Collins
In status, read lock the old and new trees being used to let data caching occur.
99
        old.lock_read()
100
        new.lock_read()
101
        try:
3930.2.2 by Karl Fogel
* bzrlib/status.py
102
            specific_files, nonexistents \
3930.2.4 by Karl Fogel
* bzrlib/status.py
103
                = _filter_nonexistent(specific_files, old, new)
2318.2.3 by Kent Gibson
merged bzr.dev
104
            want_unversioned = not versioned
2168.1.3 by John Arbash Meinel
The logic for when to display 'C' for conflicts was inverted.
105
            if short:
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
106
                changes = new.iter_changes(old, show_unchanged, specific_files,
2318.2.3 by Kent Gibson
merged bzr.dev
107
                    require_versioned=False, want_unversioned=want_unversioned)
1551.10.25 by Aaron Bentley
Make ChangeReporter private
108
                reporter = _mod_delta._ChangeReporter(output_file=to_file,
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
109
                    unversioned_filter=new.is_ignored)
2255.2.83 by John Arbash Meinel
[merge] bzr.dev 2294
110
                _mod_delta.report_changes(changes, reporter)
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
111
            else:
2255.2.83 by John Arbash Meinel
[merge] bzr.dev 2294
112
                delta = new.changes_from(old, want_unchanged=show_unchanged,
2255.7.91 by Robert Collins
Move unknown detection in long status into the delta creation, saving a tree-scan.
113
                                      specific_files=specific_files,
2318.2.3 by Kent Gibson
merged bzr.dev
114
                                      want_unversioned=want_unversioned)
2255.7.91 by Robert Collins
Move unknown detection in long status into the delta creation, saving a tree-scan.
115
                # filter out unknown files. We may want a tree method for
116
                # this
117
                delta.unversioned = [unversioned for unversioned in
118
                    delta.unversioned if not new.is_ignored(unversioned[0])]
2255.2.83 by John Arbash Meinel
[merge] bzr.dev 2294
119
                delta.show(to_file,
120
                           show_ids=show_ids,
121
                           show_unchanged=show_unchanged,
2255.7.91 by Robert Collins
Move unknown detection in long status into the delta creation, saving a tree-scan.
122
                           short_status=False)
1551.15.58 by Aaron Bentley
Status honours selected paths for conflicts (#127606)
123
            # show the new conflicts only for now. XXX: get them from the
124
            # delta.
125
            conflicts = new.conflicts()
126
            if specific_files is not None:
127
                conflicts = conflicts.select_conflicts(new, specific_files,
128
                    ignore_misses=True, recurse=True)[1]
129
            if len(conflicts) > 0 and not short:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
130
                to_file.write("conflicts:\n")
1551.15.58 by Aaron Bentley
Status honours selected paths for conflicts (#127606)
131
            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.
132
                if short:
2255.2.83 by John Arbash Meinel
[merge] bzr.dev 2294
133
                    prefix = 'C  '
2255.2.80 by Robert Collins
In status, read lock the old and new trees being used to let data caching occur.
134
                else:
135
                    prefix = ' '
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
136
                to_file.write("%s %s\n" % (prefix, conflict))
3930.2.2 by Karl Fogel
* bzrlib/status.py
137
            # Show files that were requested but don't exist (and are
138
            # not versioned).  We don't involve delta in this; these
139
            # paths are really the province of just the status
140
            # command, since they have more to do with how it was
141
            # invoked than with the tree it's operating on.
142
            if nonexistents and not short:
143
                to_file.write("nonexistent:\n")
144
            for nonexistent in nonexistents:
3992.1.1 by Ian Clatworthy
Handle non-existent files in status (Karl Fogel, #306394)
145
                # We could calculate prefix outside the loop but, given
146
                # how rarely this ought to happen, it's OK and arguably
147
                # slightly faster to do it here (ala conflicts above)
3930.2.2 by Karl Fogel
* bzrlib/status.py
148
                if short:
149
                    prefix = 'X  '
150
                else:
151
                    prefix = ' '
152
                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
153
            if (new_is_working_tree and show_pending):
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
154
                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)
155
            if nonexistents:
156
                raise errors.PathsDoNotExist(nonexistents)
2255.2.80 by Robert Collins
In status, read lock the old and new trees being used to let data caching occur.
157
        finally:
158
            old.unlock()
159
            new.unlock()
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
160
    finally:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
161
        wt.unlock()
1185.33.70 by Martin Pool
Refactor status display code.
162
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
163
164
def _get_sorted_revisions(tip_revision, revision_ids, parent_map):
165
    """Get an iterator which will return the revisions in merge sorted order.
166
167
    This will build up a list of all nodes, such that only nodes in the list
168
    are referenced. It then uses MergeSorter to return them in 'merge-sorted'
169
    order.
170
171
    :param revision_ids: A set of revision_ids
172
    :param parent_map: The parent information for each node. Revisions which
173
        are considered ghosts should not be present in the map.
3377.3.43 by John Arbash Meinel
Ian's review feedback
174
    :return: iterator from MergeSorter.iter_topo_order()
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
175
    """
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
176
    # MergeSorter requires that all nodes be present in the graph, so get rid
177
    # of any references pointing outside of this graph.
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
178
    parent_graph = {}
179
    for revision_id in revision_ids:
180
        if revision_id not in parent_map: # ghost
181
            parent_graph[revision_id] = []
182
        else:
183
            # Only include parents which are in this sub-graph
184
            parent_graph[revision_id] = [p for p in parent_map[revision_id]
185
                                            if p in revision_ids]
186
    sorter = tsort.MergeSorter(parent_graph, tip_revision)
187
    return sorter.iter_topo_order()
188
189
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
190
def show_pending_merges(new, to_file, short=False, verbose=False):
1185.33.70 by Martin Pool
Refactor status display code.
191
    """Write out a display of pending merges in a working tree."""
3377.3.43 by John Arbash Meinel
Ian's review feedback
192
    parents = new.get_parent_ids()
193
    if len(parents) < 2:
194
        return
195
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
196
    term_width = osutils.terminal_width()
197
    if term_width is not None:
198
        # we need one extra space for terminals that wrap on last char
199
        term_width = term_width - 1
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
200
    if short:
3377.3.42 by John Arbash Meinel
Get the tests to actually work, and get the code to go along with.
201
        first_prefix = 'P   '
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
202
        sub_prefix = 'P.   '
203
    else:
204
        first_prefix = '  '
205
        sub_prefix = '    '
3377.3.38 by John Arbash Meinel
Pull out terminal width from the inner loop of show_pending_merges
206
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
207
    def show_log_message(rev, prefix):
208
        if term_width is None:
209
            width = term_width
210
        else:
211
            width = term_width - len(prefix)
212
        log_message = log_formatter.log_string(None, rev, width, prefix=prefix)
213
        to_file.write(log_message + '\n')
214
1908.6.9 by Robert Collins
Fix status to not use pending_merges.
215
    pending = parents[1:]
1185.33.70 by Martin Pool
Refactor status display code.
216
    branch = new.branch
1908.6.9 by Robert Collins
Fix status to not use pending_merges.
217
    last_revision = parents[0]
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
218
    if not short:
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
219
        if verbose:
220
            to_file.write('pending merges:\n')
221
        else:
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
222
            to_file.write('pending merge tips:'
223
                          ' (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.
224
    graph = branch.repository.get_graph()
3377.3.31 by John Arbash Meinel
change the status code to use find_unique_ancestors()
225
    other_revisions = [last_revision]
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
226
    log_formatter = log.LineLogFormatter(to_file)
1908.6.9 by Robert Collins
Fix status to not use pending_merges.
227
    for merge in pending:
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
228
        try:
229
            rev = branch.repository.get_revisions([merge])[0]
230
        except errors.NoSuchRevision:
231
            # 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
232
            to_file.write(first_prefix + '(ghost) ' + merge + '\n')
3377.3.39 by John Arbash Meinel
More tweaks for show_pending_merges
233
            other_revisions.append(merge)
234
            continue
235
236
        # Log the merge, as it gets a slightly different formatting
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
237
        show_log_message(rev, first_prefix)
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
238
        if not verbose:
239
            continue
240
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
241
        # Find all of the revisions in the merge source, which are not in the
242
        # last committed revision.
3377.3.31 by John Arbash Meinel
change the status code to use find_unique_ancestors()
243
        merge_extra = graph.find_unique_ancestors(merge, other_revisions)
244
        other_revisions.append(merge)
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
245
        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
246
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
247
        # Get a handle to all of the revisions we will need
1185.33.70 by Martin Pool
Refactor status display code.
248
        try:
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
249
            revisions = dict((rev.revision_id, rev) for rev in
250
                             branch.repository.get_revisions(merge_extra))
251
        except errors.NoSuchRevision:
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
252
            # One of the sub nodes is a ghost, check each one
253
            revisions = {}
254
            for revision_id in merge_extra:
255
                try:
3377.3.42 by John Arbash Meinel
Get the tests to actually work, and get the code to go along with.
256
                    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
257
                except errors.NoSuchRevision:
258
                    revisions[revision_id] = None
259
                else:
260
                    revisions[revision_id] = rev
261
262
        # Display the revisions brought in by this merge.
263
        rev_id_iterator = _get_sorted_revisions(merge, merge_extra,
264
                            branch.repository.get_parent_map(merge_extra))
265
        # Skip the first node
266
        num, first, depth, eom = rev_id_iterator.next()
267
        if first != merge:
268
            raise AssertionError('Somehow we misunderstood how'
269
                ' iter_topo_order works %s != %s' % (first, merge))
270
        for num, sub_merge, depth, eom in rev_id_iterator:
271
            rev = revisions[sub_merge]
272
            if rev is None:
273
                to_file.write(sub_prefix + '(ghost) ' + sub_merge + '\n')
274
                continue
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
275
            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.
276
277
3930.2.4 by Karl Fogel
* bzrlib/status.py
278
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.
279
    """Convert orig_paths to two sorted lists and return them.
3930.2.2 by Karl Fogel
* bzrlib/status.py
280
281
    The first is orig_paths paths minus the items in the second list,
282
    and the second list is paths that are not in either inventory or
283
    tree (they don't qualify if they exist in the tree's inventory, or
284
    if they exist in the tree but are not versioned.)
285
286
    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
287
3224.5.19 by Andrew Bennetts
Move _raise_if_nonexistent into the only module that uses it, bzrlib.status.
288
    This can be used by operations such as bzr status that can accept
289
    unknown or ignored files.
290
    """
3930.2.2 by Karl Fogel
* bzrlib/status.py
291
    mutter("check paths: %r", orig_paths)
292
    if not orig_paths:
293
        return orig_paths, []
294
    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.
295
    s = new_tree.filter_unversioned_files(s)
3930.2.2 by Karl Fogel
* bzrlib/status.py
296
    nonexistent = [path for path in s if not new_tree.has_filename(path)]
297
    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.
298
    # Sorting the 'remaining' list doesn't have much effect in
299
    # practice, since the various status output sections will sort
300
    # their groups individually.  But for consistency of this
301
    # function's API, it's better to sort both than just 'nonexistent'.
302
    return sorted(remaining), sorted(nonexistent)