Merge with stable

hgext/inotify/client.py

@@ -154,7 +154,7 b' class client(object):'
                 if names:
                     return filter(match, names.split('\0'))
             return []
-        results = map(readnames, resphdr[:-1])
+        results = tuple(map(readnames, resphdr[:-1]))
 
         if names:
             nbytes = resphdr[-1]

mercurial/commands.py

@@ -3157,7 +3157,7 b' def revert(ui, repo, *pats, **opts):'
                     ui.note(_('saving current version of %s as %s\n') %
                             (rel, bakname))
                     if not opts.get('dry_run'):
-                        util.copyfile(target, bakname)
+                        util.rename(target, bakname)
                 if ui.verbose or not exact:
                     msg = xlist[1]
                     if not isinstance(msg, basestring):