1 2011-08-21T00:05:51 <dreimark> gn
2 2011-08-21T01:04:46 *** sinha
3 2011-08-21T08:00:29 *** MattMaker
4 2011-08-21T08:33:33 *** MattMaker
5 2011-08-21T10:20:31 *** MattMaker
6 2011-08-21T11:52:01 <dreimark> moin
7 2011-08-21T11:55:20 *** MattMaker
8 2011-08-21T12:04:53 <dreimark> bbl
9 2011-08-21T12:25:26 *** greg_f
10 2011-08-21T12:26:32 *** sinha
11 2011-08-21T13:45:52 <dreimark> re
12 2011-08-21T13:46:25 <dreimark> sinha: my replies seen?
13 2011-08-21T13:46:56 <sinha> dreimark: yes fixed that problem, now ready for merge
14 2011-08-21T13:47:59 <sinha> dreimark: do i push the changes before merge ?
15 2011-08-21T13:48:46 <dreimark> sinha: yes you can push that and then do the merge
16 2011-08-21T13:49:14 <dreimark> if you have questions ping thomas, because we will be soon in a train
17 2011-08-21T13:49:25 <sinha> dreimark: push it the old bitbucket repo ? because yesterday i have created a new repo (upto the last unmerged revision)
18 2011-08-21T13:49:26 <dreimark> i am not sure if we have internet all the time
19 2011-08-21T13:49:53 <sinha> i meant new local repo
20 2011-08-21T13:50:09 <dreimark> sinha: ehem, no, you have to do it twice then
21 2011-08-21T13:50:24 <dreimark> have it in an hg diff > mycurrentwork.patch
22 2011-08-21T13:50:54 <dreimark> do first the branch merge and then apply your mycurrentwork.patch
23 2011-08-21T13:50:58 <sinha> dreimark: i have my new repo completely updated, just want to know where to push them
24 2011-08-21T13:51:11 <dreimark> into the new one
25 2011-08-21T13:51:22 <dreimark> ThomasWaldmann: will pull in the cleaned merged repo
26 2011-08-21T13:52:24 <sinha> dreimark: so to create a new repo on bitbucket, i do clone of Thomas's moin2 repo ?
27 2011-08-21T13:52:55 <sinha> or just leave it empty during creation
28 2011-08-21T13:52:55 <dreimark> sinha: no, you find out from which changeset on you did not merge correctly
29 2011-08-21T13:54:03 <dreimark> then you have to redo the merge
30 2011-08-21T13:57:10 <dreimark> sinha: you need to apply all your changes to a fixed repo
31 2011-08-21T13:57:25 <dreimark> so you also can cherry pick all of your changes from your repo
32 2011-08-21T13:57:41 <dreimark> and add them into a fresh clone
33 2011-08-21T13:58:13 <sinha> dreimark: just created a new clone upto last unconflicted revision https://bitbucket.org/sinha/moin-2.0, pushing changes it it now, and then will merge stuff
34 2011-08-21T13:59:44 <dreimark> ok, if there are questions ask here
35 2011-08-21T14:00:09 <dreimark> because you must now use the new code of the new repo not the old one
36 2011-08-21T14:00:27 <sinha> yes
37 2011-08-21T14:02:22 <CIA-114> Akash Sinha <akash2607@gmail.com> * 476c38f0418b r383 default/MoinMoin/templates/index.html: popup block html moved outside of index test condition
38 2011-08-21T14:02:22 <CIA-114> Akash Sinha <akash2607@gmail.com> * e6f12800e78c r384 default/MoinMoin/apps/frontend/views.py: some lines of code removed(to get range list) from global history as similar function exists under util
39 2011-08-21T14:02:22 <CIA-114> Akash Sinha <akash2607@gmail.com> * 0398d1eb14c1 r385 default/MoinMoin/ (3 files in 3 dirs): small change in contenttype filter (now items with unknown mime types have a different filter, as earlier it was shown regardless of the filter selected)
40 2011-08-21T14:02:22 <CIA-114> Akash Sinha <akash2607@gmail.com> * 373b67e26138 r386 default/MoinMoin/themes/modernized/static/css/common.css: fixes issue 3 (increased size of div in actions)
41 2011-08-21T14:02:22 <CIA-114> Akash Sinha <akash2607@gmail.com> * 6332dda59cb6 r387 default/MoinMoin/ (apps/frontend/views.py items/__init__.py): some pep8 fixes
42 2011-08-21T14:02:22 <CIA-114> Akash Sinha <akash2607@gmail.com> * 0f51f999ffe5 r388 default/MoinMoin/ (3 files in 3 dirs): toggle checkbox and show more event handlers added in contenttype filter form, Fixes #4
43 2011-08-21T14:02:23 <CIA-114> Akash Sinha <akash2607@gmail.com> * e603509fd82e r389 default/MoinMoin/apps/frontend/views.py: when no contenttype group is selected, then all types of items are shown (earlier none of them were coming)
44 2011-08-21T14:02:23 <CIA-114> Akash Sinha <akash2607@gmail.com> * 200be16e8d55 r390 default/MoinMoin/ (templates/index.html themes/modernized/static/css/common.css): select all link moved separate from actions bar and some re-styilng done (to hande with width issue)
45 2011-08-21T14:02:38 <CIA-114> Akash Sinha <akash2607@gmail.com> * 77a9bd2d3dc8 r391 default/MoinMoin/items/__init__.py: regex search function updated, to get the subitem flag correctly
46 2011-08-21T14:10:43 *** greg_f
47 2011-08-21T14:25:34 *** greg_f
48 2011-08-21T14:26:49 <ThomasWaldmann> sinha: you forked your new repo from your old, bad one?
49 2011-08-21T14:27:23 <sinha> yes but from the last unconflicted revision
50 2011-08-21T14:27:34 <sinha> before the merge
51 2011-08-21T14:29:46 <ThomasWaldmann> tell me the steps your did
52 2011-08-21T14:29:57 <ThomasWaldmann> -r
53 2011-08-21T14:32:59 *** grzywacz
54 2011-08-21T14:32:59 *** grzywacz
55 2011-08-21T14:33:25 <sinha> ThomasWaldmann: used this revision e665d70b0278 while cloning
56 2011-08-21T14:36:00 <ThomasWaldmann> tell me the steps you did
57 2011-08-21T14:38:24 <sinha> i went to this https://bitbucket.org/sinha/moin2 clicked on fork and then on that fork page, i selected sepcific revision in "Fork At" dropdown and then entered the revision number e665d70b0278
58 2011-08-21T14:40:26 <ThomasWaldmann> give a complete description of all steps you did in the repository
59 2011-08-21T14:44:02 <sinha> in my local repository ? in my old repo first i exported the diffs (which were not pushed) by doing "hg export revnos" and saved them in different files and also saved the current diff by "hg diff" and then did "hg clone -r rev_no oldrepo new repo" and after that in new repo did hg import saved_diffs and then patch -pi current_diff
60 2011-08-21T14:44:05 <sinha> -p1
61 2011-08-21T14:46:22 <ThomasWaldmann> and then you pushed to your new bb repo?
62 2011-08-21T14:46:27 <sinha> yes
63 2011-08-21T14:47:16 <ThomasWaldmann> ok, that should give a (almost) valid state in your new bb repo
64 2011-08-21T14:47:28 <sinha> ThomasWaldmann: now i did hg pull from main, and again vim windows get opened, i am trying to follow steps given here http://mercurial.selenic.com/wiki/MergingWithVim
65 2011-08-21T14:47:53 <ThomasWaldmann> except that bb now thinks that the new bb repo is a fork of the old (crap) bb repo (not of the main project repo)
66 2011-08-21T14:48:30 <ThomasWaldmann> did you first commit the changes you applied with patch?
67 2011-08-21T14:50:04 <ThomasWaldmann> ?
68 2011-08-21T14:50:46 <sinha> yes i did
69 2011-08-21T14:51:20 <sinha> and so all changes are pushed there at bb
70 2011-08-21T14:52:12 <ThomasWaldmann> so, if you don't like vim for merging, why didn't you configure another merge tool?
71 2011-08-21T14:53:38 <ThomasWaldmann> (you can also use vim, if you like, the result counts. do not commit unclean merges in any case and use hg diff before you commit the merge to review what you did.)
72 2011-08-21T14:55:14 <ThomasWaldmann> also you should change the invalid bb repositories' comment to something like "repo with invalid merge - do not use" for now
73 2011-08-21T15:09:39 <sinha> ThomasWaldmann: how do i confirm using "hg diff", i mean what should i see there ? (because by doing that for a file i am seeing some lines have been added)
74 2011-08-21T15:10:23 <ThomasWaldmann> you should see a changeset that merges your stuff with main repo stuff
75 2011-08-21T15:43:45 <sinha> ThomasWaldmann: after merging and upgrading env, i get some Traceback inside converter when i start moin, is there something i should worry ?
76 2011-08-21T15:45:56 <ThomasWaldmann> sinha: no, that's known
77 2011-08-21T15:46:48 <sinha> And i was expecting to see some kind of search form ?
78 2011-08-21T15:46:50 *** pkumar
79 2011-08-21T15:48:32 <ThomasWaldmann> sinha: there should be a small search form at the top right part of the theme (on normal item views)
80 2011-08-21T15:49:34 <sinha> ThomasWaldmann: i am not seeing that (rather i am seeing the code for search form inside layout.html)
81 2011-08-21T15:50:37 <ThomasWaldmann> well, are you finished with merging?
82 2011-08-21T15:51:23 *** grzywacz
83 2011-08-21T15:52:21 <sinha> yes i guess (maybe i did something wrong again in views.py merging, supposedly in show_item function)
84 2011-08-21T15:53:37 <ThomasWaldmann> you can also just have a look at main repo, how the code looks there
85 2011-08-21T15:55:52 <sinha> ThomasWaldmann: yes added stuff from there, search working now
86 2011-08-21T15:56:39 <sinha> ThomasWaldmann: can i do merging again for that views.py file (by marking it as unresolved or something) ?
87 2011-08-21T15:57:23 <ThomasWaldmann> not sure how. and as long as you did not mark it as resolved, it is still marked unresolved.
88 2011-08-21T15:59:38 <sinha> ThomasWaldmann: what i am doing ii taken that file from main repo, doing vimdiff with my local one (i guess by this i can see the differences and make changes)
89 2011-08-21T15:59:42 <sinha> *is
90 2011-08-21T16:02:29 <ThomasWaldmann> yes. maybe find out how to configure the merge tool if you are uncomfortable with merging by vimdiff.
91 2011-08-21T16:03:07 <ThomasWaldmann> i personally dislike it if some merge tool i don't know jumps at me. so i usually configure it to no use any.
92 2011-08-21T16:06:36 <sinha> ThomasWaldmann: if some code of line is present in mine and not in the other copy, i simply move forward, but there are functions which i havent touched and have extra lines, so should i remove that ?
93 2011-08-21T16:07:25 <ThomasWaldmann> it depends
94 2011-08-21T16:07:43 <ThomasWaldmann> you have to think about that stuff.
95 2011-08-21T16:08:32 <ThomasWaldmann> sinha: how fast is your upstream?
96 2011-08-21T16:08:38 <sinha> ThomasWaldmann: just one doubt, is that gen_make_generator() has been taken off ? because i am not seeing those line in the updated repo
97 2011-08-21T16:08:46 <sinha> ThomwasWaldmann: pretty fast
98 2011-08-21T16:09:32 <sinha> i can download at over 100-200 Kbps and upstream is kind a good
99 2011-08-21T16:09:54 <ThomasWaldmann> the generator for forms is maybe given globally via the environment now
100 2011-08-21T16:10:24 <sinha> ah, ok
101 2011-08-21T16:11:30 <ThomasWaldmann> but iirc that was no recent change, but quite a while ago.
102 2011-08-21T16:18:55 <sinha> ThomasWaldmann: i have manually checked the files which has conflicts earlier, should i commit and push now
103 2011-08-21T16:19:49 <ThomasWaldmann> publish hg diff output to pastebin
104 2011-08-21T16:19:58 <sinha> okay
105 2011-08-21T16:22:10 <sinha> ThomasWaldmann: http://paste.pocoo.org/show/461858/
106 2011-08-21T16:26:09 <ThomasWaldmann> ok, wait
107 2011-08-21T16:36:08 <ThomasWaldmann> sinha: ok, frontend views looks ok. you could do a diff -urN main-repo/MoinMoin/apps/frontend/views.py your-repo/... to see if it has just what you wanted to change (and not changing anything you did not change)
108 2011-08-21T16:39:20 <sinha> okay
109 2011-08-21T16:39:35 <pkumar> ThomasWaldmann : hi, about the difference in the number of tests in my repo and the main repo, I ran the tests with initial changes one by one to chek what made the difference, I think changing MoinClassCollector to MoinTestFunction made a difference. Now each function is considered as a test item
110 2011-08-21T16:43:46 <pkumar> which was not the case previously, so we have different number of tests
111 2011-08-21T16:44:29 <ThomasWaldmann> sinha: you are removing this?:
112 2011-08-21T16:44:32 <ThomasWaldmann> - # check index when startswith param is passed
113 2011-08-21T16:44:37 <ThomasWaldmann> ...
114 2011-08-21T16:44:38 <ThomasWaldmann> - # check index when contenttype_groups is passed
115 2011-08-21T16:44:45 <ThomasWaldmann> ...
116 2011-08-21T16:44:55 <ThomasWaldmann> (in test_Items.py)
117 2011-08-21T16:49:18 <pkumar> ThomasWaldmann : so now we have changed the way pytest used to collect item in tests. (in conftest)
118 2011-08-21T16:51:51 <pkumar> ThomasWaldmann : also as you have mentioned pytest-cov, we use that plugin itself in new tests for coverage handling
119 2011-08-21T16:54:49 <ThomasWaldmann> sinha: everything else looks OK AFAICS, but check the stuff i mentioned above
120 2011-08-21T16:55:48 <ThomasWaldmann> pkumar: oh, we use pytest-cov? do you have it in setup.py?
121 2011-08-21T16:57:36 <pkumar> no, haven't added that, isn't this just for the developing purpose, could be added in the documentation for the developers?
122 2011-08-21T16:58:56 <pkumar> ThomasWaldmann : I used pytest-cov for tis project and also suggested hardy89 to use this when he was here
123 2011-08-21T17:01:07 <pkumar> xorAxAx : hi, I tried to add the module level setup but I'm not sure why, the Config class inside Test class won't let that setup execute before it
124 2011-08-21T17:01:56 <ThomasWaldmann> hmm, yes. as it is not required, devs who like it can just install it.
125 2011-08-21T17:02:41 <pkumar> yeah, just should be added in docs so that developer know they have this as an option
126 2011-08-21T17:04:57 <ThomasWaldmann> hopefully sinha gets the merge finished today, so I could merge his stuff back into main repo
127 2011-08-21T17:07:20 <dreimark> re for some minutes, waiting on norddeich for the train
128 2011-08-21T17:10:02 <dreimark> sinha: can you get the merge done today?
129 2011-08-21T17:15:27 <ThomasWaldmann> hi dreimark
130 2011-08-21T17:18:09 <pkumar> ThomasWaldmann : regarding docs, should I add the docs to docs/changes.Tests of create a new folder in docs for tests?
131 2011-08-21T17:18:56 <dreimark> ok, we have to go soon, try to join in if umts is stable
132 2011-08-21T17:19:00 <dreimark> bbl
133 2011-08-21T17:20:17 <ThomasWaldmann> pkumar: what a developer should know about (moin-specific) testing should go into docs/devel/... - read the stuff that is already there and include your stuff in similar style
134 2011-08-21T17:21:08 <ThomasWaldmann> you don't need to copy pytest docs there, but refer to them and also add what one should know to get started quickly and what's not contained in pytest docs
135 2011-08-21T17:24:47 <pkumar> ThomasWaldmann : ok, for contents regarding pytest docs, the contents would be mostly about - MoinMoin tests using pytest, bit of a working of pytest in MoinMoin, whats and what nots
136 2011-08-21T17:25:25 <pkumar> for contents regarding pytest docs, I would better give links for pytest docs
137 2011-08-21T17:25:42 <pkumar> right?
138 2011-08-21T17:29:58 <ThomasWaldmann> yes. and you should document stuff that moin tests devs usually need.
139 2011-08-21T17:30:39 <ThomasWaldmann> like customizing config, getting a request context, ....
140 2011-08-21T17:33:46 <pkumar> k
141 2011-08-21T17:38:18 <ThomasWaldmann> sinha: still there?
142 2011-08-21T17:56:18 <dreimark> re
143 2011-08-21T17:57:47 <dreimark> sinha: ping
144 2011-08-21T18:02:48 <dreimark> sinha: very nice selection tools for index now
145 2011-08-21T18:03:07 <dreimark> aka filger
146 2011-08-21T18:03:11 <dreimark> s/g/t/
147 2011-08-21T18:13:41 <dreimark> sinha: bug, deselect all
148 2011-08-21T18:13:46 <dreimark> and filter
149 2011-08-21T18:13:52 <dreimark> i see all items
150 2011-08-21T18:25:48 *** sinha
151 2011-08-21T18:26:36 <pkumar> brb
152 2011-08-21T18:40:28 *** sinha
153 2011-08-21T18:54:53 *** Marchael
154 2011-08-21T18:55:13 <Marchael> moin
155 2011-08-21T18:56:10 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> default * 450:ad338b37458c 2.0/MoinMoin/ (user.py util/interwiki.py): move some interwiki related code from MoinMoin.user to MoinMoin.util.interwiki
156 2011-08-21T18:58:29 <dreimark> sinha: see ^ more to merge
157 2011-08-21T18:59:21 <sinha> dreimark: so do i pull again ?
158 2011-08-21T19:03:30 <sinha> dreimark: ThomasWaldmann: okay, i have commited the merge and pushing it now
159 2011-08-21T19:06:17 <dreimark> sinha: after the pushing merge again
160 2011-08-21T19:06:23 <dreimark> and push again
161 2011-08-21T19:06:41 <dreimark> it becomes simpler after ThomasWaldmann has merged your repo into main
162 2011-08-21T19:07:35 <sinha> okay its coming now
163 2011-08-21T19:07:36 <dreimark> sinha: you can work then on the bug when nothing is filtered you get everything
164 2011-08-21T19:07:42 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 28093a47a961 r392 default/MoinMoin/search/ (4 files in 2 dirs): Whoosh schemas for items and revisions, analyzer for "item name" field and tokenizers for "acl" and "mimetype" fields of whoosh's schema. Write simple tests for acl and mimetype tokenizers.
165 2011-08-21T19:07:42 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 3872b8328dd5 r393 default/MoinMoin/ (16 files in 8 dirs): Sync with Thomas Waldmann repo
166 2011-08-21T19:07:42 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * bc7b8834eff5 r394 default/MoinMoin/search/ (_tests/test_analyzers.py analyzers.py): Fixed item_name_tokenizer() and test for it.
167 2011-08-21T19:07:42 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 999e33243b26 r395 default/MoinMoin/search/ (_tests/test_analyzers.py analyzers.py): Add Whoosh MultiFilter() to item_name_analyzer, fix test.
168 2011-08-21T19:07:42 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * a1273e8734a3 r396 default/MoinMoin/search/indexing.py: Add opening\creating index files for Whoosh schema
169 2011-08-21T19:07:42 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 53420a55b1bc r397 default/MoinMoin/search/ (analyzers.py indexing.py):
170 2011-08-21T19:07:43 <CIA-114> Fix some places in open_index(), add draft for indexing schema test
171 2011-08-21T19:07:43 <CIA-114> (great thanks to Thomas Waldmann!)
172 2011-08-21T19:07:44 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 1de89cc3a6bd r398 default/MoinMoin/ (9 files in 8 dirs): Merged with Thomas Waldmann's repo
173 2011-08-21T19:07:48 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 07271d66ea5b r399 default/MoinMoin/search/ (4 files in 2 dirs): Fixing wrong value names, add finally done with tests for indexing schemas
174 2011-08-21T19:07:48 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 7d32ff657987 r400 default/ (MoinMoin/search/analyzers.py setup.py): Add whoosh to dependencies, remove useless comment
175 2011-08-21T19:07:48 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * a3c707668331 r401 default/MoinMoin/search/ (3 files in 2 dirs): Fix some name issues
176 2011-08-21T19:07:48 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * a46852031865 r402 default/MoinMoin/search/_tests/test_indexing.py: Changes in test algorithm in test_indexing.py
177 2011-08-21T19:07:48 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 779eee3e39d8 r403 default/MoinMoin/search/ (_tests/test_indexing.py indexing.py): Removed "metadata" field from whoosh schema
178 2011-08-21T19:07:48 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * e6fb11f35a84 r404 default/MoinMoin/search/indexing.py: Added wikiname/userid/address/hostname/ to whoosh schema
179 2011-08-21T19:07:54 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 21860894d4dd r405 default/MoinMoin/search/_tests/test_indexing.py: Rewrited some parts of test_indexing.py using new schemas
180 2011-08-21T19:07:54 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * d5c124222533 r406 default/MoinMoin/ (5 files in 4 dirs): Building indexes, minor fixing in schemas, add forgotten imports
181 2011-08-21T19:07:54 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 98cbec45cffb r407 default/MoinMoin/ (3 files in 3 dirs): Fiexes in flask-script for rebuilding indexes. Python2.6 compatibility. Make changes in schema for better integration with Moin.
182 2011-08-21T19:07:54 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 3f7914a961e0 r408 default/MoinMoin/ (3 files in 3 dirs): Remove useless code, change whoosh schema fieldname for better MoinMoin backend compatibility.
183 2011-08-21T19:07:54 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * fd2248ba64c8 r409 default/MoinMoin/script/maint/build_indexes.py: Fix some typos in build_indexes.py
184 2011-08-21T19:07:59 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * f69fa81b34b6 r410 default/MoinMoin/script/maint/build_indexes.py: Saving revision number into indexes
185 2011-08-21T19:07:59 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 078c2ee0c19a r411 default/MoinMoin/script/maint/build_indexes.py: Convert date from os.path.mtime() format to datetime
186 2011-08-21T19:07:59 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 4b052f23b24a r412 default/MoinMoin/script/maint/build_indexes.py: Change date format
187 2011-08-21T19:07:59 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * beb99cd78481 r413 default/MoinMoin/script/ (maint/update_indexes.py __init__.py): Add draft for updating index
188 2011-08-21T19:07:59 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 28858876a5f1 r414 default/MoinMoin/script/maint/update_indexes.py: Some fixes in update script with debug output
189 2011-08-21T19:07:59 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 4dba3eece489 r415 default/MoinMoin/script/maint/update_indexes.py: Bugfixes in update_script.py
190 2011-08-21T19:08:05 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * b646d3764eb6 r416 default/MoinMoin/script/maint/build_indexes.py: Add building path option to rebuild indexes script
191 2011-08-21T19:08:05 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 750781283141 r417 default/MoinMoin/script/maint/build_indexes.py:
192 2011-08-21T19:08:05 <CIA-114> Replace multisegment writer by normal writer because
193 2011-08-21T19:08:05 <CIA-114> it has bug with writing to indexes. I'll add it again
194 2011-08-21T19:08:05 <CIA-114> (80 lines omitted)
195 2011-08-21T19:08:06 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * fdd1b2dec689 r470 default/MoinMoin/ (3 files in 3 dirs): Improved index --for ... --action show output, syntax change in css class name
196 2011-08-21T19:08:07 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 6d1f88659ab1 r507 default/MoinMoin/ (4 files in 3 dirs): Add dynamic fields support(may be don't work for last revs after rebuilding)
197 2011-08-21T19:08:08 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 6c407c842f4c r484 default/MoinMoin/search/_tests/test_indexing.py: Updated query string for acl tokenizer
198 2011-08-21T19:08:10 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * e818c98d3790 r500 default/MoinMoin/util/interwiki.py: Merged
199 2011-08-21T19:08:11 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 42f7af473347 r463 default/MoinMoin/script/maint/index.py: Fix issue with indexing users in backend
200 2011-08-21T19:08:14 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * d755f798fe66 r486 default/MoinMoin/ (8 files in 6 dirs):
201 2011-08-21T19:08:14 <CIA-114> fix some tests
202 2011-08-21T19:08:14 <CIA-114> make item name and contenttype constants unicode
203 2011-08-21T19:08:14 <CIA-114> give cfg kwarg to RouterBackend
204 2011-08-21T19:08:14 <CIA-114> delay tokenizer creation to test method call time, so that we're within a test
205 2011-08-21T19:08:14 <Marchael> oh no, not again
206 2011-08-21T19:08:14 <CIA-114> request environment and app is available.
207 2011-08-21T19:08:27 <CIA-114> Fixes #6.
208 2011-08-21T19:08:27 <CIA-114> Fixing https://bitbucket.org/marchael/moin-2.0/issue/6/unpretty-search-results-rendering
209 2011-08-21T19:08:27 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * dccbd79260ce r508 default/MoinMoin/search/indexing.py: Added several dynamic fields Fixes #17.
210 2011-08-21T19:08:27 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 643dd888e74a r499 default/MoinMoin/templates/search_results.html: Fixed showing results for wikis sharing one index
211 2011-08-21T19:08:27 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 3c1d17e77d1c r467 default/MoinMoin/storage/backends/indexing.py: Return removed line for converting backend revision to whoosh index
212 2011-08-21T19:08:27 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 66981eb25822 r503 default/MoinMoin/ (3 files in 2 dirs): Added searching in non-current revisions Fixes #18.
213 2011-08-21T19:08:28 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 256c6e0ae8bf r477 default/MoinMoin/storage/backends/indexing.py: removed all_tags / tagged_items, replaced by *_whoosh
214 2011-08-21T19:08:32 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 598b1731069b r480 default/MoinMoin/ (config/default.py app.py storage/backends/indexing.py): remove cfg.index_rebuild and related code (not needed any more)
215 2011-08-21T19:08:32 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 0ab852761ff2 r465 default/MoinMoin/apps/frontend/views.py: Using Multifield parser for searching in revisions name and content
216 2011-08-21T19:08:32 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * ea001bcb5f90 r471 default/MoinMoin/ (script/maint/index.py storage/backends/indexing.py):
217 2011-08-21T19:08:32 <CIA-114> Fixed issue with runtime indexation https://bitbucket.org/marchael/moin-2.0/issue/9/content-entered-via-wiki-ui-is-not-indexed
218 2011-08-21T19:08:32 <CIA-114> Fixes issue with content indexing in building\updating script
219 2011-08-21T19:08:32 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 6119699cec2f r494 default/MoinMoin/search/analyzers.py: analyzers: misc src cosmetics
220 2011-08-21T19:08:38 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 8589afef0e6c r496 default/MoinMoin/storage/backends/indexing.py: indexing storage mixin: misc src cosmetics
221 2011-08-21T19:08:38 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 951c8edf9776 r475 default/MoinMoin/storage/backends/indexing.py:
222 2011-08-21T19:08:38 <CIA-114> (19 lines omitted)
223 2011-08-21T19:08:39 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 33249607fd48 r509 default/MoinMoin/script/maint/index.py: Refactoing crap in building script Fixes #32.
224 2011-08-21T19:08:40 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 0173477e11bc r483 default/MoinMoin/search/analyzers.py: Update docstring
225 2011-08-21T19:08:41 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 1ed44f76458c r464 default/ (4 files in 2 dirs): merged
226 2011-08-21T19:08:42 <CIA-114> Akash Sinha <akash2607@gmail.com> * 035656874a40 r523 default/MoinMoin/themes/__init__.py: icluding tgz also as archive package for icon display, similar to tar(missed this earlier)
227 2011-08-21T19:08:44 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 2340dd0ee580 r511 default/MoinMoin/ (4 files in 3 dirs):
228 2011-08-21T19:08:44 <CIA-114> move backend_to_index function to MoinMoin.search.indexing module
229 2011-08-21T19:08:44 <CIA-114> as the schema is defined there, it makes sense that the conversion function
230 2011-08-21T19:08:44 <CIA-114> is also there.
231 2011-08-21T19:08:45 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * ab4ac448d5d8 r473 default/ (15 files in 12 dirs): merged
232 2011-08-21T19:08:46 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 2e8c562f7524 r490 default/MoinMoin/storage/backends/indexing.py: indexing: clarify ItemIndex.update_item/remove_item, remove wrong code
233 2011-08-21T19:08:47 <CIA-114> Akash Sinha <akash2607@gmail.com> * 9e4f94558847 r522 default/ (43 files in 20 dirs): merged with main repo
234 2011-08-21T19:08:48 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * e57259c40f74 r466 default/MoinMoin/themes/modernized/static/css/common.css: Using white backgroung for long search form
235 2011-08-21T19:08:50 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 78a2962bf192 r501 default/ (3 files in 3 dirs): Fixed displaying results for multiple wikis(wiki farm) Fixes #15.
236 2011-08-21T19:10:34 <ThomasWaldmann> sinha: did you see my comments?
237 2011-08-21T19:10:52 <sinha> ThomasWaldmann: yes, thanks for that, i have included them
238 2011-08-21T19:11:04 <sinha> and also did a recheck again
239 2011-08-21T19:11:24 *** brunomartin
240 2011-08-21T19:12:51 <sinha> dreimark: by default when nothing is filtered then no item was displayed, but coded some extra lines to consider that as default case
241 2011-08-21T19:14:46 <sinha> dreimark: if you see that as bug, then i will remove those lines and let it work as you said
242 2011-08-21T19:14:52 <ThomasWaldmann> sinha: ok
243 2011-08-21T19:23:16 <ThomasWaldmann> sinha: is it ready for merging back to main repo?
244 2011-08-21T19:23:25 <ThomasWaldmann> dreimark: ^^
245 2011-08-21T19:23:35 <sinha> i guess so :)
246 2011-08-21T19:26:54 *** Marchael
247 2011-08-21T19:27:01 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> default * 451:0e1c8662871f 2.0/MoinMoin/util/interwiki.py: fix getInterwikiName signature
248 2011-08-21T19:29:26 <dreimark> sinha: hg heads tells you?
249 2011-08-21T19:29:53 <dreimark> ThomasWaldmann: not sure, i have modtly gprs
250 2011-08-21T19:30:12 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> default * 452:3e4ddf215182 2.0/ (6 files in 6 dirs):
251 2011-08-21T19:30:12 <CIA-114> require cfg.interwikiname to be set to a non-empty, unique, stable unicode value
252 2011-08-21T19:30:12 <CIA-114> fix wikiconfig.py to use u"MyMoinMoin" and also add it to cfg.interwiki_map.
253 2011-08-21T19:30:46 <sinha> dreimark: hg heads is showing the last 2 revisions, one done by me after merging and one thomas's
254 2011-08-21T19:31:30 <sinha> so merging again
255 2011-08-21T19:31:50 <CIA-114> Akash Sinha <akash2607@gmail.com> * 737903cbe58e r524 default/MoinMoin/ (util/interwiki.py user.py): merged with main
256 2011-08-21T19:32:01 <sinha> dreimark: only i head present
257 2011-08-21T19:32:41 <ThomasWaldmann> sinha: you failed merging correctly. AND you ignored the warning from mercurial not to push new heads.
258 2011-08-21T19:32:53 <ThomasWaldmann> you should work more carefully.
259 2011-08-21T19:33:46 <dreimark> sinha: thhttp://paste.pocoo.org/show/461952/
260 2011-08-21T19:34:28 <sinha> ThomasWaldmann: dreimark: yes sorry for ignoring the warning, i have merged again and pushed
261 2011-08-21T19:36:55 * ThomasWaldmann pulls/merges
262 2011-08-21T19:38:31 <ThomasWaldmann> sinha: import lines are usually grouped and ordered
263 2011-08-21T19:38:55 <ThomasWaldmann> like stdlib first, then 3rd party, then moin stuff or so
264 2011-08-21T19:39:11 <ThomasWaldmann> frontend views is not that way any more
265 2011-08-21T19:39:50 <ThomasWaldmann> + gen=make_generator()
266 2011-08-21T19:40:25 <ThomasWaldmann> you have that still. wasn't that the stuff solved otherwise now? if so, remove this and also the import for it.
267 2011-08-21T19:41:43 <sinha> ThomasWaldmann: in import you are talking about that "import json" ? and i left that make_generator() in index function, because you said few days back that it will be changed after i merge
268 2011-08-21T19:42:19 <sinha> i thought changing there would give some error in forms on index page, (anyways removing them now)
269 2011-08-21T19:42:19 <ThomasWaldmann> +from flaskext.babel import format_date
270 2011-08-21T19:42:28 <ThomasWaldmann> that right between stdlib stuff
271 2011-08-21T19:42:53 <sinha> okay, and move that json stuff up ?
272 2011-08-21T19:43:49 *** greg_f
273 2011-08-21T19:44:21 <ThomasWaldmann> yes
274 2011-08-21T19:48:59 <dreimark> impsinha improve commit messages, less typos
275 2011-08-21T19:49:16 <sinha> ThomasWaldmann: i am getting error in that getInterwikiName function
276 2011-08-21T19:52:50 <ThomasWaldmann> see above
277 2011-08-21T19:53:05 <sinha> ThomasWaldmann: do i need to pull and merge again ?
278 2011-08-21T19:53:14 <sinha> ah, ok
279 2011-08-21T19:55:37 <ThomasWaldmann> sinha: your setup.py merge is also bad
280 2011-08-21T19:58:07 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 25e07ced506f r447 moin-2.0/MoinMoin/apps/frontend/views.py: backrefs using whoosh now Fixes #23.
281 2011-08-21T19:58:07 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * d9845a326f12 r448 moin-2.0/MoinMoin/storage/backends/__init__.py: create_simple_mapping() only returns one value (fix for fs19:)
282 2011-08-21T19:58:08 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 16bd4f3dbab8 r449 moin-2.0/MoinMoin/storage/backends/fs19.py: fix fs19 crash if a user has no subscribed pages
283 2011-08-21T19:58:08 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 3d3230f84e5f r450 moin-2.0/docs/admin/ (configure.rst upgrade.rst): update docs: create_simple_mapping only returns 1 value
284 2011-08-21T19:58:08 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * dfa71b20022c r451 moin-2.0/docs/admin/requirements.rst: requirements: add a note that pypy >= 1.6 works ok now
285 2011-08-21T19:58:09 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * ad338b37458c r452 moin-2.0/MoinMoin/ (util/interwiki.py user.py): move some interwiki related code from MoinMoin.user to MoinMoin.util.interwiki
286 2011-08-21T19:58:09 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * f06e9d502d6c r453 moin-2.0/ (7 files in 4 dirs): merged
287 2011-08-21T19:58:30 *** Marchael
288 2011-08-21T19:59:19 <Marchael> wi-fi here is suck, so my appologize for disconnects
289 2011-08-21T19:59:37 <Marchael> ThomasWaldmann: I merged with your repo and after restarting moin see this http://paste.pocoo.org/show/461972/
290 2011-08-21T20:00:04 <ThomasWaldmann> it is already fixed, see above
291 2011-08-21T20:00:07 <Marchael> ah
292 2011-08-21T20:02:31 <ThomasWaldmann> sinha: wikiconfig.py merge also bad
293 2011-08-21T20:02:52 <sinha> ThomasWaldmann: okay fixed setup.py, now seeing wikiconfig
294 2011-08-21T20:05:01 <ThomasWaldmann> you add mathjax again
295 2011-08-21T20:05:15 <dreimark> I removed that
296 2011-08-21T20:06:33 <dreimark> that happens by automatic merging mostly
297 2011-08-21T20:07:26 <dreimark> that means all cs must be manually reviewed
298 2011-08-21T20:09:56 *** Marchael
299 2011-08-21T20:10:13 *** Marchael
300 2011-08-21T20:10:57 <Marchael> bb returns 503 for me, is it only for me?
301 2011-08-21T20:11:20 <dreimark> sinha: if you have a patched version of jfu, we need an own xstatic package of that changes
302 2011-08-21T20:12:06 <sinha> dreimark: i have sone some changes in jfu file and also do i remove that mathjax from xstatic package list (its in my wikiconfig)
303 2011-08-21T20:13:14 <ThomasWaldmann> dreimark: there is no automatic merge if it detects a conflict
304 2011-08-21T20:13:49 <ThomasWaldmann> Marchael: they have scheduled and announced maintenance downtime for about an hour now
305 2011-08-21T20:14:10 <Marchael> ok
306 2011-08-21T20:14:14 <dreimark> how does it work with XStatic-jQuery-File-Upload==4.4.2'XStatic-jQuery-File-Upload==4.4.2'rmour.csu.ru] has joined #moin-dev
307 2011-08-21T20:14:35 <ThomasWaldmann> dreimark: ??
308 2011-08-21T20:14:48 <Marchael> :)
309 2011-08-21T20:14:57 <sinha> dreimark: jfu handles the ui for fileupload (in some manner)
310 2011-08-21T20:16:06 <dreimark> sinha: is it the original version, may be i confused me currently
311 2011-08-21T20:16:09 <dreimark> A?
312 2011-08-21T20:16:49 <sinha> no its not the original version, it has been modified earlier by ThomasWaldmann, now by me
313 2011-08-21T20:17:44 <ThomasWaldmann> it has just to be considered as part of moin code, so no extra package for that. and it calls into standard jquery-file-upload code.
314 2011-08-21T20:18:47 <ThomasWaldmann> sinha: after you have finished some cs, always push
315 2011-08-21T20:19:26 <sinha> yes, okay
316 2011-08-21T20:25:28 <sinha> bb seems to be down now
317 2011-08-21T20:25:54 <ThomasWaldmann> yes, when it is up again. ~45mins.
318 2011-08-21T20:26:14 <ThomasWaldmann> you found and fixed all issues?
319 2011-08-21T20:27:06 <dreimark> ok, seen menawhile too, was disconnected
320 2011-08-21T20:29:54 * ThomasWaldmann runs tests on ui merge
321 2011-08-21T20:32:13 <sinha> ThomasWaldmann: fixed setup.py and wikiconfig.py, looking for others
322 2011-08-21T20:34:41 *** Marchael
323 2011-08-21T20:36:47 *** Marchael
324 2011-08-21T20:36:54 <Marchael> ThomasWaldmann: http://codereview.appspot.com/4923042/ ps 8
325 2011-08-21T20:55:26 <ThomasWaldmann> review done
326 2011-08-21T20:55:27 *** sinha
327 2011-08-21T20:55:30 *** sinha1
328 2011-08-21T21:05:21 *** Marchael
329 2011-08-21T21:07:36 *** brunomartin
330 2011-08-21T21:10:56 *** Marchael
331 2011-08-21T21:11:11 <Marchael> ThomasWaldmann: I don't use rmtree anymore
332 2011-08-21T21:12:00 <Marchael> and if I'll do that I'll have problems with writing after WhooshIndex object creation
333 2011-08-21T21:12:10 <Marchael> *do that, then
334 2011-08-21T21:12:23 <dreimark> quickinstall depends on bb too
335 2011-08-21T21:13:01 <dreimark> may be we should mirror
336 2011-08-21T21:13:17 <dreimark> Error 503: Service Unavailable for URL http://bitbucket.org/jek/flatland/get/tip.zip#egg=flatland-dev (from http://pypi.python.org/simple/flatland/)
337 2011-08-21T21:18:12 <ThomasWaldmann> dreimark: export PIP_USE_MIRRORS=true
338 2011-08-21T21:18:27 <ThomasWaldmann> ehrm, no, not for that
339 2011-08-21T21:19:00 *** Marchael
340 2011-08-21T21:19:24 <dreimark> we need a mirror or pip package
341 2011-08-21T21:20:37 *** Marchael1
342 2011-08-21T21:23:28 <Marchael1> ThomasWaldmann: please, read my comments
343 2011-08-21T21:23:28 <Marchael1> on cr
344 2011-08-21T21:25:55 <ThomasWaldmann> --download-cache=DIR maybe we could use that in future
345 2011-08-21T21:26:59 <ThomasWaldmann> Marchael1: there is not a single answer to my questions
346 2011-08-21T21:27:51 <dreimark> sinha1: if nothing is selected it should not show anything
347 2011-08-21T21:28:15 <dreimark> or every item as they were all filter selected
348 2011-08-21T21:29:38 <sinha1> dreimark: yes that was happening earlier, but i changed the things to make it show everything
349 2011-08-21T21:29:57 <sinha1> but what is the use of case when no item is displayed
350 2011-08-21T21:30:03 <sinha1> why would one do that ?
351 2011-08-21T21:30:15 <dreimark> it vereifies that the filter works
352 2011-08-21T21:30:34 <dreimark> if it shows everything we will get bug reports
353 2011-08-21T21:30:43 <dreimark> many - believe me
354 2011-08-21T21:31:16 <dreimark> don't try to understand users, just make a logical workflow
355 2011-08-21T21:31:29 <dreimark> then we can explain that and everything is fine
356 2011-08-21T21:32:04 <sinha1> ah, ok, but i have seen similar things in some place, like when input is NULL, set the default
357 2011-08-21T21:32:25 <dreimark> where ?
358 2011-08-21T21:32:25 <sinha1> as similar to you were telling me to add default comment when nothing is entered
359 2011-08-21T21:32:31 <sinha1> so i was just using that logic
360 2011-08-21T21:32:53 <dreimark> sinha1: i skipped thde default comment, we did in 1.9
361 2011-08-21T21:33:02 <sinha1> yes i know
362 2011-08-21T21:33:14 <dreimark> it can be done on one place if we want to go back
363 2011-08-21T21:33:33 <dreimark> any other place?
364 2011-08-21T21:33:36 <Marchael1> ThomasWaldmann: I made some changes in names, but I don't understand where did you see rmtree in ps 8? Also, I didn't remove closed index.
365 2011-08-21T21:33:45 <Marchael1> http://codereview.appspot.com/4923042/ ps 9
366 2011-08-21T21:34:02 <sinha1> like in mysql for a primary id if you insert "NULL" it uses the default auto-increment one
367 2011-08-21T21:34:26 *** Marchael1
368 2011-08-21T21:35:02 *** Marchael
369 2011-08-21T21:35:15 <sinha1> okay i will revert that thing, such that nothing will display when no filter is selected
370 2011-08-21T21:35:18 *** Marchael
371 2011-08-21T21:35:37 *** Marchael
372 2011-08-21T21:37:41 <dreimark> hmm, there might be reasons to that but in general too much magic makes things hard to explain
373 2011-08-21T21:37:47 <dreimark> +do
374 2011-08-21T21:37:52 <ThomasWaldmann> Marchael: just look at CR, diff between 7 and 9
375 2011-08-21T21:38:27 <dreimark> sinha1: do oyu know import this ?
376 2011-08-21T21:38:37 <sinha1> no
377 2011-08-21T21:38:44 <dreimark> try it on a shell
378 2011-08-21T21:38:54 <dreimark> zen of python :)
379 2011-08-21T21:39:43 * Marchael looks
380 2011-08-21T21:39:59 <Marchael> I forgot remove shutil from test_indexing
381 2011-08-21T21:40:52 <Marchael> ah, ok
382 2011-08-21T21:41:34 <ThomasWaldmann> XStatic-multiDownload vs. jquery_multi_download - why different names?
383 2011-08-21T21:42:57 <dreimark> i adapted that name to the other one
384 2011-08-21T21:43:21 <ThomasWaldmann> ?
385 2011-08-21T21:44:33 <dreimark> XStatic-jQuery-File-Upload>
386 2011-08-21T21:45:10 <dreimark> i can change it on the left side too, this is the original name
387 2011-08-21T21:45:26 <ThomasWaldmann> XStatic-jQuery-File-Upload package name -> jquery_file_upload module name
388 2011-08-21T21:46:11 <dreimark> hmm, my fault, i used the authors name on the left side
389 2011-08-21T21:46:47 <ThomasWaldmann> so i suggest you find out what the official name of that thing is
390 2011-08-21T21:47:00 <ThomasWaldmann> and then use that for our package and for the module name
391 2011-08-21T21:47:35 <dreimark> ok
392 2011-08-21T21:49:00 <dreimark> htg, bbl
393 2011-08-21T21:49:23 <ThomasWaldmann> http://plugins.jquery.com/project/jQuery-File-Upload -> so "jQuery-File-Upload" is the official name
394 2011-08-21T21:50:08 <ThomasWaldmann> sinha1: bb is alive again
395 2011-08-21T21:50:22 <sinha1> yes
396 2011-08-21T21:50:24 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 0e1c8662871f r525 default/MoinMoin/util/interwiki.py: fix getInterwikiName signature
397 2011-08-21T21:50:25 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 3e4ddf215182 r526 default/ (6 files in 6 dirs):
398 2011-08-21T21:50:25 <CIA-114> require cfg.interwikiname to be set to a non-empty, unique, stable unicode value
399 2011-08-21T21:50:25 <CIA-114> fix wikiconfig.py to use u"MyMoinMoin" and also add it to cfg.interwiki_map.
400 2011-08-21T21:50:25 <CIA-114> Akash Sinha <akash2607@gmail.com> * f4c0d55a932f r527 default/ (6 files in 6 dirs): merged with main
401 2011-08-21T21:50:25 <CIA-114> Akash Sinha <akash2607@gmail.com> * 2f00b5e21c7d r528 default/MoinMoin/apps/frontend/views.py: imports are ordered correctly in views.py
402 2011-08-21T21:50:26 <CIA-114> Akash Sinha <akash2607@gmail.com> * c586ab858e8a r529 default/MoinMoin/apps/frontend/views.py: make_generator removed in index function
403 2011-08-21T21:50:26 <CIA-114> Akash Sinha <akash2607@gmail.com> * 43a7d7faf15c r530 default/ (wikiconfig.py setup.py): setup.py and wikiconfig.py merged with main
404 2011-08-21T21:50:27 <CIA-114> Akash Sinha <akash2607@gmail.com> * 77f05fbc7d7e r531 default/MoinMoin/ (5 files in 5 dirs): few more files merged with main
405 2011-08-21T21:50:53 <dreimark> ThomasWaldmann: http://biesiad.rushbean.com/multidownload/
406 2011-08-21T21:51:28 <dreimark> so i use that name
407 2011-08-21T21:51:49 <dreimark> or ask him if he can make it a bit more specific
408 2011-08-21T21:52:14 <dreimark> bbl
409 2011-08-21T21:57:07 <ThomasWaldmann> Storing download in cache at ./dlc/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2FX%2FXStatic-svg-edit-moin%2FXStatic-svg-edit-moin-2011.07.07.2.tar.gz
410 2011-08-21T21:57:25 <ThomasWaldmann> that's with --cache-dir=dlc
411 2011-08-21T21:58:53 <Marchael> ThomasWaldmann: please. review ps 10
412 2011-08-21T21:59:02 *** pkumar
413 2011-08-21T22:01:58 <ThomasWaldmann> Marchael: using "flush" is just confusing. don't fix what is not broken. and I am still waiting for answers.
414 2011-08-21T22:03:00 <ThomasWaldmann> in CS, "flush" usually means to empty some buffer by transfering it contents to whereever they should be in the end.
415 2011-08-21T22:04:10 <Marchael> ok, I leave remove_index()
416 2011-08-21T22:04:35 <Marchael> I don't use rmtree because removing indexes after creation is a bad idea
417 2011-08-21T22:05:09 <ThomasWaldmann> sinha1: wtf? 'XStatic-MathJax==1.1.2',
418 2011-08-21T22:05:35 <Marchael> and also just creating empty index won't change working of other scripts using index.
419 2011-08-21T22:08:12 <ThomasWaldmann> Marchael: it would be very much more productive if you read my questions before doing random changes
420 2011-08-21T22:08:30 <ThomasWaldmann> (and think about them and answer)
421 2011-08-21T22:09:41 <Marchael> I don't have rmtree
422 2011-08-21T22:10:56 <ThomasWaldmann> > you had rmtree before using create_index.
423 2011-08-21T22:10:56 <ThomasWaldmann> >
424 2011-08-21T22:10:56 <ThomasWaldmann> > rmtree removes everything - is this required?
425 2011-08-21T22:10:56 <ThomasWaldmann> > if so, does create_index also remove everything or just create a few files in
426 2011-08-21T22:10:59 <ThomasWaldmann> > between lots of other ones which are already there?
427 2011-08-21T22:13:18 <Marchael> rmtree isn't required for that, because indexes remaining after create_index() can't affect on other tests
428 2011-08-21T22:13:50 <Marchael> of course if some test using indexes running in parallel
429 2011-08-21T22:13:58 <Marchael> *tests
430 2011-08-21T22:14:43 <ThomasWaldmann> you may have noticed that whoosh creates potentially lots of different files for one index.
431 2011-08-21T22:15:06 <ThomasWaldmann> so, considering that, just answer my question.
432 2011-08-21T22:15:08 <Marchael> irrc after create_index stays only 2
433 2011-08-21T22:15:21 <Marchael> *iirc
434 2011-08-21T22:15:41 <ThomasWaldmann> you are totally missing the point.
435 2011-08-21T22:16:27 <Marchael> s/2/4/
436 2011-08-21T22:18:10 <ThomasWaldmann> sinha1: can we have that stuff fixed ASAP?
437 2011-08-21T22:18:32 <Marchael> create_index() creates 2 lock files and 2 *.toc file(28K)
438 2011-08-21T22:18:57 <Marchael> previous files were removed
439 2011-08-21T22:18:59 <ThomasWaldmann> sinha1: and for the future, keep in mind that doing unclean merges causes about 10x the work later
440 2011-08-21T22:19:46 <ThomasWaldmann> Marchael: previous files with same names or also the one with other names (belonging to same index)?
441 2011-08-21T22:19:54 <ThomasWaldmann> ones*
442 2011-08-21T22:20:24 <Marchael> all files belonging to all indexes.
443 2011-08-21T22:20:51 <Marchael> yes, they are removed first and then whoosh just creates these 4 files
444 2011-08-21T22:21:24 <Marchael> which summary 56K
445 2011-08-21T22:23:11 <Marchael> ThomasWaldmann: you may try moin index --for indexname --action clean and see that yourself
446 2011-08-21T22:23:21 <Marchael> in index_dir
447 2011-08-21T22:23:21 <ThomasWaldmann> ok, it removes ALL files of previous index. i just wanted to make sure. :)
448 2011-08-21T22:23:38 <Marchael> ah, sorry for confusing
449 2011-08-21T22:24:06 <ThomasWaldmann> ok, make sure you read all my comments on CR.
450 2011-08-21T22:24:28 <Marchael> ok, I start from 1
451 2011-08-21T22:26:34 * ThomasWaldmann just adds some more
452 2011-08-21T22:28:59 <Marchael> ThomasWaldmann: ps 11
453 2011-08-21T22:29:16 <ThomasWaldmann> read my new comments there first
454 2011-08-21T22:29:25 <Marchael> ok
455 2011-08-21T22:32:34 <Marchael> > btw, it is a bad idea to add params at the beginning of the params list.
456 2011-08-21T22:32:34 <Marchael> ThomasWaldmann: but whole theese params have default values. I should use **kwargs for that?
457 2011-08-21T22:32:48 <ThomasWaldmann> no, just read what i said
458 2011-08-21T22:34:26 <Marchael> hm, then just move this to to end of param list?
459 2011-08-21T22:35:14 <ThomasWaldmann> if you want to avoid falling over it, yes
460 2011-08-21T22:35:18 <Marchael> ok
461 2011-08-21T22:37:17 <Marchael> ThomasWaldmann: 12
462 2011-08-21T22:42:40 <ThomasWaldmann> ok, do tests, commit if it works
463 2011-08-21T22:44:01 <Marchael> ThomasWaldmann: may I close #34 or there is something undone?
464 2011-08-21T22:47:01 <ThomasWaldmann> sinha1: there are 2 more test failures in your repo than in main repo. test_sourcecode and test_frontend
465 2011-08-21T22:47:48 <ThomasWaldmann> Marchael: yes
466 2011-08-21T22:48:33 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 0e1c8662871f r454 moin-2.0/MoinMoin/util/interwiki.py: fix getInterwikiName signature
467 2011-08-21T22:48:34 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 3e4ddf215182 r455 moin-2.0/ (6 files in 6 dirs):
468 2011-08-21T22:48:34 <CIA-114> require cfg.interwikiname to be set to a non-empty, unique, stable unicode value
469 2011-08-21T22:48:34 <CIA-114> fix wikiconfig.py to use u"MyMoinMoin" and also add it to cfg.interwiki_map.
470 2011-08-21T22:48:34 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 3a042c4b99ee r456 moin-2.0/ (6 files in 6 dirs): merged
471 2011-08-21T22:48:34 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 6c07d901c6b4 r457 moin-2.0/MoinMoin/ (3 files in 3 dirs): Fixing removing indexes from test dir, some changes in WhooshIndex API Fixes #34.
472 2011-08-21T22:50:02 <ThomasWaldmann> that reminded me to remove issues service from the main bb repo.
473 2011-08-21T22:52:52 <ThomasWaldmann> 'XStatic-svg-edit-moin>=2011.07.07.2',
474 2011-08-21T22:52:52 <ThomasWaldmann> 'XStatic-svg-edit-moin==2011.07.07.2',
475 2011-08-21T22:53:28 * ThomasWaldmann won't merge sinha's stuff as is :(
476 2011-08-21T22:54:21 <ThomasWaldmann> (that's 2 lines from setup.py)
477 2011-08-21T22:57:04 <xorAxAx> pkumar, well, then fix the config class?
478 2011-08-21T22:58:27 <Marchael> gn/bbl
479 2011-08-21T22:58:54 *** Marchael
480 2011-08-21T23:26:19 <sinha1> ThomasWaldmann: reg the failing test for frontend, we have it as "/+index/" not as "/+index" (i have corrected it) and reg that favicon.ico, well its coming on the browser
481 2011-08-21T23:26:52 <sinha1> and i have fixed setup.py again (really sorry for that)
482 2011-08-21T23:27:01 <ThomasWaldmann> i didn't tell anything about favicon
483 2011-08-21T23:27:19 <ThomasWaldmann> did you fix both errors in setup.py?
484 2011-08-21T23:27:34 <ThomasWaldmann> did you check whether that is really all now?
485 2011-08-21T23:29:39 <sinha1> yes i have checked setup.py, i just have one extra line in my repo, that multiDownload one (it has == sign, do i need to change it as >= )
486 2011-08-21T23:30:33 <ThomasWaldmann> we use >= except if there is a good reason against it
487 2011-08-21T23:31:33 <sinha1> okay changing it, i did it as == , at that time it was there
488 2011-08-21T23:37:03 <sinha1> ThomasWaldmann: i am getting "61 failed, 2353 passed, 25 skipped, 1 xfailed, 4 error in 341.97 seconds"
489 2011-08-21T23:37:51 <ThomasWaldmann> == 60 failed, 2150 passed, 232 skipped, 1 xfailed, 4 error in 471.53 seconds ===
490 2011-08-21T23:38:26 <ThomasWaldmann> your machine is faster than mine :)
491 2011-08-21T23:39:11 <sinha1> so do i push now ?
492 2011-08-21T23:39:28 <ThomasWaldmann> and you seem to have more tests. so maybe run tests in main repo also, check if there are 61 fails also.
493 2011-08-21T23:40:00 <sinha1> yes i guess that test_frontend is failing
494 2011-08-21T23:40:10 <sinha1> which i just told you, reg that favicon.ico
495 2011-08-21T23:40:47 <ThomasWaldmann> you said you have corrected it
496 2011-08-21T23:41:58 <sinha1> i have corrected the index part, but in favicon.ico it is asserting content-type as image/x-icon, but i am getting it as "image/vnd.microsoft.icon"
497 2011-08-21T23:43:58 <ThomasWaldmann> fix that test
498 2011-08-21T23:44:16 <ThomasWaldmann> using ... in ['one', 'other', ]
499 2011-08-21T23:44:44 <ThomasWaldmann> it might depend on what ones has in /etc/mime.types
500 2011-08-21T23:47:02 <ThomasWaldmann> run that test afterwards, shouldn't fail any more for you then
501 2011-08-21T23:48:28 <sinha1> okay
502 2011-08-21T23:49:14 <sinha1> ThomasWaldmann: that test is also failing in main repo on my pc
503 2011-08-21T23:50:14 <sinha1> now passed by adding the extra mimetype
504 2011-08-21T23:52:41 <ThomasWaldmann> it doesn't fail for me, due to different stuff in /etc
505 2011-08-21T23:52:52 <ThomasWaldmann> ok, commit, push
506 2011-08-21T23:53:17 <ThomasWaldmann> btw, see issues on bb (in your old repo)
507 2011-08-21T23:54:04 <sinha1> yes the last 2 you have just posted ?
508 2011-08-21T23:54:42 <ThomasWaldmann> yes, for right now :)
509 2011-08-21T23:54:50 <ThomasWaldmann> but see also the other ones, later
510 2011-08-21T23:55:53 <CIA-114> Akash Sinha <akash2607@gmail.com> * 4b3cc69cfd06 r532 default/ (3 files in 3 dirs): more merging and cleaning
511 2011-08-21T23:56:36 <sinha1> ThomasWaldmann: yes i will try to do that index/history improvements in coming days
512 2011-08-21T23:58:48 <ThomasWaldmann> sinha1: +from MoinMoin.util.forms import make_generator
