Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.2, 1.9.3, and 2.0

Merge with stable

Changeset 2cb19a229821…

Parents 9fc6c5eb11d9…

Parents 8fa351776ba3…

by Steve Borho

Changes to 2 files · Browse files at 2cb19a229821 Showing diff from parent 9fc6c5eb11d9 8fa351776ba3 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgtk/​bugtraq.py Stacked
 
108
109
110
111
 
112
113
114
 
116
117
118
119
 
120
121
122
 
145
146
147
148
149
150
151
 
 
 
 
 
 
152
153
154
 
165
166
167
168
169
 
108
109
110
 
111
112
113
114
 
116
117
118
 
119
120
121
122
 
145
146
147
 
 
 
 
148
149
150
151
152
153
154
155
156
 
167
168
169
 
 
@@ -108,7 +108,7 @@
  errormessage = bugtr.OnCommitFinished(0, commonroot, pathlist,   logmessage, 0)   return errormessage - +   def show_options_dialog(self, options):   if not self.has_options():   return "" @@ -116,7 +116,7 @@
  bugtr = self._get_bugtraq_object()   options = bugtr.ShowOptionsDialog(0, options)   return options - +   def has_options(self):   if not self.supports_bugtraq2_interface():   return False @@ -145,10 +145,12 @@
  ret = []   enumerator = cm.EnumClassesOfCategories((CATID_BugTraqProvider,),())   while 1: - clsid = enumerator.Next(); - if clsid == (): - break; - + try: + clsid = enumerator.Next() + if clsid == (): + break + except pythoncom.com_error: + break   ret.extend(clsid)   return ret   @@ -165,5 +167,3 @@
  pluginclsids = get_issue_plugins()   keyandnames = [(key, get_plugin_name(key)) for key in pluginclsids]   return [kn for kn in keyandnames if kn[1] is not None] - -
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​merge.py Stacked
 
93
94
95
96
97
98
99
100
 
101
102
103
104
105
106
107
108
109
110
111
 
 
 
 
112
113
114
 
120
121
122
 
 
 
 
 
123
124
125
 
93
94
95
 
 
 
 
 
96
97
98
99
100
101
 
 
 
 
 
 
102
103
104
105
106
107
108
 
114
115
116
117
118
119
120
121
122
123
124
@@ -93,22 +93,16 @@
  # layout table for advanced options   table = gtklib.LayoutTable()   expander.add(table) - discard = gtk.CheckButton(_('Discard all changes from merge target ' - '(other) revision')) - self.discard = discard - table.add_row(discard) - +   vlist = gtk.ListStore(str, # tool name   bool) # separator   combo = gtk.ComboBoxEntry(vlist, 0)   self.mergetool = combo   combo.set_row_separator_func(lambda model, path: model[path][1]) - combo.child.set_width_chars(8) - lbl = gtk.Label(_('Merge tools:')) - lbl.set_alignment(1, 0.5) - self.mergelabel = lbl - self.action_area.add(lbl) - self.action_area.add(combo) + combo.child.set_width_chars(16) + chtool = gtk.RadioButton(None, _('Use merge tool:')) + self.mergelabel = chtool + table.add_row(chtool, combo)   prev = False   for tool in hglib.mergetools(self.repo.ui):   cur = tool.startswith('internal:') @@ -120,6 +114,11 @@
  else:   combo.child.set_text('')   + discard = gtk.RadioButton(chtool, + _('Discard all changes from merge target (other) revision')) + self.discard = discard + table.add_row(discard) +   # prepare to show   if len(self.repo.parents()) == 2:   self.mergetool.set_sensitive(False)