Mercurial > hg
comparison hgext/rebase.py @ 27977:b698abf971e7 stable 3.7.1
rebase: don't preserve most extra fields
This backs out changeset 88fde8db5307.
See the previous patches for why.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 03 Feb 2016 09:23:31 -0800 |
parents | 8f4d3eeb5198 |
children | ade12bf2bf0e 61f4d59e9a0b |
comparison
equal
deleted
inserted
replaced
27976:8f4d3eeb5198 | 27977:b698abf971e7 |
---|---|
619 repo.setparents(repo[p1].node(), repo[p2].node()) | 619 repo.setparents(repo[p1].node(), repo[p2].node()) |
620 ctx = repo[rev] | 620 ctx = repo[rev] |
621 if commitmsg is None: | 621 if commitmsg is None: |
622 commitmsg = ctx.description() | 622 commitmsg = ctx.description() |
623 keepbranch = keepbranches and repo[p1].branch() != ctx.branch() | 623 keepbranch = keepbranches and repo[p1].branch() != ctx.branch() |
624 extra = ctx.extra().copy() | 624 extra = {'rebase_source': ctx.hex()} |
625 if not keepbranches: | |
626 del extra['branch'] | |
627 extra['rebase_source'] = ctx.hex() | |
628 if extrafn: | 625 if extrafn: |
629 extrafn(ctx, extra) | 626 extrafn(ctx, extra) |
630 | 627 |
631 backup = repo.ui.backupconfig('phases', 'new-commit') | 628 backup = repo.ui.backupconfig('phases', 'new-commit') |
632 try: | 629 try: |