comparison mercurial/commands.py @ 27147:804abe8999f3

graft: copy extra (except branch) when copying changesets
author Mike Edgar <adgar@google.com>
date Sat, 28 Nov 2015 04:11:38 -0500
parents 24440cc7b441
children 39163708825c
comparison
equal deleted inserted replaced
27146:88fde8db5307 27147:804abe8999f3
3829 desc += ' (%s)' % ' '.join(names) 3829 desc += ' (%s)' % ' '.join(names)
3830 ui.status(_('grafting %s\n') % desc) 3830 ui.status(_('grafting %s\n') % desc)
3831 if opts.get('dry_run'): 3831 if opts.get('dry_run'):
3832 continue 3832 continue
3833 3833
3834 source = ctx.extra().get('source') 3834 extra = ctx.extra().copy()
3835 extra = {} 3835 del extra['branch']
3836 source = extra.get('source')
3836 if source: 3837 if source:
3837 extra['source'] = source
3838 extra['intermediate-source'] = ctx.hex() 3838 extra['intermediate-source'] = ctx.hex()
3839 else: 3839 else:
3840 extra['source'] = ctx.hex() 3840 extra['source'] = ctx.hex()
3841 user = ctx.user() 3841 user = ctx.user()
3842 if opts.get('user'): 3842 if opts.get('user'):