← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

[merge] update from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/uncommit.py
13
13
        print '* file does not exist: %r' % filename
14
14
 
15
15
 
16
 
def uncommit(branch, remove_files=False,
17
 
        dry_run=False, verbose=False, revno=None):
 
16
def uncommit(branch, dry_run=False, verbose=False, revno=None):
18
17
    """Remove the last revision from the supplied branch.
19
18
 
20
 
    :param remove_files: If True, remove files from the stores
21
 
        as well.
22
 
    :param force: Don't ask any questions
 
19
    :param dry_run: Don't actually change anything
 
20
    :param verbose: Print each step as you do it
 
21
    :param revno: Remove back to this revision
23
22
    """
24
23
    from bzrlib.atomicfile import AtomicFile
25
24
    rh = branch.revision_history()
27
26
        revno = len(rh)
28
27
 
29
28
    files_to_remove = []
30
 
    new_rev_history = AtomicFile(branch.controlfilename('revision-history'))
 
29
    new_rev_history = AtomicFile(branch.control_files.controlfilename('revision-history'))
31
30
    for r in range(revno-1, len(rh)):
32
31
        rev_id = rh.pop()
33
32
        if verbose:
34
33
            print 'Removing revno %d: %s' % (len(rh)+1, rev_id)
35
 
        rev = branch.get_revision(rev_id)
36
 
        inv = branch.get_revision_inventory(rev_id)
37
 
        inv_prev = []
38
 
        for p in rev.parent_ids:
39
 
            inv_prev.append(branch.get_revision_inventory(p))
40
 
 
41
 
        if remove_files:
42
 
            # Figure out what text-store entries are new
43
 
 
44
 
            # In the future, when we have text_version instead of
45
 
            # text_id, we can just check to see if the text_version
46
 
            # equals the current revision id.
47
 
            for file_id in inv:
48
 
                ie = inv[file_id]
49
 
                if not hasattr(ie, 'text_id'):
50
 
                    continue
51
 
                for other_inv in inv_prev:
52
 
                    if file_id in other_inv:
53
 
                        other_ie = other_inv[file_id]
54
 
                        if other_ie.text_id == ie.text_id:
55
 
                            break
56
 
                else:
57
 
                    # None of the previous ancestors used
58
 
                    # the same inventory
59
 
                    files_to_remove.append(branch.controlfilename(['text-store',
60
 
                        ie.text_id + '.gz']))
61
 
            rev_file = branch.controlfilename(['revision-store',
62
 
                    rev_id + '.gz'])
63
 
            files_to_remove.append(rev_file)
64
 
            inv_file = branch.controlfilename(['inventory-store',
65
 
                    rev.inventory_id + '.gz'])
66
 
            files_to_remove.append(inv_file)
67
 
 
68
 
    if verbose and files_to_remove:
69
 
        print 'Removing files:'
70
 
        for f in files_to_remove:
71
 
            print '\t%s' % branch.relpath(f)
72
34
 
73
35
    new_rev_history.write('\n'.join(rh))
74
36
 
76
38
    # once we have removed at least one, all the rest are invalid.
77
39
    if not dry_run:
78
40
        new_rev_history.commit()
79
 
        if remove_files:
80
 
            # Actually start removing files
81
 
            for f in files_to_remove:
82
 
                test_remove(f)
83
 
 
84
41
    else:
85
42
        new_rev_history.abort()
86
43