Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset 9db562946486…

Parents 5d47eb93bc70…

Parents f463d5c03b64…

by Steve Borho

Changes to 4 files · Browse files at 9db562946486 Showing diff from parent 5d47eb93bc70 f463d5c03b64 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​docdiff.py Stacked
 
25
26
27
28
29
30
31
32
33
34
35
 
 
 
 
 
 
 
 
36
37
38
39
 
40
41
42
 
25
26
27
 
 
 
 
 
 
 
 
28
29
30
31
32
33
34
35
36
37
38
 
39
40
41
42
@@ -25,18 +25,18 @@
  'doc' : ('diff-doc.js', 'merge-doc.js'), # MS Word   'docx' : ('diff-doc.js', 'merge-doc.js'),   'docm' : ('diff-doc.js', 'merge-doc.js'), - 'ppt' : ('diff-ppt.js'), # MS PowerPoint - 'pptx' : ('diff-ppt.js'), - 'pptm' : ('diff-ppt.js'), - 'xls' : ('diff-xls.vbs'), # MS Excel - 'xlsx' : ('diff-xls.vbs'), - 'xlsm' : ('diff-xls.vbs'), - 'xlsb' : ('diff-xls.vbs'), - 'xlam' : ('diff-xls.vbs'), + 'ppt' : ('diff-ppt.js',), # MS PowerPoint + 'pptx' : ('diff-ppt.js',), + 'pptm' : ('diff-ppt.js',), + 'xls' : ('diff-xls.vbs',), # MS Excel + 'xlsx' : ('diff-xls.vbs',), + 'xlsm' : ('diff-xls.vbs',), + 'xlsb' : ('diff-xls.vbs',), + 'xlam' : ('diff-xls.vbs',),   'ods' : ('diff-odt.vbs', 'merge-ods.vbs'), # OpenOffice Text   'odt' : ('diff-odt.vbs', 'merge-ods.vbs'),   'sxw' : ('diff-sxw.vbs', 'merge-ods.vbs'), # OpenOffice Calc - 'nb' : ('diff-nb.vbs'), # Mathematica Notebook + 'nb' : ('diff-nb.vbs',), # Mathematica Notebook  }    def main():
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​changeset.py Stacked
 
309
310
311
312
 
313
314
315
 
309
310
311
 
312
313
314
315
@@ -309,7 +309,7 @@
  self.issuedict.clear()   for m in self.bodyre.finditer(desc):   a, b = m.span() - if a > pos: + if a >= pos:   buf.insert(eob, desc[pos:a])   pos = b   groups = m.groups()
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​datamine.py Stacked
 
541
542
543
544
545
 
 
 
 
 
 
546
547
548
 
541
542
543
 
 
544
545
546
547
548
549
550
551
552
@@ -541,8 +541,12 @@
    def stop_search(self, frame):   if getattr(frame, '_mythread', None): - frame._mythread.terminate() - frame._mythread.join() + if frame._mythread.isAlive(): + try: + frame._mythread.terminate() + frame._mythread.join() + except (threading.ThreadError, ValueError): + pass   frame._mythread = None     def close_page(self, button, widget):
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​quickop.py Stacked
 
9
10
11
12
 
13
14
15
 
144
145
146
147
148
 
 
 
 
 
 
149
150
151
 
9
10
11
 
12
13
14
15
 
144
145
146
 
 
147
148
149
150
151
152
153
154
155
@@ -9,7 +9,7 @@
 import gtk  import pango   -from mercurial import cmdutil +from mercurial import cmdutil, util    from tortoisehg.util.i18n import _  from tortoisehg.util import hglib, shlib @@ -144,8 +144,12 @@
  clean='C' in filetypes,   ignored='I' in filetypes,   unknown='?' in filetypes) - except IOError: - status = [None] * 7 + except (IOError, util.Abort), e: + gdialog.Prompt(_('Unable to determine repository status'), + str(e), self).run() + self.earlyout=True + self.hide() + return     (modified, added, removed, deleted, unknown, ignored, clean) = status   if 'M' in filetypes: