Mercurial > hg-stable

changeset 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 3d53820381cb
children f364cc1d98c4
files hgext/fetch.py
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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)))