| pulkit |
| hg-reviewers |
| 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 (18 lines) | |||
| M | tests/test-absorb.t (16 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 |
| content = self.memworkingcopy[path] | content = self.memworkingcopy[path] | ||||
| else: | else: | ||||
| content = fctx.data() | content = fctx.data() | ||||
| mode = (fctx.islink(), fctx.isexec()) | mode = (fctx.islink(), fctx.isexec()) | ||||
| copy = fctx.copysource() | copy = fctx.copysource() | ||||
| return content, mode, copy | return content, mode, copy | ||||
| def overlaycontext(memworkingcopy, ctx, parents=None, extra=None): | def overlaycontext(memworkingcopy, ctx, parents=None, extra=None, desc=None): | ||||
| """({path: content}, ctx, (p1node, p2node)?, {}?) -> memctx | """({path: content}, ctx, (p1node, p2node)?, {}?) -> memctx | ||||
| memworkingcopy overrides file contents. | memworkingcopy overrides file contents. | ||||
| """ | """ | ||||
| # parents must contain 2 items: (node1, node2) | # parents must contain 2 items: (node1, node2) | ||||
| if parents is None: | if parents is None: | ||||
| parents = ctx.repo().changelog.parents(ctx.node()) | parents = ctx.repo().changelog.parents(ctx.node()) | ||||
| if extra is None: | if extra is None: | ||||
| extra = ctx.extra() | extra = ctx.extra() | ||||
| date = ctx.date() | if desc is None: | ||||
| desc = ctx.description() | desc = ctx.description() | ||||
| date = ctx.date() | |||||
| user = ctx.user() | user = ctx.user() | ||||
| files = set(ctx.files()).union(memworkingcopy) | files = set(ctx.files()).union(memworkingcopy) | ||||
| store = overlaystore(ctx, memworkingcopy) | store = overlaystore(ctx, memworkingcopy) | ||||
| return context.memctx( | return context.memctx( | ||||
| repo=ctx.repo(), | repo=ctx.repo(), | ||||
| parents=parents, | parents=parents, | ||||
| text=desc, | text=desc, | ||||
| files=files, | files=files, | ||||
| the commit is a clone from ctx, with a (optionally) different p1, and | the commit is a clone from ctx, with a (optionally) different p1, and | ||||
| different file contents replaced by memworkingcopy. | different file contents replaced by memworkingcopy. | ||||
| """ | """ | ||||
| parents = p1 and (p1, node.nullid) | parents = p1 and (p1, node.nullid) | ||||
| extra = ctx.extra() | extra = ctx.extra() | ||||
| if self._useobsolete and self.ui.configbool(b'absorb', b'add-noise'): | if self._useobsolete and self.ui.configbool(b'absorb', b'add-noise'): | ||||
| extra[b'absorb_source'] = ctx.hex() | extra[b'absorb_source'] = ctx.hex() | ||||
| mctx = overlaycontext(memworkingcopy, ctx, parents, extra=extra) | |||||
| desc = rewriteutil.update_hash_refs( | |||||
| ctx.repo(), | |||||
| ctx.description(), | |||||
| { | |||||
| oldnode: [newnode] | |||||
| for oldnode, newnode in self.replacemap.items() | |||||
| }, | |||||
| ) | |||||
| mctx = overlaycontext( | |||||
| memworkingcopy, ctx, parents, extra=extra, desc=desc | |||||
| ) | |||||
| 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 _cleanupoldcommits(self): | def _cleanupoldcommits(self): | ||||
| $ cd .. | $ cd .. | ||||
| $ hg init repo6 | $ hg init repo6 | ||||
| $ cd repo6 | $ cd repo6 | ||||
| $ echo a1 > a | $ echo a1 > a | ||||
| $ touch b | $ touch b | ||||
| $ hg commit -m a -A a b | $ hg commit -m a -A a b | ||||
| $ hg branch foo -q | $ hg branch foo -q | ||||
| $ echo b > b | $ echo b > b | ||||
| $ hg commit -m foo # will become empty | $ hg commit -m 'foo (child of 0cde1ae39321)' # will become empty | ||||
| $ hg branch bar -q | $ hg branch bar -q | ||||
| $ hg commit -m bar # is already empty | $ hg commit -m 'bar (child of e969dc86aefc)' # is already empty | ||||
| $ echo a2 > a | $ echo a2 > a | ||||
| $ printf '' > b | $ printf '' > b | ||||
| $ hg absorb --apply-changes --verbose | grep became | $ hg absorb --apply-changes --verbose | grep became | ||||
| 0:0cde1ae39321: 1 file(s) changed, became 3:fc7fcdd90fdb | 0:0cde1ae39321: 1 file(s) changed, became 3:fc7fcdd90fdb | ||||
| 1:795dfb1adcef: 2 file(s) changed, became 4:a8740537aa53 | 1:e969dc86aefc: 2 file(s) changed, became 4:8fc6b2cb43a5 | ||||
| 2:b02935f68891: 2 file(s) changed, became 5:59533e01c707 | 2:0298954ced32: 2 file(s) changed, became 5:ca8386dc4e2c | ||||
| $ hg log -T '{rev} (branch: {branch}) {desc}\n' -G --stat | $ hg log -T '{rev}:{node|short} (branch: {branch}) {desc}\n' -G --stat | ||||
| @ 5 (branch: bar) bar | @ 5:ca8386dc4e2c (branch: bar) bar (child of 8fc6b2cb43a5) | ||||
| | | | | ||||
| o 4 (branch: foo) foo | o 4:8fc6b2cb43a5 (branch: foo) foo (child of fc7fcdd90fdb) | ||||
| | | | | ||||
| o 3 (branch: default) a | o 3:fc7fcdd90fdb (branch: default) a | ||||
| a | 1 + | a | 1 + | ||||
| b | 0 | b | 0 | ||||
| 2 files changed, 1 insertions(+), 0 deletions(-) | 2 files changed, 1 insertions(+), 0 deletions(-) | ||||
| $ cd .. | $ cd .. | ||||
| $ hg init repo7 | $ hg init repo7 | ||||
| $ cd repo7 | $ cd repo7 | ||||