Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset 7eb2cdb2f684…

Parents 0a730892a57d…

Parents 597d9d739cee…

by Steve Borho

Changes to 2 files · Browse files at 7eb2cdb2f684 Showing diff from parent 0a730892a57d 597d9d739cee Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​guess.py Stacked
 
209
210
211
 
212
213
214
 
215
216
217
 
233
234
235
236
 
 
237
238
239
 
209
210
211
212
213
214
 
215
216
217
218
 
234
235
236
 
237
238
239
240
241
@@ -209,9 +209,10 @@
  for index in self.matchtv.selectionModel().selectedRows():   src, dest, percent = self.matchtv.model().getRow(index)   if dest in remdests: + udest = hglib.tounicode(dest)   QMessageBox.warning(self, _('Multiple sources chosen'),   _('You have multiple renames selected for ' - 'destination file:\n%s. Aborting!') % dest) + 'destination file:\n%s. Aborting!') % udest)   return   remdests[dest] = src   for dest, src in remdests.iteritems(): @@ -233,7 +234,8 @@
  date = hglib.displaytime(ctx.date())   difftext = mdiff.unidiff(rr, date, aa, date, src, dest, None)   if not difftext: - t = _('%s and %s have identical contents\n\n') % (src, dest) + t = _('%s and %s have identical contents\n\n') % \ + (hglib.tounicode(src), hglib.tounicode(dest))   hu.write(t, label='ui.error')   else:   for t, l in patch.difflabel(difftext.splitlines, True):
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​qfold.py Stacked
 
117
118
119
120
121
122
 
 
 
123
124
125
 
117
118
119
 
 
 
120
121
122
123
124
125
@@ -117,9 +117,9 @@
  self.summ.setText(hglib.tounicode(txt))     def composeMsg(self, patches): - return '\n* * *\n'.join( - [self.repo.changectx('qtip').description()] - + [self.repo.changectx(p).description() for p in patches]) + return u'\n* * *\n'.join( + [hglib.tounicode(self.repo.changectx(p).description()) + for p in ['qtip'] + patches])     def getMessage(self):   text = self.msgte.text()