← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

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
20
17
 
21
18
 
22
19
def show_status(branch, show_unchanged=False,
23
20
                specific_files=None,
24
21
                show_ids=False,
25
22
                to_file=None,
26
 
                show_pending=True,
27
 
                revision=None):
28
 
    """Display status for non-ignored working files.
 
23
                show_pending=True):
 
24
    """Display single-line status for non-ignored working files.
29
25
 
30
 
    show_unchanged
31
 
        If set, includes unchanged files.
 
26
    show_all
 
27
        If true, show unmodified files too.
32
28
 
33
29
    specific_files
34
30
        If set, only show the status of files in this list.
35
31
 
36
 
    show_ids
37
 
        If set, includes each file's id.
38
 
 
39
32
    to_file
40
33
        If set, write to this file (default stdout.)
41
 
 
42
 
    show_pending
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.
49
34
    """
 
35
    import sys
 
36
    from bzrlib.delta import compare_trees
 
37
 
50
38
    if to_file == None:
51
39
        to_file = sys.stdout
52
40
    
53
41
    branch.lock_read()
54
42
    try:
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
 
                
 
43
 
 
44
        old = branch.basis_tree()
 
45
        new = branch.working_tree()
75
46
 
76
47
        delta = compare_trees(old, new, want_unchanged=show_unchanged,
77
48
                              specific_files=specific_files)
80
51
                   show_ids=show_ids,
81
52
                   show_unchanged=show_unchanged)
82
53
 
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
 
54
        unknowns = new.unknowns()
 
55
        done_header = False
 
56
        for path in unknowns:
 
57
            # FIXME: Should also match if the unknown file is within a
 
58
            # specified directory.
 
59
            if specific_files:
 
60
                if path not in specific_files:
 
61
                    continue
 
62
            if not done_header:
 
63
                print >>to_file, 'unknown:'
 
64
                done_header = True
 
65
            print >>to_file, ' ', path
 
66
        if show_pending and len(branch.pending_merges()) > 0:
 
67
            print >>to_file, 'pending merges:'
 
68
            for merge in branch.pending_merges():
 
69
                print >> to_file, ' ', merge
92
70
    finally:
93
71
        branch.unlock()
94
72
        
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