equal
deleted
inserted
replaced
1163 |
1163 |
1164 def _applydiff(ui, fp, patcher, changed, strip=1, eolmode='strict'): |
1164 def _applydiff(ui, fp, patcher, changed, strip=1, eolmode='strict'): |
1165 rejects = 0 |
1165 rejects = 0 |
1166 err = 0 |
1166 err = 0 |
1167 current_file = None |
1167 current_file = None |
1168 cwd = os.getcwd() |
|
1169 backend = fsbackend(ui, os.getcwd()) |
1168 backend = fsbackend(ui, os.getcwd()) |
1170 |
1169 |
1171 for state, values in iterhunks(fp): |
1170 for state, values in iterhunks(fp): |
1172 if state == 'hunk': |
1171 if state == 'hunk': |
1173 if not current_file: |
1172 if not current_file: |