/brz/remove-bazaar

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