equal
deleted
inserted
replaced
584 ui.status("applying %s\n" % patch) |
584 ui.status("applying %s\n" % patch) |
585 pf = os.path.join(d, patch) |
585 pf = os.path.join(d, patch) |
586 |
586 |
587 text = "" |
587 text = "" |
588 for l in file(pf): |
588 for l in file(pf): |
589 if l[:4] == "--- ": break |
589 if l.startswith("--- ") or l.startswith("diff -r"): break |
590 text += l |
590 text += l |
591 |
591 |
592 # parse values that exist when importing the result of an hg export |
592 # parse values that exist when importing the result of an hg export |
593 hgpatch = user = snippet = None |
593 hgpatch = user = snippet = None |
594 ui.debug('text:\n') |
594 ui.debug('text:\n') |