Mercurial > hgsubversion

annotate hgsubversion/layouts/standard.py @ 1292:7bbe120be193

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
layouts: turn taglocations method into a property We no longer need to pass the meta path since we have an internal reference to the meta object, so we remove the parameter from the taglocations method.
author Sean Farley <sean.michael.farley@gmail.com>
date Mon, 24 Mar 2014 11:20:53 -0500
parents 13f8e9cc90c6
children a6d3692a5800
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1026
66395f232b7c layouts: pull tag location list management into layout module
David Schleimer <dschleimer@fb.com>
parents: 1014
diff changeset
1 import os.path
1012
e8cd211684c4 layouts: refactor out svn path to mercurial branch logic
David Schleimer <dschleimer@fb.com>
parents:
diff changeset
2
e8cd211684c4 layouts: refactor out svn path to mercurial branch logic
David Schleimer <dschleimer@fb.com>
parents:
diff changeset
3 import base
e8cd211684c4 layouts: refactor out svn path to mercurial branch logic
David Schleimer <dschleimer@fb.com>
parents:
diff changeset
4
e8cd211684c4 layouts: refactor out svn path to mercurial branch logic
David Schleimer <dschleimer@fb.com>
parents:
diff changeset
5 class StandardLayout(base.BaseLayout):
e8cd211684c4 layouts: refactor out svn path to mercurial branch logic
David Schleimer <dschleimer@fb.com>
parents:
diff changeset
6 """The standard trunk, branches, tags layout"""
e8cd211684c4 layouts: refactor out svn path to mercurial branch logic
David Schleimer <dschleimer@fb.com>
parents:
diff changeset
7
1265
4744b7bfa476 layouts: change constructor to take a meta object
Sean Farley <sean.michael.farley@gmail.com>
parents: 1153
diff changeset
8 def __init__(self, meta):
4744b7bfa476 layouts: change constructor to take a meta object
Sean Farley <sean.michael.farley@gmail.com>
parents: 1153
diff changeset
9 base.BaseLayout.__init__(self, meta)
1026
66395f232b7c layouts: pull tag location list management into layout module
David Schleimer <dschleimer@fb.com>
parents: 1014
diff changeset
10
66395f232b7c layouts: pull tag location list management into layout module
David Schleimer <dschleimer@fb.com>
parents: 1014
diff changeset
11 self._tag_locations = None
66395f232b7c layouts: pull tag location list management into layout module
David Schleimer <dschleimer@fb.com>
parents: 1014
diff changeset
12
1268
fadacedaf391 layouts: add cached branchdir property to standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1265
diff changeset
13 # branchdir is expected to be stripped of leading slashes but retain
fadacedaf391 layouts: add cached branchdir property to standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1265
diff changeset
14 # its last slash
fadacedaf391 layouts: add cached branchdir property to standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1265
diff changeset
15 meta._gen_cachedconfig('branchdir', 'branches',
fadacedaf391 layouts: add cached branchdir property to standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1265
diff changeset
16 pre=lambda x: '/'.join(p for p in x.split('/')
fadacedaf391 layouts: add cached branchdir property to standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1265
diff changeset
17 if p) + '/')
fadacedaf391 layouts: add cached branchdir property to standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1265
diff changeset
18
1274
d21b7259724a layouts: add cached infix property to standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1273
diff changeset
19 # infix is expected to be stripped of trailing slashes but retain
d21b7259724a layouts: add cached infix property to standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1273
diff changeset
20 # its first slash
d21b7259724a layouts: add cached infix property to standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1273
diff changeset
21 def _infix_transform(x):
d21b7259724a layouts: add cached infix property to standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1273
diff changeset
22 x = '/'.join(p for p in x.split('/') if p)
d21b7259724a layouts: add cached infix property to standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1273
diff changeset
23 if x:
d21b7259724a layouts: add cached infix property to standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1273
diff changeset
24 x = '/' + x
d21b7259724a layouts: add cached infix property to standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1273
diff changeset
25 return x
d21b7259724a layouts: add cached infix property to standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1273
diff changeset
26 meta._gen_cachedconfig('infix', '', pre=_infix_transform)
d21b7259724a layouts: add cached infix property to standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1273
diff changeset
27
1291
13f8e9cc90c6 layouts: generate cached taglocations property
Sean Farley <sean.michael.farley@gmail.com>
parents: 1276
diff changeset
28 # the lambda is to ensure nested paths are handled properly
13f8e9cc90c6 layouts: generate cached taglocations property
Sean Farley <sean.michael.farley@gmail.com>
parents: 1276
diff changeset
29 meta._gen_cachedconfig('taglocations', ['tags'], 'tag_locations',
13f8e9cc90c6 layouts: generate cached taglocations property
Sean Farley <sean.michael.farley@gmail.com>
parents: 1276
diff changeset
30 'tagpaths', lambda x: list(reversed(sorted(x))))
13f8e9cc90c6 layouts: generate cached taglocations property
Sean Farley <sean.michael.farley@gmail.com>
parents: 1276
diff changeset
31
1271
a1039f8e57d4 layouts: turn trunk into a property for standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1270
diff changeset
32 @property
a1039f8e57d4 layouts: turn trunk into a property for standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1270
diff changeset
33 def trunk(self):
1275
ca771cbf69c6 layouts: use meta.infix in standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1274
diff changeset
34 return 'trunk' + self.meta.infix
1271
a1039f8e57d4 layouts: turn trunk into a property for standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1270
diff changeset
35
1012
e8cd211684c4 layouts: refactor out svn path to mercurial branch logic
David Schleimer <dschleimer@fb.com>
parents:
diff changeset
36 def localname(self, path):
1272
38c154371240 layouts: use trunk property instead of internal variable
Sean Farley <sean.michael.farley@gmail.com>
parents: 1271
diff changeset
37 if path == self.trunk:
1012
e8cd211684c4 layouts: refactor out svn path to mercurial branch logic
David Schleimer <dschleimer@fb.com>
parents:
diff changeset
38 return None
1275
ca771cbf69c6 layouts: use meta.infix in standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1274
diff changeset
39 elif path.startswith(self.meta.branchdir) and path.endswith(self.meta.infix):
1269
738c685f893c layouts: use meta.branchdir in standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1268
diff changeset
40 path = path[len(self.meta.branchdir):]
1275
ca771cbf69c6 layouts: use meta.infix in standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1274
diff changeset
41 if self.meta.infix:
ca771cbf69c6 layouts: use meta.infix in standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1274
diff changeset
42 path = path[:-len(self.meta.infix)]
1094
9a7e3dbd0f6e layouts: add support for an infix between tbt and the hg root
David Schleimer <dschleimer@fb.com>
parents: 1093
diff changeset
43 return path
1012
e8cd211684c4 layouts: refactor out svn path to mercurial branch logic
David Schleimer <dschleimer@fb.com>
parents:
diff changeset
44 return '../%s' % path
1013
d507c1a12dcb layouts: refactor mercurial branch to svn path mapping out of svnmeta
David Schleimer <dschleimer@fb.com>
parents: 1012
diff changeset
45
d507c1a12dcb layouts: refactor mercurial branch to svn path mapping out of svnmeta
David Schleimer <dschleimer@fb.com>
parents: 1012
diff changeset
46 def remotename(self, branch):
d507c1a12dcb layouts: refactor mercurial branch to svn path mapping out of svnmeta
David Schleimer <dschleimer@fb.com>
parents: 1012
diff changeset
47 if branch == 'default' or branch is None:
1272
38c154371240 layouts: use trunk property instead of internal variable
Sean Farley <sean.michael.farley@gmail.com>
parents: 1271
diff changeset
48 path = self.trunk
1013
d507c1a12dcb layouts: refactor mercurial branch to svn path mapping out of svnmeta
David Schleimer <dschleimer@fb.com>
parents: 1012
diff changeset
49 elif branch.startswith('../'):
1094
9a7e3dbd0f6e layouts: add support for an infix between tbt and the hg root
David Schleimer <dschleimer@fb.com>
parents: 1093
diff changeset
50 path = branch[3:]
9a7e3dbd0f6e layouts: add support for an infix between tbt and the hg root
David Schleimer <dschleimer@fb.com>
parents: 1093
diff changeset
51 else:
1275
ca771cbf69c6 layouts: use meta.infix in standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1274
diff changeset
52 path = ''.join((self.meta.branchdir, branch, self.meta.infix))
1094
9a7e3dbd0f6e layouts: add support for an infix between tbt and the hg root
David Schleimer <dschleimer@fb.com>
parents: 1093
diff changeset
53
9a7e3dbd0f6e layouts: add support for an infix between tbt and the hg root
David Schleimer <dschleimer@fb.com>
parents: 1093
diff changeset
54 return path
1014
0ed7cf23e801 layouts: refactor path component of convinfo generation into layouts lib
David Schleimer <dschleimer@fb.com>
parents: 1013
diff changeset
55
0ed7cf23e801 layouts: refactor path component of convinfo generation into layouts lib
David Schleimer <dschleimer@fb.com>
parents: 1013
diff changeset
56 def remotepath(self, branch, subdir='/'):
1090
80a456b77ade layouts: fix remotepath for default branch in standard layout
David Schleimer <dschleimer@fb.com>
parents: 1029
diff changeset
57 if subdir == '/':
80a456b77ade layouts: fix remotepath for default branch in standard layout
David Schleimer <dschleimer@fb.com>
parents: 1029
diff changeset
58 subdir = ''
1272
38c154371240 layouts: use trunk property instead of internal variable
Sean Farley <sean.michael.farley@gmail.com>
parents: 1271
diff changeset
59 branchpath = self.trunk
1090
80a456b77ade layouts: fix remotepath for default branch in standard layout
David Schleimer <dschleimer@fb.com>
parents: 1029
diff changeset
60 if branch and branch != 'default':
1014
0ed7cf23e801 layouts: refactor path component of convinfo generation into layouts lib
David Schleimer <dschleimer@fb.com>
parents: 1013
diff changeset
61 if branch.startswith('../'):
0ed7cf23e801 layouts: refactor path component of convinfo generation into layouts lib
David Schleimer <dschleimer@fb.com>
parents: 1013
diff changeset
62 branchpath = branch[3:]
0ed7cf23e801 layouts: refactor path component of convinfo generation into layouts lib
David Schleimer <dschleimer@fb.com>
parents: 1013
diff changeset
63 else:
1275
ca771cbf69c6 layouts: use meta.infix in standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1274
diff changeset
64 branchpath = ''.join((self.meta.branchdir, branch,
ca771cbf69c6 layouts: use meta.infix in standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1274
diff changeset
65 self.meta.infix))
1014
0ed7cf23e801 layouts: refactor path component of convinfo generation into layouts lib
David Schleimer <dschleimer@fb.com>
parents: 1013
diff changeset
66
0ed7cf23e801 layouts: refactor path component of convinfo generation into layouts lib
David Schleimer <dschleimer@fb.com>
parents: 1013
diff changeset
67 return '%s/%s' % (subdir or '', branchpath)
1026
66395f232b7c layouts: pull tag location list management into layout module
David Schleimer <dschleimer@fb.com>
parents: 1014
diff changeset
68
1292
7bbe120be193 layouts: turn taglocations method into a property
Sean Farley <sean.michael.farley@gmail.com>
parents: 1291
diff changeset
69 @property
7bbe120be193 layouts: turn taglocations method into a property
Sean Farley <sean.michael.farley@gmail.com>
parents: 1291
diff changeset
70 def taglocations(self):
1291
13f8e9cc90c6 layouts: generate cached taglocations property
Sean Farley <sean.michael.farley@gmail.com>
parents: 1276
diff changeset
71 return self.meta.taglocations
1027
16045f6f3fef layouts: pull svn path -> potential tag name mapping into layouts
David Schleimer <dschleimer@fb.com>
parents: 1026
diff changeset
72
16045f6f3fef layouts: pull svn path -> potential tag name mapping into layouts
David Schleimer <dschleimer@fb.com>
parents: 1026
diff changeset
73 def get_path_tag(self, path, taglocations):
16045f6f3fef layouts: pull svn path -> potential tag name mapping into layouts
David Schleimer <dschleimer@fb.com>
parents: 1026
diff changeset
74 for tagspath in taglocations:
16045f6f3fef layouts: pull svn path -> potential tag name mapping into layouts
David Schleimer <dschleimer@fb.com>
parents: 1026
diff changeset
75 if path.startswith(tagspath + '/'):
16045f6f3fef layouts: pull svn path -> potential tag name mapping into layouts
David Schleimer <dschleimer@fb.com>
parents: 1026
diff changeset
76 tag = path[len(tagspath) + 1:]
16045f6f3fef layouts: pull svn path -> potential tag name mapping into layouts
David Schleimer <dschleimer@fb.com>
parents: 1026
diff changeset
77 if tag:
16045f6f3fef layouts: pull svn path -> potential tag name mapping into layouts
David Schleimer <dschleimer@fb.com>
parents: 1026
diff changeset
78 return tag
16045f6f3fef layouts: pull svn path -> potential tag name mapping into layouts
David Schleimer <dschleimer@fb.com>
parents: 1026
diff changeset
79 return None
1029
513f2b607b06 layouts: pull out logic for splitting svn paths into branch and local parts
David Schleimer <dschleimer@fb.com>
parents: 1027
diff changeset
80
513f2b607b06 layouts: pull out logic for splitting svn paths into branch and local parts
David Schleimer <dschleimer@fb.com>
parents: 1027
diff changeset
81 def split_remote_name(self, path, known_branches):
513f2b607b06 layouts: pull out logic for splitting svn paths into branch and local parts
David Schleimer <dschleimer@fb.com>
parents: 1027
diff changeset
82
513f2b607b06 layouts: pull out logic for splitting svn paths into branch and local parts
David Schleimer <dschleimer@fb.com>
parents: 1027
diff changeset
83 # this odd evolution is how we deal with people doing things like
513f2b607b06 layouts: pull out logic for splitting svn paths into branch and local parts
David Schleimer <dschleimer@fb.com>
parents: 1027
diff changeset
84 # creating brances (note the typo), committing to a branch under it,
513f2b607b06 layouts: pull out logic for splitting svn paths into branch and local parts
David Schleimer <dschleimer@fb.com>
parents: 1027
diff changeset
85 # and then moving it to branches
513f2b607b06 layouts: pull out logic for splitting svn paths into branch and local parts
David Schleimer <dschleimer@fb.com>
parents: 1027
diff changeset
86
513f2b607b06 layouts: pull out logic for splitting svn paths into branch and local parts
David Schleimer <dschleimer@fb.com>
parents: 1027
diff changeset
87 # we need to find the ../foo branch names, if they exist, before
513f2b607b06 layouts: pull out logic for splitting svn paths into branch and local parts
David Schleimer <dschleimer@fb.com>
parents: 1027
diff changeset
88 # trying to create a normally-named branch
513f2b607b06 layouts: pull out logic for splitting svn paths into branch and local parts
David Schleimer <dschleimer@fb.com>
parents: 1027
diff changeset
89
513f2b607b06 layouts: pull out logic for splitting svn paths into branch and local parts
David Schleimer <dschleimer@fb.com>
parents: 1027
diff changeset
90 components = path.split('/')
513f2b607b06 layouts: pull out logic for splitting svn paths into branch and local parts
David Schleimer <dschleimer@fb.com>
parents: 1027
diff changeset
91 candidate = ''
513f2b607b06 layouts: pull out logic for splitting svn paths into branch and local parts
David Schleimer <dschleimer@fb.com>
parents: 1027
diff changeset
92 while self.localname(candidate) not in known_branches and components:
513f2b607b06 layouts: pull out logic for splitting svn paths into branch and local parts
David Schleimer <dschleimer@fb.com>
parents: 1027
diff changeset
93 if not candidate:
513f2b607b06 layouts: pull out logic for splitting svn paths into branch and local parts
David Schleimer <dschleimer@fb.com>
parents: 1027
diff changeset
94 candidate = components.pop(0)
513f2b607b06 layouts: pull out logic for splitting svn paths into branch and local parts
David Schleimer <dschleimer@fb.com>
parents: 1027
diff changeset
95 else:
513f2b607b06 layouts: pull out logic for splitting svn paths into branch and local parts
David Schleimer <dschleimer@fb.com>
parents: 1027
diff changeset
96 candidate += '/'
513f2b607b06 layouts: pull out logic for splitting svn paths into branch and local parts
David Schleimer <dschleimer@fb.com>
parents: 1027
diff changeset
97 candidate += components.pop(0)
513f2b607b06 layouts: pull out logic for splitting svn paths into branch and local parts
David Schleimer <dschleimer@fb.com>
parents: 1027
diff changeset
98 if self.localname(candidate) in known_branches:
513f2b607b06 layouts: pull out logic for splitting svn paths into branch and local parts
David Schleimer <dschleimer@fb.com>
parents: 1027
diff changeset
99 return candidate, '/'.join(components)
513f2b607b06 layouts: pull out logic for splitting svn paths into branch and local parts
David Schleimer <dschleimer@fb.com>
parents: 1027
diff changeset
100
513f2b607b06 layouts: pull out logic for splitting svn paths into branch and local parts
David Schleimer <dschleimer@fb.com>
parents: 1027
diff changeset
101 if path == 'trunk' or path.startswith('trunk/'):
1272
38c154371240 layouts: use trunk property instead of internal variable
Sean Farley <sean.michael.farley@gmail.com>
parents: 1271
diff changeset
102 return self.trunk, path[len(self.trunk) + 1:]
1093
791382a21cc4 layouts: add support for configuring branches directory
David Schleimer <dschleimer@fb.com>
parents: 1090
diff changeset
103
1269
738c685f893c layouts: use meta.branchdir in standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1268
diff changeset
104 if path.startswith(self.meta.branchdir):
738c685f893c layouts: use meta.branchdir in standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1268
diff changeset
105 path = path[len(self.meta.branchdir):]
1093
791382a21cc4 layouts: add support for configuring branches directory
David Schleimer <dschleimer@fb.com>
parents: 1090
diff changeset
106 components = path.split('/', 1)
1269
738c685f893c layouts: use meta.branchdir in standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1268
diff changeset
107 branch_path = ''.join((self.meta.branchdir, components[0]))
1093
791382a21cc4 layouts: add support for configuring branches directory
David Schleimer <dschleimer@fb.com>
parents: 1090
diff changeset
108 if len(components) == 1:
791382a21cc4 layouts: add support for configuring branches directory
David Schleimer <dschleimer@fb.com>
parents: 1090
diff changeset
109 local_path = ''
791382a21cc4 layouts: add support for configuring branches directory
David Schleimer <dschleimer@fb.com>
parents: 1090
diff changeset
110 else:
791382a21cc4 layouts: add support for configuring branches directory
David Schleimer <dschleimer@fb.com>
parents: 1090
diff changeset
111 local_path = components[1]
1094
9a7e3dbd0f6e layouts: add support for an infix between tbt and the hg root
David Schleimer <dschleimer@fb.com>
parents: 1093
diff changeset
112
9a7e3dbd0f6e layouts: add support for an infix between tbt and the hg root
David Schleimer <dschleimer@fb.com>
parents: 1093
diff changeset
113 if local_path == '':
1275
ca771cbf69c6 layouts: use meta.infix in standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1274
diff changeset
114 branch_path += self.meta.infix
ca771cbf69c6 layouts: use meta.infix in standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1274
diff changeset
115 elif local_path.startswith(self.meta.infix[1:] + '/'):
ca771cbf69c6 layouts: use meta.infix in standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1274
diff changeset
116 branch_path += self.meta.infix
ca771cbf69c6 layouts: use meta.infix in standard
Sean Farley <sean.michael.farley@gmail.com>
parents: 1274
diff changeset
117 local_path = local_path[len(self.meta.infix):]
1093
791382a21cc4 layouts: add support for configuring branches directory
David Schleimer <dschleimer@fb.com>
parents: 1090
diff changeset
118 return branch_path, local_path
791382a21cc4 layouts: add support for configuring branches directory
David Schleimer <dschleimer@fb.com>
parents: 1090
diff changeset
119
791382a21cc4 layouts: add support for configuring branches directory
David Schleimer <dschleimer@fb.com>
parents: 1090
diff changeset
120 components = path.split('/')
791382a21cc4 layouts: add support for configuring branches directory
David Schleimer <dschleimer@fb.com>
parents: 1090
diff changeset
121 return '/'.join(components[:-1]), components[-1]