| hg-reviewers |
Earlier extras() can only be used for getting extra for a file. However at
couple of places in code, we wanted to iterate over all the extras stored with
the mergestate and they were accessing the private _stateextras.
Now, if filename is not passed, we return all the extras.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commit.py (2 lines) | |||
| M | mercurial/debugcommands.py (2 lines) | |||
| M | mercurial/mergestate.py (5 lines) |
| """ returns a list of salvaged files | """ returns a list of salvaged files | ||||
| returns empty list if config option which process salvaged files are | returns empty list if config option which process salvaged files are | ||||
| not enabled """ | not enabled """ | ||||
| salvaged = [] | salvaged = [] | ||||
| copy_sd = repo.filecopiesmode == b'changeset-sidedata' | copy_sd = repo.filecopiesmode == b'changeset-sidedata' | ||||
| if copy_sd and len(ctx.parents()) > 1: | if copy_sd and len(ctx.parents()) > 1: | ||||
| if ms.active(): | if ms.active(): | ||||
| for fname in sorted(ms._stateextras.keys()): | for fname in sorted(ms.allextras().keys()): | ||||
| might_removed = ms.extras(fname).get(b'merge-removal-candidate') | might_removed = ms.extras(fname).get(b'merge-removal-candidate') | ||||
| if might_removed == b'yes': | if might_removed == b'yes': | ||||
| if fname in ctx: | if fname in ctx: | ||||
| salvaged.append(fname) | salvaged.append(fname) | ||||
| return salvaged | return salvaged | ||||
| def _process_files(tr, ctx, ms, files, error=False): | def _process_files(tr, ctx, ms, files, error=False): | ||||
| fm_extras.startitem() | fm_extras.startitem() | ||||
| fm_extras.data(key=k) | fm_extras.data(key=k) | ||||
| fm_extras.data(value=v) | fm_extras.data(value=v) | ||||
| fm_extras.end() | fm_extras.end() | ||||
| fm_files.end() | fm_files.end() | ||||
| fm_extras = fm.nested(b'extras') | fm_extras = fm.nested(b'extras') | ||||
| for f, d in sorted(pycompat.iteritems(ms._stateextras)): | for f, d in sorted(pycompat.iteritems(ms.allextras())): | ||||
| if f in ms: | if f in ms: | ||||
| # If file is in mergestate, we have already processed it's extras | # If file is in mergestate, we have already processed it's extras | ||||
| continue | continue | ||||
| for k, v in pycompat.iteritems(d): | for k, v in pycompat.iteritems(d): | ||||
| fm_extras.startitem() | fm_extras.startitem() | ||||
| fm_extras.data(file=f) | fm_extras.data(file=f) | ||||
| fm_extras.data(key=k) | fm_extras.data(key=k) | ||||
| fm_extras.data(value=v) | fm_extras.data(value=v) | ||||
| for f, entry in pycompat.iteritems(self._state): | for f, entry in pycompat.iteritems(self._state): | ||||
| if entry[0] in ( | if entry[0] in ( | ||||
| MERGE_RECORD_UNRESOLVED, | MERGE_RECORD_UNRESOLVED, | ||||
| MERGE_RECORD_UNRESOLVED_PATH, | MERGE_RECORD_UNRESOLVED_PATH, | ||||
| ): | ): | ||||
| yield f | yield f | ||||
| def allextras(self): | |||||
| """ return all extras information stored with the mergestate """ | |||||
| return self._stateextras | |||||
| def extras(self, filename): | def extras(self, filename): | ||||
| """ return extras stored with the mergestate for the given filename """ | |||||
| return self._stateextras[filename] | return self._stateextras[filename] | ||||
| def _resolve(self, preresolve, dfile, wctx): | def _resolve(self, preresolve, dfile, wctx): | ||||
| """rerun merge process for file path `dfile`. | """rerun merge process for file path `dfile`. | ||||
| Returns whether the merge was completed and the return value of merge | Returns whether the merge was completed and the return value of merge | ||||
| obtained from filemerge._filemerge(). | obtained from filemerge._filemerge(). | ||||
| """ | """ | ||||
| if self[dfile] in ( | if self[dfile] in ( | ||||