← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

- move 'conflict' and 'resolved' from shipped plugin to regular builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
1
1
# (C) 2005 Canonical Ltd
2
 
 
 
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
 
17
import sys
 
18
from bzrlib.osutils import is_inside_any
 
19
from bzrlib.delta import compare_trees
17
20
 
18
21
 
19
22
def show_status(branch, show_unchanged=False,
20
23
                specific_files=None,
21
24
                show_ids=False,
22
25
                to_file=None,
23
 
                show_pending=True):
 
26
                show_pending=True,
 
27
                revision=None):
24
28
    """Display status for non-ignored working files.
25
29
 
26
30
    show_unchanged
37
41
 
38
42
    show_pending
39
43
        If set, write pending merges.
 
44
 
 
45
    revision
 
46
        If None the compare latest revision with working tree
 
47
        If one revision show compared it with working tree.
 
48
        If two revisions show status between first and second.
40
49
    """
41
 
    import sys
42
 
    from bzrlib.delta import compare_trees
43
 
 
44
50
    if to_file == None:
45
51
        to_file = sys.stdout
46
52
    
47
53
    branch.lock_read()
48
54
    try:
49
 
 
50
 
        old = branch.basis_tree()
51
 
        new = branch.working_tree()
 
55
        new_is_working_tree = True
 
56
        if revision is None:
 
57
            old = branch.basis_tree()
 
58
            new = branch.working_tree()
 
59
        elif len(revision) > 0:
 
60
            try:
 
61
                rev_id = revision[0].in_history(branch).rev_id
 
62
                old = branch.revision_tree(rev_id)
 
63
            except NoSuchRevision, e:
 
64
                raise BzrCommandError(str(e))
 
65
            if len(revision) > 1:
 
66
                try:
 
67
                    rev_id = revision[1].in_history(branch).rev_id
 
68
                    new = branch.revision_tree(rev_id)
 
69
                    new_is_working_tree = False
 
70
                except NoSuchRevision, e:
 
71
                    raise BzrCommandError(str(e))
 
72
            else:
 
73
                new = branch.working_tree()
 
74
                
52
75
 
53
76
        delta = compare_trees(old, new, want_unchanged=show_unchanged,
54
77
                              specific_files=specific_files)
57
80
                   show_ids=show_ids,
58
81
                   show_unchanged=show_unchanged)
59
82
 
60
 
        unknowns = new.unknowns()
61
 
        done_header = False
62
 
        for path in unknowns:
63
 
            # FIXME: Should also match if the unknown file is within a
64
 
            # specified directory.
65
 
            if specific_files:
66
 
                if path not in specific_files:
67
 
                    continue
68
 
            if not done_header:
69
 
                print >>to_file, 'unknown:'
70
 
                done_header = True
71
 
            print >>to_file, ' ', path
72
 
        if show_pending and len(branch.pending_merges()) > 0:
73
 
            print >>to_file, 'pending merges:'
74
 
            for merge in branch.pending_merges():
75
 
                print >> to_file, ' ', merge
 
83
        if new_is_working_tree:
 
84
            conflicts = new.iter_conflicts()
 
85
            unknowns = new.unknowns()
 
86
            list_paths('unknown', unknowns, specific_files, to_file)
 
87
            list_paths('conflicts', conflicts, specific_files, to_file)
 
88
            if show_pending and len(branch.pending_merges()) > 0:
 
89
                print >>to_file, 'pending merges:'
 
90
                for merge in branch.pending_merges():
 
91
                    print >> to_file, ' ', merge
76
92
    finally:
77
93
        branch.unlock()
78
94
        
 
95
def list_paths(header, paths, specific_files, to_file):
 
96
    done_header = False
 
97
    for path in paths:
 
98
        if specific_files and not is_inside_any(specific_files, path):
 
99
            continue
 
100
        if not done_header:
 
101
            print >>to_file, '%s:' % header
 
102
            done_header = True
 
103
        print >>to_file, ' ', path