← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: Robert Collins
  • Date: 2006-05-02 11:12:07 UTC
  • mto: (1692.4.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1694.
  • Revision ID: robertc@robertcollins.net-20060502111207-e4ff704e86662870
* Repository.reconcile now takes a thorough keyword parameter to allow
  requesting an indepth reconciliation, rather than just a data-loss 
  check. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/uncommit.py
 
1
#!/usr/bin/env python
 
2
"""\
 
3
Remove the last revision from the history of the current branch.
 
4
"""
 
5
 
 
6
import os
 
7
import bzrlib
 
8
from bzrlib.errors import BoundBranchOutOfDate
 
9
 
 
10
def test_remove(filename):
 
11
    if os.path.exists(filename):
 
12
        os.remove(filename)
 
13
    else:
 
14
        print '* file does not exist: %r' % filename
 
15
 
 
16
 
 
17
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None):
 
18
    """Remove the last revision from the supplied branch.
 
19
 
 
20
    :param dry_run: Don't actually change anything
 
21
    :param verbose: Print each step as you do it
 
22
    :param revno: Remove back to this revision
 
23
    """
 
24
    from bzrlib.atomicfile import AtomicFile
 
25
    unlockable = []
 
26
    try:
 
27
        if tree is not None:
 
28
            tree.lock_write()
 
29
            unlockable.append(tree)
 
30
        
 
31
        branch.lock_write()
 
32
        unlockable.append(branch)
 
33
 
 
34
        master = branch.get_master_branch()
 
35
        if master is not None:
 
36
            master.lock_write()
 
37
            unlockable.append(master)
 
38
        rh = branch.revision_history()
 
39
        if master is not None and rh[-1] != master.last_revision():
 
40
            raise BoundBranchOutOfDate(branch, master)
 
41
        if revno is None:
 
42
            revno = len(rh)
 
43
 
 
44
        files_to_remove = []
 
45
        for r in range(revno-1, len(rh)):
 
46
            rev_id = rh.pop()
 
47
            if verbose:
 
48
                print 'Removing revno %d: %s' % (len(rh)+1, rev_id)
 
49
 
 
50
 
 
51
        # Committing before we start removing files, because
 
52
        # once we have removed at least one, all the rest are invalid.
 
53
        if not dry_run:
 
54
            if master is not None:
 
55
                master.set_revision_history(rh)
 
56
            branch.set_revision_history(rh)
 
57
            if tree is not None:
 
58
                tree.set_last_revision(branch.last_revision())
 
59
    finally:
 
60
        for item in reversed(unlockable):
 
61
            item.unlock()