← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: Ian Clatworthy
  • Date: 2007-11-27 21:17:06 UTC
  • mto: (3054.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3055.
  • Revision ID: ian.clatworthy@internode.on.net-20071127211706-871zcqst0yi5tcvl
make fixes suggested by proof-readers

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
21
22
 
 
23
from bzrlib import revision as _mod_revision
 
24
from bzrlib.branch import Branch
22
25
from bzrlib.errors import BoundBranchOutOfDate
23
26
 
24
27
 
51
54
            raise BoundBranchOutOfDate(branch, master)
52
55
        if revno is None:
53
56
            revno = len(rh)
 
57
        old_revno, old_tip = branch.last_revision_info()
 
58
        new_revno = revno -1
54
59
 
55
60
        files_to_remove = []
56
61
        for r in range(revno-1, len(rh)):
57
62
            rev_id = rh.pop()
 
63
            # NB: performance would be better using the revision graph rather
 
64
            # than the whole revision.
58
65
            rev = branch.repository.get_revision(rev_id)
59
66
            # When we finish popping off the pending merges, we want
60
67
            # them to stay in the order that they used to be.
70
77
            if master is not None:
71
78
                master.set_revision_history(rh)
72
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)
73
93
            if tree is not None:
74
 
                branch_tip = branch.last_revision()
75
 
                if branch_tip is not None:
76
 
                    parents = [branch.last_revision()]
 
94
                if not _mod_revision.is_null(new_tip):
 
95
                    parents = [new_tip]
77
96
                else:
78
97
                    parents = []
79
98
                parents.extend(reversed(pending_merges))