← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_core.py

  • Committer: Martin Pool
  • Date: 2005-05-26 02:13:57 UTC
  • Revision ID: mbp@sourcefrog.net-20050526021357-9a56decdca0c174f
- All top-level classes inherit from object
  (Python new-style classes)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_core.py
2
2
from changeset import Inventory, apply_changeset, invert_dict
3
3
import os.path
4
4
 
5
 
class ThreewayInventory:
 
5
class ThreewayInventory(object):
6
6
    def __init__(self, this_inventory, base_inventory, other_inventory):
7
7
        self.this = this_inventory
8
8
        self.base = base_inventory
149
149
 
150
150
    return new_entry
151
151
 
152
 
class PermissionsMerge:
 
152
class PermissionsMerge(object):
153
153
    def __init__(self, base_path, other_path):
154
154
        self.base_path = base_path
155
155
        self.other_path = other_path
177
177
import unittest
178
178
import tempfile
179
179
import shutil
180
 
class MergeTree:
 
180
class MergeTree(object):
181
181
    def __init__(self, dir):
182
182
        self.dir = dir;
183
183
        os.mkdir(dir)
213
213
        os.rename(self.abs_path(self.inventory[id]), self.abs_path(path))
214
214
        self.inventory[id] = path
215
215
 
216
 
class MergeBuilder:
 
216
class MergeBuilder(object):
217
217
    def __init__(self):
218
218
        self.dir = tempfile.mkdtemp(prefix="BaZing")
219
219
        self.base = MergeTree(os.path.join(self.dir, "base"))