← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Martin Pool
  • Date: 2005-08-30 06:10:39 UTC
  • Revision ID: mbp@sourcefrog.net-20050830061039-1d0347fb236c39ad
- clean up some code in revision.py

- move all exceptions to bzrlib.errors

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
19
19
def show_status(branch, show_unchanged=False,
20
20
                specific_files=None,
21
21
                show_ids=False,
22
 
                to_file=None,
23
 
                show_pending=True,
24
 
                revision=None):
25
 
    """Display status for non-ignored working files.
 
22
                to_file=None):
 
23
    """Display single-line status for non-ignored working files.
26
24
 
27
 
    show_unchanged
28
 
        If set, includes unchanged files.
 
25
    show_all
 
26
        If true, show unmodified files too.
29
27
 
30
28
    specific_files
31
29
        If set, only show the status of files in this list.
32
30
 
33
 
    show_ids
34
 
        If set, includes each file's id.
35
 
 
36
31
    to_file
37
32
        If set, write to this file (default stdout.)
38
 
 
39
 
    show_pending
40
 
        If set, write pending merges.
41
 
    revision
42
 
        If None the compare latest revision with working tree
43
 
        If one revision show compared it with working tree.
44
 
        If two revisions show status between first and second.
45
33
    """
46
34
    import sys
47
35
    from bzrlib.delta import compare_trees
51
39
    
52
40
    branch.lock_read()
53
41
    try:
54
 
        new_is_working_tree = True
55
 
        if revision is None:
56
 
            old = branch.basis_tree()
57
 
            new = branch.working_tree()
58
 
        elif len(revision) > 0:
59
 
            try:
60
 
                rev_id = revision[0].in_history(branch).rev_id
61
 
                old = branch.revision_tree(rev_id)
62
 
            except NoSuchRevision, e:
63
 
                raise BzrCommandError(str(e))
64
 
            if len(revision) > 1:
65
 
                try:
66
 
                    rev_id = revision[1].in_history(branch).rev_id
67
 
                    new = branch.revision_tree(rev_id)
68
 
                    new_is_working_tree = False
69
 
                except NoSuchRevision, e:
70
 
                    raise BzrCommandError(str(e))
71
 
            else:
72
 
                new = branch.working_tree()
73
 
                
 
42
 
 
43
        old = branch.basis_tree()
 
44
        new = branch.working_tree()
74
45
 
75
46
        delta = compare_trees(old, new, want_unchanged=show_unchanged,
76
47
                              specific_files=specific_files)
79
50
                   show_ids=show_ids,
80
51
                   show_unchanged=show_unchanged)
81
52
 
82
 
        if new_is_working_tree:
83
 
            unknowns = new.unknowns()
84
 
            done_header = False
85
 
            for path in unknowns:
86
 
                # FIXME: Should also match if the unknown file is within a
87
 
                # specified directory.
88
 
                if specific_files:
89
 
                    if path not in specific_files:
90
 
                        continue
91
 
                if not done_header:
92
 
                    print >>to_file, 'unknown:'
93
 
                    done_header = True
94
 
                print >>to_file, ' ', path
95
 
            if show_pending and len(branch.pending_merges()) > 0:
96
 
                print >>to_file, 'pending merges:'
97
 
                for merge in branch.pending_merges():
98
 
                    print >> to_file, ' ', merge
 
53
        unknowns = new.unknowns()
 
54
        done_header = False
 
55
        for path in unknowns:
 
56
            # FIXME: Should also match if the unknown file is within a
 
57
            # specified directory.
 
58
            if specific_files:
 
59
                if path not in specific_files:
 
60
                    continue
 
61
            if not done_header:
 
62
                print >>to_file, 'unknown:'
 
63
                done_header = True
 
64
            print >>to_file, ' ', path
99
65
    finally:
100
66
        branch.unlock()
101
67