You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2013/11/21 22:51:40 UTC
[1/4] git commit: [#4373] ticket:488 diff in fixed-width font
Updated Branches:
refs/heads/master 8ec5847c1 -> 4386d93c3
[#4373] ticket:488 diff in fixed-width font
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/3006ef9b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/3006ef9b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/3006ef9b
Branch: refs/heads/master
Commit: 3006ef9b584b909705ff4c15125dfea2535d38df
Parents: 2e69a4e
Author: Yaroslav Sokolovsky <ya...@gmail.com>
Authored: Tue Nov 19 16:51:04 2013 +0200
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Thu Nov 21 21:40:21 2013 +0000
----------------------------------------------------------------------
ForgeWiki/forgewiki/templates/wiki/page_diff.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3006ef9b/ForgeWiki/forgewiki/templates/wiki/page_diff.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_diff.html b/ForgeWiki/forgewiki/templates/wiki/page_diff.html
index f521911..9868785 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_diff.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_diff.html
@@ -35,7 +35,7 @@
<p>Comparing <a href=".?version={{p1.version}}">Version {{p1.version}}</a>
with <a href=".?version={{p2.version}}">Version {{p2.version}}</a></p>
<hr/>
-<div style="font-family: fixed">
+<div style="font-family: fixed-width, monospace">
{{h.html.literal(edits)}}
</div>
{% endblock %}
[3/4] git commit: [#4373] ticket:488 expanded diff test
Posted by tv...@apache.org.
[#4373] ticket:488 expanded diff test
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/6383afc0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/6383afc0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/6383afc0
Branch: refs/heads/master
Commit: 6383afc00619e3ae51857bd70ae87a0a92daf87a
Parents: 8ec5847
Author: Yaroslav Sokolovsky <ya...@gmail.com>
Authored: Tue Nov 19 13:48:56 2013 +0200
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Thu Nov 21 21:40:21 2013 +0000
----------------------------------------------------------------------
.../forgewiki/tests/functional/test_root.py | 74 ++++++++++++++++++++
1 file changed, 74 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6383afc0/ForgeWiki/forgewiki/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/tests/functional/test_root.py b/ForgeWiki/forgewiki/tests/functional/test_root.py
index 8be7ff8..0bd5d78 100644
--- a/ForgeWiki/forgewiki/tests/functional/test_root.py
+++ b/ForgeWiki/forgewiki/tests/functional/test_root.py
@@ -243,6 +243,80 @@ class TestRootController(TestController):
assert 'Subscribe' in response
response = self.app.get('/wiki/tést/diff?v1=0&v2=0')
assert 'tést' in response
+ d = dict(title='testdiff', text="""**Optionally**, you may also want to remove all the unused accounts that have accumulated (one was created for *every* logged in SF-user who has visited your MediaWiki hosted app):
+
+ ~~~~~
+ php removeUnusedAccounts.php --delete
+ ~~~~~
+
+ #### 6) Import image (and other) files into your Mediawiki install ####
+
+ Upload the backup of your data files to the project web.
+
+ ~~~~~
+ scp projectname_mediawiki_files.tar.gz USERNAME@web.sourceforge.net:
+ ~~~~~
+
+ In the project web shell, unpack the files to the images directory of you wiki installation. In the backup, the images are in a subfolder *projectname*, so follow these steps:
+
+ ~~~~~
+ cd wiki
+ mkdir oldimages
+ cd oldimages
+ tar -xvzf ../../../projectname_mediawiki_files.tar.gz
+ mv projectname/* ../images/
+ cd ..
+ rm -r oldimages
+ # Now fix permissons. Wrong permissions may cause massive slowdown!
+ chown yournick:apache images/ --recursive
+ chmod 775 images/ --recursive
+ ~~~~~
+
+ **TODO: FIXME:** The following can't be quite correct:
+
+ Now hit your wiki a few times from a browser. Initially, it will be dead slow, as it is trying to build thumbnails for the images. And it will time out, a lot. Keep hitting reload, until it works.
+
+ **Note:** The logo shown in the sidebar is no longer stored as an object in the wiki (as it was in the Hosted App installation). Rather save it as a regular file, then edit LocalSettings.php, adding""")
+ self.app.post('/wiki/testdiff/update', params=d)
+ d = dict(title='testdiff', text="""**Optionally**, you may also want to remove all the unused accounts that have accumulated (one was created for *every* logged in SF-user who has visited your MediaWiki hosted app):
+
+ ~~~~~
+ php removeUnusedAccounts.php --delete
+ ~~~~~
+
+ #### 6) Import image (and other) files into your Mediawiki install ####
+
+ Upload the backup of your data files to the project web.
+
+ ~~~~~
+ scp projectname_mediawiki_files.tar.gz USERNAME@web.sourceforge.net:
+ ~~~~~
+
+ In the project web shell, unpack the files to the images directory of you wiki installation. In the backup, the images are in a subfolder *projectname*, so follow these steps:
+
+ ~~~~~
+ cd wiki
+ mkdir oldimages
+ cd oldimages
+ tar -xvzf ../../../projectname_mediawiki_files.tar.gz
+ mv projectname/* ../images/
+ cd ..
+ rm -r oldimages
+ # Now fix permissions. Wrong permissions may cause a massive slowdown!
+ chown yournick:apache images/ --recursive
+ chmod 775 images/ --recursive
+ ~~~~~
+
+ **TODO: FIXME:** The following can't be quite correct:
+
+ Now hit your wiki a few times from a browser. Initially, it will be dead slow, as it is trying to build thumbnails for the images. And it will time out, a lot. Keep hitting reload, until it works.
+
+ **Note:** The logo shown in the sidebar is no longer stored as an object in the wiki (as it was in the Hosted App installation). Rather save it as a regular file, then edit LocalSettings.php, adding""")
+ self.app.post('/wiki/testdiff/update', params=d)
+ response = self.app.get('/wiki/testdiff/diff?v1=1&v2=2')
+ assert '# Now fix <del> permissons. </del> <ins> permissions. </ins> Wrong permissions may cause <ins> a </ins> massive slowdown!' in response
+ response = self.app.get('/wiki/testdiff/diff?v1=2&v2=1')
+ assert '# Now fix <del> permissions. </del> <ins> permissons. </ins> Wrong permissions may cause <del> a </del> massive slowdown!' in response
def test_page_raw(self):
self.app.post(
[2/4] git commit: [#4373] ticket:488 fixed diff_text helper
Posted by tv...@apache.org.
[#4373] ticket:488 fixed diff_text helper
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/2e69a4ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/2e69a4ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/2e69a4ed
Branch: refs/heads/master
Commit: 2e69a4ed3bfc7617dbd12f2a359d473cf2c8d250
Parents: 6383afc
Author: Yaroslav Sokolovsky <ya...@gmail.com>
Authored: Tue Nov 19 15:48:15 2013 +0200
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Thu Nov 21 21:40:21 2013 +0000
----------------------------------------------------------------------
Allura/allura/lib/helpers.py | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2e69a4ed/Allura/allura/lib/helpers.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/helpers.py b/Allura/allura/lib/helpers.py
index 601f24d..a987a3e 100644
--- a/Allura/allura/lib/helpers.py
+++ b/Allura/allura/lib/helpers.py
@@ -392,13 +392,11 @@ def diff_text(t1, t2, differ=None):
for line in t1_lines:
for word in line.split(' '):
t1_words.append(word)
- t1_words.append(' ')
t1_words.append('\n')
t2_words = []
for line in t2_lines:
for word in line.split(' '):
t2_words.append(word)
- t2_words.append(' ')
t2_words.append('\n')
if differ is None:
differ = difflib.SequenceMatcher(None, t1_words, t2_words)
[4/4] git commit: Add some padding to wiki diff view
Posted by tv...@apache.org.
Add some padding to wiki diff view
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/4386d93c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/4386d93c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/4386d93c
Branch: refs/heads/master
Commit: 4386d93c3f8d786c37fcc298cf56178f6bc32734
Parents: 3006ef9
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Thu Nov 21 21:51:04 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Thu Nov 21 21:51:04 2013 +0000
----------------------------------------------------------------------
ForgeWiki/forgewiki/templates/wiki/page_diff.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4386d93c/ForgeWiki/forgewiki/templates/wiki/page_diff.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_diff.html b/ForgeWiki/forgewiki/templates/wiki/page_diff.html
index 9868785..dd98802 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_diff.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_diff.html
@@ -35,7 +35,7 @@
<p>Comparing <a href=".?version={{p1.version}}">Version {{p1.version}}</a>
with <a href=".?version={{p2.version}}">Version {{p2.version}}</a></p>
<hr/>
-<div style="font-family: fixed-width, monospace">
+<div style="font-family: fixed-width, monospace; padding: 10px;">
{{h.html.literal(edits)}}
</div>
{% endblock %}