This excludes the --collapse case because degenerating to p1 is almost certainly
as wrong as leaving the old hashes in place. I expect most people to amend the
message explicitly when using that.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| '''Commit the wd changes with parents p1 and p2. | '''Commit the wd changes with parents p1 and p2. | ||||
| Reuse commit info from rev but also store useful information in extra. | Reuse commit info from rev but also store useful information in extra. | ||||
| Return node of committed revision.''' | Return node of committed revision.''' | ||||
| repo = self.repo | repo = self.repo | ||||
| ctx = repo[rev] | ctx = repo[rev] | ||||
| if commitmsg is None: | if commitmsg is None: | ||||
| commitmsg = ctx.description() | commitmsg = ctx.description() | ||||
| # Skip replacement if collapsing, as that degenerates to p1 for all | |||||
| # nodes. | |||||
| if not self.collapsef: | |||||
| cl = repo.changelog | |||||
| commitmsg = rewriteutil.update_hash_refs( | |||||
| repo, | |||||
| commitmsg, | |||||
| { | |||||
| cl.node(oldrev): [cl.node(newrev)] | |||||
| for oldrev, newrev in self.state.items() | |||||
| if newrev != revtodo | |||||
| }, | |||||
| ) | |||||
| date = self.date | date = self.date | ||||
| if date is None: | if date is None: | ||||
| date = ctx.date() | date = ctx.date() | ||||
| extra = {b'rebase_source': ctx.hex()} | extra = {b'rebase_source': ctx.hex()} | ||||
| for c in self.extrafns: | for c in self.extrafns: | ||||
| c(ctx, extra) | c(ctx, extra) | ||||
| destphase = max(ctx.phase(), phases.draft) | destphase = max(ctx.phase(), phases.draft) | ||||
| overrides = { | overrides = { | ||||
| $ echo a > a | $ echo a > a | ||||
| $ hg add a | $ hg add a | ||||
| $ hg commit --message "File a created" | $ hg commit --message "File a created" | ||||
| $ hg copy a b | $ hg copy a b | ||||
| $ echo b > b | $ echo b > b | ||||
| $ hg commit --message "File b created as copy of a and modified" | $ hg commit --message "File b created as copy of a and modified" | ||||
| $ hg copy b c | $ hg copy b c | ||||
| $ echo c > c | $ echo c > c | ||||
| $ hg commit --message "File c created as copy of b and modified" | $ hg commit --message "File c created as copy of b and modified" ## | ||||
| $ hg copy c d | $ hg copy c d | ||||
| $ echo d > d | $ echo d > d | ||||
| $ hg commit --message "File d created as copy of c and modified" | $ hg commit --message "File d created as copy of c and modified (child of 327f772bc074)" | ||||
| Note that there are four entries in the log for d | Note that there are four entries in the log for d | ||||
| $ hg tglog --follow d | $ hg tglog --follow d | ||||
| @ 3: 421b7e82bb85 'File d created as copy of c and modified' | @ 3: 6be224292cfa 'File d created as copy of c and modified (child of 327f772bc074)' | ||||
| | | | | ||||
| o 2: 327f772bc074 'File c created as copy of b and modified' | o 2: 327f772bc074 'File c created as copy of b and modified' | ||||
| | | | | ||||
| o 1: 79d255d24ad2 'File b created as copy of a and modified' | o 1: 79d255d24ad2 'File b created as copy of a and modified' | ||||
| | | | | ||||
| o 0: b220cd6d2326 'File a created' | o 0: b220cd6d2326 'File a created' | ||||
| Update back to before we performed copies, and inject an unrelated change. | Update back to before we performed copies, and inject an unrelated change. | ||||
| $ hg update 0 | $ hg update 0 | ||||
| 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | ||||
| $ echo unrelated > unrelated | $ echo unrelated > unrelated | ||||
| $ hg add unrelated | $ hg add unrelated | ||||
| $ hg commit --message "Unrelated file created" | $ hg commit --message "Unrelated file created" | ||||
| created new head | created new head | ||||
| $ hg update 4 | $ hg update 4 | ||||
| 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| Rebase the copies on top of the unrelated change. | Rebase the copies on top of the unrelated change. | ||||
| $ hg rebase --source 1 --dest 4 | $ hg rebase --source 1 --dest 4 | ||||
| rebasing 1:79d255d24ad2 "File b created as copy of a and modified" | rebasing 1:79d255d24ad2 "File b created as copy of a and modified" | ||||
| rebasing 2:327f772bc074 "File c created as copy of b and modified" | rebasing 2:327f772bc074 "File c created as copy of b and modified" | ||||
| rebasing 3:421b7e82bb85 "File d created as copy of c and modified" | rebasing 3:6be224292cfa "File d created as copy of c and modified (child of 327f772bc074)" | ||||
| saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/79d255d24ad2-a2265555-rebase.hg | saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/79d255d24ad2-a3e674e3-rebase.hg | ||||
| $ hg update 4 | $ hg update 4 | ||||
| 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| There should still be four entries in the log for d | There should still be four entries in the log for d | ||||
| $ hg tglog --follow d | $ hg tglog --follow d | ||||
| @ 4: dbb9ba033561 'File d created as copy of c and modified' | @ 4: afbdde3a60d5 'File d created as copy of c and modified (child of af74b229bc02)' | ||||
| | | | | ||||
| o 3: af74b229bc02 'File c created as copy of b and modified' | o 3: af74b229bc02 'File c created as copy of b and modified' | ||||
| | | | | ||||
| o 2: 68bf06433839 'File b created as copy of a and modified' | o 2: 68bf06433839 'File b created as copy of a and modified' | ||||
| : | : | ||||
| o 0: b220cd6d2326 'File a created' | o 0: b220cd6d2326 'File a created' | ||||
| Same steps as above, but with --collapse on rebase to make sure the | Same steps as above, but with --collapse on rebase to make sure the | ||||
| copy records collapse correctly. | copy records collapse correctly. | ||||
| $ hg co 1 | $ hg co 1 | ||||
| 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | ||||
| $ echo more >> unrelated | $ echo more >> unrelated | ||||
| $ hg ci -m 'unrelated commit is unrelated' | $ hg ci -m 'unrelated commit is unrelated' | ||||
| created new head | created new head | ||||
| $ hg rebase -s 2 --dest 5 --collapse | $ hg rebase -s 2 --dest 5 --collapse | ||||
| rebasing 2:68bf06433839 "File b created as copy of a and modified" | rebasing 2:68bf06433839 "File b created as copy of a and modified" | ||||
| rebasing 3:af74b229bc02 "File c created as copy of b and modified" | rebasing 3:af74b229bc02 "File c created as copy of b and modified" | ||||
| merging b and c to c | merging b and c to c | ||||
| rebasing 4:dbb9ba033561 "File d created as copy of c and modified" | rebasing 4:afbdde3a60d5 "File d created as copy of c and modified (child of af74b229bc02)" | ||||
| merging c and d to d | merging c and d to d | ||||
| saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/68bf06433839-dde37595-rebase.hg | saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/68bf06433839-29d5057f-rebase.hg | ||||
| $ hg co tip | $ hg co tip | ||||
| 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| This should show both revision 3 and 0 since 'd' was transitively a | This should show both revision 3 and 0 since 'd' was transitively a | ||||
| copy of 'a'. | copy of 'a'. | ||||
| $ hg tglog --follow d | $ hg tglog --follow d | ||||
| @ 3: 5a46b94210e5 'Collapsed revision | @ 3: 75708a266e56 'Collapsed revision | ||||
| : * File b created as copy of a and modified | : * File b created as copy of a and modified | ||||
| : * File c created as copy of b and modified | : * File c created as copy of b and modified | ||||
| : * File d created as copy of c and modified' | : * File d created as copy of c and modified (child of af74b229bc02)' | ||||
| o 0: b220cd6d2326 'File a created' | o 0: b220cd6d2326 'File a created' | ||||
| $ hg log -G -Tcompact | |||||
| @ 3[tip] 75708a266e56 1970-01-01 00:00 +0000 test | |||||
| | Collapsed revision | |||||
| | | |||||
| o 2 15258cf0cf10 1970-01-01 00:00 +0000 test | |||||
| | unrelated commit is unrelated | |||||
| | | |||||
| o 1 1d689898494b 1970-01-01 00:00 +0000 test | |||||
| | Unrelated file created | |||||
| | | |||||
| o 0 b220cd6d2326 1970-01-01 00:00 +0000 test | |||||
| File a created | |||||
| $ cd .. | $ cd .. | ||||