/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to uncommit.py

  • Committer: John Arbash Meinel
  • Date: 2005-09-23 18:30:46 UTC
  • mto: (1185.31.24 bzr-jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1512.
  • Revision ID: john@arbash-meinel.com-20050923183046-1d5dc250bb7d4e4d
Adding ability to revert back to earlier revisions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
uncommit.py
19
19
 
20
20
 
21
21
def uncommit(branch, remove_files=False,
22
 
        dry_run=False, verbose=False):
 
22
        dry_run=False, verbose=False, revno=None):
23
23
    """Remove the last revision from the supplied branch.
24
24
 
25
25
    :param remove_files: If True, remove files from the stores
27
27
    """
28
28
    from bzrlib.atomicfile import AtomicFile
29
29
    rh = branch.revision_history()
30
 
    rev_id = rh.pop()
31
 
    rev = branch.get_revision(rev_id)
32
 
    inv = branch.get_inventory(rev.inventory_id)
33
 
    inv_prev = []
34
 
    for p in rev.parents:
35
 
        inv_prev.append(branch.get_revision_inventory(p.revision_id))
 
30
    if revno is None:
 
31
        revno = len(rh)
36
32
 
 
33
    files_to_remove = []
37
34
    new_rev_history = AtomicFile(branch.controlfilename('revision-history'))
 
35
    for r in range(revno-1, len(rh)):
 
36
        rev_id = rh.pop()
 
37
        if verbose:
 
38
            print 'Removing revno %d: %s' % (len(rh)+1, rev_id)
 
39
        rev = branch.get_revision(rev_id)
 
40
        inv = branch.get_inventory(rev.inventory_id)
 
41
        inv_prev = []
 
42
        for p in rev.parents:
 
43
            inv_prev.append(branch.get_revision_inventory(p.revision_id))
 
44
 
 
45
        if remove_files:
 
46
            # Figure out what text-store entries are new
 
47
 
 
48
            # In the future, when we have text_version instead of
 
49
            # text_id, we can just check to see if the text_version
 
50
            # equals the current revision id.
 
51
            for file_id in inv:
 
52
                ie = inv[file_id]
 
53
                if not hasattr(ie, 'text_id'):
 
54
                    continue
 
55
                for other_inv in inv_prev:
 
56
                    if file_id in other_inv:
 
57
                        other_ie = other_inv[file_id]
 
58
                        if other_ie.text_id == ie.text_id:
 
59
                            break
 
60
                else:
 
61
                    # None of the previous ancestors used
 
62
                    # the same inventory
 
63
                    files_to_remove.append(branch.controlfilename(['text-store',
 
64
                        ie.text_id + '.gz']))
 
65
            rev_file = branch.controlfilename(['revision-store',
 
66
                    rev_id + '.gz'])
 
67
            files_to_remove.append(rev_file)
 
68
            inv_file = branch.controlfilename(['inventory-store',
 
69
                    rev.inventory_id + '.gz'])
 
70
            files_to_remove.append(inv_file)
 
71
 
 
72
    if verbose:
 
73
        print 'Removing files:'
 
74
        for f in files_to_remove:
 
75
            print '\t%s' % branch.relpath(f)
 
76
 
38
77
    new_rev_history.write('\n'.join(rh))
39
 
    # Committing now, because even if we fail to remove all files
 
78
 
 
79
    # Committing before we start removing files, because
40
80
    # once we have removed at least one, all the rest are invalid.
41
81
    if not dry_run:
42
82
        new_rev_history.commit()
43
 
    else:
44
 
        new_rev_history.abort()
45
 
 
46
 
    if remove_files:
47
 
        # Figure out what text-store entries are new
48
 
        files_to_remove = []
49
 
        for file_id in inv:
50
 
            ie = inv[file_id]
51
 
            if not hasattr(ie, 'text_id'):
52
 
                continue
53
 
            for other_inv in inv_prev:
54
 
                if file_id in other_inv:
55
 
                    other_ie = other_inv[file_id]
56
 
                    if other_ie.text_id == ie.text_id:
57
 
                        break
58
 
            else:
59
 
                # None of the previous ancestors used
60
 
                # the same inventory
61
 
                files_to_remove.append(branch.controlfilename(['text-store',
62
 
                    ie.text_id + '.gz']))
63
 
        rev_file = branch.controlfilename(['revision-store',
64
 
                rev_id + '.gz'])
65
 
        files_to_remove.append(rev_file)
66
 
        inv_file = branch.controlfilename(['inventory-store',
67
 
                rev.inventory_id + '.gz'])
68
 
        files_to_remove.append(inv_file)
69
 
 
70
 
        if verbose:
71
 
            print 'Removing files:'
72
 
            for f in files_to_remove:
73
 
                print '\t%s' % branch.relpath(f)
74
 
 
75
 
        if not dry_run:
 
83
        if remove_files:
76
84
            # Actually start removing files
77
85
            for f in files_to_remove:
78
86
                test_remove(f)
79
87
 
 
88
    else:
 
89
        new_rev_history.abort()
 
90
 
 
91