--- a/mercurial/dagparser.py Sat Aug 07 16:38:38 2010 -0300
+++ b/mercurial/dagparser.py Sun Aug 15 11:05:04 2010 +0200
@@ -7,6 +7,7 @@
import re, string
import util
+from i18n import _
def parsedag(desc):
'''parses a DAG from a concise textual description; generates events
--- a/mercurial/wireproto.py Sat Aug 07 16:38:38 2010 -0300
+++ b/mercurial/wireproto.py Sun Aug 15 11:05:04 2010 +0200
@@ -5,7 +5,7 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
-import urllib, tempfile, os
+import urllib, tempfile, os, sys
from i18n import _
from node import bin, hex
import changegroup as changegroupmod
@@ -36,7 +36,7 @@
try:
return decodelist(d[:-1])
except:
- self.abort(error.ResponseError(_("unexpected response:"), d))
+ self._abort(error.ResponseError(_("unexpected response:"), d))
def branchmap(self):
d = self._call("branchmap")