Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 27974:bb14a81ce647 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: don't preserve most extra fields This backs out changeset 804abe8999f3. See the previous patch for why we're doing this.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 03 Feb 2016 09:06:52 -0800
parents ce9696193175
children 96bfd2875213 e417e4512b0f
comparison
equal deleted inserted replaced
27973:ce9696193175 27974:bb14a81ce647
4008 desc += ' (%s)' % ' '.join(names) 4008 desc += ' (%s)' % ' '.join(names)
4009 ui.status(_('grafting %s\n') % desc) 4009 ui.status(_('grafting %s\n') % desc)
4010 if opts.get('dry_run'): 4010 if opts.get('dry_run'):
4011 continue 4011 continue
4012 4012
4013 extra = ctx.extra().copy() 4013 source = ctx.extra().get('source')
4014 del extra['branch'] 4014 extra = {}
4015 source = extra.get('source')
4016 if source: 4015 if source:
4016 extra['source'] = source
4017 extra['intermediate-source'] = ctx.hex() 4017 extra['intermediate-source'] = ctx.hex()
4018 else: 4018 else:
4019 extra['source'] = ctx.hex() 4019 extra['source'] = ctx.hex()
4020 user = ctx.user() 4020 user = ctx.user()
4021 if opts.get('user'): 4021 if opts.get('user'):