# HG changeset patch # User Augie Fackler # Date 1465188757 14400 # Node ID a6fa4f3aa82620ea448849c23b4b15a377241870 # Parent 2eba84031a7880b6524114b7247f13b27fb596f9 FileMap: no longer take a meta diff --git a/hgsubversion/maps.py b/hgsubversion/maps.py --- a/hgsubversion/maps.py +++ b/hgsubversion/maps.py @@ -491,7 +491,7 @@ class FileMap(object): VERSION = 1 - def __init__(self, meta): + def __init__(self, ui, filepath): '''Initialise a new FileMap. The ui argument is used to print diagnostic messages. @@ -499,8 +499,8 @@ class FileMap(object): The path argument is the location of the backing store, typically .hg/svn/filemap. ''' - self._filename = meta.filemap_file - self._ui = meta.ui + self._filename = filepath + self._ui = ui self.include = {} self.exclude = {} if os.path.isfile(self._filename): diff --git a/hgsubversion/svnmeta.py b/hgsubversion/svnmeta.py --- a/hgsubversion/svnmeta.py +++ b/hgsubversion/svnmeta.py @@ -303,7 +303,7 @@ class SVNMeta(object): @property def filemap(self): if self._filemap is None: - self._filemap = maps.FileMap(self) + self._filemap = maps.FileMap(self.ui, self.filemap_file) return self._filemap @property