hgsubversion: hg_delta_editor.py comparison

comparison hg_delta_editor.py @ 331:75f082b5897e

Switch to using url scheme wrappers instead of duplicating each command we wrap. The 'hg svn url' command has been killed; the replacement is '.hg/hgrc'. More stuff related to its disappearance has been stripped, including two tests. HgChangeReceiver now takes a UUID argument, which it uses to ensure that remote repositories remain unchanged. This is a temporary solution, and I'm not entirely satisfied with how it's done either. Access to the UUID file has been isolated in a HgChangeReceiver property. Some more tests have been updated to use ui.pushbuffer()/popbuffer(), and to pass through the Mercurial API. Moved the arguments to wrappers.pull() to the UI configuration. Also, remove HgChangeReceiver.opts in favour of a 'usebranchnames' instance & configuration variable. The name is taken from the ConvertExtension.

author	Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date	Fri, 15 May 2009 19:18:43 +0200
parents	5f8f2fd4fd54
children	9ef720a611e0

comparison

equal deleted inserted replaced

-:5f8f2fd4fd54
+:75f082b5897e
 from mercurial import hg
 from mercurial import ui
 from mercurial import util as hgutil
 from mercurial import revlog
 from mercurial import node
+from mercurial import error
 from svn import delta
 from svn import core
 import svnexternals
 import util
 except ValueError:
 return 0
 def __init__(self, path=None, repo=None, ui_=None,
 subdir='', author_host='',
-tag_locations=['tags'],
+tag_locations=[],
-authors=None,
+authors=None, filemap=None, uuid=None):
-filemap=None):
 """path is the path to the target hg repo.
 subdir is the subdirectory of the edits *on the svn server*.
 It is needed for stripping paths off in certain cases.
 """
 if repo and repo.ui and not ui_:
 ui_ = repo.ui
 if not ui_:
 ui_ = ui.ui()
 self.ui = ui_
-self.__setup_repo(repo or path)
+self.__setup_repo(repo or path, uuid)
+if not author_host:
+author_host = self.ui.config('hgsubversion', 'defaulthost', uuid)
+if not authors:
+authors = self.ui.config('hgsubversion', 'authormap')
+if not filemap:
+filemap = self.ui.config('hgsubversion', 'filemap')
+if not tag_locations:
+tag_locations = self.ui.config('hgsubversion', 'tagpaths', ['tags'])
+self.usebranchnames = self.ui.configbool('hgsubversion',
+'usebranchnames', True)
 self.subdir = subdir
 if self.subdir and self.subdir[0] == '/':
 self.subdir = self.subdir[1:]
-self.revmap = {}
-if os.path.exists(self.revmap_file):
-self.revmap = util.parse_revmap(self.revmap_file)
 self.branches = {}
 if os.path.exists(self.branch_info_file):
 f = open(self.branch_info_file)
 self.branches = pickle.load(f)
 f.close()
 self.lastdate = date
 else:
 date = self.lastdate
 return date
-def __setup_repo(self, arg):
+def __setup_repo(self, arg, uuid):
 """Verify the repo is going to work out for us.
 This method will fail an assertion if the repo exists but doesn't have
 the Subversion metadata.
 """
 self.path = os.path.normpath(os.path.join(self.repo.path, '..'))
 else: #pragma: no cover
 raise TypeError("editor requires either a path or a repository "
 "specified")
-if os.path.isdir(self.meta_data_dir) and os.listdir(self.meta_data_dir):
+if not os.path.isdir(self.meta_data_dir):
-assert os.path.isfile(self.revmap_file)
+os.makedirs(self.meta_data_dir)
-assert os.path.isfile(self.svn_url_file)
+self._set_uuid(uuid)
-assert os.path.isfile(self.uuid_file)
+if os.path.isfile(self.revmap_file):
+self.revmap = util.parse_revmap(self.revmap_file)
 else:
-os.makedirs(os.path.dirname(self.uuid_file))
+self.revmap = {}
 f = open(self.revmap_file, 'w')
 f.write('%s\n' % util.REVMAP_FILE_VERSION)
 f.flush()
 f.close()
 parents = (ha, closed)
 def del_all_files(*args):
 raise IOError
 files = parentctx.manifest().keys()
 extra = {}
-if not self.opts.get('svn_no_branchnames', False):
+if self.usebranchnames:
 extra['branch'] = 'closed-branches'
 current_ctx = context.memctx(self.repo,
 parents,
 rev.message or ' ',
 files,
 parents = (self.get_parent_revision(rev.revnum, branch),
 revlog.nullid)
 if parents[0] in closed_revs and branch in self.branches_to_delete:
 continue
-extra = util.build_extra(rev.revnum, branch,
+extra = util.build_extra(rev.revnum, branch, self.uuid, self.subdir)
-open(self.uuid_file).read(),
-self.subdir)
 if branch is not None:
 if (branch not in self.branches
 and branch not in self.repo.branchtags()):
 continue
 parent_ctx = self.repo.changectx(parents[0])
 data = parent_ctx.filectx(path).data()
 return context.memfilectx(path=path,
 data=data,
 islink=is_link, isexec=is_exec,
 copied=copied)
-if self.opts.get('svn_no_branchnames', False):
+if not self.usebranchnames:
 extra.pop('branch', None)
 current_ctx = context.memctx(self.repo,
 parents,
 rev.message or '...',
 files.keys(),
 raise IOError
 # True here meant nuke all files, shouldn't happen with branch closing
 if self.commit_branches_empty[branch]: #pragma: no cover
 raise hgutil.Abort('Empty commit to an open branch attempted. '
 'Please report this issue.')
-extra = util.build_extra(rev.revnum, branch,
+extra = util.build_extra(rev.revnum, branch, self.uuid, self.subdir)
-open(self.uuid_file).read(),
+if not self.usebranchnames:
-self.subdir)
-if self.opts.get('svn_no_branchnames', False):
 extra.pop('branch', None)
 current_ctx = context.memctx(self.repo,
 (ha, node.nullid),
 rev.message or ' ',
 [],
 def revmap_file(self):
 return self.meta_file_named('rev_map')
 revmap_file = property(revmap_file)
-def svn_url_file(self):
+def _get_uuid(self):
-return self.meta_file_named('url')
+return open(self.meta_file_named('uuid')).read()
-svn_url_file = property(svn_url_file)
+def _set_uuid(self, uuid):
-def uuid_file(self):
+if not uuid:
-return self.meta_file_named('uuid')
+return self._get_uuid()
-uuid_file = property(uuid_file)
+elif os.path.isfile(self.meta_file_named('uuid')):
+stored_uuid = self._get_uuid()
+assert stored_uuid
+if uuid != stored_uuid:
+raise hgutil.Abort('unable to operate on unrelated repository')
+else:
+return stored_uuid
+else:
+if uuid:
+f = open(self.meta_file_named('uuid'), 'w')
+f.write(uuid)
+f.flush()
+f.close()
+return self._get_uuid()
+else:
+raise hgutil.Abort('unable to operate on unrelated repository')
+uuid = property(_get_uuid, _set_uuid, None,
+'Error-checked UUID of source Subversion repository.')
 def branch_info_file(self):
 return self.meta_file_named('branch_info')
 branch_info_file = property(branch_info_file)
 tag_info_file = property(tag_info_file)
 def tag_locations_file(self):
 return self.meta_file_named('tag_locations')
 tag_locations_file = property(tag_locations_file)
-def url(self):
-return open(self.svn_url_file).read()
-url = property(url)
 def authors_file(self):
 return self.meta_file_named('authors')
 authors_file = property(authors_file)

Mercurial > hgsubversion

comparison hg_delta_editor.py @ 331:75f082b5897e