# HG changeset patch # User Matt Mackall # Date 1243882281 18000 # Node ID 4ea995e5aac04fc9908d2c5a2f36a75997ebe4e4 # Parent 3d53820381cb368cc538c18ee2e42beda1dc20bb fetch: no need to pass files list to commit diff -r 3d53820381cb -r 4ea995e5aac0 hgext/fetch.py --- a/hgext/fetch.py Wed Jun 03 14:50:03 2009 +0200 +++ b/hgext/fetch.py Mon Jun 01 13:51:21 2009 -0500 @@ -121,15 +121,14 @@ err = hg.merge(repo, secondparent, remind=False) if not err: - mod, add, rem = repo.status()[:3] message = (cmdutil.logmessage(opts) or (_('Automated merge with %s') % url.removeauth(other.url()))) editor = cmdutil.commiteditor if opts.get('force_editor') or opts.get('edit'): editor = cmdutil.commitforceeditor - n = repo.commit(mod + add + rem, message, opts['user'], - opts['date'], force=True, editor=editor) + n = repo.commit(None, message, opts['user'], opts['date'], + force=True, editor=editor) ui.status(_('new changeset %d:%s merges remote changes ' 'with local\n') % (repo.changelog.rev(n), short(n)))