##// END OF EJS Templates
merges for upcoming release
marcink -
r1209:45fed9a4 default
parent child Browse files
Show More
@@ -0,0 +1,6 b''
1 List of contributors to RhodeCode project:
2 Marcin Kuźmiński <marcin@python-works.com>
3 Lukasz Balcerzak <lukaszbalcerzak@gmail.com>
4 Jason Harris <jason@jasonfharris.com>
5 Thayne Harbaugh <thayne@fusionio.com>
6 cejones No newline at end of file
This diff has been collapsed as it changes many lines, (840 lines changed) Show them Hide them
@@ -1,285 +1,626 b''
1 GNU GENERAL PUBLIC LICENSE
2 Version 2, June 1991
1 GNU GENERAL PUBLIC LICENSE
2 Version 3, 29 June 2007
3 3
4 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
5 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
4 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
6 5 Everyone is permitted to copy and distribute verbatim copies
7 6 of this license document, but changing it is not allowed.
8 7
9 Preamble
8 Preamble
9
10 The GNU General Public License is a free, copyleft license for
11 software and other kinds of works.
10 12
11 The licenses for most software are designed to take away your
12 freedom to share and change it. By contrast, the GNU General Public
13 License is intended to guarantee your freedom to share and change free
14 software--to make sure the software is free for all its users. This
15 General Public License applies to most of the Free Software
16 Foundation's software and to any other program whose authors commit to
17 using it. (Some other Free Software Foundation software is covered by
18 the GNU Library General Public License instead.) You can apply it to
13 The licenses for most software and other practical works are designed
14 to take away your freedom to share and change the works. By contrast,
15 the GNU General Public License is intended to guarantee your freedom to
16 share and change all versions of a program--to make sure it remains free
17 software for all its users. We, the Free Software Foundation, use the
18 GNU General Public License for most of our software; it applies also to
19 any other work released this way by its authors. You can apply it to
19 20 your programs, too.
20 21
21 22 When we speak of free software, we are referring to freedom, not
22 23 price. Our General Public Licenses are designed to make sure that you
23 24 have the freedom to distribute copies of free software (and charge for
24 this service if you wish), that you receive source code or can get it
25 if you want it, that you can change the software or use pieces of it
26 in new free programs; and that you know you can do these things.
25 them if you wish), that you receive source code or can get it if you
26 want it, that you can change the software or use pieces of it in new
27 free programs, and that you know you can do these things.
27 28
28 To protect your rights, we need to make restrictions that forbid
29 anyone to deny you these rights or to ask you to surrender the rights.
30 These restrictions translate to certain responsibilities for you if you
31 distribute copies of the software, or if you modify it.
29 To protect your rights, we need to prevent others from denying you
30 these rights or asking you to surrender the rights. Therefore, you have
31 certain responsibilities if you distribute copies of the software, or if
32 you modify it: responsibilities to respect the freedom of others.
32 33
33 34 For example, if you distribute copies of such a program, whether
34 gratis or for a fee, you must give the recipients all the rights that
35 you have. You must make sure that they, too, receive or can get the
36 source code. And you must show them these terms so they know their
37 rights.
35 gratis or for a fee, you must pass on to the recipients the same
36 freedoms that you received. You must make sure that they, too, receive
37 or can get the source code. And you must show them these terms so they
38 know their rights.
38 39
39 We protect your rights with two steps: (1) copyright the software, and
40 (2) offer you this license which gives you legal permission to copy,
41 distribute and/or modify the software.
40 Developers that use the GNU GPL protect your rights with two steps:
41 (1) assert copyright on the software, and (2) offer you this License
42 giving you legal permission to copy, distribute and/or modify it.
43
44 For the developers' and authors' protection, the GPL clearly explains
45 that there is no warranty for this free software. For both users' and
46 authors' sake, the GPL requires that modified versions be marked as
47 changed, so that their problems will not be attributed erroneously to
48 authors of previous versions.
42 49
43 Also, for each author's protection and ours, we want to make certain
44 that everyone understands that there is no warranty for this free
45 software. If the software is modified by someone else and passed on, we
46 want its recipients to know that what they have is not the original, so
47 that any problems introduced by others will not reflect on the original
48 authors' reputations.
50 Some devices are designed to deny users access to install or run
51 modified versions of the software inside them, although the manufacturer
52 can do so. This is fundamentally incompatible with the aim of
53 protecting users' freedom to change the software. The systematic
54 pattern of such abuse occurs in the area of products for individuals to
55 use, which is precisely where it is most unacceptable. Therefore, we
56 have designed this version of the GPL to prohibit the practice for those
57 products. If such problems arise substantially in other domains, we
58 stand ready to extend this provision to those domains in future versions
59 of the GPL, as needed to protect the freedom of users.
49 60
50 Finally, any free program is threatened constantly by software
51 patents. We wish to avoid the danger that redistributors of a free
52 program will individually obtain patent licenses, in effect making the
53 program proprietary. To prevent this, we have made it clear that any
54 patent must be licensed for everyone's free use or not licensed at all.
61 Finally, every program is threatened constantly by software patents.
62 States should not allow patents to restrict development and use of
63 software on general-purpose computers, but in those that do, we wish to
64 avoid the special danger that patents applied to a free program could
65 make it effectively proprietary. To prevent this, the GPL assures that
66 patents cannot be used to render the program non-free.
55 67
56 68 The precise terms and conditions for copying, distribution and
57 69 modification follow.
58 70
59 GNU GENERAL PUBLIC LICENSE
60 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
71 TERMS AND CONDITIONS
72
73 0. Definitions.
74
75 "This License" refers to version 3 of the GNU General Public License.
76
77 "Copyright" also means copyright-like laws that apply to other kinds of
78 works, such as semiconductor masks.
79
80 "The Program" refers to any copyrightable work licensed under this
81 License. Each licensee is addressed as "you". "Licensees" and
82 "recipients" may be individuals or organizations.
83
84 To "modify" a work means to copy from or adapt all or part of the work
85 in a fashion requiring copyright permission, other than the making of an
86 exact copy. The resulting work is called a "modified version" of the
87 earlier work or a work "based on" the earlier work.
88
89 A "covered work" means either the unmodified Program or a work based
90 on the Program.
61 91
62 0. This License applies to any program or other work which contains
63 a notice placed by the copyright holder saying it may be distributed
64 under the terms of this General Public License. The "Program", below,
65 refers to any such program or work, and a "work based on the Program"
66 means either the Program or any derivative work under copyright law:
67 that is to say, a work containing the Program or a portion of it,
68 either verbatim or with modifications and/or translated into another
69 language. (Hereinafter, translation is included without limitation in
70 the term "modification".) Each licensee is addressed as "you".
92 To "propagate" a work means to do anything with it that, without
93 permission, would make you directly or secondarily liable for
94 infringement under applicable copyright law, except executing it on a
95 computer or modifying a private copy. Propagation includes copying,
96 distribution (with or without modification), making available to the
97 public, and in some countries other activities as well.
98
99 To "convey" a work means any kind of propagation that enables other
100 parties to make or receive copies. Mere interaction with a user through
101 a computer network, with no transfer of a copy, is not conveying.
102
103 An interactive user interface displays "Appropriate Legal Notices"
104 to the extent that it includes a convenient and prominently visible
105 feature that (1) displays an appropriate copyright notice, and (2)
106 tells the user that there is no warranty for the work (except to the
107 extent that warranties are provided), that licensees may convey the
108 work under this License, and how to view a copy of this License. If
109 the interface presents a list of user commands or options, such as a
110 menu, a prominent item in the list meets this criterion.
111
112 1. Source Code.
71 113
72 Activities other than copying, distribution and modification are not
73 covered by this License; they are outside its scope. The act of
74 running the Program is not restricted, and the output from the Program
75 is covered only if its contents constitute a work based on the
76 Program (independent of having been made by running the Program).
77 Whether that is true depends on what the Program does.
114 The "source code" for a work means the preferred form of the work
115 for making modifications to it. "Object code" means any non-source
116 form of a work.
117
118 A "Standard Interface" means an interface that either is an official
119 standard defined by a recognized standards body, or, in the case of
120 interfaces specified for a particular programming language, one that
121 is widely used among developers working in that language.
122
123 The "System Libraries" of an executable work include anything, other
124 than the work as a whole, that (a) is included in the normal form of
125 packaging a Major Component, but which is not part of that Major
126 Component, and (b) serves only to enable use of the work with that
127 Major Component, or to implement a Standard Interface for which an
128 implementation is available to the public in source code form. A
129 "Major Component", in this context, means a major essential component
130 (kernel, window system, and so on) of the specific operating system
131 (if any) on which the executable work runs, or a compiler used to
132 produce the work, or an object code interpreter used to run it.
78 133
79 1. You may copy and distribute verbatim copies of the Program's
80 source code as you receive it, in any medium, provided that you
81 conspicuously and appropriately publish on each copy an appropriate
82 copyright notice and disclaimer of warranty; keep intact all the
83 notices that refer to this License and to the absence of any warranty;
84 and give any other recipients of the Program a copy of this License
85 along with the Program.
134 The "Corresponding Source" for a work in object code form means all
135 the source code needed to generate, install, and (for an executable
136 work) run the object code and to modify the work, including scripts to
137 control those activities. However, it does not include the work's
138 System Libraries, or general-purpose tools or generally available free
139 programs which are used unmodified in performing those activities but
140 which are not part of the work. For example, Corresponding Source
141 includes interface definition files associated with source files for
142 the work, and the source code for shared libraries and dynamically
143 linked subprograms that the work is specifically designed to require,
144 such as by intimate data communication or control flow between those
145 subprograms and other parts of the work.
86 146
87 You may charge a fee for the physical act of transferring a copy, and
88 you may at your option offer warranty protection in exchange for a fee.
147 The Corresponding Source need not include anything that users
148 can regenerate automatically from other parts of the Corresponding
149 Source.
150
151 The Corresponding Source for a work in source code form is that
152 same work.
153
154 2. Basic Permissions.
155
156 All rights granted under this License are granted for the term of
157 copyright on the Program, and are irrevocable provided the stated
158 conditions are met. This License explicitly affirms your unlimited
159 permission to run the unmodified Program. The output from running a
160 covered work is covered by this License only if the output, given its
161 content, constitutes a covered work. This License acknowledges your
162 rights of fair use or other equivalent, as provided by copyright law.
89 163
90 2. You may modify your copy or copies of the Program or any portion
91 of it, thus forming a work based on the Program, and copy and
92 distribute such modifications or work under the terms of Section 1
93 above, provided that you also meet all of these conditions:
164 You may make, run and propagate covered works that you do not
165 convey, without conditions so long as your license otherwise remains
166 in force. You may convey covered works to others for the sole purpose
167 of having them make modifications exclusively for you, or provide you
168 with facilities for running those works, provided that you comply with
169 the terms of this License in conveying all material for which you do
170 not control copyright. Those thus making or running the covered works
171 for you must do so exclusively on your behalf, under your direction
172 and control, on terms that prohibit them from making any copies of
173 your copyrighted material outside their relationship with you.
174
175 Conveying under any other circumstances is permitted solely under
176 the conditions stated below. Sublicensing is not allowed; section 10
177 makes it unnecessary.
178
179 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
180
181 No covered work shall be deemed part of an effective technological
182 measure under any applicable law fulfilling obligations under article
183 11 of the WIPO copyright treaty adopted on 20 December 1996, or
184 similar laws prohibiting or restricting circumvention of such
185 measures.
94 186
95 a) You must cause the modified files to carry prominent notices
96 stating that you changed the files and the date of any change.
187 When you convey a covered work, you waive any legal power to forbid
188 circumvention of technological measures to the extent such circumvention
189 is effected by exercising rights under this License with respect to
190 the covered work, and you disclaim any intention to limit operation or
191 modification of the work as a means of enforcing, against the work's
192 users, your or third parties' legal rights to forbid circumvention of
193 technological measures.
194
195 4. Conveying Verbatim Copies.
97 196
98 b) You must cause any work that you distribute or publish, that in
99 whole or in part contains or is derived from the Program or any
100 part thereof, to be licensed as a whole at no charge to all third
101 parties under the terms of this License.
197 You may convey verbatim copies of the Program's source code as you
198 receive it, in any medium, provided that you conspicuously and
199 appropriately publish on each copy an appropriate copyright notice;
200 keep intact all notices stating that this License and any
201 non-permissive terms added in accord with section 7 apply to the code;
202 keep intact all notices of the absence of any warranty; and give all
203 recipients a copy of this License along with the Program.
204
205 You may charge any price or no price for each copy that you convey,
206 and you may offer support or warranty protection for a fee.
207
208 5. Conveying Modified Source Versions.
209
210 You may convey a work based on the Program, or the modifications to
211 produce it from the Program, in the form of source code under the
212 terms of section 4, provided that you also meet all of these conditions:
213
214 a) The work must carry prominent notices stating that you modified
215 it, and giving a relevant date.
102 216
103 c) If the modified program normally reads commands interactively
104 when run, you must cause it, when started running for such
105 interactive use in the most ordinary way, to print or display an
106 announcement including an appropriate copyright notice and a
107 notice that there is no warranty (or else, saying that you provide
108 a warranty) and that users may redistribute the program under
109 these conditions, and telling the user how to view a copy of this
110 License. (Exception: if the Program itself is interactive but
111 does not normally print such an announcement, your work based on
112 the Program is not required to print an announcement.)
217 b) The work must carry prominent notices stating that it is
218 released under this License and any conditions added under section
219 7. This requirement modifies the requirement in section 4 to
220 "keep intact all notices".
221
222 c) You must license the entire work, as a whole, under this
223 License to anyone who comes into possession of a copy. This
224 License will therefore apply, along with any applicable section 7
225 additional terms, to the whole of the work, and all its parts,
226 regardless of how they are packaged. This License gives no
227 permission to license the work in any other way, but it does not
228 invalidate such permission if you have separately received it.
229
230 d) If the work has interactive user interfaces, each must display
231 Appropriate Legal Notices; however, if the Program has interactive
232 interfaces that do not display Appropriate Legal Notices, your
233 work need not make them do so.
234
235 A compilation of a covered work with other separate and independent
236 works, which are not by their nature extensions of the covered work,
237 and which are not combined with it such as to form a larger program,
238 in or on a volume of a storage or distribution medium, is called an
239 "aggregate" if the compilation and its resulting copyright are not
240 used to limit the access or legal rights of the compilation's users
241 beyond what the individual works permit. Inclusion of a covered work
242 in an aggregate does not cause this License to apply to the other
243 parts of the aggregate.
113 244
114 These requirements apply to the modified work as a whole. If
115 identifiable sections of that work are not derived from the Program,
116 and can be reasonably considered independent and separate works in
117 themselves, then this License, and its terms, do not apply to those
118 sections when you distribute them as separate works. But when you
119 distribute the same sections as part of a whole which is a work based
120 on the Program, the distribution of the whole must be on the terms of
121 this License, whose permissions for other licensees extend to the
122 entire whole, and thus to each and every part regardless of who wrote it.
245 6. Conveying Non-Source Forms.
246
247 You may convey a covered work in object code form under the terms
248 of sections 4 and 5, provided that you also convey the
249 machine-readable Corresponding Source under the terms of this License,
250 in one of these ways:
251
252 a) Convey the object code in, or embodied in, a physical product
253 (including a physical distribution medium), accompanied by the
254 Corresponding Source fixed on a durable physical medium
255 customarily used for software interchange.
256
257 b) Convey the object code in, or embodied in, a physical product
258 (including a physical distribution medium), accompanied by a
259 written offer, valid for at least three years and valid for as
260 long as you offer spare parts or customer support for that product
261 model, to give anyone who possesses the object code either (1) a
262 copy of the Corresponding Source for all the software in the
263 product that is covered by this License, on a durable physical
264 medium customarily used for software interchange, for a price no
265 more than your reasonable cost of physically performing this
266 conveying of source, or (2) access to copy the
267 Corresponding Source from a network server at no charge.
268
269 c) Convey individual copies of the object code with a copy of the
270 written offer to provide the Corresponding Source. This
271 alternative is allowed only occasionally and noncommercially, and
272 only if you received the object code with such an offer, in accord
273 with subsection 6b.
123 274
124 Thus, it is not the intent of this section to claim rights or contest
125 your rights to work written entirely by you; rather, the intent is to
126 exercise the right to control the distribution of derivative or
127 collective works based on the Program.
275 d) Convey the object code by offering access from a designated
276 place (gratis or for a charge), and offer equivalent access to the
277 Corresponding Source in the same way through the same place at no
278 further charge. You need not require recipients to copy the
279 Corresponding Source along with the object code. If the place to
280 copy the object code is a network server, the Corresponding Source
281 may be on a different server (operated by you or a third party)
282 that supports equivalent copying facilities, provided you maintain
283 clear directions next to the object code saying where to find the
284 Corresponding Source. Regardless of what server hosts the
285 Corresponding Source, you remain obligated to ensure that it is
286 available for as long as needed to satisfy these requirements.
287
288 e) Convey the object code using peer-to-peer transmission, provided
289 you inform other peers where the object code and Corresponding
290 Source of the work are being offered to the general public at no
291 charge under subsection 6d.
128 292
129 In addition, mere aggregation of another work not based on the Program
130 with the Program (or with a work based on the Program) on a volume of
131 a storage or distribution medium does not bring the other work under
132 the scope of this License.
293 A separable portion of the object code, whose source code is excluded
294 from the Corresponding Source as a System Library, need not be
295 included in conveying the object code work.
133 296
134 3. You may copy and distribute the Program (or a work based on it,
135 under Section 2) in object code or executable form under the terms of
136 Sections 1 and 2 above provided that you also do one of the following:
297 A "User Product" is either (1) a "consumer product", which means any
298 tangible personal property which is normally used for personal, family,
299 or household purposes, or (2) anything designed or sold for incorporation
300 into a dwelling. In determining whether a product is a consumer product,
301 doubtful cases shall be resolved in favor of coverage. For a particular
302 product received by a particular user, "normally used" refers to a
303 typical or common use of that class of product, regardless of the status
304 of the particular user or of the way in which the particular user
305 actually uses, or expects or is expected to use, the product. A product
306 is a consumer product regardless of whether the product has substantial
307 commercial, industrial or non-consumer uses, unless such uses represent
308 the only significant mode of use of the product.
309
310 "Installation Information" for a User Product means any methods,
311 procedures, authorization keys, or other information required to install
312 and execute modified versions of a covered work in that User Product from
313 a modified version of its Corresponding Source. The information must
314 suffice to ensure that the continued functioning of the modified object
315 code is in no case prevented or interfered with solely because
316 modification has been made.
137 317
138 a) Accompany it with the complete corresponding machine-readable
139 source code, which must be distributed under the terms of Sections
140 1 and 2 above on a medium customarily used for software interchange; or,
318 If you convey an object code work under this section in, or with, or
319 specifically for use in, a User Product, and the conveying occurs as
320 part of a transaction in which the right of possession and use of the
321 User Product is transferred to the recipient in perpetuity or for a
322 fixed term (regardless of how the transaction is characterized), the
323 Corresponding Source conveyed under this section must be accompanied
324 by the Installation Information. But this requirement does not apply
325 if neither you nor any third party retains the ability to install
326 modified object code on the User Product (for example, the work has
327 been installed in ROM).
328
329 The requirement to provide Installation Information does not include a
330 requirement to continue to provide support service, warranty, or updates
331 for a work that has been modified or installed by the recipient, or for
332 the User Product in which it has been modified or installed. Access to a
333 network may be denied when the modification itself materially and
334 adversely affects the operation of the network or violates the rules and
335 protocols for communication across the network.
336
337 Corresponding Source conveyed, and Installation Information provided,
338 in accord with this section must be in a format that is publicly
339 documented (and with an implementation available to the public in
340 source code form), and must require no special password or key for
341 unpacking, reading or copying.
342
343 7. Additional Terms.
141 344
142 b) Accompany it with a written offer, valid for at least three
143 years, to give any third party, for a charge no more than your
144 cost of physically performing source distribution, a complete
145 machine-readable copy of the corresponding source code, to be
146 distributed under the terms of Sections 1 and 2 above on a medium
147 customarily used for software interchange; or,
345 "Additional permissions" are terms that supplement the terms of this
346 License by making exceptions from one or more of its conditions.
347 Additional permissions that are applicable to the entire Program shall
348 be treated as though they were included in this License, to the extent
349 that they are valid under applicable law. If additional permissions
350 apply only to part of the Program, that part may be used separately
351 under those permissions, but the entire Program remains governed by
352 this License without regard to the additional permissions.
353
354 When you convey a copy of a covered work, you may at your option
355 remove any additional permissions from that copy, or from any part of
356 it. (Additional permissions may be written to require their own
357 removal in certain cases when you modify the work.) You may place
358 additional permissions on material, added by you to a covered work,
359 for which you have or can give appropriate copyright permission.
148 360
149 c) Accompany it with the information you received as to the offer
150 to distribute corresponding source code. (This alternative is
151 allowed only for noncommercial distribution and only if you
152 received the program in object code or executable form with such
153 an offer, in accord with Subsection b above.)
361 Notwithstanding any other provision of this License, for material you
362 add to a covered work, you may (if authorized by the copyright holders of
363 that material) supplement the terms of this License with terms:
364
365 a) Disclaiming warranty or limiting liability differently from the
366 terms of sections 15 and 16 of this License; or
367
368 b) Requiring preservation of specified reasonable legal notices or
369 author attributions in that material or in the Appropriate Legal
370 Notices displayed by works containing it; or
371
372 c) Prohibiting misrepresentation of the origin of that material, or
373 requiring that modified versions of such material be marked in
374 reasonable ways as different from the original version; or
375
376 d) Limiting the use for publicity purposes of names of licensors or
377 authors of the material; or
154 378
155 The source code for a work means the preferred form of the work for
156 making modifications to it. For an executable work, complete source
157 code means all the source code for all modules it contains, plus any
158 associated interface definition files, plus the scripts used to
159 control compilation and installation of the executable. However, as a
160 special exception, the source code distributed need not include
161 anything that is normally distributed (in either source or binary
162 form) with the major components (compiler, kernel, and so on) of the
163 operating system on which the executable runs, unless that component
164 itself accompanies the executable.
379 e) Declining to grant rights under trademark law for use of some
380 trade names, trademarks, or service marks; or
381
382 f) Requiring indemnification of licensors and authors of that
383 material by anyone who conveys the material (or modified versions of
384 it) with contractual assumptions of liability to the recipient, for
385 any liability that these contractual assumptions directly impose on
386 those licensors and authors.
387
388 All other non-permissive additional terms are considered "further
389 restrictions" within the meaning of section 10. If the Program as you
390 received it, or any part of it, contains a notice stating that it is
391 governed by this License along with a term that is a further
392 restriction, you may remove that term. If a license document contains
393 a further restriction but permits relicensing or conveying under this
394 License, you may add to a covered work material governed by the terms
395 of that license document, provided that the further restriction does
396 not survive such relicensing or conveying.
397
398 If you add terms to a covered work in accord with this section, you
399 must place, in the relevant source files, a statement of the
400 additional terms that apply to those files, or a notice indicating
401 where to find the applicable terms.
165 402
166 If distribution of executable or object code is made by offering
167 access to copy from a designated place, then offering equivalent
168 access to copy the source code from the same place counts as
169 distribution of the source code, even though third parties are not
170 compelled to copy the source along with the object code.
403 Additional terms, permissive or non-permissive, may be stated in the
404 form of a separately written license, or stated as exceptions;
405 the above requirements apply either way.
406
407 8. Termination.
408
409 You may not propagate or modify a covered work except as expressly
410 provided under this License. Any attempt otherwise to propagate or
411 modify it is void, and will automatically terminate your rights under
412 this License (including any patent licenses granted under the third
413 paragraph of section 11).
414
415 However, if you cease all violation of this License, then your
416 license from a particular copyright holder is reinstated (a)
417 provisionally, unless and until the copyright holder explicitly and
418 finally terminates your license, and (b) permanently, if the copyright
419 holder fails to notify you of the violation by some reasonable means
420 prior to 60 days after the cessation.
421
422 Moreover, your license from a particular copyright holder is
423 reinstated permanently if the copyright holder notifies you of the
424 violation by some reasonable means, this is the first time you have
425 received notice of violation of this License (for any work) from that
426 copyright holder, and you cure the violation prior to 30 days after
427 your receipt of the notice.
171 428
172 4. You may not copy, modify, sublicense, or distribute the Program
173 except as expressly provided under this License. Any attempt
174 otherwise to copy, modify, sublicense or distribute the Program is
175 void, and will automatically terminate your rights under this License.
176 However, parties who have received copies, or rights, from you under
177 this License will not have their licenses terminated so long as such
178 parties remain in full compliance.
429 Termination of your rights under this section does not terminate the
430 licenses of parties who have received copies or rights from you under
431 this License. If your rights have been terminated and not permanently
432 reinstated, you do not qualify to receive new licenses for the same
433 material under section 10.
434
435 9. Acceptance Not Required for Having Copies.
436
437 You are not required to accept this License in order to receive or
438 run a copy of the Program. Ancillary propagation of a covered work
439 occurring solely as a consequence of using peer-to-peer transmission
440 to receive a copy likewise does not require acceptance. However,
441 nothing other than this License grants you permission to propagate or
442 modify any covered work. These actions infringe copyright if you do
443 not accept this License. Therefore, by modifying or propagating a
444 covered work, you indicate your acceptance of this License to do so.
445
446 10. Automatic Licensing of Downstream Recipients.
447
448 Each time you convey a covered work, the recipient automatically
449 receives a license from the original licensors, to run, modify and
450 propagate that work, subject to this License. You are not responsible
451 for enforcing compliance by third parties with this License.
179 452
180 5. You are not required to accept this License, since you have not
181 signed it. However, nothing else grants you permission to modify or
182 distribute the Program or its derivative works. These actions are
183 prohibited by law if you do not accept this License. Therefore, by
184 modifying or distributing the Program (or any work based on the
185 Program), you indicate your acceptance of this License to do so, and
186 all its terms and conditions for copying, distributing or modifying
187 the Program or works based on it.
453 An "entity transaction" is a transaction transferring control of an
454 organization, or substantially all assets of one, or subdividing an
455 organization, or merging organizations. If propagation of a covered
456 work results from an entity transaction, each party to that
457 transaction who receives a copy of the work also receives whatever
458 licenses to the work the party's predecessor in interest had or could
459 give under the previous paragraph, plus a right to possession of the
460 Corresponding Source of the work from the predecessor in interest, if
461 the predecessor has it or can get it with reasonable efforts.
188 462
189 6. Each time you redistribute the Program (or any work based on the
190 Program), the recipient automatically receives a license from the
191 original licensor to copy, distribute or modify the Program subject to
192 these terms and conditions. You may not impose any further
193 restrictions on the recipients' exercise of the rights granted herein.
194 You are not responsible for enforcing compliance by third parties to
463 You may not impose any further restrictions on the exercise of the
464 rights granted or affirmed under this License. For example, you may
465 not impose a license fee, royalty, or other charge for exercise of
466 rights granted under this License, and you may not initiate litigation
467 (including a cross-claim or counterclaim in a lawsuit) alleging that
468 any patent claim is infringed by making, using, selling, offering for
469 sale, or importing the Program or any portion of it.
470
471 11. Patents.
472
473 A "contributor" is a copyright holder who authorizes use under this
474 License of the Program or a work on which the Program is based. The
475 work thus licensed is called the contributor's "contributor version".
476
477 A contributor's "essential patent claims" are all patent claims
478 owned or controlled by the contributor, whether already acquired or
479 hereafter acquired, that would be infringed by some manner, permitted
480 by this License, of making, using, or selling its contributor version,
481 but do not include claims that would be infringed only as a
482 consequence of further modification of the contributor version. For
483 purposes of this definition, "control" includes the right to grant
484 patent sublicenses in a manner consistent with the requirements of
195 485 this License.
196 486
197 7. If, as a consequence of a court judgment or allegation of patent
198 infringement or for any other reason (not limited to patent issues),
199 conditions are imposed on you (whether by court order, agreement or
200 otherwise) that contradict the conditions of this License, they do not
201 excuse you from the conditions of this License. If you cannot
202 distribute so as to satisfy simultaneously your obligations under this
203 License and any other pertinent obligations, then as a consequence you
204 may not distribute the Program at all. For example, if a patent
205 license would not permit royalty-free redistribution of the Program by
206 all those who receive copies directly or indirectly through you, then
207 the only way you could satisfy both it and this License would be to
208 refrain entirely from distribution of the Program.
487 Each contributor grants you a non-exclusive, worldwide, royalty-free
488 patent license under the contributor's essential patent claims, to
489 make, use, sell, offer for sale, import and otherwise run, modify and
490 propagate the contents of its contributor version.
491
492 In the following three paragraphs, a "patent license" is any express
493 agreement or commitment, however denominated, not to enforce a patent
494 (such as an express permission to practice a patent or covenant not to
495 sue for patent infringement). To "grant" such a patent license to a
496 party means to make such an agreement or commitment not to enforce a
497 patent against the party.
209 498
210 If any portion of this section is held invalid or unenforceable under
211 any particular circumstance, the balance of the section is intended to
212 apply and the section as a whole is intended to apply in other
213 circumstances.
499 If you convey a covered work, knowingly relying on a patent license,
500 and the Corresponding Source of the work is not available for anyone
501 to copy, free of charge and under the terms of this License, through a
502 publicly available network server or other readily accessible means,
503 then you must either (1) cause the Corresponding Source to be so
504 available, or (2) arrange to deprive yourself of the benefit of the
505 patent license for this particular work, or (3) arrange, in a manner
506 consistent with the requirements of this License, to extend the patent
507 license to downstream recipients. "Knowingly relying" means you have
508 actual knowledge that, but for the patent license, your conveying the
509 covered work in a country, or your recipient's use of the covered work
510 in a country, would infringe one or more identifiable patents in that
511 country that you have reason to believe are valid.
512
513 If, pursuant to or in connection with a single transaction or
514 arrangement, you convey, or propagate by procuring conveyance of, a
515 covered work, and grant a patent license to some of the parties
516 receiving the covered work authorizing them to use, propagate, modify
517 or convey a specific copy of the covered work, then the patent license
518 you grant is automatically extended to all recipients of the covered
519 work and works based on it.
214 520
215 It is not the purpose of this section to induce you to infringe any
216 patents or other property right claims or to contest validity of any
217 such claims; this section has the sole purpose of protecting the
218 integrity of the free software distribution system, which is
219 implemented by public license practices. Many people have made
220 generous contributions to the wide range of software distributed
221 through that system in reliance on consistent application of that
222 system; it is up to the author/donor to decide if he or she is willing
223 to distribute software through any other system and a licensee cannot
224 impose that choice.
521 A patent license is "discriminatory" if it does not include within
522 the scope of its coverage, prohibits the exercise of, or is
523 conditioned on the non-exercise of one or more of the rights that are
524 specifically granted under this License. You may not convey a covered
525 work if you are a party to an arrangement with a third party that is
526 in the business of distributing software, under which you make payment
527 to the third party based on the extent of your activity of conveying
528 the work, and under which the third party grants, to any of the
529 parties who would receive the covered work from you, a discriminatory
530 patent license (a) in connection with copies of the covered work
531 conveyed by you (or copies made from those copies), or (b) primarily
532 for and in connection with specific products or compilations that
533 contain the covered work, unless you entered into that arrangement,
534 or that patent license was granted, prior to 28 March 2007.
535
536 Nothing in this License shall be construed as excluding or limiting
537 any implied license or other defenses to infringement that may
538 otherwise be available to you under applicable patent law.
539
540 12. No Surrender of Others' Freedom.
225 541
226 This section is intended to make thoroughly clear what is believed to
227 be a consequence of the rest of this License.
542 If conditions are imposed on you (whether by court order, agreement or
543 otherwise) that contradict the conditions of this License, they do not
544 excuse you from the conditions of this License. If you cannot convey a
545 covered work so as to satisfy simultaneously your obligations under this
546 License and any other pertinent obligations, then as a consequence you may
547 not convey it at all. For example, if you agree to terms that obligate you
548 to collect a royalty for further conveying from those to whom you convey
549 the Program, the only way you could satisfy both those terms and this
550 License would be to refrain entirely from conveying the Program.
551
552 13. Use with the GNU Affero General Public License.
228 553
229 8. If the distribution and/or use of the Program is restricted in
230 certain countries either by patents or by copyrighted interfaces, the
231 original copyright holder who places the Program under this License
232 may add an explicit geographical distribution limitation excluding
233 those countries, so that distribution is permitted only in or among
234 countries not thus excluded. In such case, this License incorporates
235 the limitation as if written in the body of this License.
554 Notwithstanding any other provision of this License, you have
555 permission to link or combine any covered work with a work licensed
556 under version 3 of the GNU Affero General Public License into a single
557 combined work, and to convey the resulting work. The terms of this
558 License will continue to apply to the part which is the covered work,
559 but the special requirements of the GNU Affero General Public License,
560 section 13, concerning interaction through a network will apply to the
561 combination as such.
236 562
237 9. The Free Software Foundation may publish revised and/or new versions
238 of the General Public License from time to time. Such new versions will
563 14. Revised Versions of this License.
564
565 The Free Software Foundation may publish revised and/or new versions of
566 the GNU General Public License from time to time. Such new versions will
239 567 be similar in spirit to the present version, but may differ in detail to
240 568 address new problems or concerns.
241 569
242 Each version is given a distinguishing version number. If the Program
243 specifies a version number of this License which applies to it and "any
244 later version", you have the option of following the terms and conditions
245 either of that version or of any later version published by the Free
246 Software Foundation. If the Program does not specify a version number of
247 this License, you may choose any version ever published by the Free Software
248 Foundation.
570 Each version is given a distinguishing version number. If the
571 Program specifies that a certain numbered version of the GNU General
572 Public License "or any later version" applies to it, you have the
573 option of following the terms and conditions either of that numbered
574 version or of any later version published by the Free Software
575 Foundation. If the Program does not specify a version number of the
576 GNU General Public License, you may choose any version ever published
577 by the Free Software Foundation.
249 578
250 10. If you wish to incorporate parts of the Program into other free
251 programs whose distribution conditions are different, write to the author
252 to ask for permission. For software which is copyrighted by the Free
253 Software Foundation, write to the Free Software Foundation; we sometimes
254 make exceptions for this. Our decision will be guided by the two goals
255 of preserving the free status of all derivatives of our free software and
256 of promoting the sharing and reuse of software generally.
579 If the Program specifies that a proxy can decide which future
580 versions of the GNU General Public License can be used, that proxy's
581 public statement of acceptance of a version permanently authorizes you
582 to choose that version for the Program.
257 583
258 NO WARRANTY
584 Later license versions may give you additional or different
585 permissions. However, no additional obligations are imposed on any
586 author or copyright holder as a result of your choosing to follow a
587 later version.
588
589 15. Disclaimer of Warranty.
259 590
260 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
261 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
262 OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
263 PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
264 OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
265 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
266 TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
267 PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
268 REPAIR OR CORRECTION.
591 THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
592 APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
593 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
594 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
595 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
596 PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
597 IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
598 ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
599
600 16. Limitation of Liability.
269 601
270 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
271 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
272 REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
273 INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
274 OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
275 TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
276 YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
277 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
278 POSSIBILITY OF SUCH DAMAGES.
602 IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
603 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
604 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
605 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
606 USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
607 DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
608 PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
609 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
610 SUCH DAMAGES.
279 611
280 END OF TERMS AND CONDITIONS
612 17. Interpretation of Sections 15 and 16.
281 613
282 How to Apply These Terms to Your New Programs
614 If the disclaimer of warranty and limitation of liability provided
615 above cannot be given local legal effect according to their terms,
616 reviewing courts shall apply local law that most closely approximates
617 an absolute waiver of all civil liability in connection with the
618 Program, unless a warranty or assumption of liability accompanies a
619 copy of the Program in return for a fee.
620
621 END OF TERMS AND CONDITIONS
622
623 How to Apply These Terms to Your New Programs
283 624
284 625 If you develop a new program, and you want it to be of the greatest
285 626 possible use to the public, the best way to achieve this is to make it
@@ -287,15 +628,15 b' free software which everyone can redistr'
287 628
288 629 To do so, attach the following notices to the program. It is safest
289 630 to attach them to the start of each source file to most effectively
290 convey the exclusion of warranty; and each file should have at least
631 state the exclusion of warranty; and each file should have at least
291 632 the "copyright" line and a pointer to where the full notice is found.
292 633
293 634 <one line to give the program's name and a brief idea of what it does.>
294 635 Copyright (C) <year> <name of author>
295 636
296 This program is free software; you can redistribute it and/or modify
637 This program is free software: you can redistribute it and/or modify
297 638 it under the terms of the GNU General Public License as published by
298 the Free Software Foundation; either version 2 of the License, or
639 the Free Software Foundation, either version 3 of the License, or
299 640 (at your option) any later version.
300 641
301 642 This program is distributed in the hope that it will be useful,
@@ -304,37 +645,30 b' the "copyright" line and a pointer to wh'
304 645 GNU General Public License for more details.
305 646
306 647 You should have received a copy of the GNU General Public License
307 along with this program; if not, write to the Free Software
308 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
309
648 along with this program. If not, see <http://www.gnu.org/licenses/>.
310 649
311 650 Also add information on how to contact you by electronic and paper mail.
312 651
313 If the program is interactive, make it output a short notice like this
314 when it starts in an interactive mode:
652 If the program does terminal interaction, make it output a short
653 notice like this when it starts in an interactive mode:
315 654
316 Gnomovision version 69, Copyright (C) year name of author
317 Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
655 <program> Copyright (C) <year> <name of author>
656 This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
318 657 This is free software, and you are welcome to redistribute it
319 658 under certain conditions; type `show c' for details.
320 659
321 660 The hypothetical commands `show w' and `show c' should show the appropriate
322 parts of the General Public License. Of course, the commands you use may
323 be called something other than `show w' and `show c'; they could even be
324 mouse-clicks or menu items--whatever suits your program.
325
326 You should also get your employer (if you work as a programmer) or your
327 school, if any, to sign a "copyright disclaimer" for the program, if
328 necessary. Here is a sample; alter the names:
661 parts of the General Public License. Of course, your program's commands
662 might be different; for a GUI interface, you would use an "about box".
329 663
330 Yoyodyne, Inc., hereby disclaims all copyright interest in the program
331 `Gnomovision' (which makes passes at compilers) written by James Hacker.
332
333 <signature of Ty Coon>, 1 April 1989
334 Ty Coon, President of Vice
664 You should also get your employer (if you work as a programmer) or school,
665 if any, to sign a "copyright disclaimer" for the program, if necessary.
666 For more information on this, and how to apply and follow the GNU GPL, see
667 <http://www.gnu.org/licenses/>.
335 668
336 This General Public License does not permit incorporating your program into
337 proprietary programs. If your program is a subroutine library, you may
338 consider it more useful to permit linking proprietary applications with the
339 library. If this is what you want to do, use the GNU Library General
340 Public License instead of this License.
669 The GNU General Public License does not permit incorporating your program
670 into proprietary programs. If your program is a subroutine library, you
671 may consider it more useful to permit linking proprietary applications with
672 the library. If this is what you want to do, use the GNU Lesser General
673 Public License instead of this License. But first, please read
674 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
@@ -8,29 +8,28 b''
8 8
9 9 :created_on: Apr 9, 2010
10 10 :author: marcink
11 :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
11 :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
12 12 :license: GPLv3, see COPYING for more details.
13 13 """
14 # This program is free software; you can redistribute it and/or
15 # modify it under the terms of the GNU General Public License
16 # as published by the Free Software Foundation; version 2
17 # of the License or (at your opinion) any later version of the license.
18 #
14 # This program is free software: you can redistribute it and/or modify
15 # it under the terms of the GNU General Public License as published by
16 # the Free Software Foundation, either version 3 of the License, or
17 # (at your option) any later version.
18 #
19 19 # This program is distributed in the hope that it will be useful,
20 20 # but WITHOUT ANY WARRANTY; without even the implied warranty of
21 21 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22 22 # GNU General Public License for more details.
23 #
23 #
24 24 # You should have received a copy of the GNU General Public License
25 # along with this program; if not, write to the Free Software
26 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
27 # MA 02110-1301, USA.
25 # along with this program. If not, see <http://www.gnu.org/licenses/>.
28 26 import platform
29 27
30 VERSION = (1, 1, 7)
28 VERSION = (1, 1, 8)
31 29 __version__ = '.'.join((str(each) for each in VERSION[:4]))
32 __dbversion__ = 2 #defines current db version for migrations
30 __dbversion__ = 2 # defines current db version for migrations
33 31 __platform__ = platform.system()
32 __license__ = 'GPLv3'
34 33
35 34 PLATFORM_WIN = ('Windows',)
36 35 PLATFORM_OTHERS = ('Linux', 'Darwin', 'FreeBSD',)
@@ -45,6 +44,7 b' except ImportError:'
45 44 if len(VERSION) > 3 and _rev:
46 45 __version__ += ' [rev:%s]' % _rev[0]
47 46
47
48 48 def get_version():
49 49 """Returns shorter version (digit parts only) as string."""
50 50
@@ -21,6 +21,7 b' from rhodecode.lib.timerproxy import Tim'
21 21
22 22 log = logging.getLogger(__name__)
23 23
24
24 25 def load_environment(global_conf, app_conf, initial=False):
25 26 """Configure the Pylons environment via the ``pylons.config``
26 27 object
@@ -67,7 +68,7 b' def load_environment(global_conf, app_co'
67 68 if config['debug'] and not test:
68 69 #use query time debugging.
69 70 sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.',
70 proxy=TimerProxy())
71 proxy=TimerProxy())
71 72 else:
72 73 sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.')
73 74
@@ -16,6 +16,7 b' from rhodecode.lib.middleware.simplegit '
16 16 from rhodecode.lib.middleware.https_fixup import HttpsFixup
17 17 from rhodecode.config.environment import load_environment
18 18
19
19 20 def make_app(global_conf, full_stack=True, static_files=True, **app_conf):
20 21 """Create a Pylons WSGI application and return it
21 22
@@ -76,4 +77,3 b' def make_app(global_conf, full_stack=Tru'
76 77 app.config = config
77 78
78 79 return app
79
@@ -9,12 +9,13 b' from __future__ import with_statement'
9 9 from routes import Mapper
10 10 from rhodecode.lib.utils import check_repo_fast as cr
11 11
12
12 13 def make_map(config):
13 14 """Create, configure and return the routes Mapper"""
14 map = Mapper(directory=config['pylons.paths']['controllers'],
15 rmap = Mapper(directory=config['pylons.paths']['controllers'],
15 16 always_scan=config['debug'])
16 map.minimization = False
17 map.explicit = False
17 rmap.minimization = False
18 rmap.explicit = False
18 19
19 20 def check_repo(environ, match_dict):
20 21 """
@@ -27,21 +28,22 b' def make_map(config):'
27 28
28 29 # The ErrorController route (handles 404/500 error pages); it should
29 30 # likely stay at the top, ensuring it can always be resolved
30 map.connect('/error/{action}', controller='error')
31 map.connect('/error/{action}/{id}', controller='error')
31 rmap.connect('/error/{action}', controller='error')
32 rmap.connect('/error/{action}/{id}', controller='error')
32 33
33 34 #==========================================================================
34 35 # CUSTOM ROUTES HERE
35 36 #==========================================================================
36 37
37 38 #MAIN PAGE
38 map.connect('home', '/', controller='home', action='index')
39 map.connect('bugtracker', "http://bitbucket.org/marcinkuzminski/rhodecode/issues", _static=True)
40 map.connect('gpl_license', "http://www.gnu.org/licenses/gpl.html", _static=True)
41 map.connect('rhodecode_official', "http://rhodecode.org", _static=True)
39 rmap.connect('home', '/', controller='home', action='index')
40 rmap.connect('bugtracker',
41 "http://bitbucket.org/marcinkuzminski/rhodecode/issues",
42 _static=True)
43 rmap.connect('rhodecode_official', "http://rhodecode.org", _static=True)
42 44
43 45 #ADMIN REPOSITORY REST ROUTES
44 with map.submapper(path_prefix='/_admin', controller='admin/repos') as m:
46 with rmap.submapper(path_prefix='/_admin', controller='admin/repos') as m:
45 47 m.connect("repos", "/repos",
46 48 action="create", conditions=dict(method=["POST"]))
47 49 m.connect("repos", "/repos",
@@ -83,134 +85,160 b' def make_map(config):'
83 85 action="repo_cache", conditions=dict(method=["DELETE"],
84 86 function=check_repo))
85 87 #ADMIN USER REST ROUTES
86 map.resource('user', 'users', controller='admin/users', path_prefix='/_admin')
88 rmap.resource('user', 'users', controller='admin/users',
89 path_prefix='/_admin')
87 90
88 91 #ADMIN PERMISSIONS REST ROUTES
89 map.resource('permission', 'permissions', controller='admin/permissions', path_prefix='/_admin')
90
92 rmap.resource('permission', 'permissions', controller='admin/permissions',
93 path_prefix='/_admin')
91 94
92 95 ##ADMIN LDAP SETTINGS
93 map.connect('ldap_settings', '/_admin/ldap', controller='admin/ldap_settings',
94 action='ldap_settings', conditions=dict(method=["POST"]))
95 map.connect('ldap_home', '/_admin/ldap', controller='admin/ldap_settings',)
96
97
96 rmap.connect('ldap_settings', '/_admin/ldap',
97 controller='admin/ldap_settings', action='ldap_settings',
98 conditions=dict(method=["POST"]))
99 rmap.connect('ldap_home', '/_admin/ldap',
100 controller='admin/ldap_settings',)
98 101
99 102 #ADMIN SETTINGS REST ROUTES
100 with map.submapper(path_prefix='/_admin', controller='admin/settings') as m:
103 with rmap.submapper(path_prefix='/_admin',
104 controller='admin/settings') as m:
101 105 m.connect("admin_settings", "/settings",
102 action="create", conditions=dict(method=["POST"]))
106 action="create", conditions=dict(method=["POST"]))
103 107 m.connect("admin_settings", "/settings",
104 action="index", conditions=dict(method=["GET"]))
108 action="index", conditions=dict(method=["GET"]))
105 109 m.connect("formatted_admin_settings", "/settings.{format}",
106 action="index", conditions=dict(method=["GET"]))
110 action="index", conditions=dict(method=["GET"]))
107 111 m.connect("admin_new_setting", "/settings/new",
108 action="new", conditions=dict(method=["GET"]))
112 action="new", conditions=dict(method=["GET"]))
109 113 m.connect("formatted_admin_new_setting", "/settings/new.{format}",
110 action="new", conditions=dict(method=["GET"]))
114 action="new", conditions=dict(method=["GET"]))
111 115 m.connect("/settings/{setting_id}",
112 action="update", conditions=dict(method=["PUT"]))
116 action="update", conditions=dict(method=["PUT"]))
113 117 m.connect("/settings/{setting_id}",
114 action="delete", conditions=dict(method=["DELETE"]))
118 action="delete", conditions=dict(method=["DELETE"]))
115 119 m.connect("admin_edit_setting", "/settings/{setting_id}/edit",
116 action="edit", conditions=dict(method=["GET"]))
117 m.connect("formatted_admin_edit_setting", "/settings/{setting_id}.{format}/edit",
118 action="edit", conditions=dict(method=["GET"]))
120 action="edit", conditions=dict(method=["GET"]))
121 m.connect("formatted_admin_edit_setting",
122 "/settings/{setting_id}.{format}/edit",
123 action="edit", conditions=dict(method=["GET"]))
119 124 m.connect("admin_setting", "/settings/{setting_id}",
120 action="show", conditions=dict(method=["GET"]))
125 action="show", conditions=dict(method=["GET"]))
121 126 m.connect("formatted_admin_setting", "/settings/{setting_id}.{format}",
122 action="show", conditions=dict(method=["GET"]))
127 action="show", conditions=dict(method=["GET"]))
123 128 m.connect("admin_settings_my_account", "/my_account",
124 action="my_account", conditions=dict(method=["GET"]))
129 action="my_account", conditions=dict(method=["GET"]))
125 130 m.connect("admin_settings_my_account_update", "/my_account_update",
126 action="my_account_update", conditions=dict(method=["PUT"]))
131 action="my_account_update", conditions=dict(method=["PUT"]))
127 132 m.connect("admin_settings_create_repository", "/create_repository",
128 action="create_repository", conditions=dict(method=["GET"]))
133 action="create_repository", conditions=dict(method=["GET"]))
129 134
130 135 #ADMIN MAIN PAGES
131 with map.submapper(path_prefix='/_admin', controller='admin/admin') as m:
132 m.connect('admin_home', '', action='index')#main page
136 with rmap.submapper(path_prefix='/_admin', controller='admin/admin') as m:
137 m.connect('admin_home', '', action='index')
133 138 m.connect('admin_add_repo', '/add_repo/{new_repo:[a-z0-9\. _-]*}',
134 139 action='add_repo')
135 140
136
137 141 #USER JOURNAL
138 map.connect('journal', '/_admin/journal', controller='journal',)
139 map.connect('toggle_following', '/_admin/toggle_following', controller='journal',
140 action='toggle_following', conditions=dict(method=["POST"]))
141
142 rmap.connect('journal', '/_admin/journal', controller='journal',)
143 rmap.connect('toggle_following', '/_admin/toggle_following',
144 controller='journal', action='toggle_following',
145 conditions=dict(method=["POST"]))
142 146
143 147 #SEARCH
144 map.connect('search', '/_admin/search', controller='search',)
145 map.connect('search_repo', '/_admin/search/{search_repo:.*}', controller='search')
148 rmap.connect('search', '/_admin/search', controller='search',)
149 rmap.connect('search_repo', '/_admin/search/{search_repo:.*}',
150 controller='search')
146 151
147 152 #LOGIN/LOGOUT/REGISTER/SIGN IN
148 map.connect('login_home', '/_admin/login', controller='login')
149 map.connect('logout_home', '/_admin/logout', controller='login', action='logout')
150 map.connect('register', '/_admin/register', controller='login', action='register')
151 map.connect('reset_password', '/_admin/password_reset', controller='login', action='password_reset')
153 rmap.connect('login_home', '/_admin/login', controller='login')
154 rmap.connect('logout_home', '/_admin/logout', controller='login',
155 action='logout')
156 rmap.connect('register', '/_admin/register', controller='login',
157 action='register')
158 rmap.connect('reset_password', '/_admin/password_reset',
159 controller='login', action='password_reset')
152 160
153 161 #FEEDS
154 map.connect('rss_feed_home', '/{repo_name:.*}/feed/rss',
162 rmap.connect('rss_feed_home', '/{repo_name:.*}/feed/rss',
155 163 controller='feed', action='rss',
156 164 conditions=dict(function=check_repo))
157 map.connect('atom_feed_home', '/{repo_name:.*}/feed/atom',
165 rmap.connect('atom_feed_home', '/{repo_name:.*}/feed/atom',
158 166 controller='feed', action='atom',
159 167 conditions=dict(function=check_repo))
160 168
161
162 169 #REPOSITORY ROUTES
163 map.connect('changeset_home', '/{repo_name:.*}/changeset/{revision}',
170 rmap.connect('changeset_home', '/{repo_name:.*}/changeset/{revision}',
164 171 controller='changeset', revision='tip',
165 172 conditions=dict(function=check_repo))
166 map.connect('raw_changeset_home', '/{repo_name:.*}/raw-changeset/{revision}',
167 controller='changeset', action='raw_changeset', revision='tip',
168 conditions=dict(function=check_repo))
169 map.connect('summary_home_', '/{repo_name:.*}',
173
174 rmap.connect('raw_changeset_home',
175 '/{repo_name:.*}/raw-changeset/{revision}',
176 controller='changeset', action='raw_changeset',
177 revision='tip', conditions=dict(function=check_repo))
178
179 rmap.connect('summary_home_', '/{repo_name:.*}',
170 180 controller='summary', conditions=dict(function=check_repo))
171 map.connect('summary_home', '/{repo_name:.*}/summary',
181
182 rmap.connect('summary_home', '/{repo_name:.*}/summary',
172 183 controller='summary', conditions=dict(function=check_repo))
173 map.connect('shortlog_home', '/{repo_name:.*}/shortlog',
184
185 rmap.connect('shortlog_home', '/{repo_name:.*}/shortlog',
174 186 controller='shortlog', conditions=dict(function=check_repo))
175 map.connect('branches_home', '/{repo_name:.*}/branches',
187
188 rmap.connect('branches_home', '/{repo_name:.*}/branches',
176 189 controller='branches', conditions=dict(function=check_repo))
177 map.connect('tags_home', '/{repo_name:.*}/tags',
190
191 rmap.connect('tags_home', '/{repo_name:.*}/tags',
178 192 controller='tags', conditions=dict(function=check_repo))
179 map.connect('changelog_home', '/{repo_name:.*}/changelog',
193
194 rmap.connect('changelog_home', '/{repo_name:.*}/changelog',
180 195 controller='changelog', conditions=dict(function=check_repo))
181 map.connect('files_home', '/{repo_name:.*}/files/{revision}/{f_path:.*}',
196
197 rmap.connect('files_home', '/{repo_name:.*}/files/{revision}/{f_path:.*}',
182 198 controller='files', revision='tip', f_path='',
183 199 conditions=dict(function=check_repo))
184 map.connect('files_diff_home', '/{repo_name:.*}/diff/{f_path:.*}',
200
201 rmap.connect('files_diff_home', '/{repo_name:.*}/diff/{f_path:.*}',
185 202 controller='files', action='diff', revision='tip', f_path='',
186 203 conditions=dict(function=check_repo))
187 map.connect('files_rawfile_home', '/{repo_name:.*}/rawfile/{revision}/{f_path:.*}',
188 controller='files', action='rawfile', revision='tip', f_path='',
189 conditions=dict(function=check_repo))
190 map.connect('files_raw_home', '/{repo_name:.*}/raw/{revision}/{f_path:.*}',
191 controller='files', action='raw', revision='tip', f_path='',
192 conditions=dict(function=check_repo))
193 map.connect('files_annotate_home', '/{repo_name:.*}/annotate/{revision}/{f_path:.*}',
194 controller='files', action='annotate', revision='tip', f_path='',
195 conditions=dict(function=check_repo))
196 map.connect('files_archive_home', '/{repo_name:.*}/archive/{revision}/{fileformat}',
197 controller='files', action='archivefile', revision='tip',
198 conditions=dict(function=check_repo))
199 map.connect('repo_settings_delete', '/{repo_name:.*}/settings',
200 controller='settings', action="delete",
201 conditions=dict(method=["DELETE"], function=check_repo))
202 map.connect('repo_settings_update', '/{repo_name:.*}/settings',
203 controller='settings', action="update",
204 conditions=dict(method=["PUT"], function=check_repo))
205 map.connect('repo_settings_home', '/{repo_name:.*}/settings',
206 controller='settings', action='index',
207 conditions=dict(function=check_repo))
204
205 rmap.connect('files_rawfile_home',
206 '/{repo_name:.*}/rawfile/{revision}/{f_path:.*}',
207 controller='files', action='rawfile', revision='tip',
208 f_path='', conditions=dict(function=check_repo))
209
210 rmap.connect('files_raw_home',
211 '/{repo_name:.*}/raw/{revision}/{f_path:.*}',
212 controller='files', action='raw', revision='tip', f_path='',
213 conditions=dict(function=check_repo))
214
215 rmap.connect('files_annotate_home',
216 '/{repo_name:.*}/annotate/{revision}/{f_path:.*}',
217 controller='files', action='annotate', revision='tip',
218 f_path='', conditions=dict(function=check_repo))
208 219
209 map.connect('repo_fork_create_home', '/{repo_name:.*}/fork',
220 rmap.connect('files_archive_home',
221 '/{repo_name:.*}/archive/{revision}/{fileformat}',
222 controller='files', action='archivefile', revision='tip',
223 conditions=dict(function=check_repo))
224
225 rmap.connect('repo_settings_delete', '/{repo_name:.*}/settings',
226 controller='settings', action="delete",
227 conditions=dict(method=["DELETE"], function=check_repo))
228
229 rmap.connect('repo_settings_update', '/{repo_name:.*}/settings',
230 controller='settings', action="update",
231 conditions=dict(method=["PUT"], function=check_repo))
232
233 rmap.connect('repo_settings_home', '/{repo_name:.*}/settings',
234 controller='settings', action='index',
235 conditions=dict(function=check_repo))
236
237 rmap.connect('repo_fork_create_home', '/{repo_name:.*}/fork',
210 238 controller='settings', action='fork_create',
211 239 conditions=dict(function=check_repo, method=["POST"]))
212 map.connect('repo_fork_home', '/{repo_name:.*}/fork',
240 rmap.connect('repo_fork_home', '/{repo_name:.*}/fork',
213 241 controller='settings', action='fork',
214 242 conditions=dict(function=check_repo))
215 243
216 return map
244 return rmap
@@ -4,26 +4,24 b''
4 4 ~~~~~~~~~~~~~~~~~~
5 5
6 6 Weboperations and setup for rhodecode
7
7
8 8 :created_on: Dec 11, 2010
9 9 :author: marcink
10 :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
10 :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
11 11 :license: GPLv3, see COPYING for more details.
12 12 """
13 # This program is free software; you can redistribute it and/or
14 # modify it under the terms of the GNU General Public License
15 # as published by the Free Software Foundation; version 2
16 # of the License or (at your opinion) any later version of the license.
17 #
13 # This program is free software: you can redistribute it and/or modify
14 # it under the terms of the GNU General Public License as published by
15 # the Free Software Foundation, either version 3 of the License, or
16 # (at your option) any later version.
17 #
18 18 # This program is distributed in the hope that it will be useful,
19 19 # but WITHOUT ANY WARRANTY; without even the implied warranty of
20 20 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21 21 # GNU General Public License for more details.
22 #
22 #
23 23 # You should have received a copy of the GNU General Public License
24 # along with this program; if not, write to the Free Software
25 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
26 # MA 02110-1301, USA.
24 # along with this program. If not, see <http://www.gnu.org/licenses/>.
27 25
28 26 import os
29 27 import logging
@@ -34,21 +32,18 b' from rhodecode.lib.db_manage import DbMa'
34 32
35 33 log = logging.getLogger(__name__)
36 34
35
37 36 def setup_app(command, conf, vars):
38 37 """Place any commands to setup rhodecode here"""
39 38 dbconf = conf['sqlalchemy.db1.url']
40 dbmanage = DbManage(log_sql=True, dbconf=dbconf, root=conf['here'], tests=False)
39 dbmanage = DbManage(log_sql=True, dbconf=dbconf, root=conf['here'],
40 tests=False)
41 41 dbmanage.create_tables(override=True)
42 42 dbmanage.set_db_version()
43 dbmanage.config_prompt(None)
43 dbmanage.create_settings(dbmanage.config_prompt(None))
44 44 dbmanage.create_default_user()
45 45 dbmanage.admin_prompt()
46 46 dbmanage.create_permissions()
47 47 dbmanage.populate_default_permissions()
48 48
49 49 load_environment(conf.global_conf, conf.local_conf, initial=True)
50
51
52
53
54
General Comments 0
You need to be logged in to leave comments. Login now