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

visdiff: only use shell quoting on Windows

Changeset be7c4360ae85…

Parent 1a3dc260c4db…

by Steve Borho

Changes to one file · Browse files at be7c4360ae85 Showing diff from parent 1a3dc260c4db Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​visdiff.py Stacked
 
233
234
235
236
 
 
237
238
239
 
 
240
241
242
 
233
234
235
 
236
237
238
239
 
240
241
242
243
244
@@ -233,10 +233,12 @@
  else:   dir1 = os.path.join(dir1, util.localpath(fname))   dir2 = os.path.join(dir2root, dir2, util.localpath(fname)) - cmdline = ('%s %s %s %s' % + if os.name == 'nt': + cmdline = ('%s %s %s %s' %   (util.shellquote(self.diffpath), ' '.join(self.diffopts),   util.shellquote(dir1), util.shellquote(dir2))) - #cmdline = [self.diffpath] + self.diffopts + [dir1, dir2] + else: + cmdline = [self.diffpath] + self.diffopts + [dir1, dir2]   subprocess.Popen(cmdline, shell=False, cwd=tmproot,   creationflags=openflags,   stderr=subprocess.PIPE,