| hg-reviewers |
A side-effect of this is the new warning in the test case, but the
warning is valid, so I don't think that's a problem.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/absorb.py (17 lines) | |||
| M | tests/test-absorb-strip.t (1 line) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz |
| linelog, | linelog, | ||||
| mdiff, | mdiff, | ||||
| node, | node, | ||||
| obsolete, | obsolete, | ||||
| patch, | patch, | ||||
| phases, | phases, | ||||
| pycompat, | pycompat, | ||||
| registrar, | registrar, | ||||
| repair, | |||||
| scmutil, | scmutil, | ||||
| util, | util, | ||||
| ) | ) | ||||
| from mercurial.utils import ( | from mercurial.utils import ( | ||||
| stringutil, | stringutil, | ||||
| ) | ) | ||||
| # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for | # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for | ||||
| """commit changes. update self.finalnode, self.replacemap""" | """commit changes. update self.finalnode, self.replacemap""" | ||||
| with self.repo.wlock(), self.repo.lock(): | with self.repo.wlock(), self.repo.lock(): | ||||
| with self.repo.transaction('absorb') as tr: | with self.repo.transaction('absorb') as tr: | ||||
| self._commitstack() | self._commitstack() | ||||
| self._movebookmarks(tr) | self._movebookmarks(tr) | ||||
| if self.repo['.'].node() in self.replacemap: | if self.repo['.'].node() in self.replacemap: | ||||
| self._moveworkingdirectoryparent() | self._moveworkingdirectoryparent() | ||||
| if self._useobsolete: | if self._useobsolete: | ||||
| self._obsoleteoldcommits() | self._cleanupoldcommits() | ||||
| if not self._useobsolete: # strip must be outside transactions | if not self._useobsolete: # strip must be outside transactions | ||||
| self._stripoldcommits() | self._cleanupoldcommits() | ||||
| return self.finalnode | return self.finalnode | ||||
| def printchunkstats(self): | def printchunkstats(self): | ||||
| """print things like '1 of 2 chunk(s) applied'""" | """print things like '1 of 2 chunk(s) applied'""" | ||||
| ui = self.ui | ui = self.ui | ||||
| chunkstats = self.chunkstats | chunkstats = self.chunkstats | ||||
| if ui.verbose: | if ui.verbose: | ||||
| # chunkstats for each file | # chunkstats for each file | ||||
| ('phases', 'new-commit'): ctx.phase()}): | ('phases', 'new-commit'): ctx.phase()}): | ||||
| return mctx.commit() | return mctx.commit() | ||||
| @util.propertycache | @util.propertycache | ||||
| def _useobsolete(self): | def _useobsolete(self): | ||||
| """() -> bool""" | """() -> bool""" | ||||
| return obsolete.isenabled(self.repo, obsolete.createmarkersopt) | return obsolete.isenabled(self.repo, obsolete.createmarkersopt) | ||||
| def _obsoleteoldcommits(self): | def _cleanupoldcommits(self): | ||||
| replacements = {k: ([v] if v is not None else []) | replacements = {k: ([v] if v is not None else []) | ||||
| for k, v in self.replacemap.iteritems()} | for k, v in self.replacemap.iteritems()} | ||||
| if replacements: | if replacements: | ||||
| scmutil.cleanupnodes(self.repo, replacements, operation='absorb') | scmutil.cleanupnodes(self.repo, replacements, operation='absorb') | ||||
| def _stripoldcommits(self): | |||||
| nodelist = self.replacemap.keys() | |||||
| # make sure we don't strip innocent children | |||||
| revs = self.repo.revs('%ln - (::(heads(%ln::)-%ln))', nodelist, | |||||
| nodelist, nodelist) | |||||
| tonode = self.repo.changelog.node | |||||
| nodelist = [tonode(r) for r in revs] | |||||
| if nodelist: | |||||
| repair.strip(self.repo.ui, self.repo, nodelist) | |||||
| def _parsechunk(hunk): | def _parsechunk(hunk): | ||||
| """(crecord.uihunk or patch.recordhunk) -> (path, (a1, a2, [bline]))""" | """(crecord.uihunk or patch.recordhunk) -> (path, (a1, a2, [bline]))""" | ||||
| if type(hunk) not in (crecord.uihunk, patch.recordhunk): | if type(hunk) not in (crecord.uihunk, patch.recordhunk): | ||||
| return None, None | return None, None | ||||
| path = hunk.header.filename() | path = hunk.header.filename() | ||||
| a1 = hunk.fromline + len(hunk.before) - 1 | a1 = hunk.fromline + len(hunk.before) - 1 | ||||
| # remove before and after context | # remove before and after context | ||||
| hunk.before = hunk.after = [] | hunk.before = hunk.after = [] | ||||
| > | | > | | ||||
| > A | > A | ||||
| > EOF | > EOF | ||||
| $ hg up E -q | $ hg up E -q | ||||
| $ echo 1 >> B | $ echo 1 >> B | ||||
| $ echo 2 >> D | $ echo 2 >> D | ||||
| $ hg absorb -a | $ hg absorb -a | ||||
| warning: orphaned descendants detected, not stripping 112478962961, 26805aba1e60 | |||||
| saved backup bundle to * (glob) | saved backup bundle to * (glob) | ||||
| 2 of 2 chunk(s) applied | 2 of 2 chunk(s) applied | ||||
| $ hg log -G -T '{desc}' | $ hg log -G -T '{desc}' | ||||
| @ E | @ E | ||||
| | | | | ||||
| o D | o D | ||||
| | | | | ||||