← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Aaron Bentley
  • Date: 2005-10-20 02:57:55 UTC
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1474.
  • Revision ID: aaron.bentley@utoronto.ca-20051020025755-e03df41c52aa3156
tweaked spacing

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
from bzrlib.log import line_log
 
21
from bzrlib.errors import NoSuchRevision
17
22
 
18
23
 
19
24
def show_status(branch, show_unchanged=False,
20
25
                specific_files=None,
21
26
                show_ids=False,
22
27
                to_file=None,
23
 
                show_pending=True):
 
28
                show_pending=True,
 
29
                revision=None):
24
30
    """Display status for non-ignored working files.
25
31
 
26
32
    show_unchanged
37
43
 
38
44
    show_pending
39
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.
40
51
    """
41
 
    import sys
42
 
    from bzrlib.delta import compare_trees
43
 
 
44
52
    if to_file == None:
45
53
        to_file = sys.stdout
46
54
    
47
55
    branch.lock_read()
48
56
    try:
49
 
 
50
 
        old = branch.basis_tree()
51
 
        new = branch.working_tree()
 
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
                
52
77
 
53
78
        delta = compare_trees(old, new, want_unchanged=show_unchanged,
54
79
                              specific_files=specific_files)
57
82
                   show_ids=show_ids,
58
83
                   show_unchanged=show_unchanged)
59
84
 
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
 
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(branch.pending_merges()) > 0:
 
91
                print >>to_file, 'pending merges:'
 
92
                for merge in branch.pending_merges():
 
93
                    try:
 
94
                        m_revision = branch.get_revision(merge)
 
95
                        print >> to_file, ' ', line_log(m_revision, 77)
 
96
                    except NoSuchRevision:
 
97
                        print >> to_file, ' ', merge 
 
98
                        
76
99
    finally:
77
100
        branch.unlock()
78
101
        
 
102
def list_paths(header, paths, specific_files, to_file):
 
103
    done_header = False
 
104
    for path in paths:
 
105
        if specific_files and not is_inside_any(specific_files, path):
 
106
            continue
 
107
        if not done_header:
 
108
            print >>to_file, '%s:' % header
 
109
            done_header = True
 
110
        print >>to_file, ' ', path