Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset f30579a20375…

Parents 001c91cb2092…

Parents c9bc1c7192c2…

by Steve Borho

Changes to 2 files · Browse files at f30579a20375 Showing diff from parent 001c91cb2092 c9bc1c7192c2 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​visdiff.py Stacked
 
118
119
120
121
 
 
 
 
 
 
 
 
 
122
123
124
 
118
119
120
 
121
122
123
124
125
126
127
128
129
130
131
132
@@ -118,7 +118,15 @@
  def quote(match):   key = match.group()[1:]   return util.shellquote(replace[key]) - args = ' '.join(opts) + if isinstance(cmd, unicode): + cmd = hglib.fromunicode(cmd) + lopts = [] + for opt in opts: + if isinstance(opt, unicode): + lopts.append(hglib.fromunicode(opt)) + else: + lopts.append(opt) + args = ' '.join(lopts)   args = re.sub(_regex, quote, args)   cmdline = util.shellquote(cmd) + ' ' + args   cmdline = util.quotecommand(cmdline)
Change 1 of 1 Show Entire File win32/​setup.cfg Stacked
 
1
2
3
4
 
5
 
1
2
3
 
4
5
@@ -1,5 +1,5 @@
 [py2exe]  excludes=pywin, pywin.dialogs, pywin.dialogs.list, PyQt4.uic.port_v3, tcl, tk, py2exe  includes=sip -packages=ctypes, email, hgext, hgext.convert, encodings, tortoisehg.util, tortoisehg.hgqt, iniparse, pygments, nntplib, dulwich +packages=ctypes, email, hgext, hgext.convert, encodings, tortoisehg.util, tortoisehg.hgqt, iniparse, pygments, nntplib, dulwich, json  dll_excludes=mswsock.dll, powrprof.dll, shfolder.dll, credui.dll, msvcp90.dll, secur32.dll, tk85.dll, tcl85.dll