Submitter | Katsunori FUJIWARA |
---|---|
Date | Aug. 2, 2014, 1:02 p.m. |
Message ID | <3d0afcec1d5053a7ed5f.1406984531@feefifofum> |
Download | mbox | patch |
Permalink | /patch/5230/ |
State | Accepted |
Commit | 20fd00ee432e16965bfb97a2fcfbed8134d4352a |
Headers | show |
Comments
Patch
diff --git a/hgext/fetch.py b/hgext/fetch.py --- a/hgext/fetch.py +++ b/hgext/fetch.py @@ -143,8 +143,8 @@ ('Automated merge with %s' % util.removeauth(other.url()))) editopt = opts.get('edit') or opts.get('force_editor') - n = repo.commit(message, opts['user'], opts['date'], - editor=cmdutil.getcommiteditor(edit=editopt)) + editor = cmdutil.getcommiteditor(edit=editopt, editform='fetch') + n = repo.commit(message, opts['user'], opts['date'], editor=editor) ui.status(_('new changeset %d:%s merges remote changes ' 'with local\n') % (repo.changelog.rev(n), short(n)))