mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
Fix issue483 - mq does not work under windows with gnu-win32 patch.
Add --binary option to patch command under win32.
This commit is contained in:
parent
1c67345a13
commit
37afbaec09
@ -296,6 +296,9 @@ def patch(patchname, ui, strip=1, cwd=None, files={}):
|
||||
patcher = util.find_in_path('gpatch', os.environ.get('PATH', ''),
|
||||
'patch')
|
||||
args = []
|
||||
if util.needbinarypatch():
|
||||
args.append('--binary')
|
||||
|
||||
if cwd:
|
||||
args.append('-d %s' % util.shellquote(cwd))
|
||||
fp = os.popen('%s %s -p%d < %s' % (patcher, ' '.join(args), strip,
|
||||
|
@ -793,6 +793,10 @@ def linkfunc(path, fallback):
|
||||
_umask = os.umask(0)
|
||||
os.umask(_umask)
|
||||
|
||||
def needbinarypatch():
|
||||
"""return True if patches should be applied in binary mode by default."""
|
||||
return os.name == 'nt'
|
||||
|
||||
# Platform specific variants
|
||||
if os.name == 'nt':
|
||||
import msvcrt
|
||||
|
Loading…
Reference in New Issue
Block a user