| indygreg |
| hg-reviewers |
Having bytestrings like b'r' makes it hard to understand for people who don't
know the code much or looking at it for the first time.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| sparsematch = matcher(repo, includetemp=False) | sparsematch = matcher(repo, includetemp=False) | ||||
| dirstate = repo.dirstate | dirstate = repo.dirstate | ||||
| mresult = mergemod.mergeresult() | mresult = mergemod.mergeresult() | ||||
| dropped = [] | dropped = [] | ||||
| tempincludes = readtemporaryincludes(repo) | tempincludes = readtemporaryincludes(repo) | ||||
| for file in tempincludes: | for file in tempincludes: | ||||
| if file in dirstate and not sparsematch(file): | if file in dirstate and not sparsematch(file): | ||||
| message = _(b'dropping temporarily included sparse files') | message = _(b'dropping temporarily included sparse files') | ||||
| mresult.addfile(file, b'r', None, message) | mresult.addfile(file, mergestatemod.ACTION_REMOVE, None, message) | ||||
| dropped.append(file) | dropped.append(file) | ||||
| mergemod.applyupdates( | mergemod.applyupdates( | ||||
| repo, mresult, repo[None], repo[b'.'], False, wantfiledata=False | repo, mresult, repo[None], repo[b'.'], False, wantfiledata=False | ||||
| ) | ) | ||||
| # Fix dirstate | # Fix dirstate | ||||
| for file in dropped: | for file in dropped: | ||||
| for file in files: | for file in files: | ||||
| old = origsparsematch(file) | old = origsparsematch(file) | ||||
| new = sparsematch(file) | new = sparsematch(file) | ||||
| # Add files that are newly included, or that don't exist in | # Add files that are newly included, or that don't exist in | ||||
| # the dirstate yet. | # the dirstate yet. | ||||
| if (new and not old) or (old and new and not file in dirstate): | if (new and not old) or (old and new and not file in dirstate): | ||||
| fl = mf.flags(file) | fl = mf.flags(file) | ||||
| if repo.wvfs.exists(file): | if repo.wvfs.exists(file): | ||||
| mresult.addfile(file, b'e', (fl,), b'') | mresult.addfile(file, mergestatemod.ACTION_EXEC, (fl,), b'') | ||||
| lookup.append(file) | lookup.append(file) | ||||
| else: | else: | ||||
| mresult.addfile(file, b'g', (fl, False), b'') | mresult.addfile( | ||||
| file, mergestatemod.ACTION_GET, (fl, False), b'' | |||||
| ) | |||||
| added.append(file) | added.append(file) | ||||
| # Drop files that are newly excluded, or that still exist in | # Drop files that are newly excluded, or that still exist in | ||||
| # the dirstate. | # the dirstate. | ||||
| elif (old and not new) or (not old and not new and file in dirstate): | elif (old and not new) or (not old and not new and file in dirstate): | ||||
| dropped.append(file) | dropped.append(file) | ||||
| if file not in pending: | if file not in pending: | ||||
| mresult.addfile(file, b'r', [], b'') | mresult.addfile(file, mergestatemod.ACTION_REMOVE, [], b'') | ||||
| # Verify there are no pending changes in newly included files | # Verify there are no pending changes in newly included files | ||||
| abort = False | abort = False | ||||
| for file in lookup: | for file in lookup: | ||||
| repo.ui.warn(_(b"pending changes to '%s'\n") % file) | repo.ui.warn(_(b"pending changes to '%s'\n") % file) | ||||
| abort = not force | abort = not force | ||||
| if abort: | if abort: | ||||
| raise error.Abort( | raise error.Abort( | ||||