/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/status.py

Changing final merge message to All changes applied successfully, rather than 0 conflicts applied.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
 
1
# (C) 2005 Canonical Ltd
 
2
#
 
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.
 
7
#
 
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.
 
12
#
 
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
 
 
17
import sys
 
18
from bzrlib.osutils import is_inside_any
 
19
from bzrlib.delta import compare_trees
 
20
from bzrlib.log import line_log
 
21
from bzrlib.errors import NoSuchRevision
 
22
 
 
23
 
 
24
def show_status(branch, show_unchanged=False,
 
25
                specific_files=None,
 
26
                show_ids=False,
 
27
                to_file=None,
 
28
                show_pending=True,
 
29
                revision=None):
 
30
    """Display status for non-ignored working files.
 
31
 
 
32
    show_unchanged
 
33
        If set, includes unchanged files.
 
34
 
 
35
    specific_files
 
36
        If set, only show the status of files in this list.
 
37
 
 
38
    show_ids
 
39
        If set, includes each file's id.
 
40
 
 
41
    to_file
 
42
        If set, write to this file (default stdout.)
 
43
 
 
44
    show_pending
 
45
        If set, write pending merges.
 
46
 
 
47
    revision
 
48
        If None the compare latest revision with working tree
 
49
        If one revision show compared it with working tree.
 
50
        If two revisions show status between first and second.
 
51
    """
 
52
    if to_file == None:
 
53
        to_file = sys.stdout
 
54
    
 
55
    branch.lock_read()
 
56
    try:
 
57
        new_is_working_tree = True
 
58
        if revision is None:
 
59
            old = branch.basis_tree()
 
60
            new = branch.working_tree()
 
61
        elif len(revision) > 0:
 
62
            try:
 
63
                rev_id = revision[0].in_history(branch).rev_id
 
64
                old = branch.revision_tree(rev_id)
 
65
            except NoSuchRevision, e:
 
66
                raise BzrCommandError(str(e))
 
67
            if len(revision) > 1:
 
68
                try:
 
69
                    rev_id = revision[1].in_history(branch).rev_id
 
70
                    new = branch.revision_tree(rev_id)
 
71
                    new_is_working_tree = False
 
72
                except NoSuchRevision, e:
 
73
                    raise BzrCommandError(str(e))
 
74
            else:
 
75
                new = branch.working_tree()
 
76
                
 
77
 
 
78
        delta = compare_trees(old, new, want_unchanged=show_unchanged,
 
79
                              specific_files=specific_files)
 
80
 
 
81
        delta.show(to_file,
 
82
                   show_ids=show_ids,
 
83
                   show_unchanged=show_unchanged)
 
84
 
 
85
        if new_is_working_tree:
 
86
            conflicts = new.iter_conflicts()
 
87
            unknowns = new.unknowns()
 
88
            list_paths('unknown', unknowns, specific_files, to_file)
 
89
            list_paths('conflicts', conflicts, specific_files, to_file)
 
90
            if show_pending and len(new.pending_merges()) > 0:
 
91
                print >>to_file, 'pending merges:'
 
92
                last_revision = branch.last_revision()
 
93
                if last_revision is not None:
 
94
                    ignore = set(branch.get_ancestry(last_revision))
 
95
                else:
 
96
                    ignore = set()
 
97
                for merge in new.pending_merges():
 
98
                    ignore.add(merge)
 
99
                    try:
 
100
                        m_revision = branch.get_revision(merge)
 
101
                        print >> to_file, ' ', line_log(m_revision, 77)
 
102
                        inner_merges = branch.get_ancestry(merge)
 
103
                        inner_merges.reverse()
 
104
                        for mmerge in inner_merges:
 
105
                            if mmerge in ignore:
 
106
                                continue
 
107
                            mm_revision = branch.get_revision(mmerge)
 
108
                            print >> to_file, '   ', line_log(mm_revision, 75)
 
109
                            ignore.add(mmerge)
 
110
                            
 
111
                    except NoSuchRevision:
 
112
                        print >> to_file, ' ', merge 
 
113
                        
 
114
    finally:
 
115
        branch.unlock()
 
116
        
 
117
def list_paths(header, paths, specific_files, to_file):
 
118
    done_header = False
 
119
    for path in paths:
 
120
        if specific_files and not is_inside_any(specific_files, path):
 
121
            continue
 
122
        if not done_header:
 
123
            print >>to_file, '%s:' % header
 
124
            done_header = True
 
125
        print >>to_file, ' ', path