Mercurial > public > mercurial-scm > hg

comparison mercurial/patch.py @ 7186:f77c8d8331ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
clean up trailing spaces, leading spaces in C
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 20 Oct 2008 14:57:04 +0200
parents 353141d74ca8
children df79ee9b6278
comparison
equal deleted inserted replaced
7185:67ba74938b15 7186:f77c8d8331ca
781 if not l: 781 if not l:
782 break 782 break
783 yield l 783 yield l
784 784
785 def scangitpatch(lr, firstline): 785 def scangitpatch(lr, firstline):
786 """ 786 """
787 Git patches can emit: 787 Git patches can emit:
788 - rename a to b 788 - rename a to b
789 - change b 789 - change b
790 - copy a to c 790 - copy a to c
791 - change c 791 - change c
792 792
793 We cannot apply this sequence as-is, the renamed 'a' could not be 793 We cannot apply this sequence as-is, the renamed 'a' could not be
794 found for it would have been renamed already. And we cannot copy 794 found for it would have been renamed already. And we cannot copy
795 from 'b' instead because 'b' would have been changed already. So 795 from 'b' instead because 'b' would have been changed already. So
796 we scan the git patch for copy and rename commands so we can 796 we scan the git patch for copy and rename commands so we can
797 perform the copies ahead of time. 797 perform the copies ahead of time.