← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

Merged bzr.dev and updated NEWS with a better description of changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/uncommit.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
"""Remove the last revision from the history of the current branch.
18
 
"""
 
17
"""Remove the last revision from the history of the current branch."""
 
18
 
 
19
# TODO: make the guts of this methods on tree, branch.
19
20
 
20
21
import os
 
22
 
 
23
from bzrlib import revision as _mod_revision
 
24
from bzrlib.branch import Branch
21
25
from bzrlib.errors import BoundBranchOutOfDate
22
26
 
23
 
def test_remove(filename):
24
 
    if os.path.exists(filename):
25
 
        os.remove(filename)
26
 
    else:
27
 
        print '* file does not exist: %r' % filename
28
 
 
29
27
 
30
28
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None):
31
29
    """Remove the last revision from the supplied branch.
44
42
        unlockable.append(branch)
45
43
 
46
44
        pending_merges = []
 
45
        if tree is not None:
 
46
            pending_merges = tree.get_parent_ids()[1:]
47
47
 
48
48
        master = branch.get_master_branch()
49
49
        if master is not None:
54
54
            raise BoundBranchOutOfDate(branch, master)
55
55
        if revno is None:
56
56
            revno = len(rh)
 
57
        old_revno, old_tip = branch.last_revision_info()
 
58
        new_revno = revno -1
57
59
 
58
60
        files_to_remove = []
59
61
        for r in range(revno-1, len(rh)):
60
62
            rev_id = rh.pop()
 
63
            # NB: performance would be better using the revision graph rather
 
64
            # than the whole revision.
61
65
            rev = branch.repository.get_revision(rev_id)
62
66
            # When we finish popping off the pending merges, we want
63
67
            # them to stay in the order that they used to be.
67
71
            if verbose:
68
72
                print 'Removing revno %d: %s' % (len(rh)+1, rev_id)
69
73
 
70
 
 
71
74
        # Committing before we start removing files, because
72
75
        # once we have removed at least one, all the rest are invalid.
73
76
        if not dry_run:
74
77
            if master is not None:
75
78
                master.set_revision_history(rh)
76
79
            branch.set_revision_history(rh)
 
80
            new_tip = _mod_revision.ensure_null(branch.last_revision())
 
81
            if master is None:
 
82
                hook_local = None
 
83
                hook_master = branch
 
84
            else:
 
85
                hook_local = branch
 
86
                hook_master = master
 
87
            for hook in Branch.hooks['post_uncommit']:
 
88
                hook_new_tip = new_tip
 
89
                if hook_new_tip == _mod_revision.NULL_REVISION:
 
90
                    hook_new_tip = None
 
91
                hook(hook_local, hook_master, old_revno, old_tip, new_revno,
 
92
                     hook_new_tip)
77
93
            if tree is not None:
78
 
                tree.set_last_revision(branch.last_revision())
79
 
                pending_merges.reverse()
80
 
                tree.set_pending_merges(pending_merges)
 
94
                if not _mod_revision.is_null(new_tip):
 
95
                    parents = [new_tip]
 
96
                else:
 
97
                    parents = []
 
98
                parents.extend(reversed(pending_merges))
 
99
                tree.set_parent_ids(parents)
81
100
    finally:
82
101
        for item in reversed(unlockable):
83
102
            item.unlock()