Mercurial > hgsubversion

comparison hg_delta_editor.py @ 155:ba801f44d240

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
utility_commands: Implement rebuildmeta so that metadata can be rebuilt. hg_delta_editor: Fixed some longstanding branch_info bugs detected while rebuilding meta.
author Augie Fackler <durin42@gmail.com>
date Tue, 23 Dec 2008 22:19:26 -0600
parents 6fa97cfbf62f
children 56dae5beae65
comparison
equal deleted inserted replaced
154:6fa97cfbf62f 155:ba801f44d240
300 # Not from a tag, and from a valid repo path 300 # Not from a tag, and from a valid repo path
301 (src_p, 301 (src_p,
302 src_branch) = self._path_and_branch_for_path(src_p) 302 src_branch) = self._path_and_branch_for_path(src_p)
303 if src_p is None: 303 if src_p is None:
304 continue 304 continue
305 added_branches[br] = src_branch, src_rev, revision.revnum 305 if (br not in self.branches or
306 not (src_rev == 0 and src_branch == None)):
307 added_branches[br] = src_branch, src_rev, revision.revnum
306 elif fi == '' and br in self.branches: 308 elif fi == '' and br in self.branches:
307 br2 = br or 'default' 309 self.branches_to_delete.add(br)
308 if br2 not in self.repo.branchtags() and paths[p].action == 'D':
309 self.branches_to_delete.add(br)
310 else: 310 else:
311 t_name = self._is_path_tag(p) 311 t_name = self._is_path_tag(p)
312 if t_name == False: 312 if t_name == False:
313 continue 313 continue
314 src_p, src_rev = paths[p].copyfrom_path, paths[p].copyfrom_rev 314 src_p, src_rev = paths[p].copyfrom_path, paths[p].copyfrom_rev