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

Parents efed27525c47…

Parents b4653fb0b02f…

by Adrian Buehlmann

Changes to 2 files · Browse files at f8bc5e22abe7 Showing diff from parent efed27525c47 b4653fb0b02f Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​bugreport.py Stacked
 
5
6
7
8
 
9
10
11
 
63
64
65
 
 
 
 
 
 
 
 
 
 
 
 
 
 
66
67
68
 
5
6
7
 
8
9
10
11
 
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
@@ -5,7 +5,7 @@
 # This software may be used and distributed according to the terms of the  # GNU General Public License version 2, incorporated herein by reference.   -import os +import os, sys  import gtk    from mercurial import extensions @@ -63,6 +63,20 @@
  text += '** CWD: %s\n' % os.getcwd()   extlist = [x[0] for x in extensions.extensions()]   text += '** Extensions loaded: %s\n' % ', '.join(extlist) + if os.name == 'nt': + text += '** sys.getwindowsversion(): %s\n' % str(sys.getwindowsversion()) + arch = 'unknown (failed to import win32api)' + try: + import win32api + arch = 'unknown' + archval = win32api.GetNativeSystemInfo()[0] + if archval == 9: + arch = 'x64' + elif archval == 0: + arch = 'x86' + except ImportError: + pass + text += '** Processor architecture: %s\n' % arch   text += self.opts['error']   text += '\n}}}'   self.__error_text__ = text
Show Entire File tortoisehg/​hgtk/​commit.py Stacked
(No changes)