← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/weave_fmt/repository.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/weave_fmt/repository.py
20
20
ghosts.
21
21
"""
22
22
 
 
23
from __future__ import absolute_import
 
24
 
23
25
import gzip
24
26
import os
25
27
from cStringIO import StringIO
26
 
import urllib
27
28
 
28
29
from bzrlib.lazy_import import lazy_import
29
30
lazy_import(globals(), """
52
53
from bzrlib.decorators import needs_read_lock, needs_write_lock
53
54
from bzrlib.repository import (
54
55
    InterRepository,
55
 
    RepositoryFormat,
 
56
    RepositoryFormatMetaDir,
56
57
    )
57
58
from bzrlib.store.text import TextStore
58
59
from bzrlib.versionedfile import (
322
323
            raise NotImplementedError
323
324
 
324
325
        repo_transport = a_bzrdir.get_repository_transport(None)
325
 
        control_files = a_bzrdir._control_files
326
326
        result = AllInOneRepository(_format=self, a_bzrdir=a_bzrdir)
327
327
        result.revisions = self._get_revisions(repo_transport, result)
328
328
        result.signatures = self._get_signatures(repo_transport, result)
505
505
    def _serializer(self):
506
506
        return xml5.serializer_v5
507
507
 
508
 
    def get_format_string(self):
 
508
    @classmethod
 
509
    def get_format_string(cls):
509
510
        """See RepositoryFormat.get_format_string()."""
510
511
        return "Bazaar-NG Repository format 7"
511
512
 
562
563
                                    than normal. I.e. during 'upgrade'.
563
564
        """
564
565
        if not _found:
565
 
            format = RepositoryFormat.find_format(a_bzrdir)
 
566
            format = RepositoryFormatMetaDir.find_format(a_bzrdir)
566
567
        if _override_transport is not None:
567
568
            repo_transport = _override_transport
568
569
        else:
708
709
            raise errors.ObjectNotLocked(self)
709
710
        relpaths = set()
710
711
        for quoted_relpath in self._transport.iter_files_recursive():
711
 
            relpath = urllib.unquote(quoted_relpath)
 
712
            relpath = urlutils.unquote(quoted_relpath)
712
713
            path, ext = os.path.splitext(relpath)
713
714
            if ext == '.gz':
714
715
                relpath = path
748
749
            raise errors.ObjectNotLocked(self)
749
750
        relpaths = set()
750
751
        for quoted_relpath in self._transport.iter_files_recursive():
751
 
            relpath = urllib.unquote(quoted_relpath)
 
752
            relpath = urlutils.unquote(quoted_relpath)
752
753
            path, ext = os.path.splitext(relpath)
753
754
            if ext == '.gz':
754
755
                relpath = path