##// END OF EJS Templates
rebase: add boolean config item rebase.store-source...
C. Masloch -
r50343:cfff73ca default
parent child Browse files
Show More
@@ -546,7 +546,9 b' class rebaseruntime:'
546 date = self.date
546 date = self.date
547 if date is None:
547 if date is None:
548 date = ctx.date()
548 date = ctx.date()
549 extra = {b'rebase_source': ctx.hex()}
549 extra = {}
550 if repo.ui.configbool(b'rebase', b'store-source'):
551 extra = {b'rebase_source': ctx.hex()}
550 for c in self.extrafns:
552 for c in self.extrafns:
551 c(ctx, extra)
553 c(ctx, extra)
552 destphase = max(ctx.phase(), phases.draft)
554 destphase = max(ctx.phase(), phases.draft)
@@ -2841,3 +2841,17 b' coreconfigitem('
2841 b'experimental.inmemory',
2841 b'experimental.inmemory',
2842 default=False,
2842 default=False,
2843 )
2843 )
2844
2845 # This setting controls creation of a rebase_source extra field
2846 # during rebase. When False, no such field is created. This is
2847 # useful eg for incrementally converting changesets and then
2848 # rebasing them onto an existing repo.
2849 # WARNING: this is an advanced setting reserved for people who know
2850 # exactly what they are doing. Misuse of this setting can easily
2851 # result in obsmarker cycles and a vivid headache.
2852 coreconfigitem(
2853 b'rebase',
2854 b'store-source',
2855 default=True,
2856 experimental=True,
2857 )
General Comments 0
You need to be logged in to leave comments. Login now