← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2006-05-30 15:18:12 UTC
  • mto: This revision was merged to the branch mainline in revision 1738.
  • Revision ID: abentley@panoramicfeedback.com-20060530151812-0e3e9b78cc15a804
Rename changesets to revision bundles

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
25
25
import bzrlib.branch
26
26
from bzrlib.branch import Branch
27
27
import bzrlib.bzrdir as bzrdir
28
 
from bzrlib.changeset.read_changeset import BadChangeset, ChangesetReader
29
 
from bzrlib.changeset.apply_changeset import merge_changeset
 
28
from bzrlib.bundle.read_bundle import BadBundle, BundleReader
 
29
from bzrlib.bundle.apply_bundle import merge_bundle
30
30
from bzrlib.commands import Command, display_command
31
31
import bzrlib.errors as errors
32
32
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError, 
1982
1982
        tree = WorkingTree.open_containing(u'.')[0]
1983
1983
        try:
1984
1984
            if branch is not None:
1985
 
                reader = ChangesetReader(file(branch, 'rb'))
 
1985
                reader = BundleReader(file(branch, 'rb'))
1986
1986
            else:
1987
1987
                reader = None
1988
1988
        except IOError, e:
1989
1989
            if e.errno not in (errno.ENOENT, errno.EISDIR):
1990
1990
                raise
1991
1991
            reader = None
1992
 
        except BadChangeset:
 
1992
        except BadBundle:
1993
1993
            reader = None
1994
1994
        if reader is not None:
1995
 
            conflicts = merge_changeset(reader, tree, not force, merge_type,
 
1995
            conflicts = merge_bundle(reader, tree, not force, merge_type,
1996
1996
                                        reprocess, show_base)
1997
1997
            if conflicts == 0:
1998
1998
                return 0
2479
2479
    --dry-run will go through all the motions, but not actually
2480
2480
    remove anything.
2481
2481
    
2482
 
    In the future, uncommit will create a changeset, which can then
 
2482
    In the future, uncommit will create a revision bundle, which can then
2483
2483
    be re-applied.
2484
2484
    """
2485
2485
 
2639
2639
# aliases.  ideally we would avoid loading the implementation until the
2640
2640
# details were needed.
2641
2641
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2642
 
from bzrlib.changeset.commands import cmd_changeset
 
2642
from bzrlib.bundle.commands import cmd_bundle_revisions
2643
2643
from bzrlib.sign_my_commits import cmd_sign_my_commits
2644
2644
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
2645
2645
        cmd_weave_plan_merge, cmd_weave_merge_text