| pulkit |
| hg-reviewers |
This lets us make the in-memory and on-disk code a bit more
similar. I'll soon also implement setparents() on the regular
workingctx.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/rebase.py (2 lines) | |||
| M | mercurial/context.py (8 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| return None | return None | ||||
| # By convention, ``extra['branch']`` (set by extrafn) clobbers | # By convention, ``extra['branch']`` (set by extrafn) clobbers | ||||
| # ``branch`` (used when passing ``--keepbranches``). | # ``branch`` (used when passing ``--keepbranches``). | ||||
| branch = None | branch = None | ||||
| if b'branch' in extra: | if b'branch' in extra: | ||||
| branch = extra[b'branch'] | branch = extra[b'branch'] | ||||
| wctx.setparents(repo[p1].node(), repo[p2].node()) | |||||
| memctx = wctx.tomemctx( | memctx = wctx.tomemctx( | ||||
| commitmsg, | commitmsg, | ||||
| parents=(p1, p2), | |||||
| date=date, | date=date, | ||||
| extra=extra, | extra=extra, | ||||
| user=user, | user=user, | ||||
| branch=branch, | branch=branch, | ||||
| editor=editor, | editor=editor, | ||||
| ) | ) | ||||
| commitres = repo.commitctx(memctx) | commitres = repo.commitctx(memctx) | ||||
| wctx.clean() # Might be reused | wctx.clean() # Might be reused | ||||
| def setbase(self, wrappedctx): | def setbase(self, wrappedctx): | ||||
| self._wrappedctx = wrappedctx | self._wrappedctx = wrappedctx | ||||
| self._parents = [wrappedctx] | self._parents = [wrappedctx] | ||||
| # Drop old manifest cache as it is now out of date. | # Drop old manifest cache as it is now out of date. | ||||
| # This is necessary when, e.g., rebasing several nodes with one | # This is necessary when, e.g., rebasing several nodes with one | ||||
| # ``overlayworkingctx`` (e.g. with --collapse). | # ``overlayworkingctx`` (e.g. with --collapse). | ||||
| util.clearcachedproperty(self, b'_manifest') | util.clearcachedproperty(self, b'_manifest') | ||||
| def setparents(self, p1node, p2node=nullid): | |||||
| assert p1node == self._wrappedctx.node() | |||||
| self._parents = [self._wrappedctx, self._repo.unfiltered()[p2node]] | |||||
| def data(self, path): | def data(self, path): | ||||
| if self.isdirty(path): | if self.isdirty(path): | ||||
| if self._cache[path][b'exists']: | if self._cache[path][b'exists']: | ||||
| if self._cache[path][b'data'] is not None: | if self._cache[path][b'data'] is not None: | ||||
| return self._cache[path][b'data'] | return self._cache[path][b'data'] | ||||
| else: | else: | ||||
| # Must fallback here, too, because we only set flags. | # Must fallback here, too, because we only set flags. | ||||
| return self._wrappedctx[path].data() | return self._wrappedctx[path].data() | ||||
| editor=None, | editor=None, | ||||
| ): | ): | ||||
| """Converts this ``overlayworkingctx`` into a ``memctx`` ready to be | """Converts this ``overlayworkingctx`` into a ``memctx`` ready to be | ||||
| committed. | committed. | ||||
| ``text`` is the commit message. | ``text`` is the commit message. | ||||
| ``parents`` (optional) are rev numbers. | ``parents`` (optional) are rev numbers. | ||||
| """ | """ | ||||
| # Default parents to the wrapped contexts' if not passed. | # Default parents to the wrapped context if not passed. | ||||
| if parents is None: | if parents is None: | ||||
| parents = self._wrappedctx.parents() | parents = self.parents() | ||||
| if len(parents) == 1: | if len(parents) == 1: | ||||
| parents = (parents[0], None) | parents = (parents[0], None) | ||||
| # ``parents`` is passed as rev numbers; convert to ``commitctxs``. | # ``parents`` is passed as rev numbers; convert to ``commitctxs``. | ||||
| if parents[1] is None: | if parents[1] is None: | ||||
| parents = (self._repo[parents[0]], None) | parents = (self._repo[parents[0]], None) | ||||
| else: | else: | ||||
| parents = (self._repo[parents[0]], self._repo[parents[1]]) | parents = (self._repo[parents[0]], self._repo[parents[1]]) | ||||