← 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: Jelmer Vernooij
  • Date: 2012-01-06 22:44:57 UTC
  • mfrom: (6436 +trunk)
  • mto: (6437.3.11 2.5)
  • mto: This revision was merged to the branch mainline in revision 6444.
  • Revision ID: jelmer@samba.org-20120106224457-re0pcy0fz31xob77
Merge bzr.dev.

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(), """
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