| Alphare |
| hg-reviewers |
Since mq does not work on merge, we do not need this.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/mq.py (11 lines) |
| all_files.update(files) | all_files.update(files) | ||||
| patcherr = not patcherr | patcherr = not patcherr | ||||
| else: | else: | ||||
| self.ui.warn(_(b"patch %s is empty\n") % patchname) | self.ui.warn(_(b"patch %s is empty\n") % patchname) | ||||
| patcherr, files, fuzz = 0, [], 0 | patcherr, files, fuzz = 0, [], 0 | ||||
| if merge and files: | if merge and files: | ||||
| # Mark as removed/merged and update dirstate parent info | # Mark as removed/merged and update dirstate parent info | ||||
| removed = [] | |||||
| merged = [] | |||||
| for f in files: | |||||
| if os.path.lexists(repo.wjoin(f)): | |||||
| merged.append(f) | |||||
| else: | |||||
| removed.append(f) | |||||
| with repo.dirstate.parentchange(): | with repo.dirstate.parentchange(): | ||||
| for f in removed: | for f in files: | ||||
| repo.dirstate.update_file_p1(f, p1_tracked=True) | repo.dirstate.update_file_p1(f, p1_tracked=True) | ||||
| for f in merged: | |||||
| repo.dirstate.merge(f) | |||||
| p1 = repo.dirstate.p1() | p1 = repo.dirstate.p1() | ||||
| repo.setparents(p1, merge) | repo.setparents(p1, merge) | ||||
| if all_files and b'.hgsubstate' in all_files: | if all_files and b'.hgsubstate' in all_files: | ||||
| wctx = repo[None] | wctx = repo[None] | ||||
| pctx = repo[b'.'] | pctx = repo[b'.'] | ||||
| overwrite = False | overwrite = False | ||||
| mergedsubstate = subrepoutil.submerge( | mergedsubstate = subrepoutil.submerge( | ||||