hgsubversion: hgsubversion/stupid.py comparison

stupid: use layouts library for detecting branch mapping

author	David Schleimer <dschleimer@fb.com>
date	Tue, 25 Jun 2013 19:22:12 -0700
parents	c4b25a903ad3
children	67e11b650e94

comparison

equal deleted inserted replaced

-:6fa55b6fa3f2
+:4e4c47351102
 if checkpath(p, revnum) == 'f':
 actually_files.append(p)
 # if there's a copyfrom_path and there were files inside that copyfrom,
 # we need to detect those branches. It's a little thorny and slow, but
 # seems to be the best option.
-elif paths[p].copyfrom_path and not p.startswith('tags/'):
+elif paths[p].copyfrom_path and not meta.get_path_tag(p):
 paths_need_discovery.extend(['%s/%s' % (p, x[0])
 for x in listdir(p, revnum)
 if x[1] == 'f'])
 if not actually_files:
 continue
-filepaths = [p.split('/') for p in actually_files]
+for path in actually_files:
-filepaths = [(len(p), p) for p in filepaths]
+if meta.get_path_tag(path):
-filepaths.sort()
+continue
-filepaths = [p[1] for p in filepaths]
+fpath, branch, bpath = meta.split_branch_path(path, existing=False)
-while filepaths:
+if bpath is None:
-path = filepaths.pop(0)
+continue
-parentdir = '/'.join(path[:-1])
+branches[branch] = bpath
-filepaths = [p for p in filepaths if not '/'.join(p).startswith(parentdir)]
-branchpath = meta.normalize(parentdir)
-if branchpath.startswith('tags/'):
-continue
-branchname = meta.localname(branchpath)
-if branchpath.startswith('trunk/'):
-branches[meta.localname('trunk')] = 'trunk'
-continue
-if branchname and branchname.startswith('../'):
-continue
-branches[branchname] = branchpath
 return branches
 def convert_rev(ui, meta, svn, r, tbdelta, firstrun):
 # this server fails at replay

Mercurial > hgsubversion