Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/patch.py @ 4516:96d8a56d4ef9
Removed trailing whitespace and tabs from python files
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 06 Jun 2007 20:22:52 +0200 |
parents | b79cdb7f0597 |
children | 50252ea60549 |
comparison
equal
deleted
inserted
replaced
4515:86a66cce9566 | 4516:96d8a56d4ef9 |
---|---|
303 util.find_exe('patch')) | 303 util.find_exe('patch')) |
304 if not patcher: | 304 if not patcher: |
305 raise util.Abort(_('no patch command found in hgrc or PATH')) | 305 raise util.Abort(_('no patch command found in hgrc or PATH')) |
306 if util.needbinarypatch(): | 306 if util.needbinarypatch(): |
307 args.append('--binary') | 307 args.append('--binary') |
308 | 308 |
309 if cwd: | 309 if cwd: |
310 args.append('-d %s' % util.shellquote(cwd)) | 310 args.append('-d %s' % util.shellquote(cwd)) |
311 fp = os.popen('%s %s -p%d < %s' % (patcher, ' '.join(args), strip, | 311 fp = os.popen('%s %s -p%d < %s' % (patcher, ' '.join(args), strip, |
312 util.shellquote(patchname))) | 312 util.shellquote(patchname))) |
313 | 313 |