/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bundle/commands.py

  • Committer: John Arbash Meinel
  • Date: 2007-07-11 23:45:20 UTC
  • mfrom: (2601 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2643.
  • Revision ID: john@arbash-meinel.com-20070711234520-do3h7zw8skbathpz
[merge] bzr.dev 2601

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/commands.py
27
27
from bzrlib import (
28
28
    branch,
29
29
    errors,
 
30
    revision as _mod_revision,
30
31
    urlutils,
31
32
    )
32
 
from bzrlib.revision import common_ancestor
33
33
""")
34
34
 
35
35
from bzrlib.commands import Command
97
97
        - Bundle to transform A into B
98
98
    """
99
99
    takes_options = ['revision', 'remember',
100
 
                     Option("output", help="write bundle to specified file",
101
 
                            type=unicode)]
 
100
                     Option("output",
 
101
                            help="Write bundle to specified file.",
 
102
                            type=unicode),
 
103
                     ]
102
104
    takes_args = ['base?']
103
105
    aliases = ['bundle']
104
106
    encoding_type = 'exact'
155
157
                                                 ' to be specified.')
156
158
            target_branch.repository.fetch(base_branch.repository, 
157
159
                                           base_branch.last_revision())
158
 
            base_revision = common_ancestor(base_branch.last_revision(),
159
 
                                            target_revision,
160
 
                                            target_branch.repository)
161
 
 
 
160
            graph = target_branch.repository.get_graph()
 
161
            base_revision = graph.find_unique_lca(
 
162
                _mod_revision.ensure_null(base_branch.last_revision()),
 
163
                _mod_revision.ensure_null(target_revision))
162
164
 
163
165
        if output is not None:
164
166
            fileobj = file(output, 'wb')