Mercurial > hgsubversion

comparison hgsubversion/layouts/standard.py @ 1272:38c154371240

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
layouts: use trunk property instead of internal variable
author Sean Farley <sean.michael.farley@gmail.com>
date Mon, 24 Mar 2014 11:20:50 -0500
parents a1039f8e57d4
children a1ca3d6be68c
comparison
equal deleted inserted replaced
1271:a1039f8e57d4 1272:38c154371240
25 @property 25 @property
26 def trunk(self): 26 def trunk(self):
27 return 'trunk' + self._infix 27 return 'trunk' + self._infix
28 28
29 def localname(self, path): 29 def localname(self, path):
30 if path == self._trunk: 30 if path == self.trunk:
31 return None 31 return None
32 elif path.startswith(self.meta.branchdir) and path.endswith(self._infix): 32 elif path.startswith(self.meta.branchdir) and path.endswith(self._infix):
33 path = path[len(self.meta.branchdir):] 33 path = path[len(self.meta.branchdir):]
34 if self._infix: 34 if self._infix:
35 path = path[:-len(self._infix)] 35 path = path[:-len(self._infix)]
36 return path 36 return path
37 return '../%s' % path 37 return '../%s' % path
38 38
39 def remotename(self, branch): 39 def remotename(self, branch):
40 if branch == 'default' or branch is None: 40 if branch == 'default' or branch is None:
41 path = self._trunk 41 path = self.trunk
42 elif branch.startswith('../'): 42 elif branch.startswith('../'):
43 path = branch[3:] 43 path = branch[3:]
44 else: 44 else:
45 path = ''.join((self.meta.branchdir, branch, self._infix)) 45 path = ''.join((self.meta.branchdir, branch, self._infix))
46 46
47 return path 47 return path
48 48
49 def remotepath(self, branch, subdir='/'): 49 def remotepath(self, branch, subdir='/'):
50 if subdir == '/': 50 if subdir == '/':
51 subdir = '' 51 subdir = ''
52 branchpath = self._trunk 52 branchpath = self.trunk
53 if branch and branch != 'default': 53 if branch and branch != 'default':
54 if branch.startswith('../'): 54 if branch.startswith('../'):
55 branchpath = branch[3:] 55 branchpath = branch[3:]
56 else: 56 else:
57 branchpath = ''.join((self.meta.branchdir, branch, self._infix)) 57 branchpath = ''.join((self.meta.branchdir, branch, self._infix))
111 candidate += components.pop(0) 111 candidate += components.pop(0)
112 if self.localname(candidate) in known_branches: 112 if self.localname(candidate) in known_branches:
113 return candidate, '/'.join(components) 113 return candidate, '/'.join(components)
114 114
115 if path == 'trunk' or path.startswith('trunk/'): 115 if path == 'trunk' or path.startswith('trunk/'):
116 return self._trunk, path[len(self._trunk) + 1:] 116 return self.trunk, path[len(self.trunk) + 1:]
117 117
118 if path.startswith(self.meta.branchdir): 118 if path.startswith(self.meta.branchdir):
119 path = path[len(self.meta.branchdir):] 119 path = path[len(self.meta.branchdir):]
120 components = path.split('/', 1) 120 components = path.split('/', 1)
121 branch_path = ''.join((self.meta.branchdir, components[0])) 121 branch_path = ''.join((self.meta.branchdir, components[0]))