← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Martin Pool
  • Date: 2005-09-05 09:27:11 UTC
  • Revision ID: mbp@sourcefrog.net-20050905092711-f9f5bded3fd82605
- more disentangling of xml storage format from objects

- remove pack_xml and unpack_xml function in favor of 
  serializer object

- test unpacking canned revision xml

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
 
import os
 
18
import os.path
19
19
import tempfile
20
20
import shutil
21
21
import errno
26
26
from bzrlib.merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
27
27
from bzrlib.changeset import generate_changeset, ExceptionConflictHandler
28
28
from bzrlib.changeset import Inventory, Diff3Merge
29
 
from bzrlib.branch import Branch
30
 
from bzrlib.errors import BzrCommandError, UnrelatedBranches, NoCommonAncestor
31
 
from bzrlib.errors import NoCommits
 
29
from bzrlib.branch import find_branch
 
30
from bzrlib.errors import BzrCommandError, UnrelatedBranches
32
31
from bzrlib.delta import compare_trees
33
32
from bzrlib.trace import mutter, warning
34
33
from bzrlib.fetch import greedy_fetch
134
133
            
135
134
def get_tree(treespec, temp_root, label, local_branch=None):
136
135
    location, revno = treespec
137
 
    branch = Branch.open(location)
 
136
    branch = find_branch(location)
138
137
    if revno is None:
139
138
        revision = None
140
139
    elif revno == -1:
141
140
        revision = branch.last_patch()
142
141
    else:
143
 
        revision = branch.get_rev_id(revno)
 
142
        revision = branch.lookup_revision(revno)
144
143
    return branch, get_revid_tree(branch, revision, temp_root, label,
145
144
                                  local_branch)
146
145
 
244
243
    try:
245
244
        if this_dir is None:
246
245
            this_dir = '.'
247
 
        this_branch = Branch.open_containing(this_dir)
 
246
        this_branch = find_branch(this_dir)
248
247
        this_rev_id = this_branch.last_patch()
249
248
        if this_rev_id is None:
250
249
            raise BzrCommandError("This branch has no commits")
257
256
                                            this_branch)
258
257
        if other_revision[1] == -1:
259
258
            other_rev_id = other_branch.last_patch()
260
 
            if other_rev_id is None:
261
 
                raise NoCommits(other_branch)
262
259
            other_basis = other_rev_id
263
260
        elif other_revision[1] is not None:
264
 
            other_rev_id = other_branch.get_rev_id(other_revision[1])
 
261
            other_rev_id = other_branch.lookup_revision(other_revision[1])
265
262
            other_basis = other_rev_id
266
263
        else:
267
264
            other_rev_id = None
268
265
            other_basis = other_branch.last_patch()
269
 
            if other_basis is None:
270
 
                raise NoCommits(other_branch)
271
266
        if base_revision == [None, None]:
272
 
            try:
273
 
                base_rev_id = common_ancestor(this_rev_id, other_basis, 
274
 
                                              this_branch)
275
 
            except NoCommonAncestor:
 
267
            base_rev_id = common_ancestor(this_rev_id, other_basis, 
 
268
                                          this_branch)
 
269
            if base_rev_id is None:
276
270
                raise UnrelatedBranches()
277
271
            base_tree = get_revid_tree(this_branch, base_rev_id, tempdir, 
278
272
                                       "base", None)
284
278
            elif base_revision[1] is None:
285
279
                base_rev_id = None
286
280
            else:
287
 
                base_rev_id = base_branch.get_rev_id(base_revision[1])
 
281
                base_rev_id = base_branch.lookup_revision(base_revision[1])
288
282
            if base_rev_id is not None:
289
283
                base_is_ancestor = is_ancestor(this_rev_id, base_rev_id, 
290
284
                                               MultipleRevisionSources(this_branch, 
363
357
            if path == '.':
364
358
                path = ''
365
359
            else:
366
 
                assert path.startswith('.' + os.sep), "path is %s" % path
 
360
                assert path.startswith('./'), "path is %s" % path
367
361
            path = path[2:]
368
362
        adjust_ids.append((path, id))
369
363
    if len(adjust_ids) > 0: