Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/patch.py @ 7972:425a30ddfff6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew-stable
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Sat, 04 Apr 2009 19:43:00 +0200
parents 4a4c7f6a5912 6ea0318daf75
children 388bb482024e
comparison
equal deleted inserted replaced
7969:a969b1470987 7972:425a30ddfff6
908 for gp in gitpatches: 908 for gp in gitpatches:
909 changed[gp.path] = gp 909 changed[gp.path] = gp
910 # else error? 910 # else error?
911 # copy/rename + modify should modify target, not source 911 # copy/rename + modify should modify target, not source
912 gp = changed.get(bfile) 912 gp = changed.get(bfile)
913 if gp and gp.op in ('COPY', 'DELETE', 'RENAME'): 913 if gp and gp.op in ('COPY', 'DELETE', 'RENAME', 'ADD'):
914 afile = bfile 914 afile = bfile
915 gitworkdone = True 915 gitworkdone = True
916 newfile = True 916 newfile = True
917 elif x.startswith('---'): 917 elif x.startswith('---'):
918 # check for a unified diff 918 # check for a unified diff