##// END OF EJS Templates
i18n: mark strings for translation in rebase extension
Martin Geisler -
r6964:b3239bad default
parent child Browse files
Show More
@@ -170,8 +170,8 b' def rebasenode(repo, rev, target, state,'
170 state[rev] = repo[newrev].rev()
170 state[rev] = repo[newrev].rev()
171 else:
171 else:
172 if not collapse:
172 if not collapse:
173 repo.ui.note('no changes, revision %d skipped\n' % rev)
173 repo.ui.note(_('no changes, revision %d skipped\n') % rev)
174 repo.ui.debug('next revision set to %s\n' % p1)
174 repo.ui.debug(_('next revision set to %s\n') % p1)
175 skipped[rev] = True
175 skipped[rev] = True
176 state[rev] = p1
176 state[rev] = p1
177
177
@@ -209,7 +209,7 b' def updatemq(repo, state, skipped, **opt'
209 mqrebase = {}
209 mqrebase = {}
210 for p in repo.mq.applied:
210 for p in repo.mq.applied:
211 if repo[p.rev].rev() in state:
211 if repo[p.rev].rev() in state:
212 repo.ui.debug('revision %d is an mq patch (%s), finalize it.\n' %
212 repo.ui.debug(_('revision %d is an mq patch (%s), finalize it.\n') %
213 (repo[p.rev].rev(), p.name))
213 (repo[p.rev].rev(), p.name))
214 mqrebase[repo[p.rev].rev()] = p.name
214 mqrebase[repo[p.rev].rev()] = p.name
215
215
@@ -222,8 +222,8 b' def updatemq(repo, state, skipped, **opt'
222 mq.reverse()
222 mq.reverse()
223 for rev in mq:
223 for rev in mq:
224 if rev not in skipped:
224 if rev not in skipped:
225 repo.ui.debug('import mq patch %d (%s)\n' % (state[rev],
225 repo.ui.debug(_('import mq patch %d (%s)\n')
226 mqrebase[rev]))
226 % (state[rev], mqrebase[rev]))
227 repo.mq.qimport(repo, (), patchname=mqrebase[rev],
227 repo.mq.qimport(repo, (), patchname=mqrebase[rev],
228 git=opts.get('git', False),rev=[str(state[rev])])
228 git=opts.get('git', False),rev=[str(state[rev])])
229 repo.mq.save_dirty()
229 repo.mq.save_dirty()
General Comments 0
You need to be logged in to leave comments. Login now