← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

(broken) merge aaron's workingtree format changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
1067
1067
        # format objects are generally stateless
1068
1068
        return isinstance(other, self.__class__)
1069
1069
 
 
1070
    def __ne__(self, other):
 
1071
        return not self == other
 
1072
 
1070
1073
    @classmethod
1071
1074
    def find_format(klass, a_bzrdir):
1072
1075
        """Return the format for the repository object in a_bzrdir.
1256
1259
    'RepositoryFormatKnit2',
1257
1260
    )
1258
1261
 
 
1262
format_registry.register_lazy(
 
1263
    'Bazaar Knit Repository Format 3\n',
 
1264
    'bzrlib.repofmt.knitrepo',
 
1265
    'RepositoryFormatKnit3',
 
1266
    )
 
1267
 
1259
1268
 
1260
1269
class InterRepository(InterObject):
1261
1270
    """This class represents operations taking place between two repositories.
1334
1343
            return False
1335
1344
        if not isinstance(target, Repository):
1336
1345
            return False
1337
 
        if source._format.rich_root_data == target._format.rich_root_data:
1338
 
            return True
 
1346
        if source._format.rich_root_data != target._format.rich_root_data:
 
1347
            return False
 
1348
        if source._serializer != target._serializer:
 
1349
            return False
1339
1350
        else:
1340
 
            return False
 
1351
            return True 
1341
1352
 
1342
1353
    @needs_write_lock
1343
1354
    def copy_content(self, revision_id=None, basis=None):
1977
1988
        :param file_parents: The per-file parent revision ids.
1978
1989
        """
1979
1990
        self._add_text_to_weave(file_id, [], file_parents.keys())
 
1991
 
 
1992
    def modified_reference(self, file_id, file_parents):
 
1993
        """Record the modification of a reference.
 
1994
 
 
1995
        :param file_id: The file_id of the link to record.
 
1996
        :param file_parents: The per-file parent revision ids.
 
1997
        """
 
1998
        self._add_text_to_weave(file_id, [], file_parents.keys())
1980
1999
    
1981
2000
    def modified_file_text(self, file_id, file_parents,
1982
2001
                           get_content_byte_lines, text_sha1=None,