Show More
@@ -52,8 +52,8 b' def convertsource(ui, path, type, rev):' | |||||
52 | exceptions.append(inst) |
|
52 | exceptions.append(inst) | |
53 | if not ui.quiet: |
|
53 | if not ui.quiet: | |
54 | for inst in exceptions: |
|
54 | for inst in exceptions: | |
55 |
ui.write( |
|
55 | ui.write("%s\n" % inst) | |
56 | raise util.Abort('%s: unknown repository type' % path) |
|
56 | raise util.Abort(_('%s: unknown repository type') % path) | |
57 |
|
57 | |||
58 | def convertsink(ui, path, type): |
|
58 | def convertsink(ui, path, type): | |
59 | for name, sink in sink_converters: |
|
59 | for name, sink in sink_converters: | |
@@ -62,7 +62,7 b' def convertsink(ui, path, type):' | |||||
62 | return sink(ui, path) |
|
62 | return sink(ui, path) | |
63 | except NoRepo, inst: |
|
63 | except NoRepo, inst: | |
64 | ui.note(_("convert: %s\n") % inst) |
|
64 | ui.note(_("convert: %s\n") % inst) | |
65 | raise util.Abort('%s: unknown repository type' % path) |
|
65 | raise util.Abort(_('%s: unknown repository type') % path) | |
66 |
|
66 | |||
67 | class converter(object): |
|
67 | class converter(object): | |
68 | def __init__(self, ui, source, dest, revmapfile, opts): |
|
68 | def __init__(self, ui, source, dest, revmapfile, opts): | |
@@ -274,7 +274,7 b' class converter(object):' | |||||
274 | # tolocal() because util._encoding conver() use it as |
|
274 | # tolocal() because util._encoding conver() use it as | |
275 | # 'utf-8' |
|
275 | # 'utf-8' | |
276 | self.ui.status("%d %s\n" % (num, recode(desc))) |
|
276 | self.ui.status("%d %s\n" % (num, recode(desc))) | |
277 |
self.ui.note(_("source: %s\n" % recode(c)) |
|
277 | self.ui.note(_("source: %s\n") % recode(c)) | |
278 | self.copy(c) |
|
278 | self.copy(c) | |
279 |
|
279 | |||
280 | tags = self.source.gettags() |
|
280 | tags = self.source.gettags() |
@@ -23,7 +23,7 b' class gnuarch_source(converter_source, c' | |||||
23 | super(gnuarch_source, self).__init__(ui, path, rev=rev) |
|
23 | super(gnuarch_source, self).__init__(ui, path, rev=rev) | |
24 |
|
24 | |||
25 | if not os.path.exists(os.path.join(path, '{arch}')): |
|
25 | if not os.path.exists(os.path.join(path, '{arch}')): | |
26 |
raise NoRepo(_("%s does not look like a GNU Arch repo" % path) |
|
26 | raise NoRepo(_("%s does not look like a GNU Arch repo") % path) | |
27 |
|
27 | |||
28 | # Could use checktool, but we want to check for baz or tla. |
|
28 | # Could use checktool, but we want to check for baz or tla. | |
29 | self.execmd = None |
|
29 | self.execmd = None | |
@@ -54,7 +54,7 b' class gnuarch_source(converter_source, c' | |||||
54 | output = self.run0('tree-version', '-d', self.path) |
|
54 | output = self.run0('tree-version', '-d', self.path) | |
55 | self.treeversion = output.strip() |
|
55 | self.treeversion = output.strip() | |
56 |
|
56 | |||
57 |
self.ui.status(_('analyzing tree version %s...\n' % self.treeversion) |
|
57 | self.ui.status(_('analyzing tree version %s...\n') % self.treeversion) | |
58 |
|
58 | |||
59 | # Get name of temporary directory |
|
59 | # Get name of temporary directory | |
60 | version = self.treeversion.split('/') |
|
60 | version = self.treeversion.split('/') | |
@@ -80,7 +80,7 b' class gnuarch_source(converter_source, c' | |||||
80 | self.parents[None] = child |
|
80 | self.parents[None] = child | |
81 |
|
81 | |||
82 | def after(self): |
|
82 | def after(self): | |
83 |
self.ui.debug(_('cleaning up %s\n' % self.tmppath) |
|
83 | self.ui.debug(_('cleaning up %s\n') % self.tmppath) | |
84 | shutil.rmtree(self.tmppath, ignore_errors=True) |
|
84 | shutil.rmtree(self.tmppath, ignore_errors=True) | |
85 |
|
85 | |||
86 | def getheads(self): |
|
86 | def getheads(self): | |
@@ -155,7 +155,7 b' class gnuarch_source(converter_source, c' | |||||
155 | # Initialise 'base-0' revision |
|
155 | # Initialise 'base-0' revision | |
156 | self._obtainrevision(rev) |
|
156 | self._obtainrevision(rev) | |
157 | else: |
|
157 | else: | |
158 |
self.ui.debug(_('applying revision %s...\n' % rev) |
|
158 | self.ui.debug(_('applying revision %s...\n') % rev) | |
159 | revision = '%s--%s' % (self.treeversion, rev) |
|
159 | revision = '%s--%s' % (self.treeversion, rev) | |
160 | changeset, status = self.runlines('replay', '-d', self.tmppath, |
|
160 | changeset, status = self.runlines('replay', '-d', self.tmppath, | |
161 | revision) |
|
161 | revision) | |
@@ -166,8 +166,8 b' class gnuarch_source(converter_source, c' | |||||
166 | self._obtainrevision(rev) |
|
166 | self._obtainrevision(rev) | |
167 | else: |
|
167 | else: | |
168 | old_rev = self.parents[rev][0] |
|
168 | old_rev = self.parents[rev][0] | |
169 |
self.ui.debug(_('computing changeset between %s and %s...\n' |
|
169 | self.ui.debug(_('computing changeset between %s and %s...\n') | |
170 |
|
|
170 | % (old_rev, rev)) | |
171 | rev_a = '%s--%s' % (self.treeversion, old_rev) |
|
171 | rev_a = '%s--%s' % (self.treeversion, old_rev) | |
172 | rev_b = '%s--%s' % (self.treeversion, rev) |
|
172 | rev_b = '%s--%s' % (self.treeversion, rev) | |
173 | self._parsechangeset(changeset, rev) |
|
173 | self._parsechangeset(changeset, rev) | |
@@ -217,11 +217,11 b' class gnuarch_source(converter_source, c' | |||||
217 | return changes, copies |
|
217 | return changes, copies | |
218 |
|
218 | |||
219 | def _obtainrevision(self, rev): |
|
219 | def _obtainrevision(self, rev): | |
220 |
self.ui.debug(_('obtaining revision %s...\n' % rev) |
|
220 | self.ui.debug(_('obtaining revision %s...\n') % rev) | |
221 | revision = '%s--%s' % (self.treeversion, rev) |
|
221 | revision = '%s--%s' % (self.treeversion, rev) | |
222 | output = self._execute('get', revision, self.tmppath) |
|
222 | output = self._execute('get', revision, self.tmppath) | |
223 | self.checkexit(output) |
|
223 | self.checkexit(output) | |
224 |
self.ui.debug(_('analysing revision %s...\n' % rev) |
|
224 | self.ui.debug(_('analysing revision %s...\n') % rev) | |
225 | files = self._readcontents(self.tmppath) |
|
225 | files = self._readcontents(self.tmppath) | |
226 | self.changes[rev].add_files += files |
|
226 | self.changes[rev].add_files += files | |
227 |
|
227 |
@@ -209,7 +209,7 b' def archive(repo, dest, node, kind, deco' | |||||
209 | archiver.addfile(name, mode, islink, data) |
|
209 | archiver.addfile(name, mode, islink, data) | |
210 |
|
210 | |||
211 | if kind not in archivers: |
|
211 | if kind not in archivers: | |
212 |
raise util.Abort(_("unknown archive type '%s'" % kind) |
|
212 | raise util.Abort(_("unknown archive type '%s'") % kind) | |
213 |
|
213 | |||
214 | ctx = repo[node] |
|
214 | ctx = repo[node] | |
215 | archiver = archivers[kind](dest, prefix, mtime or ctx.date()[0]) |
|
215 | archiver = archivers[kind](dest, prefix, mtime or ctx.date()[0]) |
@@ -172,7 +172,7 b' class hgwebdir(object):' | |||||
172 | try: |
|
172 | try: | |
173 | u.readconfig(os.path.join(path, '.hg', 'hgrc')) |
|
173 | u.readconfig(os.path.join(path, '.hg', 'hgrc')) | |
174 | except Exception, e: |
|
174 | except Exception, e: | |
175 |
u.warn(_('error reading %s/.hg/hgrc: %s\n' % (path, e)) |
|
175 | u.warn(_('error reading %s/.hg/hgrc: %s\n') % (path, e)) | |
176 | continue |
|
176 | continue | |
177 | def get(section, name, default=None): |
|
177 | def get(section, name, default=None): | |
178 | return u.config(section, name, default, untrusted=True) |
|
178 | return u.config(section, name, default, untrusted=True) |
General Comments 0
You need to be logged in to leave comments.
Login now