[PATCH] Fix read mode when importing patch

Patrick Mezard pmezard at gmail.com
Tue Jun 19 10:51:19 CDT 2007


# HG changeset patch
# User Patrick Mezard <pmezard at gmail.com>
# Date 1182265411 -7200
# Node ID 48bfc756ccaf46b74875e4bf6e01595762fcc725
# Parent  2a7af17f0d3d3eb55cd4bf4753c871b6926ff200
Fix read mode when importing patch.

diff -r 2a7af17f0d3d -r 48bfc756ccaf mercurial/commands.py
--- a/mercurial/commands.py	Tue Jun 19 17:18:20 2007 +0200
+++ b/mercurial/commands.py	Tue Jun 19 17:03:31 2007 +0200
@@ -1482,7 +1482,7 @@ def import_(ui, repo, patch1, *patches, 
             tmpname, message, user, date, branch, nodeid, p1, p2 = patch.extract(ui, sys.stdin)
         else:
             ui.status(_("applying %s\n") % p)
-            tmpname, message, user, date, branch, nodeid, p1, p2 = patch.extract(ui, file(pf))
+            tmpname, message, user, date, branch, nodeid, p1, p2 = patch.extract(ui, file(pf, 'rb'))
 
         if tmpname is None:
             raise util.Abort(_('no diffs found'))


More information about the Mercurial-devel mailing list