##// END OF EJS Templates
convert.monotone: fix quotes and backslashes in change descriptions.
David Reiss -
r6632:aa3f6188 default
parent child Browse files
Show More
@@ -1,198 +1,201 b''
1 # monotone support for the convert extension
1 # monotone support for the convert extension
2
2
3 import os, re, time
3 import os, re, time
4 from mercurial import util
4 from mercurial import util
5 from common import NoRepo, MissingTool, commit, converter_source, checktool
5 from common import NoRepo, MissingTool, commit, converter_source, checktool
6 from common import commandline
6 from common import commandline
7 from mercurial.i18n import _
7 from mercurial.i18n import _
8
8
9 class monotone_source(converter_source, commandline):
9 class monotone_source(converter_source, commandline):
10 def __init__(self, ui, path=None, rev=None):
10 def __init__(self, ui, path=None, rev=None):
11 converter_source.__init__(self, ui, path, rev)
11 converter_source.__init__(self, ui, path, rev)
12 commandline.__init__(self, ui, 'mtn')
12 commandline.__init__(self, ui, 'mtn')
13
13
14 self.ui = ui
14 self.ui = ui
15 self.path = path
15 self.path = path
16
16
17 # regular expressions for parsing monotone output
17 # regular expressions for parsing monotone output
18 space = r'\s*'
18 space = r'\s*'
19 name = r'\s+"((?:[^"]|\\")*)"\s*'
19 name = r'\s+"((?:\\"|[^"])*)"\s*'
20 value = name
20 value = name
21 revision = r'\s+\[(\w+)\]\s*'
21 revision = r'\s+\[(\w+)\]\s*'
22 lines = r'(?:.|\n)+'
22 lines = r'(?:.|\n)+'
23
23
24 self.dir_re = re.compile(space + "dir" + name)
24 self.dir_re = re.compile(space + "dir" + name)
25 self.file_re = re.compile(space + "file" + name + "content" + revision)
25 self.file_re = re.compile(space + "file" + name + "content" + revision)
26 self.add_file_re = re.compile(space + "add_file" + name + "content" + revision)
26 self.add_file_re = re.compile(space + "add_file" + name + "content" + revision)
27 self.patch_re = re.compile(space + "patch" + name + "from" + revision + "to" + revision)
27 self.patch_re = re.compile(space + "patch" + name + "from" + revision + "to" + revision)
28 self.rename_re = re.compile(space + "rename" + name + "to" + name)
28 self.rename_re = re.compile(space + "rename" + name + "to" + name)
29 self.delete_re = re.compile(space + "delete" + name)
29 self.delete_re = re.compile(space + "delete" + name)
30 self.tag_re = re.compile(space + "tag" + name + "revision" + revision)
30 self.tag_re = re.compile(space + "tag" + name + "revision" + revision)
31 self.cert_re = re.compile(lines + space + "name" + name + "value" + value)
31 self.cert_re = re.compile(lines + space + "name" + name + "value" + value)
32
32
33 attr = space + "file" + lines + space + "attr" + space
33 attr = space + "file" + lines + space + "attr" + space
34 self.attr_execute_re = re.compile(attr + '"mtn:execute"' + space + '"true"')
34 self.attr_execute_re = re.compile(attr + '"mtn:execute"' + space + '"true"')
35
35
36 # cached data
36 # cached data
37 self.manifest_rev = None
37 self.manifest_rev = None
38 self.manifest = None
38 self.manifest = None
39 self.files = None
39 self.files = None
40 self.dirs = None
40 self.dirs = None
41
41
42 norepo = NoRepo (_("%s does not look like a monotone repo") % path)
42 norepo = NoRepo (_("%s does not look like a monotone repo") % path)
43 if not os.path.exists(path):
43 if not os.path.exists(path):
44 raise norepo
44 raise norepo
45
45
46 checktool('mtn', abort=False)
46 checktool('mtn', abort=False)
47
47
48 # test if there are any revisions
48 # test if there are any revisions
49 self.rev = None
49 self.rev = None
50 try:
50 try:
51 self.getheads()
51 self.getheads()
52 except:
52 except:
53 raise norepo
53 raise norepo
54 self.rev = rev
54 self.rev = rev
55
55
56 def mtnrun(self, *args, **kwargs):
56 def mtnrun(self, *args, **kwargs):
57 kwargs['d'] = self.path
57 kwargs['d'] = self.path
58 return self.run0('automate', *args, **kwargs)
58 return self.run0('automate', *args, **kwargs)
59
59
60 def mtnloadmanifest(self, rev):
60 def mtnloadmanifest(self, rev):
61 if self.manifest_rev == rev:
61 if self.manifest_rev == rev:
62 return
62 return
63 self.manifest = self.mtnrun("get_manifest_of", rev).split("\n\n")
63 self.manifest = self.mtnrun("get_manifest_of", rev).split("\n\n")
64 self.manifest_rev = rev
64 self.manifest_rev = rev
65 self.files = {}
65 self.files = {}
66 self.dirs = {}
66 self.dirs = {}
67
67
68 for e in self.manifest:
68 for e in self.manifest:
69 m = self.file_re.match(e)
69 m = self.file_re.match(e)
70 if m:
70 if m:
71 attr = ""
71 attr = ""
72 name = m.group(1)
72 name = m.group(1)
73 node = m.group(2)
73 node = m.group(2)
74 if self.attr_execute_re.match(e):
74 if self.attr_execute_re.match(e):
75 attr += "x"
75 attr += "x"
76 self.files[name] = (node, attr)
76 self.files[name] = (node, attr)
77 m = self.dir_re.match(e)
77 m = self.dir_re.match(e)
78 if m:
78 if m:
79 self.dirs[m.group(1)] = True
79 self.dirs[m.group(1)] = True
80
80
81 def mtnisfile(self, name, rev):
81 def mtnisfile(self, name, rev):
82 # a non-file could be a directory or a deleted or renamed file
82 # a non-file could be a directory or a deleted or renamed file
83 self.mtnloadmanifest(rev)
83 self.mtnloadmanifest(rev)
84 try:
84 try:
85 self.files[name]
85 self.files[name]
86 return True
86 return True
87 except KeyError:
87 except KeyError:
88 return False
88 return False
89
89
90 def mtnisdir(self, name, rev):
90 def mtnisdir(self, name, rev):
91 self.mtnloadmanifest(rev)
91 self.mtnloadmanifest(rev)
92 try:
92 try:
93 self.dirs[name]
93 self.dirs[name]
94 return True
94 return True
95 except KeyError:
95 except KeyError:
96 return False
96 return False
97
97
98 def mtngetcerts(self, rev):
98 def mtngetcerts(self, rev):
99 certs = {"author":"<missing>", "date":"<missing>",
99 certs = {"author":"<missing>", "date":"<missing>",
100 "changelog":"<missing>", "branch":"<missing>"}
100 "changelog":"<missing>", "branch":"<missing>"}
101 cert_list = self.mtnrun("certs", rev).split("\n\n")
101 cert_list = self.mtnrun("certs", rev).split('\n\n key "')
102 for e in cert_list:
102 for e in cert_list:
103 m = self.cert_re.match(e)
103 m = self.cert_re.match(e)
104 if m:
104 if m:
105 certs[m.group(1)] = m.group(2)
105 name, value = m.groups()
106 value = value.replace(r'\"', '"')
107 value = value.replace(r'\\', '\\')
108 certs[name] = value
106 return certs
109 return certs
107
110
108 def mtnrenamefiles(self, files, fromdir, todir):
111 def mtnrenamefiles(self, files, fromdir, todir):
109 renamed = {}
112 renamed = {}
110 for tofile in files:
113 for tofile in files:
111 suffix = tofile.lstrip(todir)
114 suffix = tofile.lstrip(todir)
112 if todir + suffix == tofile:
115 if todir + suffix == tofile:
113 renamed[tofile] = (fromdir + suffix).lstrip("/")
116 renamed[tofile] = (fromdir + suffix).lstrip("/")
114 return renamed
117 return renamed
115
118
116
119
117 # implement the converter_source interface:
120 # implement the converter_source interface:
118
121
119 def getheads(self):
122 def getheads(self):
120 if not self.rev:
123 if not self.rev:
121 return self.mtnrun("leaves").splitlines()
124 return self.mtnrun("leaves").splitlines()
122 else:
125 else:
123 return [self.rev]
126 return [self.rev]
124
127
125 def getchanges(self, rev):
128 def getchanges(self, rev):
126 #revision = self.mtncmd("get_revision %s" % rev).split("\n\n")
129 #revision = self.mtncmd("get_revision %s" % rev).split("\n\n")
127 revision = self.mtnrun("get_revision", rev).split("\n\n")
130 revision = self.mtnrun("get_revision", rev).split("\n\n")
128 files = {}
131 files = {}
129 copies = {}
132 copies = {}
130 for e in revision:
133 for e in revision:
131 m = self.add_file_re.match(e)
134 m = self.add_file_re.match(e)
132 if m:
135 if m:
133 files[m.group(1)] = rev
136 files[m.group(1)] = rev
134 m = self.patch_re.match(e)
137 m = self.patch_re.match(e)
135 if m:
138 if m:
136 files[m.group(1)] = rev
139 files[m.group(1)] = rev
137
140
138 # Delete/rename is handled later when the convert engine
141 # Delete/rename is handled later when the convert engine
139 # discovers an IOError exception from getfile,
142 # discovers an IOError exception from getfile,
140 # but only if we add the "from" file to the list of changes.
143 # but only if we add the "from" file to the list of changes.
141 m = self.delete_re.match(e)
144 m = self.delete_re.match(e)
142 if m:
145 if m:
143 files[m.group(1)] = rev
146 files[m.group(1)] = rev
144 m = self.rename_re.match(e)
147 m = self.rename_re.match(e)
145 if m:
148 if m:
146 toname = m.group(2)
149 toname = m.group(2)
147 fromname = m.group(1)
150 fromname = m.group(1)
148 if self.mtnisfile(toname, rev):
151 if self.mtnisfile(toname, rev):
149 copies[toname] = fromname
152 copies[toname] = fromname
150 files[toname] = rev
153 files[toname] = rev
151 files[fromname] = rev
154 files[fromname] = rev
152 if self.mtnisdir(toname, rev):
155 if self.mtnisdir(toname, rev):
153 renamed = self.mtnrenamefiles(self.files, fromname, toname)
156 renamed = self.mtnrenamefiles(self.files, fromname, toname)
154 for tofile, fromfile in renamed.items():
157 for tofile, fromfile in renamed.items():
155 self.ui.debug (_("copying file in renamed dir from '%s' to '%s'") % (fromfile, tofile), '\n')
158 self.ui.debug (_("copying file in renamed dir from '%s' to '%s'") % (fromfile, tofile), '\n')
156 files[tofile] = rev
159 files[tofile] = rev
157 for fromfile in renamed.values():
160 for fromfile in renamed.values():
158 files[fromfile] = rev
161 files[fromfile] = rev
159 return (files.items(), copies)
162 return (files.items(), copies)
160
163
161 def getmode(self, name, rev):
164 def getmode(self, name, rev):
162 self.mtnloadmanifest(rev)
165 self.mtnloadmanifest(rev)
163 try:
166 try:
164 node, attr = self.files[name]
167 node, attr = self.files[name]
165 return attr
168 return attr
166 except KeyError:
169 except KeyError:
167 return ""
170 return ""
168
171
169 def getfile(self, name, rev):
172 def getfile(self, name, rev):
170 if not self.mtnisfile(name, rev):
173 if not self.mtnisfile(name, rev):
171 raise IOError() # file was deleted or renamed
174 raise IOError() # file was deleted or renamed
172 try:
175 try:
173 return self.mtnrun("get_file_of", name, r=rev)
176 return self.mtnrun("get_file_of", name, r=rev)
174 except:
177 except:
175 raise IOError() # file was deleted or renamed
178 raise IOError() # file was deleted or renamed
176
179
177 def getcommit(self, rev):
180 def getcommit(self, rev):
178 certs = self.mtngetcerts(rev)
181 certs = self.mtngetcerts(rev)
179 return commit(
182 return commit(
180 author=certs["author"],
183 author=certs["author"],
181 date=util.datestr(util.strdate(certs["date"], "%Y-%m-%dT%H:%M:%S")),
184 date=util.datestr(util.strdate(certs["date"], "%Y-%m-%dT%H:%M:%S")),
182 desc=certs["changelog"],
185 desc=certs["changelog"],
183 rev=rev,
186 rev=rev,
184 parents=self.mtnrun("parents", rev).splitlines(),
187 parents=self.mtnrun("parents", rev).splitlines(),
185 branch=certs["branch"])
188 branch=certs["branch"])
186
189
187 def gettags(self):
190 def gettags(self):
188 tags = {}
191 tags = {}
189 for e in self.mtnrun("tags").split("\n\n"):
192 for e in self.mtnrun("tags").split("\n\n"):
190 m = self.tag_re.match(e)
193 m = self.tag_re.match(e)
191 if m:
194 if m:
192 tags[m.group(1)] = m.group(2)
195 tags[m.group(1)] = m.group(2)
193 return tags
196 return tags
194
197
195 def getchangedfiles(self, rev, i):
198 def getchangedfiles(self, rev, i):
196 # This function is only needed to support --filemap
199 # This function is only needed to support --filemap
197 # ... and we don't support that
200 # ... and we don't support that
198 raise NotImplementedError()
201 raise NotImplementedError()
General Comments 0
You need to be logged in to leave comments. Login now