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 f90a950e1471…

Parents 859fca957625…

Parents 0a707be45e60…

by Steve Borho

Changes to 5 files · Browse files at f90a950e1471 Showing diff from parent 859fca957625 0a707be45e60 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​bugreport.py Stacked
 
95
96
97
98
 
99
100
101
 
95
96
97
 
98
99
100
101
@@ -95,7 +95,7 @@
  os.path.join(os.getcwd(), 'bugreport.txt'),   _('Text files (*.txt)'))   if fname: - open(fname, 'wb').write(self.text) + open(fname, 'wb').write(hglib.fromunicode(self.text))   except (EnvironmentError), e:   QMessageBox.critical(self, _('Error writing file'), str(e))  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​rejects.py Stacked
 
178
179
180
181
182
183
184
185
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
186
187
188
 
178
179
180
 
 
 
 
 
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
@@ -178,11 +178,31 @@
  self.rejectbrowser.saveSettings(s, 'rejects/rejbrowse')     def accept(self): - f = QFile(self.path) - f.open(QIODevice.WriteOnly) - self.editor.write(f) - self.saveSettings() - super(RejectsDialog, self).accept() + # If the editor has been modified, we implicitly accept the changes + acceptresolution = self.editor.isModified() + if not acceptresolution: + action = QMessageBox.warning(self, + _("Warning"), + _("You have marked all rejected patch chunks as resolved yet you " \ + "have not modified the file on the edit panel.\n\n" \ + "This probably means that no code from any of the rejected patch " \ + "chunks made it into the file.\n\n"\ + "Are you sure that you want to leave the file as is and " \ + "consider all the rejected patch chunks as resolved?\n\n" \ + "Doing so may delete them from a shelve, for example, which " \ + "would mean that you would lose them forever!\n\n" + "Click Yes to accept the file as is or No to continue resolving " \ + "the rejected patch chunks."), + QMessageBox.Yes, QMessageBox.No) + if action == QMessageBox.Yes: + acceptresolution = True + + if acceptresolution: + f = QFile(self.path) + f.open(QIODevice.WriteOnly) + self.editor.write(f) + self.saveSettings() + super(RejectsDialog, self).accept()     def reject(self):   self.saveSettings()
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​revset.py Stacked
 
372
373
374
375
 
376
377
378
 
372
373
374
 
375
376
377
378
@@ -372,7 +372,7 @@
  self.showMessage.emit(_('found revision'))   self.queryIssued.emit(self.query, [ctx.rev()])   return - except (error.RepoLookupError, error.Abort): + except (error.RepoError, error.LookupError, error.Abort):   self.text = 'keyword("%s")' % self.text   cwd = os.getcwd()   try:
Change 1 of 1 Show Entire File win32/​wix/​dist.wxs Stacked
 
54
55
56
 
57
58
59
 
54
55
56
57
58
59
60
@@ -54,6 +54,7 @@
  <?if $(var.Platform) = "x86" ?>   <File Name="intl3_svn.dll" />   <File Name="libdb44.dll" /> + <File Name="libsasl.dll" />   <?endif?>   <File Name="select.pyd" />   <File Name="sip.pyd" />
Change 1 of 1 Show Entire File win32/​wix/​guids.wxi Stacked
 
33
34
35
36
 
37
38
39
 
33
34
35
 
36
37
38
39
@@ -33,7 +33,7 @@
  <?define templates.static.guid = {ECF8D1EF-910D-4586-9508-86A6236B4FD5} ?>     <!-- dist.wxs --> - <?define dist.guid = {9287B4BD-AA5A-43CA-8BB2-BAAAFB1BC283} ?> + <?define dist.guid = {9A429564-6BA8-4F18-ACCF-59C586364FFC} ?>   <?define imageformats.guid = {056DFB00-3EB1-4ACA-A43B-55CD5004DED1} ?>     <!-- cmenu-i18n.wxs -->