Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

merge with stable

Changeset 8cf315a25d96…

Parents 8faf3715e777…

Parents 7e3488848e2c…

by Steve Borho

Changes to one file · Browse files at 8cf315a25d96 Showing diff from parent 8faf3715e777 7e3488848e2c Diff from another changeset...

Change 1 of 3 Show Entire File hggtk/​gdialog.py Stacked
 
192
193
194
 
195
196
197
 
199
200
201
202
 
203
204
205
 
377
378
379
380
 
381
382
383
 
192
193
194
195
196
197
198
 
200
201
202
 
203
204
205
206
 
378
379
380
 
381
382
383
384
@@ -192,6 +192,7 @@
  path = cmd   diffopts = self.ui.config('extdiff', 'opts.' + cmd, '')   diffopts = diffopts and [diffopts] or [] + return path, diffopts   elif cmd == usercmd:   # command = path opts   if path: @@ -199,7 +200,7 @@
  path = diffopts.pop(0)   else:   path, diffopts = cmd, [] - return path, diffopts + return path, diffopts   return None, None     def _parse_config(self): @@ -377,7 +378,7 @@
  extdiff.dodiff(self.ui, self.repo, self.diffcmd, self.diffopts,   [self.repo.wjoin(file)], self.opts)   - if self.diffcmd == 'diff': + if not self.diffcmd or self.diffcmd == 'diff':   Prompt(_('No visual diff configured'),   _('Please select a visual diff application.'), self).run()   dlg = ConfigDialog(self.repo.root, False)