← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: John Arbash Meinel
  • Date: 2006-07-27 18:14:48 UTC
  • mto: (1946.2.6 reduce-knit-churn)
  • mto: This revision was merged to the branch mainline in revision 1887.
  • Revision ID: john@arbash-meinel.com-20060727181448-62962f823be5d3cc
minor typo fix

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
 
 
23
 
from bzrlib import revision as _mod_revision
24
 
from bzrlib.branch import Branch
25
21
from bzrlib.errors import BoundBranchOutOfDate
26
22
 
 
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
 
27
29
 
28
30
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None):
29
31
    """Remove the last revision from the supplied branch.
42
44
        unlockable.append(branch)
43
45
 
44
46
        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
59
57
 
60
58
        files_to_remove = []
61
59
        for r in range(revno-1, len(rh)):
62
60
            rev_id = rh.pop()
63
 
            # NB: performance would be better using the revision graph rather
64
 
            # than the whole revision.
65
61
            rev = branch.repository.get_revision(rev_id)
66
62
            # When we finish popping off the pending merges, we want
67
63
            # them to stay in the order that they used to be.
71
67
            if verbose:
72
68
                print 'Removing revno %d: %s' % (len(rh)+1, rev_id)
73
69
 
 
70
 
74
71
        # Committing before we start removing files, because
75
72
        # once we have removed at least one, all the rest are invalid.
76
73
        if not dry_run:
77
74
            if master is not None:
78
75
                master.set_revision_history(rh)
79
76
            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
77
            if tree is not None:
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)
 
78
                tree.set_last_revision(branch.last_revision())
 
79
                pending_merges.reverse()
 
80
                tree.set_pending_merges(pending_merges)
100
81
    finally:
101
82
        for item in reversed(unlockable):
102
83
            item.unlock()