Mercurial > public > mercurial-scm > hg

comparison hgext/fetch.py @ 8698:4ea995e5aac0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fetch: no need to pass files list to commit
author Matt Mackall <mpm@selenic.com>
date Mon, 01 Jun 2009 13:51:21 -0500
parents b97e2417ae53
children 25e9c71b89de
comparison
equal deleted inserted replaced
8697:3d53820381cb 8698:4ea995e5aac0
119 ui.status(_('merging with %d:%s\n') % 119 ui.status(_('merging with %d:%s\n') %
120 (repo.changelog.rev(secondparent), short(secondparent))) 120 (repo.changelog.rev(secondparent), short(secondparent)))
121 err = hg.merge(repo, secondparent, remind=False) 121 err = hg.merge(repo, secondparent, remind=False)
122 122
123 if not err: 123 if not err:
124 mod, add, rem = repo.status()[:3]
125 message = (cmdutil.logmessage(opts) or 124 message = (cmdutil.logmessage(opts) or
126 (_('Automated merge with %s') % 125 (_('Automated merge with %s') %
127 url.removeauth(other.url()))) 126 url.removeauth(other.url())))
128 editor = cmdutil.commiteditor 127 editor = cmdutil.commiteditor
129 if opts.get('force_editor') or opts.get('edit'): 128 if opts.get('force_editor') or opts.get('edit'):
130 editor = cmdutil.commitforceeditor 129 editor = cmdutil.commitforceeditor
131 n = repo.commit(mod + add + rem, message, opts['user'], 130 n = repo.commit(None, message, opts['user'], opts['date'],
132 opts['date'], force=True, editor=editor) 131 force=True, editor=editor)
133 ui.status(_('new changeset %d:%s merges remote changes ' 132 ui.status(_('new changeset %d:%s merges remote changes '
134 'with local\n') % (repo.changelog.rev(n), 133 'with local\n') % (repo.changelog.rev(n),
135 short(n))) 134 short(n)))
136 135
137 finally: 136 finally: