← 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-09-16 06:44:47 UTC
  • mfrom: (2014 +trunk)
  • mto: (2017.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 2018.
  • Revision ID: robertc@robertcollins.net-20060916064447-99a2987e5485b5ea
Merge from bzr.dev, fixing found bugs handling 'has('/')' in MemoryTransport and SFTP transports.

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