equal
deleted
inserted
replaced
1930 patches.append(p) |
1930 patches.append(p) |
1931 |
1931 |
1932 for p in patches: |
1932 for p in patches: |
1933 if not message: |
1933 if not message: |
1934 ph = q.readheaders(p) |
1934 ph = q.readheaders(p) |
1935 messages.append(ph.message) |
1935 if ph.message: |
|
1936 messages.append(ph.message) |
1936 pf = q.join(p) |
1937 pf = q.join(p) |
1937 (patchsuccess, files, fuzz) = q.patch(repo, pf) |
1938 (patchsuccess, files, fuzz) = q.patch(repo, pf) |
1938 if not patchsuccess: |
1939 if not patchsuccess: |
1939 raise util.Abort(_('Error folding patch %s') % p) |
1940 raise util.Abort(_('Error folding patch %s') % p) |
1940 patch.updatedir(ui, repo, files) |
1941 patch.updatedir(ui, repo, files) |