failed tests (was: Re: Clone via hardlinks for Windows)

[Thomas Arendsen Hein]

* Stephen Darnell <sdarnell at esmertec.com> [20050828 14:59]:
> I also ran the test suite on debian and it fails the same as the
> current latest (unrelated to my changes).
> - test-copy2.err (time diffs?)
> - test-filebranch.err (whitespace change)

I saw this, too, and have fixed it. Patches attached and pullable
from me.

I haven't looked at the windows hardlink part yet.

Thomas

-- 
Email: thomas at intevation.de
http://intevation.de/~thomas/
-------------- next part --------------
# HG changeset patch
# User Thomas Arendsen Hein <thomas at intevation.de>
# Node ID 624a3a4fa232bffcbc9ec680b1697f82b30a41e2
# Parent  a33a7a543803c7383a6918b19797bf9fd6b83e8e
Changed printing of copies in hg debugstate to: "copy: source -> dest"

diff -r a33a7a543803c7383a6918b19797bf9fd6b83e8e -r 624a3a4fa232bffcbc9ec680b1697f82b30a41e2 mercurial/commands.py
--- a/mercurial/commands.py	Sun Aug 28 06:45:27 2005
+++ b/mercurial/commands.py	Sun Aug 28 14:24:04 2005
@@ -690,9 +690,8 @@
                  % (dc[file_][0], dc[file_][1] & 0777, dc[file_][2],
                     time.strftime("%x %X",
                                   time.localtime(dc[file_][3])), file_))
-    ui.write("\n")
     for f in repo.dirstate.copies:
-        ui.write("%s -> %s\n" % (repo.dirstate.copies[f], f))
+        ui.write("copy: %s -> %s\n" % (repo.dirstate.copies[f], f))
 
 def debugdata(ui, file_, rev):
     """dump the contents of an data file revision"""
-------------- next part --------------
# HG changeset patch
# User Thomas Arendsen Hein <thomas at intevation.de>
# Node ID 19b048da4da98b840461f7bf150e978da597d8db
# Parent  624a3a4fa232bffcbc9ec680b1697f82b30a41e2
Fixed test-copy2 with only looking at copied files.

diff -r 624a3a4fa232bffcbc9ec680b1697f82b30a41e2 -r 19b048da4da98b840461f7bf150e978da597d8db tests/test-copy2
--- a/tests/test-copy2	Sun Aug 28 14:24:04 2005
+++ b/tests/test-copy2	Sun Aug 28 14:37:24 2005
@@ -8,11 +8,11 @@
 echo "# should show copy"
 cp foo bar
 hg copy foo bar
-hg debugstate
+hg debugstate|grep ^copy
 
 echo "# shouldn't show copy"
 hg commit -m2 -d"0 0"
-hg debugstate
+hg debugstate|grep ^copy
 
 echo "# should match"
 hg debugindex .hg/data/foo.i
@@ -28,7 +28,7 @@
 cp foo bar
 hg copy foo bar
 echo "# should show copy"
-hg debugstate
+hg debugstate|grep ^copy
 hg commit -m3 -d"0 0"
 
 echo "# should show no parents for tip"
@@ -38,4 +38,6 @@
 hg debugrename bar
 
 echo "# should show no copies"
-hg debugstate
\ No newline at end of file
+hg debugstate|grep ^copy
+
+exit 0
diff -r 624a3a4fa232bffcbc9ec680b1697f82b30a41e2 -r 19b048da4da98b840461f7bf150e978da597d8db tests/test-copy2.out
--- a/tests/test-copy2.out	Sun Aug 28 14:24:04 2005
+++ b/tests/test-copy2.out	Sun Aug 28 14:37:24 2005
@@ -1,12 +1,6 @@
 # should show copy
-a 644          4 08/28/05 05:00:19 bar
-n 644          4 08/28/05 05:00:19 foo
-
-foo -> bar
+copy: foo -> bar
 # shouldn't show copy
-n 644          4 08/28/05 05:00:19 bar
-n 644          4 08/28/05 05:00:19 foo
-
 # should match
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
@@ -14,10 +8,7 @@
 # should not be renamed
 not renamed
 # should show copy
-n 644          5 08/28/05 05:00:19 bar
-n 644          6 08/28/05 05:00:19 foo
-
-foo -> bar
+copy: foo -> bar
 # should show no parents for tip
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0      69      0       1 6ca237634e1f 000000000000 000000000000
@@ -29,6 +20,3 @@
      1         5       7      1       2 dd12c926cf16 2ed2a3912a0b 000000000000
 renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17
 # should show no copies
-n 644          6 08/28/05 05:00:19 bar
-n 644          6 08/28/05 05:00:19 foo
-
-------------- next part --------------
# HG changeset patch
# User Thomas Arendsen Hein <thomas at intevation.de>
# Node ID 8bf19f96b97ad6447adef4640ac0d0e46c0bea05
# Parent  19b048da4da98b840461f7bf150e978da597d8db
Fixed test-static-http with http_proxy variable set.

diff -r 19b048da4da98b840461f7bf150e978da597d8db -r 8bf19f96b97ad6447adef4640ac0d0e46c0bea05 tests/test-static-http
--- a/tests/test-static-http	Sun Aug 28 14:37:24 2005
+++ b/tests/test-static-http	Sun Aug 28 14:41:16 2005
@@ -31,7 +31,7 @@
 
 cd ..
 
-hg clone old-http://localhost:20059/remote local
+http_proxy= hg clone old-http://localhost:20059/remote local
 
 cd local
 hg verify