~bzr-pqm/bzr/bzr.dev

1662.1.9 by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
1
# Copyright (C) 2005, 2006 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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
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
1185.13.2 by Robert Collins
Merge Aarons conflict plugin for 0.1rc1
19
from bzrlib.delta import compare_trees
1662.1.9 by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
20
from bzrlib.diff import _raise_if_nonexistent
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
21
import bzrlib.errors as errors
1185.12.27 by Aaron Bentley
Use line log for pending merges
22
from bzrlib.log import line_log
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
23
from bzrlib.osutils import is_inside_any
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
24
from bzrlib.symbol_versioning import (deprecated_function,
25
        zero_eight,
26
        )
362 by Martin Pool
- Import stat-cache code
27
1185.33.70 by Martin Pool
Refactor status display code.
28
# TODO: when showing single-line logs, truncate to the width of the terminal
29
# if known, but only if really going to the terminal (not into a file)
30
465 by Martin Pool
- Move show_status() out of Branch into a new function in
31
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
32
@deprecated_function(zero_eight)
1773.1.2 by Robert Collins
Remove --all option from status.
33
def show_status(branch, show_unchanged=None,
483 by Martin Pool
- change 'file_list' to more explanatory 'specific_files'
34
                specific_files=None,
915 by Martin Pool
- add simple test case for bzr status
35
                show_ids=False,
974.1.48 by Aaron Bentley
Status command shows pending merges
36
                to_file=None,
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
37
                show_pending=True,
38
                revision=None):
1185.33.70 by Martin Pool
Refactor status display code.
39
    """Display summary of changes.
40
1551.2.11 by Aaron Bentley
Niced up the documentation
41
    Please use show_tree_status instead.
42
1185.33.70 by Martin Pool
Refactor status display code.
43
    By default this compares the working tree to a previous revision. 
44
    If the revision argument is given, summarizes changes between the 
45
    working tree and another, or between two revisions.
46
47
    The result is written out as Unicode and to_file should be able 
48
    to encode that.
465 by Martin Pool
- Move show_status() out of Branch into a new function in
49
1185.3.1 by Martin Pool
- docstring fix from Magnus Therning
50
    show_unchanged
51
        If set, includes unchanged files.
465 by Martin Pool
- Move show_status() out of Branch into a new function in
52
483 by Martin Pool
- change 'file_list' to more explanatory 'specific_files'
53
    specific_files
465 by Martin Pool
- Move show_status() out of Branch into a new function in
54
        If set, only show the status of files in this list.
915 by Martin Pool
- add simple test case for bzr status
55
1185.3.1 by Martin Pool
- docstring fix from Magnus Therning
56
    show_ids
57
        If set, includes each file's id.
58
915 by Martin Pool
- add simple test case for bzr status
59
    to_file
60
        If set, write to this file (default stdout.)
1185.3.1 by Martin Pool
- docstring fix from Magnus Therning
61
62
    show_pending
63
        If set, write pending merges.
1092.3.4 by Robert Collins
update symlink branch to integration
64
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
65
    revision
66
        If None the compare latest revision with working tree
67
        If one revision show compared it with working tree.
68
        If two revisions show status between first and second.
465 by Martin Pool
- Move show_status() out of Branch into a new function in
69
    """
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
70
    show_tree_status(branch.bzrdir.open_workingtree(), show_unchanged, 
71
                     specific_files, show_ids, to_file, show_pending, revision)
72
1551.2.11 by Aaron Bentley
Niced up the documentation
73
1773.1.2 by Robert Collins
Remove --all option from status.
74
def show_tree_status(wt, show_unchanged=None,
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
75
                     specific_files=None,
76
                     show_ids=False,
77
                     to_file=None,
78
                     show_pending=True,
79
                     revision=None):
80
    """Display summary of changes.
81
82
    By default this compares the working tree to a previous revision. 
83
    If the revision argument is given, summarizes changes between the 
84
    working tree and another, or between two revisions.
85
86
    The result is written out as Unicode and to_file should be able 
87
    to encode that.
88
1662.1.9 by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
89
    If showing the status of a working tree, extra information is included
90
    about unknown files, conflicts, and pending merges.
91
1773.1.2 by Robert Collins
Remove --all option from status.
92
    :param show_unchanged: Deprecated parameter. If set, includes unchanged 
93
        files.
94
    :param specific_files: If set, a list of filenames whose status should be
95
        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)
96
        tree, or in the working inventory or in the basis inventory.
1773.1.2 by Robert Collins
Remove --all option from status.
97
    :param show_ids: If set, includes each file's id.
98
    :param to_file: If set, write to this file (default stdout.)
99
    :param show_pending: If set, write pending merges.
100
    :param revision: If None the compare latest revision with working tree
101
        If not None it must be a RevisionSpec list.
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
102
        If one revision show compared it with working tree.
103
        If two revisions show status between first and second.
104
    """
1773.1.2 by Robert Collins
Remove --all option from status.
105
    if show_unchanged is not None:
106
        warn("show_status_trees with show_unchanged has been deprecated "
107
             "since bzrlib 0.9", DeprecationWarning, stacklevel=2)
108
109
    if to_file is None:
915 by Martin Pool
- add simple test case for bzr status
110
        to_file = sys.stdout
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
111
    
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
112
    wt.lock_read()
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
113
    try:
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
114
        new_is_working_tree = True
115
        if revision is None:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
116
            new = wt
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
117
            old = new.basis_tree()
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
118
        elif len(revision) > 0:
119
            try:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
120
                rev_id = revision[0].in_history(wt.branch).rev_id
121
                old = wt.branch.repository.revision_tree(rev_id)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
122
            except errors.NoSuchRevision, e:
123
                raise errors.BzrCommandError(str(e))
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
124
            if (len(revision) > 1) and (revision[1].spec is not None):
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
125
                try:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
126
                    rev_id = revision[1].in_history(wt.branch).rev_id
127
                    new = wt.branch.repository.revision_tree(rev_id)
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
128
                    new_is_working_tree = False
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
129
                except errors.NoSuchRevision, e:
130
                    raise errors.BzrCommandError(str(e))
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
131
            else:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
132
                new = wt
1662.1.9 by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
133
        _raise_if_nonexistent(specific_files, old, new)
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
134
        delta = compare_trees(old, new, want_unchanged=show_unchanged,
135
                              specific_files=specific_files)
915 by Martin Pool
- add simple test case for bzr status
136
        delta.show(to_file,
137
                   show_ids=show_ids,
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
138
                   show_unchanged=show_unchanged)
139
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
140
        if new_is_working_tree:
1185.33.70 by Martin Pool
Refactor status display code.
141
            list_paths('unknown', new.unknowns(), specific_files, to_file)
1534.10.9 by Aaron Bentley
Switched display functions to conflict_lines
142
            conflict_title = False
1534.10.24 by Aaron Bentley
Eliminated conflicts_to_strings, made remove_files a ConflictList member
143
            for conflict in wt.conflicts():
1534.10.9 by Aaron Bentley
Switched display functions to conflict_lines
144
                if conflict_title is False:
145
                    print >> to_file, "conflicts:"
146
                    conflict_title = True
147
                print >> to_file, "  %s" % conflict
1185.33.70 by Martin Pool
Refactor status display code.
148
        if new_is_working_tree and show_pending:
149
            show_pending_merges(new, to_file)
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
150
    finally:
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
151
        wt.unlock()
1185.33.70 by Martin Pool
Refactor status display code.
152
153
def show_pending_merges(new, to_file):
154
    """Write out a display of pending merges in a working tree."""
155
    pending = new.pending_merges()
156
    branch = new.branch
157
    if len(pending) == 0:
158
        return
159
    print >>to_file, 'pending merges:'
160
    last_revision = branch.last_revision()
161
    if last_revision is not None:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
162
        ignore = set(branch.repository.get_ancestry(last_revision))
1185.33.70 by Martin Pool
Refactor status display code.
163
    else:
1551.6.19 by Aaron Bentley
Fix pending merge status on empty trees
164
        ignore = set([None])
1185.33.70 by Martin Pool
Refactor status display code.
165
    for merge in new.pending_merges():
166
        ignore.add(merge)
167
        try:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
168
            m_revision = branch.repository.get_revision(merge)
1185.33.70 by Martin Pool
Refactor status display code.
169
            print >> to_file, ' ', line_log(m_revision, 77)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
170
            inner_merges = branch.repository.get_ancestry(merge)
1668.1.14 by Martin Pool
merge olaf - InvalidRevisionId fixes
171
            assert inner_merges[0] == None
172
            inner_merges.pop(0)
1185.33.70 by Martin Pool
Refactor status display code.
173
            inner_merges.reverse()
174
            for mmerge in inner_merges:
175
                if mmerge in ignore:
176
                    continue
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
177
                mm_revision = branch.repository.get_revision(mmerge)
1185.33.70 by Martin Pool
Refactor status display code.
178
                print >> to_file, '   ', line_log(mm_revision, 75)
179
                ignore.add(mmerge)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
180
        except errors.NoSuchRevision:
181
            print >> to_file, ' ', merge
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
182
        
1185.14.11 by Aaron Bentley
moved conflict listing into status and stopped monkey-patching
183
def list_paths(header, paths, specific_files, to_file):
184
    done_header = False
185
    for path in paths:
186
        if specific_files and not is_inside_any(specific_files, path):
187
            continue
188
        if not done_header:
189
            print >>to_file, '%s:' % header
190
            done_header = True
191
        print >>to_file, ' ', path