~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Martin Pool
  • Date: 2005-05-10 06:00:59 UTC
  • Revision ID: mbp@sourcefrog.net-20050510060059-bae67a465325f650
- Use AtomicFile to update statcache.
- New closed property on AtomicFile

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
 
17
17
 
18
18
 
19
 
def show_status(branch, show_unchanged=False,
20
 
                specific_files=None,
21
 
                show_ids=False,
22
 
                to_file=None,
23
 
                show_pending=True,
24
 
                revision=None):
25
 
    """Display status for non-ignored working files.
26
 
 
27
 
    show_unchanged
28
 
        If set, includes unchanged files.
29
 
 
30
 
    specific_files
31
 
        If set, only show the status of files in this list.
32
 
 
33
 
    show_ids
34
 
        If set, includes each file's id.
35
 
 
36
 
    to_file
37
 
        If set, write to this file (default stdout.)
38
 
 
39
 
    show_pending
40
 
        If set, write pending merges.
41
 
 
42
 
    revision
43
 
        If None the compare latest revision with working tree
44
 
        If one revision show compared it with working tree.
45
 
        If two revisions show status between first and second.
 
19
def find_modified(branch):
 
20
    """Return a list of files that have been modified in the working copy.
 
21
 
 
22
    This does not consider renames and does not include files added or
 
23
    deleted.
 
24
 
 
25
    Each modified file is returned as (PATH, ENTRY).
46
26
    """
47
 
    import sys
48
 
    from bzrlib.osutils import is_inside_any
49
 
    from bzrlib.delta import compare_trees
 
27
    import cache
50
28
 
51
 
    if to_file == None:
52
 
        to_file = sys.stdout
 
29
    inv = branch.read_working_inventory()
 
30
    cc = cache.update_cache(branch, inv)
 
31
    basis_inv = branch.basis_tree().inventory
53
32
    
54
 
    branch.lock_read()
55
 
    try:
56
 
        new_is_working_tree = True
57
 
        if revision is None:
58
 
            old = branch.basis_tree()
59
 
            new = branch.working_tree()
60
 
        elif len(revision) > 0:
61
 
            try:
62
 
                rev_id = revision[0].in_history(branch).rev_id
63
 
                old = branch.revision_tree(rev_id)
64
 
            except NoSuchRevision, e:
65
 
                raise BzrCommandError(str(e))
66
 
            if len(revision) > 1:
67
 
                try:
68
 
                    rev_id = revision[1].in_history(branch).rev_id
69
 
                    new = branch.revision_tree(rev_id)
70
 
                    new_is_working_tree = False
71
 
                except NoSuchRevision, e:
72
 
                    raise BzrCommandError(str(e))
73
 
            else:
74
 
                new = branch.working_tree()
75
 
                
76
 
 
77
 
        delta = compare_trees(old, new, want_unchanged=show_unchanged,
78
 
                              specific_files=specific_files)
79
 
 
80
 
        delta.show(to_file,
81
 
                   show_ids=show_ids,
82
 
                   show_unchanged=show_unchanged)
83
 
 
84
 
        if new_is_working_tree:
85
 
            unknowns = new.unknowns()
86
 
            done_header = False
87
 
            for path in unknowns:
88
 
                if specific_files and not is_inside_any(specific_files, path):
89
 
                    continue
90
 
                if not done_header:
91
 
                    print >>to_file, 'unknown:'
92
 
                    done_header = True
93
 
                print >>to_file, ' ', path
94
 
            if show_pending and len(branch.pending_merges()) > 0:
95
 
                print >>to_file, 'pending merges:'
96
 
                for merge in branch.pending_merges():
97
 
                    print >> to_file, ' ', merge
98
 
    finally:
99
 
        branch.unlock()
 
33
    for path, entry in inv.iter_entries():
 
34
        if entry.kind != 'file':
 
35
            continue
 
36
        
 
37
        file_id = entry.file_id
 
38
        ce = cc.get(file_id)
 
39
        if not ce:
 
40
            continue                    # not in working dir
 
41
 
 
42
        if file_id not in basis_inv:
 
43
            continue                    # newly added
 
44
 
 
45
        old_entry = basis_inv[file_id]
 
46
 
 
47
        if (old_entry.text_size == ce[3]
 
48
            and old_entry.text_sha1 == ce[1]):
 
49
            continue
 
50
 
 
51
        yield path, entry
100
52