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