equal
deleted
inserted
replaced
701 message = "imported patch %s\n" % patch |
701 message = "imported patch %s\n" % patch |
702 else: |
702 else: |
703 message = "%s\n" % '\n'.join(message) |
703 message = "%s\n" % '\n'.join(message) |
704 ui.debug('message:\n%s\n' % message) |
704 ui.debug('message:\n%s\n' % message) |
705 |
705 |
706 f = os.popen("patch -p%d < %s" % (strip, pf)) |
706 f = os.popen("patch -p%d < '%s'" % (strip, pf)) |
707 files = [] |
707 files = [] |
708 for l in f.read().splitlines(): |
708 for l in f.read().splitlines(): |
709 l.rstrip('\r\n'); |
709 l.rstrip('\r\n'); |
710 ui.status("%s\n" % l) |
710 ui.status("%s\n" % l) |
711 if l.startswith('patching file '): |
711 if l.startswith('patching file '): |