Mercurial > public > mercurial-scm > hg
comparison mercurial/patch.py @ 24837:edf907bd8144 stable
record: fix record with change on moved file crashes (issue4619)
reverting 79fceed67676, add a test to prevent the issue from coming back.
| author | Laurent Charignon <lcharignon@fb.com> |
|---|---|
| date | Wed, 22 Apr 2015 13:56:30 -0700 |
| parents | a7f8e3584ef3 |
| children | 8133494accf1 |
comparison
equal
deleted
inserted
replaced
| 24836:1f9127c9239b | 24837:edf907bd8144 |
|---|---|
| 818 class header(object): | 818 class header(object): |
| 819 """patch header | 819 """patch header |
| 820 """ | 820 """ |
| 821 diffgit_re = re.compile('diff --git a/(.*) b/(.*)$') | 821 diffgit_re = re.compile('diff --git a/(.*) b/(.*)$') |
| 822 diff_re = re.compile('diff -r .* (.*)$') | 822 diff_re = re.compile('diff -r .* (.*)$') |
| 823 allhunks_re = re.compile('(?:index|deleted file) ') | 823 allhunks_re = re.compile('(?:index|new file|deleted file) ') |
| 824 pretty_re = re.compile('(?:new file|deleted file) ') | 824 pretty_re = re.compile('(?:new file|deleted file) ') |
| 825 special_re = re.compile('(?:index|new|deleted|copy|rename) ') | 825 special_re = re.compile('(?:index|new|deleted|copy|rename) ') |
| 826 | 826 |
| 827 def __init__(self, header): | 827 def __init__(self, header): |
| 828 self.header = header | 828 self.header = header |