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

docdiff: cleanup trailing white space

Changeset 5057f100ba23…

Parent 8f0f9fc0b692…

by Steve Borho

Changes to one file · Browse files at 5057f100ba23 Showing diff from parent 8f0f9fc0b692 Diff from another changeset...

Change 1 of 1 Show Changes Only win32/​docdiff.py Stacked
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
 
48
49
 
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
 
47
48
 
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
 '''  Binary document diff wrapper script    This script is converted into an executable by py2exe for use in  TortoiseHg binary packages. It is then used by TortoiseHg as a visual  diff application for binary document types.    It takes two (diff) or four (merge) arguments, determines the file type  based on the file extension, then launches the appropriate document diff  script that THG has borrowed from the TortoiseSVN project.    This script is quite useless outside of a TortoiseHg binary install.  '''    import os  import sys  import subprocess  import shutil  import win32con  import win32api  import win32process  import locale    from mercurial import util    scripts = {   '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',),   '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  }    def safe_encode(string, encoding):   if isinstance(string, unicode):   return string.encode(encoding) - +   return string - +  def main():   args = sys.argv[1:]   if len(args) not in (2, 4):   print 'Two or four arguments expected:'   print sys.argv[0], '[local] [other]'   print sys.argv[0], '[local] [base] [other] [output]'   sys.exit(1)   elif len(args) == 2:   local, other = [os.path.abspath(f) for f in args]   base, ext = os.path.splitext(local)   else:   local, base, other, output = [os.path.abspath(f) for f in args]   base, ext = os.path.splitext(output)     if not ext or ext.lower()[1:] not in scripts.keys():   print 'Unsupported file type', ext   sys.exit(1)     proc = win32api.GetCurrentProcess()   try:   # This will fail on windows < NT   filename = win32process.GetModuleFileNameEx(proc, 0)   except:   filename = win32api.GetModuleFileName(0)   path = os.path.join(os.path.dirname(filename), 'diff-scripts')   if not os.path.isdir(path):   print 'Diff scripts not found at', path   sys.exit(1)     use = scripts[ext.lower()[1:]]     if 'xls' in use[0] and os.path.basename(local) == os.path.basename(other):   # XLS hack; Excel will not diff two files if they have the same   # basename.   othertmp = other+'~x1'   shutil.copy(other, othertmp)   other = othertmp     if len(args) == 2:   script = os.path.join(path, use[0])   cmd = ['wscript', script, other, local]   elif len(use) == 1:   print 'Unsupported file type for merge', local   sys.exit(1)   else:   script = os.path.join(path, use[1])   cmd = ['wscript', script, output, other, local, base]     encoding = locale.getpreferredencoding(do_setlocale=True)   cmd = [util.shellquote(safe_encode(arg, encoding)) for arg in cmd]   cmdline = util.quotecommand(' '.join(cmd))   proc = subprocess.Popen(cmdline, shell=True,   creationflags=win32con.CREATE_NO_WINDOW,   stderr=subprocess.PIPE,   stdout=subprocess.PIPE,   stdin=subprocess.PIPE)   return proc.communicate()    if __name__=='__main__':   main()