[darcs-devel] [issue207] bug in darcs! in function reconcile_unwindings

[Henrik Hjelte]

New submission from Henrik Hjelte <henrik at evahjelte.com>:

On darcs 1.0.7pre1. 
Best wishes, Henrik Hjelte

darcs --exact-version
darcs compiled on Mar  1 2006, at 03:01:57
# configured Wed Mar  1 02:53:45 CET 2006
./configure --prefix=/afs/aei-potsdam.mpg.de/u/eschnett LDFLAGS=-static
--no-create --no-recursion

Context:

[bump version to 1.0.7pre1
Tommy Pettersson <ptp at lysator.liu.se>**20060301000323]

[show 1.0.6 as latest stable source on web page
Tommy Pettersson <ptp at lysator.liu.se>**20060301000158
 Forgot this, again :-/
]

[TAG 1.0.6
Tommy Pettersson <ptp at lysator.liu.se>**20060228111841]

darcs: bug in darcs!
in function reconcile_unwindings
Original patch:
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./src/components/window.lisp 70
-        (<:as-html (window-component.inline-javascript window)))))
+        (<:as-is (window-component.inline-javascript window)))))
hunk ./src/components/window.lisp 70
-        (<:as-html (window-component.inline-javascript window)))))
+        (<:as-is (window-component.inline-javascript window)))))
)
hunk ./src/components/window.lisp 58
-              :type "text/css"))
-    (when (window-component.first-inline-javascript window)
-      (<:script :type "text/javascript"
-        (<:as-is (window-component.first-inline-javascript window))))
-    (when (window-component.javascript window)
-      (dolist (js (ensure-list (window-component.javascript window)))
-       ;; most browsers (firefox, safari and ie at least) really,
-       ;; really, really don't like empty script tags. The "" forces
-       ;; yaclml to generate a seperate closing tag.
-       (<:script :type "text/javascript" :src js "")))
-    (when (window-component.inline-javascript window)
-      (<:script :type "text/javascript"
-        (<:as-is (window-component.inline-javascript window)))))
+              :type "text/css"))
+    (dolist* ((type value) (window-component.javascript window))
+      (ecase type
+        (:src
+         ;; most browsers (firefox, safari and ie at least) really,
+         ;; really, really don't like empty script tags. The "" forces
+         ;; yaclml to generate a seperate closing tag.
+         (<:script :type "text/javascript" :src value ""))
+        (:js
+         (<:script :type "text/javascript" (<:as-is value))))))
)
merger 0.0 (
hunk ./src/components/window.lisp 59
+    (when (window-component.first-inline-javascript window)
+      (<:script :type "text/javascript"
+        (<:as-is (window-component.first-inline-javascript window))))
hunk ./src/components/window.lisp 58
-              :type "text/css"))
+              :type "text/css"))
+    (when (window-component.first-inline-javascript window)
+      (<:script :type "text/javascript"
+        (<:as-is (window-component.first-inline-javascript window))))
)
)
merger 0.0 (
merger 0.0 (
hunk ./src/components/window.lisp 58
-              :type "text/css"))
-    (when (window-component.first-inline-javascript window)
-      (<:script :type "text/javascript"
-        (<:as-is (window-component.first-inline-javascript window))))
-    (when (window-component.javascript window)
-      (dolist (js (ensure-list (window-component.javascript window)))
-       ;; most browsers (firefox, safari and ie at least) really,
-       ;; really, really don't like empty script tags. The "" forces
-       ;; yaclml to generate a seperate closing tag.
-       (<:script :type "text/javascript" :src js "")))
-    (when (window-component.inline-javascript window)
-      (<:script :type "text/javascript"
-        (<:as-is (window-component.inline-javascript window)))))
+              :type "text/css"))
+    (dolist* ((type value) (window-component.javascript window))
+      (ecase type
+        (:src
+         ;; most browsers (firefox, safari and ie at least) really,
+         ;; really, really don't like empty script tags. The "" forces
+         ;; yaclml to generate a seperate closing tag.
+         (<:script :type "text/javascript" :src value ""))
+        (:js
+         (<:script :type "text/javascript" (<:as-is value))))))
merger 0.0 (
hunk ./src/components/window.lisp 70
-        (<:as-html (window-component.inline-javascript window)))))
+        (<:as-is (window-component.inline-javascript window)))))
hunk ./src/components/window.lisp 70
-        (<:as-html (window-component.inline-javascript window)))))
+        (<:as-is (window-component.inline-javascript window)))))
)
)
hunk ./src/components/window.lisp 67
+         (<:script :type "text/javascript" (<:as-is (js:js* value))))
+        (:script
)
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./src/components/window.lisp 59
+    (when (window-component.first-inline-javascript window)
+      (<:script :type "text/javascript"
+        (<:as-is (window-component.first-inline-javascript window))))
hunk ./src/components/window.lisp 58
-              :type "text/css"))
+              :type "text/css"))
+    (when (window-component.first-inline-javascript window)
+      (<:script :type "text/javascript"
+        (<:as-is (window-component.first-inline-javascript window))))
)
merger 0.0 (
merger 0.0 (
hunk ./src/components/window.lisp 70
-        (<:as-html (window-component.inline-javascript window)))))
+        (<:as-is (window-component.inline-javascript window)))))
hunk ./src/components/window.lisp 70
-        (<:as-html (window-component.inline-javascript window)))))
+        (<:as-is (window-component.inline-javascript window)))))
)
hunk ./src/components/window.lisp 58
-              :type "text/css"))
-    (when (window-component.first-inline-javascript window)
-      (<:script :type "text/javascript"
-        (<:as-is (window-component.first-inline-javascript window))))
-    (when (window-component.javascript window)
-      (dolist (js (ensure-list (window-component.javascript window)))
-       ;; most browsers (firefox, safari and ie at least) really,
-       ;; really, really don't like empty script tags. The "" forces
-       ;; yaclml to generate a seperate closing tag.
-       (<:script :type "text/javascript" :src js "")))
-    (when (window-component.inline-javascript window)
-      (<:script :type "text/javascript"
-        (<:as-is (window-component.inline-javascript window)))))
+              :type "text/css"))
+    (dolist* ((type value) (window-component.javascript window))
+      (ecase type
+        (:src
+         ;; most browsers (firefox, safari and ie at least) really,
+         ;; really, really don't like empty script tags. The "" forces
+         ;; yaclml to generate a seperate closing tag.
+         (<:script :type "text/javascript" :src value ""))
+        (:js
+         (<:script :type "text/javascript" (<:as-is value))))))
)
)
hunk ./src/components/window.lisp 58
-              :type "text/css"))
-    (when (window-component.javascript window)
-      (dolist (js (ensure-list (window-component.javascript window)))
-       ;; most browsers (firefox, safari and ie at least) really,
-       ;; really, really don't like empty script tags. The "" forces
-       ;; yaclml to generate a seperate closing tag.
-       (<:script :type "text/javascript" :src js "")))
-    (when (window-component.inline-javascript window)
-      (<:script :type "text/javascript"
-        (<:as-html (window-component.inline-javascript window)))))
+              :type "text/css"))
+    (dolist* ((type value) (window-component.javascript window))
+      (ecase type
+        (:src
+         ;; most browsers (firefox, safari and ie at least) really,
+         ;; really, really don't like empty script tags. The "" forces
+         ;; yaclml to generate a seperate closing tag.
+         (<:script :type "text/javascript" :src value ""))
+        (:js
+         (<:script :type "text/javascript" (<:as-is (js:js* value))))
+        (:script
+         (<:script :type "text/javascript" (<:as-is value))))))
)
)
Please report this to bugs at darcs.net
If possible include the output of 'darcs --exact-version'.

----------
messages: 744
nosy: droundy, henrik, tommy
status: unread
title: bug in darcs! in function reconcile_unwindings

____________________________________
Darcs issue tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue207>
____________________________________