equal
deleted
inserted
replaced
2101 fuzz = False |
2101 fuzz = False |
2102 args = [] |
2102 args = [] |
2103 cwd = repo.root |
2103 cwd = repo.root |
2104 if cwd: |
2104 if cwd: |
2105 args.append('-d %s' % procutil.shellquote(cwd)) |
2105 args.append('-d %s' % procutil.shellquote(cwd)) |
2106 fp = procutil.popen('%s %s -p%d < %s' % (patcher, ' '.join(args), strip, |
2106 cmd = ('%s %s -p%d < %s' |
2107 procutil.shellquote(patchname))) |
2107 % (patcher, ' '.join(args), strip, procutil.shellquote(patchname))) |
|
2108 fp = procutil.popen(cmd, 'rb') |
2108 try: |
2109 try: |
2109 for line in util.iterfile(fp): |
2110 for line in util.iterfile(fp): |
2110 line = line.rstrip() |
2111 line = line.rstrip() |
2111 ui.note(line + '\n') |
2112 ui.note(line + '\n') |
2112 if line.startswith('patching file '): |
2113 if line.startswith('patching file '): |