Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make debuginstall actually attempt to use external patch and merge
authorMatt Mackall <mpm@selenic.com>
Sun, 10 Dec 2006 00:44:52 -0600
changeset 3846 18855084b922
parent 3845 8958417abf62
child 3847 048e9bc5cdc2
Make debuginstall actually attempt to use external patch and merge This will catch some tricky problems with tools and setup.
mercurial/commands.py file | annotate | diff | comparison | revisions
tests/test-install file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Sun Dec 10 00:06:31 2006 -0600
+++ b/mercurial/commands.py	Sun Dec 10 00:44:52 2006 -0600
@@ -10,7 +10,7 @@
 from i18n import gettext as _
 demandload(globals(), "bisect os re sys signal imp urllib pdb shlex stat")
 demandload(globals(), "fancyopts ui hg util lock revlog bundlerepo")
-demandload(globals(), "difflib patch time help")
+demandload(globals(), "difflib patch time help mdiff tempfile")
 demandload(globals(), "traceback errno version atexit")
 demandload(globals(), "archival changegroup cmdutil hgweb.server sshserver")
 
@@ -830,6 +830,13 @@
 def debuginstall(ui):
     '''test Mercurial installation'''
 
+    def writetemp(contents):
+        (fd, name) = tempfile.mkstemp()
+        f = os.fdopen(fd, "wb")
+        f.write(contents)
+        f.close()
+        return name
+
     problems = 0
 
     # encoding
@@ -867,7 +874,31 @@
     if not patcher:
         ui.write(_(" Can't find patch or gpatch in PATH\n"))
         problems += 1
-    # should actually attempt a patch here
+    else:
+        # actually attempt a patch here
+        a = "1\n2\n3\n4\n"
+        b = "1\n2\n3\ninsert\n4\n"
+        d = mdiff.unidiff(a, None, b, None, "a")
+        fa = writetemp(a)
+        fd = writetemp(d)
+        fp = os.popen('%s %s %s' % (patcher, fa, fd))
+        files = []
+        output = ""
+        for line in fp:
+            output += line
+            if line.startswith('patching file '):
+                pf = util.parse_patch_output(line.rstrip())
+                files.append(pf)
+        if files != [fa]:
+            ui.write(_(" unexpected patch output!"))
+            ui.write(data)
+            problems += 1
+        a = file(fa).read()
+        if a != b:
+            ui.write(_(" patch test failed!"))
+            problems += 1
+        os.unlink(fa)
+        os.unlink(fd)
 
     # merge helper
     ui.status(_("Checking merge helper...\n"))
@@ -883,7 +914,22 @@
         else:
             ui.write(_(" Can't find merge helper '%s' in PATH\n") % cmd)
             problems += 1
-    # should attempt a non-conflicting merge here
+    else:
+        # actually attempt a patch here
+        fa = writetemp("1\n2\n3\n4\n")
+        fl = writetemp("1\n2\n3\ninsert\n4\n")
+        fr = writetemp("begin\n1\n2\n3\n4\n")
+        r = os.system('%s %s %s %s' % (cmd, fl, fa, fr))
+        if r:
+            ui.write(_(" got unexpected merge error %d!") % r)
+            problems += 1
+        m = file(fl).read()
+        if m != "begin\n1\n2\n3\ninsert\n4\n":
+            ui.write(_(" got unexpected merge results!") % r)
+            ui.write(m)
+        os.unlink(fa)
+        os.unlink(fl)
+        os.unlink(fr)
 
     # editor
     ui.status(_("Checking commit editor...\n"))
--- a/tests/test-install	Sun Dec 10 00:06:31 2006 -0600
+++ b/tests/test-install	Sun Dec 10 00:44:52 2006 -0600
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-hg debuginstall
+HGMERGE=merge hg debuginstall
Mercurial