# HG changeset patch # User Sean Farley # Date 1392482751 21600 # Node ID f4a32d381e03b8e32c885b87a28dd947e194f243 # Parent a4b54b19cd2e69af7c6823dfea107d3961013603 util: remove all calls to load_string Now that we use json, we no longer need to load strings differently from any other serialized data. diff --git a/hgsubversion/maps.py b/hgsubversion/maps.py --- a/hgsubversion/maps.py +++ b/hgsubversion/maps.py @@ -203,8 +203,7 @@ class RevMap(dict): # file to svnmeta itself rather than leaving it here. # must load youngest file first, or else self._load() can # clobber the info - _yonngest_str = util.load_string(self.ypath, '0') - self._youngest = int(_yonngest_str.strip()) + self._youngest = util.load(self.ypath, 0) self.oldest = 0 if os.path.isfile(self.path): self._load() diff --git a/hgsubversion/svncommands.py b/hgsubversion/svncommands.py --- a/hgsubversion/svncommands.py +++ b/hgsubversion/svncommands.py @@ -92,7 +92,7 @@ def _buildmeta(ui, repo, args, partial=F youngestpath = os.path.join(svnmetadir, 'lastpulled') foundpartialinfo = False if os.path.exists(youngestpath): - youngest = int(util.load_string(youngestpath).strip()) + youngest = util.load(youngestpath) sofar = list(maps.RevMap.readmapfile(repo)) if sofar and len(sofar[-1].split(' ', 2)) > 1: lasthash = sofar[-1].split(' ', 2)[1]