Rev 1766: Rename RevisionMetadata.fileprops -> RevisionMetadata.changed_fileprops. in file:///data/jelmer/bzr-svn/trunk/
Jelmer Vernooij
jelmer at samba.org
Mon Sep 1 21:53:18 BST 2008
At file:///data/jelmer/bzr-svn/trunk/
------------------------------------------------------------
revno: 1766
revision-id: jelmer at samba.org-20080901205316-j3zktrc2yjb5166w
parent: jelmer at samba.org-20080901204016-wekl3tys4uyogw41
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Mon 2008-09-01 22:53:16 +0200
message:
Rename RevisionMetadata.fileprops -> RevisionMetadata.changed_fileprops.
modified:
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
fileids.py fileids.py-20060714013623-u5iiyqqnko11grcf-1
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
upgrade.py upgrade.py-20070106192108-0rakplee2lzah4gs-1
=== modified file 'fetch.py'
--- a/fetch.py 2008-09-01 20:38:56 +0000
+++ b/fetch.py 2008-09-01 20:53:16 +0000
@@ -122,9 +122,9 @@
def change_prop(self, name, value):
if self.path == "":
# Replay lazy_dict, since it may be more expensive
- if type(self.editor.revmeta.fileprops) != dict:
- self.editor.revmeta.fileprops = {}
- self.editor.revmeta.fileprops[name] = value
+ if type(self.editor.revmeta.changed_fileprops) != dict:
+ self.editor.revmeta.changed_fileprops = {}
+ self.editor.revmeta.changed_fileprops[name] = value
if name in (properties.PROP_ENTRY_COMMITTED_DATE,
properties.PROP_ENTRY_COMMITTED_REV,
@@ -403,7 +403,7 @@
rev = Revision(revision_id=revid,
parent_ids=parent_ids)
- self.mapping.import_revision(self.revmeta.revprops, self.revmeta.fileprops,
+ self.mapping.import_revision(self.revmeta.revprops, self.revmeta.changed_fileprops,
self.revmeta.uuid, self.revmeta.branch_path,
self.revmeta.revnum, rev)
@@ -494,7 +494,7 @@
def _get_text_revid(self, path):
if self._text_revids is None:
self._text_revids = self.mapping.import_text_parents(self.revmeta.revprops,
- self.revmeta.fileprops)
+ self.revmeta.changed_fileprops)
return self._text_revids.get(path)
=== modified file 'fileids.py'
--- a/fileids.py 2008-09-01 13:22:31 +0000
+++ b/fileids.py 2008-09-01 20:53:16 +0000
@@ -108,7 +108,7 @@
self.repos = repos
def _use_text_revids(self, mapping, revmeta, map):
- text_revids = mapping.import_text_parents(revmeta.revprops, revmeta.fileprops).items()
+ text_revids = mapping.import_text_parents(revmeta.revprops, revmeta.changed_fileprops).items()
for path, revid in text_revids:
assert path in map
map[path] = (map[path][0], revid)
=== modified file 'mapping.py'
--- a/mapping.py 2008-09-01 13:22:31 +0000
+++ b/mapping.py 2008-09-01 20:53:16 +0000
@@ -709,7 +709,7 @@
mapping_registry.register_lazy('v4', 'bzrlib.plugins.svn.mapping4',
'BzrSvnMappingv4',
'Fourth format (bzr-svn 0.5.x)')
-mapping_registry.set_default('v4')
+mapping_registry.set_default('v3')
def parse_mapping_name(name):
assert isinstance(name, str)
=== modified file 'repository.py'
--- a/repository.py 2008-09-01 20:40:16 +0000
+++ b/repository.py 2008-09-01 20:53:16 +0000
@@ -73,13 +73,13 @@
class RevisionMetadata(object):
- def __init__(self, repository, branch_path, paths, revnum, revprops, fileprops, consider_fileprops=False):
+ def __init__(self, repository, branch_path, paths, revnum, revprops, changed_fileprops=None, consider_fileprops=False):
self.repository = repository
self.branch_path = branch_path
self.paths = paths
self.revnum = revnum
self.revprops = revprops
- self.fileprops = fileprops
+ self.changed_fileprops = fileprops
self.uuid = repository.uuid
self.consider_fileprops = consider_fileprops
@@ -87,10 +87,10 @@
return "<RevisionMetadata for revision %d in repository %s>" % (self.revnum, self.repository.uuid)
def get_revision_id(self, mapping):
- return self.repository.generate_revision_id(self.revnum, self.branch_path, mapping, self.revprops, self.fileprops)
+ return self.repository.generate_revision_id(self.revnum, self.branch_path, mapping, self.revprops, self.changed_fileprops)
def get_lhs_parent(self, mapping):
- lhs_parent = mapping.get_lhs_parent(self.branch_path, self.revprops, self.fileprops)
+ lhs_parent = mapping.get_lhs_parent(self.branch_path, self.revprops, self.changed_fileprops)
if lhs_parent is None:
# Determine manually
lhs_parent = self.repository.lhs_revision_parent(self.branch_path, self.revnum, mapping)
@@ -105,7 +105,7 @@
if self.repository.quick_log_revprops:
order.append(lambda: is_bzr_revision_revprops(self.revprops))
if self.consider_fileprops:
- order.append(lambda: is_bzr_revision_fileprops(self.fileprops))
+ order.append(lambda: is_bzr_revision_fileprops(self.changed_fileprops))
# Only look for revprops if they could've been committed
if (not self.repository.quick_log_revprops and
self.repository.check_revprops):
@@ -117,7 +117,7 @@
return None
def get_rhs_parents(self, mapping):
- extra_rhs_parents = mapping.get_rhs_parents(self.branch_path, self.revprops, self.fileprops)
+ extra_rhs_parents = mapping.get_rhs_parents(self.branch_path, self.revprops, self.changed_fileprops)
if extra_rhs_parents != ():
return extra_rhs_parents
@@ -125,7 +125,7 @@
if self.is_bzr_revision():
return ()
- current = self.fileprops.get(SVN_PROP_SVK_MERGE, "")
+ current = self.changed_fileprops.get(SVN_PROP_SVK_MERGE, "")
if current == "":
return ()
@@ -170,13 +170,13 @@
rev.svn_meta = self
rev.svn_mapping = mapping
- mapping.import_revision(self.revprops, self.fileprops, self.repository.uuid, self.branch_path,
+ mapping.import_revision(self.revprops, self.changed_fileprops, self.repository.uuid, self.branch_path,
self.revnum, rev)
return rev
def get_fileid_map(self, mapping):
- return mapping.import_fileid_map(self.revprops, self.fileprops)
+ return mapping.import_fileid_map(self.revprops, self.changed_fileprops)
def __hash__(self):
return hash((self.__class__, self.repository.uuid, self.branch_path, self.revnum))
@@ -660,7 +660,7 @@
fileprops = self.branchprop_list.get_changed_properties(path, revnum)
revmeta = RevisionMetadata(self, path, changes, revnum, revprops,
- fileprops, consider_fileprops)
+ fileprops, consider_fileprops=consider_fileprops)
self._revmeta_cache[path,revnum] = revmeta
return revmeta
=== modified file 'revids.py'
--- a/revids.py 2008-09-01 13:22:31 +0000
+++ b/revids.py 2008-09-01 20:53:16 +0000
@@ -128,7 +128,7 @@
# Find the branch property between min_revnum and max_revnum that
# added revid
for revmeta in self.repos.iter_reverse_branch_changes(branch_path, max_revnum, min_revnum):
- for propname, propvalue in revmeta.fileprops.items():
+ for propname, propvalue in revmeta.changed_fileprops.items():
if not propname.startswith(SVN_PROP_BZR_REVISION_ID):
continue
try:
=== modified file 'upgrade.py'
--- a/upgrade.py 2008-08-29 23:55:41 +0000
+++ b/upgrade.py 2008-09-01 20:53:16 +0000
@@ -23,7 +23,6 @@
import itertools
from bzrlib.plugins.svn import changes, logwalker, mapping, properties
from bzrlib.plugins.svn.mapping import parse_revision_id
-from bzrlib.plugins.svn.repository import RevisionMetadata
class UpgradeChangesContent(BzrError):
"""Inconsistency was found upgrading the mapping of a revision."""
More information about the bazaar-commits
mailing list