Show More
@@ -74,7 +74,7 b' class Imerge(object):' | |||||
74 |
|
74 | |||
75 | status = statusfile.read().split('\0') |
|
75 | status = statusfile.read().split('\0') | |
76 | if len(status) < 3: |
|
76 | if len(status) < 3: | |
77 | raise util.Abort('invalid imerge status file') |
|
77 | raise util.Abort(_('invalid imerge status file')) | |
78 |
|
78 | |||
79 | try: |
|
79 | try: | |
80 | parents = [self.repo.changectx(n) for n in status[:2]] |
|
80 | parents = [self.repo.changectx(n) for n in status[:2]] | |
@@ -154,7 +154,7 b' class Imerge(object):' | |||||
154 | dp = self.repo.dirstate.parents() |
|
154 | dp = self.repo.dirstate.parents() | |
155 | p1, p2 = self.wctx.parents() |
|
155 | p1, p2 = self.wctx.parents() | |
156 | if p1.node() != dp[0] or p2.node() != dp[1]: |
|
156 | if p1.node() != dp[0] or p2.node() != dp[1]: | |
157 | raise util.Abort('imerge state does not match working directory') |
|
157 | raise util.Abort(_('imerge state does not match working directory')) | |
158 |
|
158 | |||
159 | def next(self): |
|
159 | def next(self): | |
160 | remaining = self.remaining() |
|
160 | remaining = self.remaining() | |
@@ -164,7 +164,7 b' class Imerge(object):' | |||||
164 | resolved = dict.fromkeys(self.resolved) |
|
164 | resolved = dict.fromkeys(self.resolved) | |
165 | for fn in files: |
|
165 | for fn in files: | |
166 | if fn not in self.conflicts: |
|
166 | if fn not in self.conflicts: | |
167 | raise util.Abort('%s is not in the merge set' % fn) |
|
167 | raise util.Abort(_('%s is not in the merge set') % fn) | |
168 | resolved[fn] = True |
|
168 | resolved[fn] = True | |
169 | self.resolved = resolved.keys() |
|
169 | self.resolved = resolved.keys() | |
170 | self.resolved.sort() |
|
170 | self.resolved.sort() | |
@@ -175,7 +175,7 b' class Imerge(object):' | |||||
175 | resolved = dict.fromkeys(self.resolved) |
|
175 | resolved = dict.fromkeys(self.resolved) | |
176 | for fn in files: |
|
176 | for fn in files: | |
177 | if fn not in resolved: |
|
177 | if fn not in resolved: | |
178 | raise util.Abort('%s is not resolved' % fn) |
|
178 | raise util.Abort(_('%s is not resolved') % fn) | |
179 | del resolved[fn] |
|
179 | del resolved[fn] | |
180 | self.resolved = resolved.keys() |
|
180 | self.resolved = resolved.keys() | |
181 | self.resolved.sort() |
|
181 | self.resolved.sort() | |
@@ -194,11 +194,11 b' class Imerge(object):' | |||||
194 |
|
194 | |||
195 | def load(im, source): |
|
195 | def load(im, source): | |
196 | if im.merging(): |
|
196 | if im.merging(): | |
197 | raise util.Abort('there is already a merge in progress ' |
|
197 | raise util.Abort(_('there is already a merge in progress ' | |
198 |
'(update -C <rev> to abort it)' |
|
198 | '(update -C <rev> to abort it)')) | |
199 | m, a, r, d = im.repo.status()[:4] |
|
199 | m, a, r, d = im.repo.status()[:4] | |
200 | if m or a or r or d: |
|
200 | if m or a or r or d: | |
201 | raise util.Abort('working directory has uncommitted changes') |
|
201 | raise util.Abort(_('working directory has uncommitted changes')) | |
202 |
|
202 | |||
203 | rc = im.unpickle(source) |
|
203 | rc = im.unpickle(source) | |
204 | if not rc: |
|
204 | if not rc: | |
@@ -243,7 +243,7 b' def next(im):' | |||||
243 |
|
243 | |||
244 | def resolve(im, *files): |
|
244 | def resolve(im, *files): | |
245 | if not files: |
|
245 | if not files: | |
246 | raise util.Abort('resolve requires at least one filename') |
|
246 | raise util.Abort(_('resolve requires at least one filename')) | |
247 | return im.resolve(files) |
|
247 | return im.resolve(files) | |
248 |
|
248 | |||
249 | def save(im, dest): |
|
249 | def save(im, dest): | |
@@ -286,7 +286,7 b' def status(im, **opts):' | |||||
286 |
|
286 | |||
287 | def unresolve(im, *files): |
|
287 | def unresolve(im, *files): | |
288 | if not files: |
|
288 | if not files: | |
289 | raise util.Abort('unresolve requires at least one filename') |
|
289 | raise util.Abort(_('unresolve requires at least one filename')) | |
290 | return im.unresolve(files) |
|
290 | return im.unresolve(files) | |
291 |
|
291 | |||
292 | subcmdtable = { |
|
292 | subcmdtable = { | |
@@ -380,7 +380,7 b' def imerge(ui, repo, *args, **opts):' | |||||
380 | else: |
|
380 | else: | |
381 | rev = opts.get('rev') |
|
381 | rev = opts.get('rev') | |
382 | if rev and args: |
|
382 | if rev and args: | |
383 | raise util.Abort('please specify just one revision') |
|
383 | raise util.Abort(_('please specify just one revision')) | |
384 |
|
384 | |||
385 | if len(args) == 2 and args[0] == 'load': |
|
385 | if len(args) == 2 and args[0] == 'load': | |
386 | pass |
|
386 | pass |
General Comments 0
You need to be logged in to leave comments.
Login now