Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 614:6bff574d639f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Stop patch description import at diff -r -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Stop patch description import at diff -r manifest hash: cc269f69c26ad4fba1fdaeefe2dc8191a0669fe0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyZmyywK+sNU5EO8RAkODAJ9d/JYpBOZiOcQxlz0n2VtIPtK/IgCgl2Lj caGbq4yn4RxzBQqqIoQzOTQ= =9fHy -----END PGP SIGNATURE-----
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Jul 2005 12:18:58 -0800
parents 5374955ec5b1
children ad2999fad721
comparison
equal deleted inserted replaced
613:5374955ec5b1 614:6bff574d639f
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')