##// END OF EJS Templates
convert: ignore case changes in vieworder for Perforce...
Eugene Baranov -
r25776:809c3e4a default
parent child Browse files
Show More
@@ -1,270 +1,270 b''
1 # Perforce source for convert extension.
1 # Perforce source for convert extension.
2 #
2 #
3 # Copyright 2009, Frank Kingswood <frank@kingswood-consulting.co.uk>
3 # Copyright 2009, Frank Kingswood <frank@kingswood-consulting.co.uk>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from mercurial import util
8 from mercurial import util
9 from mercurial.i18n import _
9 from mercurial.i18n import _
10
10
11 from common import commit, converter_source, checktool, NoRepo
11 from common import commit, converter_source, checktool, NoRepo
12 import marshal
12 import marshal
13 import re
13 import re
14
14
15 def loaditer(f):
15 def loaditer(f):
16 "Yield the dictionary objects generated by p4"
16 "Yield the dictionary objects generated by p4"
17 try:
17 try:
18 while True:
18 while True:
19 d = marshal.load(f)
19 d = marshal.load(f)
20 if not d:
20 if not d:
21 break
21 break
22 yield d
22 yield d
23 except EOFError:
23 except EOFError:
24 pass
24 pass
25
25
26 class p4_source(converter_source):
26 class p4_source(converter_source):
27 def __init__(self, ui, path, revs=None):
27 def __init__(self, ui, path, revs=None):
28 super(p4_source, self).__init__(ui, path, revs=revs)
28 super(p4_source, self).__init__(ui, path, revs=revs)
29
29
30 if "/" in path and not path.startswith('//'):
30 if "/" in path and not path.startswith('//'):
31 raise NoRepo(_('%s does not look like a P4 repository') % path)
31 raise NoRepo(_('%s does not look like a P4 repository') % path)
32
32
33 checktool('p4', abort=False)
33 checktool('p4', abort=False)
34
34
35 self.p4changes = {}
35 self.p4changes = {}
36 self.heads = {}
36 self.heads = {}
37 self.changeset = {}
37 self.changeset = {}
38 self.files = {}
38 self.files = {}
39 self.copies = {}
39 self.copies = {}
40 self.tags = {}
40 self.tags = {}
41 self.lastbranch = {}
41 self.lastbranch = {}
42 self.parent = {}
42 self.parent = {}
43 self.encoding = "latin_1"
43 self.encoding = "latin_1"
44 self.depotname = {} # mapping from local name to depot name
44 self.depotname = {} # mapping from local name to depot name
45 self.localname = {} # mapping from depot name to local name
45 self.localname = {} # mapping from depot name to local name
46 self.re_type = re.compile(
46 self.re_type = re.compile(
47 "([a-z]+)?(text|binary|symlink|apple|resource|unicode|utf\d+)"
47 "([a-z]+)?(text|binary|symlink|apple|resource|unicode|utf\d+)"
48 "(\+\w+)?$")
48 "(\+\w+)?$")
49 self.re_keywords = re.compile(
49 self.re_keywords = re.compile(
50 r"\$(Id|Header|Date|DateTime|Change|File|Revision|Author)"
50 r"\$(Id|Header|Date|DateTime|Change|File|Revision|Author)"
51 r":[^$\n]*\$")
51 r":[^$\n]*\$")
52 self.re_keywords_old = re.compile("\$(Id|Header):[^$\n]*\$")
52 self.re_keywords_old = re.compile("\$(Id|Header):[^$\n]*\$")
53
53
54 if revs and len(revs) > 1:
54 if revs and len(revs) > 1:
55 raise util.Abort(_("p4 source does not support specifying "
55 raise util.Abort(_("p4 source does not support specifying "
56 "multiple revisions"))
56 "multiple revisions"))
57 self._parse(ui, path)
57 self._parse(ui, path)
58
58
59 def _parse_view(self, path):
59 def _parse_view(self, path):
60 "Read changes affecting the path"
60 "Read changes affecting the path"
61 cmd = 'p4 -G changes -s submitted %s' % util.shellquote(path)
61 cmd = 'p4 -G changes -s submitted %s' % util.shellquote(path)
62 stdout = util.popen(cmd, mode='rb')
62 stdout = util.popen(cmd, mode='rb')
63 for d in loaditer(stdout):
63 for d in loaditer(stdout):
64 c = d.get("change", None)
64 c = d.get("change", None)
65 if c:
65 if c:
66 self.p4changes[c] = True
66 self.p4changes[c] = True
67
67
68 def _parse(self, ui, path):
68 def _parse(self, ui, path):
69 "Prepare list of P4 filenames and revisions to import"
69 "Prepare list of P4 filenames and revisions to import"
70 ui.status(_('reading p4 views\n'))
70 ui.status(_('reading p4 views\n'))
71
71
72 # read client spec or view
72 # read client spec or view
73 if "/" in path:
73 if "/" in path:
74 self._parse_view(path)
74 self._parse_view(path)
75 if path.startswith("//") and path.endswith("/..."):
75 if path.startswith("//") and path.endswith("/..."):
76 views = {path[:-3]:""}
76 views = {path[:-3]:""}
77 else:
77 else:
78 views = {"//": ""}
78 views = {"//": ""}
79 else:
79 else:
80 cmd = 'p4 -G client -o %s' % util.shellquote(path)
80 cmd = 'p4 -G client -o %s' % util.shellquote(path)
81 clientspec = marshal.load(util.popen(cmd, mode='rb'))
81 clientspec = marshal.load(util.popen(cmd, mode='rb'))
82
82
83 views = {}
83 views = {}
84 for client in clientspec:
84 for client in clientspec:
85 if client.startswith("View"):
85 if client.startswith("View"):
86 sview, cview = clientspec[client].split()
86 sview, cview = clientspec[client].split()
87 self._parse_view(sview)
87 self._parse_view(sview)
88 if sview.endswith("...") and cview.endswith("..."):
88 if sview.endswith("...") and cview.endswith("..."):
89 sview = sview[:-3]
89 sview = sview[:-3]
90 cview = cview[:-3]
90 cview = cview[:-3]
91 cview = cview[2:]
91 cview = cview[2:]
92 cview = cview[cview.find("/") + 1:]
92 cview = cview[cview.find("/") + 1:]
93 views[sview] = cview
93 views[sview] = cview
94
94
95 # list of changes that affect our source files
95 # list of changes that affect our source files
96 self.p4changes = self.p4changes.keys()
96 self.p4changes = self.p4changes.keys()
97 self.p4changes.sort(key=int)
97 self.p4changes.sort(key=int)
98
98
99 # list with depot pathnames, longest first
99 # list with depot pathnames, longest first
100 vieworder = views.keys()
100 vieworder = views.keys()
101 vieworder.sort(key=len, reverse=True)
101 vieworder.sort(key=len, reverse=True)
102
102
103 # handle revision limiting
103 # handle revision limiting
104 startrev = self.ui.config('convert', 'p4.startrev', default=0)
104 startrev = self.ui.config('convert', 'p4.startrev', default=0)
105 self.p4changes = [x for x in self.p4changes
105 self.p4changes = [x for x in self.p4changes
106 if ((not startrev or int(x) >= int(startrev)) and
106 if ((not startrev or int(x) >= int(startrev)) and
107 (not self.revs or int(x) <= int(self.revs[0])))]
107 (not self.revs or int(x) <= int(self.revs[0])))]
108
108
109 # now read the full changelists to get the list of file revisions
109 # now read the full changelists to get the list of file revisions
110 ui.status(_('collecting p4 changelists\n'))
110 ui.status(_('collecting p4 changelists\n'))
111 lastid = None
111 lastid = None
112 for change in self.p4changes:
112 for change in self.p4changes:
113 cmd = "p4 -G describe -s %s" % change
113 cmd = "p4 -G describe -s %s" % change
114 stdout = util.popen(cmd, mode='rb')
114 stdout = util.popen(cmd, mode='rb')
115 d = marshal.load(stdout)
115 d = marshal.load(stdout)
116 desc = self.recode(d.get("desc", ""))
116 desc = self.recode(d.get("desc", ""))
117 shortdesc = desc.split("\n", 1)[0]
117 shortdesc = desc.split("\n", 1)[0]
118 t = '%s %s' % (d["change"], repr(shortdesc)[1:-1])
118 t = '%s %s' % (d["change"], repr(shortdesc)[1:-1])
119 ui.status(util.ellipsis(t, 80) + '\n')
119 ui.status(util.ellipsis(t, 80) + '\n')
120
120
121 if lastid:
121 if lastid:
122 parents = [lastid]
122 parents = [lastid]
123 else:
123 else:
124 parents = []
124 parents = []
125
125
126 date = (int(d["time"]), 0) # timezone not set
126 date = (int(d["time"]), 0) # timezone not set
127 c = commit(author=self.recode(d["user"]),
127 c = commit(author=self.recode(d["user"]),
128 date=util.datestr(date, '%Y-%m-%d %H:%M:%S %1%2'),
128 date=util.datestr(date, '%Y-%m-%d %H:%M:%S %1%2'),
129 parents=parents, desc=desc, branch='',
129 parents=parents, desc=desc, branch='',
130 extra={"p4": change})
130 extra={"p4": change})
131
131
132 files = []
132 files = []
133 copies = {}
133 copies = {}
134 copiedfiles = []
134 copiedfiles = []
135 i = 0
135 i = 0
136 while ("depotFile%d" % i) in d and ("rev%d" % i) in d:
136 while ("depotFile%d" % i) in d and ("rev%d" % i) in d:
137 oldname = d["depotFile%d" % i]
137 oldname = d["depotFile%d" % i]
138 filename = None
138 filename = None
139 for v in vieworder:
139 for v in vieworder:
140 if oldname.startswith(v):
140 if oldname.lower().startswith(v.lower()):
141 filename = views[v] + oldname[len(v):]
141 filename = views[v] + oldname[len(v):]
142 break
142 break
143 if filename:
143 if filename:
144 files.append((filename, d["rev%d" % i]))
144 files.append((filename, d["rev%d" % i]))
145 self.depotname[filename] = oldname
145 self.depotname[filename] = oldname
146 if (d.get("action%d" % i) == "move/add"):
146 if (d.get("action%d" % i) == "move/add"):
147 copiedfiles.append(filename)
147 copiedfiles.append(filename)
148 self.localname[oldname] = filename
148 self.localname[oldname] = filename
149 i += 1
149 i += 1
150
150
151 # Collect information about copied files
151 # Collect information about copied files
152 for filename in copiedfiles:
152 for filename in copiedfiles:
153 oldname = self.depotname[filename]
153 oldname = self.depotname[filename]
154
154
155 flcmd = 'p4 -G filelog %s' \
155 flcmd = 'p4 -G filelog %s' \
156 % util.shellquote(oldname)
156 % util.shellquote(oldname)
157 flstdout = util.popen(flcmd, mode='rb')
157 flstdout = util.popen(flcmd, mode='rb')
158
158
159 copiedfilename = None
159 copiedfilename = None
160 for d in loaditer(flstdout):
160 for d in loaditer(flstdout):
161 copiedoldname = None
161 copiedoldname = None
162
162
163 i = 0
163 i = 0
164 while ("change%d" % i) in d:
164 while ("change%d" % i) in d:
165 if (d["change%d" % i] == change and
165 if (d["change%d" % i] == change and
166 d["action%d" % i] == "move/add"):
166 d["action%d" % i] == "move/add"):
167 j = 0
167 j = 0
168 while ("file%d,%d" % (i, j)) in d:
168 while ("file%d,%d" % (i, j)) in d:
169 if d["how%d,%d" % (i, j)] == "moved from":
169 if d["how%d,%d" % (i, j)] == "moved from":
170 copiedoldname = d["file%d,%d" % (i, j)]
170 copiedoldname = d["file%d,%d" % (i, j)]
171 break
171 break
172 j += 1
172 j += 1
173 i += 1
173 i += 1
174
174
175 if copiedoldname and copiedoldname in self.localname:
175 if copiedoldname and copiedoldname in self.localname:
176 copiedfilename = self.localname[copiedoldname]
176 copiedfilename = self.localname[copiedoldname]
177 break
177 break
178
178
179 if copiedfilename:
179 if copiedfilename:
180 copies[filename] = copiedfilename
180 copies[filename] = copiedfilename
181 else:
181 else:
182 ui.warn(_("cannot find source for copied file: %s@%s\n")
182 ui.warn(_("cannot find source for copied file: %s@%s\n")
183 % (filename, change))
183 % (filename, change))
184
184
185 self.changeset[change] = c
185 self.changeset[change] = c
186 self.files[change] = files
186 self.files[change] = files
187 self.copies[change] = copies
187 self.copies[change] = copies
188 lastid = change
188 lastid = change
189
189
190 if lastid:
190 if lastid:
191 self.heads = [lastid]
191 self.heads = [lastid]
192
192
193 def getheads(self):
193 def getheads(self):
194 return self.heads
194 return self.heads
195
195
196 def getfile(self, name, rev):
196 def getfile(self, name, rev):
197 cmd = 'p4 -G print %s' \
197 cmd = 'p4 -G print %s' \
198 % util.shellquote("%s#%s" % (self.depotname[name], rev))
198 % util.shellquote("%s#%s" % (self.depotname[name], rev))
199
199
200 lasterror = None
200 lasterror = None
201 while True:
201 while True:
202 stdout = util.popen(cmd, mode='rb')
202 stdout = util.popen(cmd, mode='rb')
203
203
204 mode = None
204 mode = None
205 contents = ""
205 contents = ""
206 keywords = None
206 keywords = None
207
207
208 for d in loaditer(stdout):
208 for d in loaditer(stdout):
209 code = d["code"]
209 code = d["code"]
210 data = d.get("data")
210 data = d.get("data")
211
211
212 if code == "error":
212 if code == "error":
213 # if this is the first time error happened
213 # if this is the first time error happened
214 # re-attempt getting the file
214 # re-attempt getting the file
215 if not lasterror:
215 if not lasterror:
216 lasterror = IOError(d["generic"], data)
216 lasterror = IOError(d["generic"], data)
217 # this will exit inner-most for-loop
217 # this will exit inner-most for-loop
218 break
218 break
219 else:
219 else:
220 raise lasterror
220 raise lasterror
221
221
222 elif code == "stat":
222 elif code == "stat":
223 action = d.get("action")
223 action = d.get("action")
224 if action in ["purge", "delete", "move/delete"]:
224 if action in ["purge", "delete", "move/delete"]:
225 return None, None
225 return None, None
226 p4type = self.re_type.match(d["type"])
226 p4type = self.re_type.match(d["type"])
227 if p4type:
227 if p4type:
228 mode = ""
228 mode = ""
229 flags = ((p4type.group(1) or "")
229 flags = ((p4type.group(1) or "")
230 + (p4type.group(3) or ""))
230 + (p4type.group(3) or ""))
231 if "x" in flags:
231 if "x" in flags:
232 mode = "x"
232 mode = "x"
233 if p4type.group(2) == "symlink":
233 if p4type.group(2) == "symlink":
234 mode = "l"
234 mode = "l"
235 if "ko" in flags:
235 if "ko" in flags:
236 keywords = self.re_keywords_old
236 keywords = self.re_keywords_old
237 elif "k" in flags:
237 elif "k" in flags:
238 keywords = self.re_keywords
238 keywords = self.re_keywords
239
239
240 elif code == "text" or code == "binary":
240 elif code == "text" or code == "binary":
241 contents += data
241 contents += data
242
242
243 lasterror = None
243 lasterror = None
244
244
245 if not lasterror:
245 if not lasterror:
246 break
246 break
247
247
248 if mode is None:
248 if mode is None:
249 return None, None
249 return None, None
250
250
251 if keywords:
251 if keywords:
252 contents = keywords.sub("$\\1$", contents)
252 contents = keywords.sub("$\\1$", contents)
253 if mode == "l" and contents.endswith("\n"):
253 if mode == "l" and contents.endswith("\n"):
254 contents = contents[:-1]
254 contents = contents[:-1]
255
255
256 return contents, mode
256 return contents, mode
257
257
258 def getchanges(self, rev, full):
258 def getchanges(self, rev, full):
259 if full:
259 if full:
260 raise util.Abort(_("convert from p4 do not support --full"))
260 raise util.Abort(_("convert from p4 do not support --full"))
261 return self.files[rev], self.copies[rev], set()
261 return self.files[rev], self.copies[rev], set()
262
262
263 def getcommit(self, rev):
263 def getcommit(self, rev):
264 return self.changeset[rev]
264 return self.changeset[rev]
265
265
266 def gettags(self):
266 def gettags(self):
267 return self.tags
267 return self.tags
268
268
269 def getchangedfiles(self, rev, i):
269 def getchangedfiles(self, rev, i):
270 return sorted([x[0] for x in self.files[rev]])
270 return sorted([x[0] for x in self.files[rev]])
General Comments 0
You need to be logged in to leave comments. Login now