Comments
Patch
@@ -9,6 +9,7 @@
from lock import release
from i18n import _
import os, re, difflib, time, tempfile, errno
+import sys
import hg, scmutil, util, revlog, copies, error, bookmarks
import patch, help, encoding, templatekw, discovery
import archival, changegroup, cmdutil, hbisect
@@ -2045,6 +2046,9 @@
f.close()
return name
+ ui.status(_("displaying install info...\n"))
+ ui.status(_("sys.version: %s\n\n") % sys.version)
+
problems = 0
# encoding
@@ -2,6 +2,7 @@
import fnmatch
import os
import subprocess
+import sys
import textwrap
import unittest
@@ -46,7 +47,15 @@
# We use a deque so we can call popleft() and compare lines without
# keeping track of a list index.
lines = collections.deque(lines)
- self.checklines(lines, ["checking encoding (ascii)..."])
+ # Since sys.version can be a multi-line string, we need to dedent
+ # before doing the substitution.
+ expected = textwrap.dedent("""\
+ displaying install info...
+ sys.version: %s
+
+ checking encoding (ascii)...
+ """) % sys.version
+ self.checklines(lines, expected.splitlines())
expected = tolines("""\
checking Python lib (*lib*)...
checking installed modules (*mercurial)...