Mercurial > hgsubversion

comparison hgsubversion/editor.py @ 540:8dc759dc9ca9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
svnmeta: remove split_branch_tag() exacttag argument
author Patrick Mezard <pmezard@gmail.com>
date Tue, 02 Feb 2010 21:18:20 +0100
parents e38f110e7088
children ebd8fb1a05e4
comparison
equal deleted inserted replaced
539:36eb608b831b 540:8dc759dc9ca9
121 self.repo = meta.repo 121 self.repo = meta.repo
122 self.current = RevisionData(meta.ui) 122 self.current = RevisionData(meta.ui)
123 123
124 @ieditor 124 @ieditor
125 def delete_entry(self, path, revision_bogus, parent_baton, pool=None): 125 def delete_entry(self, path, revision_bogus, parent_baton, pool=None):
126 br_path, branch = self.meta.split_branch_path(path)[:2] 126 br_path, branch = self.meta.split_branch_path(path)[:2]
127 if br_path == '': 127 if br_path == '':
128 if self.meta.get_path_tag(path):
129 # Tag deletion is not handled as branched deletion
130 return
128 self.meta.closebranches.add(branch) 131 self.meta.closebranches.add(branch)
129 if br_path is not None: 132 if br_path is not None:
130 ha = self.meta.get_parent_revision(self.current.rev.revnum, branch) 133 ha = self.meta.get_parent_revision(self.current.rev.revnum, branch)
131 if ha == revlog.nullid: 134 if ha == revlog.nullid:
132 return 135 return
303 @ieditor 306 @ieditor
304 def open_directory(self, path, parent_baton, base_revision, dir_pool=None): 307 def open_directory(self, path, parent_baton, base_revision, dir_pool=None):
305 self.current.batons[path] = path 308 self.current.batons[path] = path
306 p_, branch = self.meta.split_branch_path(path)[:2] 309 p_, branch = self.meta.split_branch_path(path)[:2]
307 if p_ == '' or (self.meta.layout == 'single' and p_): 310 if p_ == '' or (self.meta.layout == 'single' and p_):
308 self.current.emptybranches[branch] = False 311 if not self.meta.get_path_tag(path):
312 self.current.emptybranches[branch] = False
309 return path 313 return path
310 314
311 @ieditor 315 @ieditor
312 def close_directory(self, dir_baton, dir_pool=None): 316 def close_directory(self, dir_baton, dir_pool=None):
313 if dir_baton is not None: 317 if dir_baton is not None: