Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

commit: improve and use get_lengths()

Changeset 0a26b1001776…

Parent e547cbfb1a39…

by Yuki KODAMA

Changes to one file · Browse files at 0a26b1001776 Showing diff from parent e547cbfb1a39 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgtk/​commit.py Stacked
 
1013
1014
1015
1016
1017
1018
 
 
1019
1020
1021
1022
1023
1024
 
1025
1026
1027
 
1028
1029
1030
 
1054
1055
1056
1057
 
1058
1059
1060
 
1198
1199
1200
1201
 
1202
1203
1204
1205
 
 
1206
1207
1208
 
1236
1237
1238
1239
1240
1241
1242
1243
1244
 
1245
1246
1247
 
1013
1014
1015
 
 
 
1016
1017
1018
1019
1020
1021
1022
 
1023
1024
1025
 
1026
1027
1028
1029
 
1053
1054
1055
 
1056
1057
1058
1059
 
1197
1198
1199
 
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
 
1237
1238
1239
 
 
 
 
 
 
1240
1241
1242
1243
@@ -1013,18 +1013,17 @@
  return False     try: - sumlen = int(self.repo.ui.config('tortoisehg', 'summarylen', 0)) - maxlen = int(self.repo.ui.config('tortoisehg', 'messagewrap', 0)) - except (TypeError, ValueError): + sumlen, maxlen = self.get_lengths(noexcept=False) + except ValueError:   gdialog.Prompt(_('Error'),   _('Message format configuration error'),   self).run()   self.msg_config(None)   return False - +   lines = hglib.tounicode(buf.get_text(buf.get_start_iter(),   buf.get_end_iter())).splitlines() - +   if sumlen and len(lines[0].rstrip()) > sumlen:   resp = gdialog.Confirm(_('Confirm Commit'), [], self,   _('The summary line length of %i is greater than' @@ -1054,7 +1053,7 @@
  if resp != gtk.RESPONSE_YES:   return False   return True - +   def hg_commit(self, files, callback):   # get advanced options   user = hglib.fromutf(self.committer_cbbox.get_active_text()) @@ -1198,11 +1197,13 @@
  menu.append(menuitem)   menu.show_all()   - def get_lengths(self): + def get_lengths(self, noexcept=True):   try:   sumlen = int(self.repo.ui.config('tortoisehg', 'summarylen', 0))   maxlen = int(self.repo.ui.config('tortoisehg', 'messagewrap', 0))   except (TypeError, ValueError): + if not noexcept: + raise ValueError   sumlen = 0   maxlen = 0   return sumlen, maxlen @@ -1236,12 +1237,7 @@
  buf.insert_at_cursor('\n'.join(fnames))     def msg_word_wrap(self, sender): - try: - sumlen = int(self.repo.ui.config('tortoisehg', 'summarylen', 0)) - maxlen = int(self.repo.ui.config('tortoisehg', 'messagewrap', 0)) - except (TypeError, ValueError): - sumlen = 0 - maxlen = 0 + sumlen, maxlen = self.get_lengths()   if not (sumlen or maxlen):   gdialog.Prompt(_('Info Required'),   _('Message format needs to be configured'),