~bzr-pqm/bzr/bzr.dev

362 by Martin Pool
- Import stat-cache code
1
# (C) 2005 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
18
from bzrlib.osutils import is_inside_any
19
from bzrlib.delta import compare_trees
1185.12.27 by Aaron Bentley
Use line log for pending merges
20
from bzrlib.log import line_log
21
from bzrlib.errors import NoSuchRevision
362 by Martin Pool
- Import stat-cache code
22
1185.33.70 by Martin Pool
Refactor status display code.
23
# TODO: when showing single-line logs, truncate to the width of the terminal
24
# if known, but only if really going to the terminal (not into a file)
25
465 by Martin Pool
- Move show_status() out of Branch into a new function in
26
27
def show_status(branch, show_unchanged=False,
483 by Martin Pool
- change 'file_list' to more explanatory 'specific_files'
28
                specific_files=None,
915 by Martin Pool
- add simple test case for bzr status
29
                show_ids=False,
974.1.48 by Aaron Bentley
Status command shows pending merges
30
                to_file=None,
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
31
                show_pending=True,
32
                revision=None):
1185.33.70 by Martin Pool
Refactor status display code.
33
    """Display summary of changes.
34
35
    By default this compares the working tree to a previous revision. 
36
    If the revision argument is given, summarizes changes between the 
37
    working tree and another, or between two revisions.
38
39
    The result is written out as Unicode and to_file should be able 
40
    to encode that.
465 by Martin Pool
- Move show_status() out of Branch into a new function in
41
1185.3.1 by Martin Pool
- docstring fix from Magnus Therning
42
    show_unchanged
43
        If set, includes unchanged files.
465 by Martin Pool
- Move show_status() out of Branch into a new function in
44
483 by Martin Pool
- change 'file_list' to more explanatory 'specific_files'
45
    specific_files
465 by Martin Pool
- Move show_status() out of Branch into a new function in
46
        If set, only show the status of files in this list.
915 by Martin Pool
- add simple test case for bzr status
47
1185.3.1 by Martin Pool
- docstring fix from Magnus Therning
48
    show_ids
49
        If set, includes each file's id.
50
915 by Martin Pool
- add simple test case for bzr status
51
    to_file
52
        If set, write to this file (default stdout.)
1185.3.1 by Martin Pool
- docstring fix from Magnus Therning
53
54
    show_pending
55
        If set, write pending merges.
1092.3.4 by Robert Collins
update symlink branch to integration
56
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
57
    revision
58
        If None the compare latest revision with working tree
59
        If one revision show compared it with working tree.
60
        If two revisions show status between first and second.
465 by Martin Pool
- Move show_status() out of Branch into a new function in
61
    """
915 by Martin Pool
- add simple test case for bzr status
62
    if to_file == None:
63
        to_file = sys.stdout
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
64
    
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
65
    branch.lock_read()
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
66
    try:
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
67
        new_is_working_tree = True
68
        if revision is None:
69
            old = branch.basis_tree()
70
            new = branch.working_tree()
71
        elif len(revision) > 0:
72
            try:
73
                rev_id = revision[0].in_history(branch).rev_id
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
74
                old = branch.repository.revision_tree(rev_id)
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
75
            except NoSuchRevision, e:
76
                raise BzrCommandError(str(e))
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
77
            if (len(revision) > 1) and (revision[1].spec is not None):
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
78
                try:
79
                    rev_id = revision[1].in_history(branch).rev_id
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
80
                    new = branch.repository.revision_tree(rev_id)
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
81
                    new_is_working_tree = False
82
                except NoSuchRevision, e:
83
                    raise BzrCommandError(str(e))
84
            else:
85
                new = branch.working_tree()
86
                
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
87
88
        delta = compare_trees(old, new, want_unchanged=show_unchanged,
89
                              specific_files=specific_files)
90
915 by Martin Pool
- add simple test case for bzr status
91
        delta.show(to_file,
92
                   show_ids=show_ids,
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
93
                   show_unchanged=show_unchanged)
94
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
95
        if new_is_working_tree:
1185.33.70 by Martin Pool
Refactor status display code.
96
            list_paths('unknown', new.unknowns(), specific_files, to_file)
97
            list_paths('conflicts', new.iter_conflicts(), specific_files, to_file)
98
        if new_is_working_tree and show_pending:
99
            show_pending_merges(new, to_file)
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
100
    finally:
101
        branch.unlock()
1185.33.70 by Martin Pool
Refactor status display code.
102
103
def show_pending_merges(new, to_file):
104
    """Write out a display of pending merges in a working tree."""
105
    pending = new.pending_merges()
106
    branch = new.branch
107
    if len(pending) == 0:
108
        return
109
    print >>to_file, 'pending merges:'
110
    last_revision = branch.last_revision()
111
    if last_revision is not None:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
112
        ignore = set(branch.repository.get_ancestry(last_revision))
1185.33.70 by Martin Pool
Refactor status display code.
113
    else:
114
        ignore = set()
115
    for merge in new.pending_merges():
116
        ignore.add(merge)
117
        try:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
118
            m_revision = branch.repository.get_revision(merge)
1185.33.70 by Martin Pool
Refactor status display code.
119
            print >> to_file, ' ', line_log(m_revision, 77)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
120
            inner_merges = branch.repository.get_ancestry(merge)
1185.33.70 by Martin Pool
Refactor status display code.
121
            inner_merges.reverse()
122
            for mmerge in inner_merges:
123
                if mmerge in ignore:
124
                    continue
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
125
                mm_revision = branch.repository.get_revision(mmerge)
1185.33.70 by Martin Pool
Refactor status display code.
126
                print >> to_file, '   ', line_log(mm_revision, 75)
127
                ignore.add(mmerge)
128
        except NoSuchRevision:
129
            print >> to_file, ' ', merge 
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
130
        
1185.14.11 by Aaron Bentley
moved conflict listing into status and stopped monkey-patching
131
def list_paths(header, paths, specific_files, to_file):
132
    done_header = False
133
    for path in paths:
134
        if specific_files and not is_inside_any(specific_files, path):
135
            continue
136
        if not done_header:
137
            print >>to_file, '%s:' % header
138
            done_header = True
139
        print >>to_file, ' ', path