Compare commits
640 Commits
Author | SHA1 | Date |
---|---|---|
Vitaliy Filippov | 3c1cfef827 | |
Vitaliy Filippov | 6c18327bbf | |
Vitaliy Filippov | cd14ba3825 | |
Vitaliy Filippov | 8ca4b5b85a | |
Vitaliy Filippov | 8b3d3363f2 | |
Vitaliy Filippov | 44c5f2bb1a | |
Vitaliy Filippov | d3d81490e3 | |
Vitaliy Filippov | 5814634779 | |
Vitaliy Filippov | b3000cf63b | |
Vitaliy Filippov | 0a6f6a7a66 | |
Vitaliy Filippov | 3ddd0caa42 | |
Vitaliy Filippov | 983f9c7379 | |
Vitaliy Filippov | 56c2b61458 | |
vfilippov | 479a5b4506 | |
vfilippov | 5d442fac7d | |
vfilippov | 57e1ca8909 | |
vfilippov | 8492aa772e | |
vfilippov | e854e254f9 | |
vfilippov | 4b06eeeb94 | |
vfilippov | ac063ff93a | |
vfilippov | b5ac9522cc | |
vfilippov | a071627c59 | |
vfilippov | 24e0a24ca9 | |
vfilippov | dfff9c0cc2 | |
vfilippov | 0bd2b940f9 | |
vfilippov | 24b979d9e2 | |
vfilippov | 7d06bd21bc | |
vfilippov | fa08478619 | |
vfilippov | 7d15648286 | |
vfilippov | 76987f0851 | |
vfilippov | 928bf6f1a6 | |
vfilippov | 4cd52560ac | |
vfilippov | a0a40b6047 | |
vfilippov | e8c05fc096 | |
vfilippov | 999c9de4d3 | |
vfilippov | 131171943d | |
vfilippov | e415cd7bb0 | |
vfilippov | 575b4d8a49 | |
vfilippov | 3ec2c244a8 | |
vfilippov | 160233f758 | |
vfilippov | 72934bf6cd | |
vfilippov | a564b02d18 | |
vfilippov | 80ccb26b20 | |
vfilippov | 1b75ada880 | |
vfilippov | ecadbf9fd3 | |
vfilippov | 8dc02448bc | |
vfilippov | 8aca8406a3 | |
vfilippov | 639d1c25db | |
vfilippov | e363cf19b1 | |
vfilippov | 83c7e6fe49 | |
vfilippov | 361a00ff13 | |
vfilippov | e8f25d9c7b | |
vfilippov | c6582d1480 | |
vfilippov | ceb4990dec | |
vfilippov | 12434cb5b7 | |
vfilippov | f4f2e432a7 | |
vfilippov | 7eb621bcd1 | |
vfilippov | 5de0639a9c | |
vfilippov | e25a91837e | |
vfilippov | 6df7a894d1 | |
vfilippov | 04d3d504e0 | |
vfilippov | 33fffa82e8 | |
vfilippov | fdd255f0ff | |
vfilippov | 0b5123e1b8 | |
vfilippov | 56614d0f13 | |
vfilippov | 94c0c90329 | |
vfilippov | a4c3bd1a46 | |
vfilippov | a9701721e2 | |
vfilippov | 5c1ac512d1 | |
vfilippov | cd9c47fe46 | |
vfilippov | bb906c1f70 | |
vfilippov | b9a894f708 | |
vfilippov | 1fae3f7e3e | |
vfilippov | c73ba23f6e | |
vfilippov | 0f323a50a4 | |
vfilippov | f3ba9d5e0a | |
vfilippov | 1cda6497e1 | |
vfilippov | b9f2b63c09 | |
vfilippov | b1cffd5f2d | |
vfilippov | 323a4d5629 | |
vfilippov | d65737cc43 | |
vfilippov | 67b205634e | |
vfilippov | 4e9089255c | |
vfilippov | bf062cc41b | |
vfilippov | ab7e1bdc64 | |
vfilippov | e17b0dce21 | |
vfilippov | 552d04e882 | |
vfilippov | f0a1418fbf | |
vfilippov | 75be406156 | |
vfilippov | 964531a7a9 | |
vfilippov | 4304976db7 | |
vfilippov | 8a649198d4 | |
vfilippov | e78c234550 | |
vfilippov | 8367e08370 | |
vfilippov | b7c8b5eb6f | |
Vitaliy Filippov | 06bfb6a5fe | |
cmpilato | 4251b52987 | |
cmpilato | 0ac2f63f71 | |
cmpilato | aa724feae4 | |
cmpilato | 9e97bd332d | |
cmpilato | 89d478a933 | |
cmpilato | a1fd08948a | |
cmpilato | d2e7f4aff2 | |
cmpilato | ece31e7369 | |
cmpilato | 16d7e0af8a | |
cmpilato | 75e503a16b | |
cmpilato | 3fbaffa2fd | |
cmpilato | a4ad1b13c2 | |
cmpilato | 1f58e41376 | |
cmpilato | 4fd9cc0811 | |
cmpilato | 7026dcb498 | |
cmpilato | 6406b106a1 | |
cmpilato | a2090ce90b | |
cmpilato | 0ca6106034 | |
cmpilato | 801eaff764 | |
cmpilato | 1ca3dc4195 | |
cmpilato | 814bee3e4a | |
cmpilato | b67254fcf2 | |
cmpilato | decb5e375b | |
cmpilato | af996b9b49 | |
cmpilato | 388c55e564 | |
cmpilato | ab923539dd | |
cmpilato | 701ba24454 | |
cmpilato | eaeb527802 | |
cmpilato | 819915112e | |
cmpilato | 33eeb41763 | |
cmpilato | 345e7ceb8d | |
cmpilato | 63563517d7 | |
cmpilato | b8a7f32fb4 | |
cmpilato | 8854a73040 | |
cmpilato | 9b57e7d6a6 | |
cmpilato | 3edd7de4d1 | |
cmpilato | 07ac7f5e54 | |
cmpilato | 41858c6f89 | |
cmpilato | bbe8b42877 | |
cmpilato | 3d3f677b3c | |
cmpilato | 572554fa89 | |
cmpilato | 281ed5ca84 | |
cmpilato | bb4a748eda | |
cmpilato | f48add83f7 | |
cmpilato | b57831ade8 | |
cmpilato | 19818e269c | |
cmpilato | 0d1da3c79b | |
cmpilato | d018467937 | |
cmpilato | cea54da382 | |
cmpilato | 6fcc2b5992 | |
cmpilato | dcb7e17dc6 | |
cmpilato | e8f975475e | |
cmpilato | 06910f29e3 | |
cmpilato | 64b0994f2f | |
cmpilato | a8d3373025 | |
cmpilato | de517ae29c | |
cmpilato | 4a98f512f7 | |
cmpilato | f4945fd7d9 | |
cmpilato | 4590ebbd6b | |
cmpilato | ace5d55f0e | |
cmpilato | 00feefc3dc | |
cmpilato | adfa50c9b4 | |
cmpilato | 5e815bc101 | |
cmpilato | ca040b2361 | |
cmpilato | b5d66b7afe | |
cmpilato | 1a6390d78a | |
cmpilato | 698e9db4f2 | |
cmpilato | 163f63ed15 | |
cmpilato | 44ec30da8e | |
cmpilato | 1380dba9ba | |
cmpilato | 6533b4fc7c | |
cmpilato | 6964b067e6 | |
cmpilato | fee21df5d7 | |
cmpilato | ada79bc6e7 | |
cmpilato | 01ebe77beb | |
cmpilato | 87b574b3ee | |
cmpilato | fc7d9b1da4 | |
cmpilato | 4cc840b54a | |
cmpilato | 3df47b625e | |
cmpilato | 836e643dc5 | |
cmpilato | ca52fe277d | |
cmpilato | bfe2cbe5ca | |
cmpilato | 91654688a1 | |
cmpilato | 9d75ed19f8 | |
cmpilato | f65b03fcdc | |
cmpilato | 60b80bd3b2 | |
cmpilato | 272ae0fa37 | |
cmpilato | 23714979e4 | |
cmpilato | 1b63870590 | |
cmpilato | 1296106171 | |
cmpilato | 3297f45285 | |
cmpilato | 91d1b75856 | |
cmpilato | 8f39d274f5 | |
cmpilato | 86449bdec7 | |
cmpilato | 7043120d2c | |
cmpilato | ad0c0dd5fa | |
cmpilato | 9e9b82218c | |
cmpilato | 85df9e6ba4 | |
cmpilato | 8fc1166f2d | |
cmpilato | 25ab342bbf | |
cmpilato | ccb7f2e3f1 | |
cmpilato | 0cd9f664d6 | |
cmpilato | 6fe390a642 | |
cmpilato | 5d68a5f883 | |
cmpilato | 6418278d55 | |
cmpilato | 1dd1a21537 | |
cmpilato | 06a3feec90 | |
cmpilato | a03cd82de5 | |
cmpilato | 094024a0ec | |
cmpilato | 56e645ecb8 | |
cmpilato | 2f722f39b9 | |
cmpilato | 402dfd831f | |
cmpilato | 738d17f71f | |
cmpilato | fdc0bcd420 | |
cmpilato | db032720a8 | |
cmpilato | c9256effc4 | |
cmpilato | b42a4a0915 | |
cmpilato | d2275afb6d | |
cmpilato | 5db50e6bcc | |
cmpilato | 7b6ecd807c | |
cmpilato | e8a0caeef5 | |
cmpilato | dfeb3b5d90 | |
cmpilato | 5943e01304 | |
cmpilato | 6a8d5debd6 | |
cmpilato | 537c59c516 | |
cmpilato | 92b7b65707 | |
cmpilato | 46e17662d5 | |
cmpilato | 7ab960262a | |
cmpilato | 6f47cef67d | |
cmpilato | a592e3b0bc | |
cmpilato | 94d9f0ef49 | |
cmpilato | b566f297b3 | |
cmpilato | a6be4da978 | |
cmpilato | 8cdccc1ea5 | |
cmpilato | ccb53d164e | |
stilor | 441da057cc | |
cmpilato | a69597e29c | |
cmpilato | 43f001ef25 | |
cmpilato | 4341dab5b7 | |
stilor | 6e81b5eb1e | |
cmpilato | dc1763b37b | |
cmpilato | 65137920a8 | |
cmpilato | 00d96de446 | |
cmpilato | 6008bc6a7b | |
cmpilato | 753d2d5320 | |
cmpilato | 2b5e7b51a0 | |
stilor | 6453447c63 | |
cmpilato | 5e3c53e592 | |
cmpilato | 24cbe623e7 | |
cmpilato | 48a59d30ad | |
cmpilato | 605e66e56f | |
cmpilato | 661e7fc569 | |
cmpilato | 055e1dad53 | |
cmpilato | 51f194d4ad | |
cmpilato | 3f19b50a08 | |
cmpilato | 5e22b37a56 | |
stilor | 1e14eccbe0 | |
stilor | 4bf50b31f7 | |
stilor | 68496ebc9f | |
stilor | a789c13698 | |
stilor | 44a6fe7465 | |
stilor | 90a1d6cae2 | |
stilor | 4fe882972a | |
stilor | f57be6e516 | |
stilor | c819b3a3fc | |
stilor | 682ff6c9b9 | |
stilor | 988f5b535e | |
stilor | 4780023396 | |
stilor | 63227ef2a1 | |
stilor | 6253fec4fb | |
stilor | 7cdab259b8 | |
stilor | d1427e6639 | |
stilor | 04329a707b | |
stilor | 888f7ee302 | |
cmpilato | 205484b0f2 | |
stilor | 7466b03e7c | |
stilor | 737b5d2b23 | |
stilor | c6775f5b89 | |
stilor | eba17bcbd7 | |
stilor | 3e5836cdb4 | |
stilor | 35544ecbef | |
cmpilato | a6c9d3ac49 | |
cmpilato | f44c50a5ed | |
cmpilato | b96b8d4003 | |
cmpilato | 814e0d4d6c | |
cmpilato | 1ae87bb8b6 | |
cmpilato | ec2a0a3f3b | |
cmpilato | ac75dc9651 | |
cmpilato | 59f55fecb6 | |
cmpilato | 7da44377c5 | |
cmpilato | 9228cc9a89 | |
cmpilato | c355d1ce3e | |
cmpilato | 47c12cb194 | |
cmpilato | c9f9c96db2 | |
cmpilato | 18a52bd5ce | |
cmpilato | 02bd4d70db | |
cmpilato | aac6bbafb9 | |
cmpilato | 90d35a6fc1 | |
cmpilato | 91995a4241 | |
cmpilato | eef47fbb1f | |
cmpilato | 63ddc213ae | |
cmpilato | 8eeac0cd59 | |
cmpilato | 5132017538 | |
cmpilato | a00c6ee5cb | |
cmpilato | 868300daf4 | |
cmpilato | 61bcf03fcd | |
cmpilato | 1e4c3f92f6 | |
cmpilato | df71275a13 | |
cmpilato | 4818a56012 | |
cmpilato | f12cef277c | |
cmpilato | 0ca7fac7fb | |
cmpilato | 35a55c317e | |
cmpilato | 963a3a2094 | |
cmpilato | 5ce98d04d6 | |
cmpilato | 49957ea54b | |
cmpilato | bd3323410a | |
cmpilato | fce93313e5 | |
cmpilato | 76dae127d6 | |
cmpilato | 2f8af5fdb7 | |
cmpilato | c3dc73d840 | |
cmpilato | 0fe6e33643 | |
cmpilato | f7df7da7f0 | |
cmpilato | bc2ab5c093 | |
cmpilato | 2e69660725 | |
cmpilato | 51fe3f9d1c | |
cmpilato | 77bf7001a6 | |
cmpilato | 2dfe9c55f0 | |
cmpilato | c39a091b83 | |
cmpilato | 5678e463ad | |
cmpilato | e8ba12d66d | |
mhagger | 31d16b42fe | |
cmpilato | 31bf260508 | |
cmpilato | 4c965a521d | |
cmpilato | ce4f396604 | |
cmpilato | 0c38626f18 | |
cmpilato | 6ac853c1f4 | |
cmpilato | beb2205b64 | |
cmpilato | 060ef83f0e | |
cmpilato | de95d36720 | |
cmpilato | f0e2fa721a | |
cmpilato | f3629550dd | |
cmpilato | 5f50e82bda | |
cmpilato | 400eb13d76 | |
cmpilato | c123490436 | |
cmpilato | ce5a303c02 | |
cmpilato | 40df73e111 | |
cmpilato | 239844c040 | |
cmpilato | d6a4d294fb | |
cmpilato | 1d33308f90 | |
cmpilato | 2012320bfc | |
cmpilato | e2433ea8e9 | |
cmpilato | 1d8e32110c | |
cmpilato | b6f0d36c72 | |
cmpilato | 42f1c80e74 | |
cmpilato | 8360e07a97 | |
cmpilato | a0b87889dc | |
cmpilato | 8b78e4d0b3 | |
cmpilato | 42208db4aa | |
cmpilato | ed975ad336 | |
cmpilato | 6b7c9d066f | |
cmpilato | fb5ca5c1d9 | |
cmpilato | a5df176395 | |
cmpilato | a86bac818e | |
cmpilato | 07ba91e7d9 | |
cmpilato | 41bc85c437 | |
cmpilato | 0e0c657341 | |
cmpilato | 6b35895704 | |
cmpilato | 3f5c86fe85 | |
cmpilato | 8c2b5cd63a | |
cmpilato | ab1f329994 | |
cmpilato | 6444e57831 | |
cmpilato | 6e5703686a | |
cmpilato | f548912f9a | |
cmpilato | 8f9eaf9e26 | |
cmpilato | 9ce6a651c7 | |
cmpilato | 28b4383a7b | |
cmpilato | e3042df5a3 | |
cmpilato | 26522f7f71 | |
cmpilato | ff990c90b5 | |
cmpilato | 5a87b383e9 | |
cmpilato | f17e5a76a2 | |
cmpilato | 10d460902d | |
cmpilato | c6f65cb422 | |
cmpilato | f90d575dd2 | |
cmpilato | bcb28885a9 | |
cmpilato | 60c2e59707 | |
cmpilato | 90e5df36c9 | |
cmpilato | 29cba5c197 | |
cmpilato | b60b4148ba | |
cmpilato | 0df74987cc | |
cmpilato | bf31982901 | |
cmpilato | bee9ac95be | |
cmpilato | 9e2ee8277b | |
cmpilato | b07b83d252 | |
cmpilato | aa3f355ec2 | |
cmpilato | a04e0a3297 | |
cmpilato | b922b3604d | |
cmpilato | cadb94c8b4 | |
cmpilato | 0d2cad4c2d | |
cmpilato | 4a96cb39f5 | |
cmpilato | ec36a17b1c | |
cmpilato | d899df1771 | |
cmpilato | 8af6e2d824 | |
cmpilato | 16f6728f48 | |
cmpilato | 1da4f1a0e3 | |
cmpilato | 8af29de901 | |
cmpilato | 8018ab4a95 | |
cmpilato | eb245f2cde | |
cmpilato | 19cc8e7e7b | |
cmpilato | 26fa0600c6 | |
cmpilato | 82c5390d06 | |
cmpilato | 3bfefeaaff | |
cmpilato | 3563f77bc0 | |
cmpilato | 9dc26d4a01 | |
cmpilato | 9fbedaeded | |
cmpilato | 2d0fced231 | |
cmpilato | 167a98ca4e | |
cmpilato | fa33ac3990 | |
cmpilato | e5f533a115 | |
cmpilato | bedf47ea58 | |
cmpilato | 4979fd6091 | |
cmpilato | 94708561eb | |
cmpilato | 050eb3c433 | |
cmpilato | 2d091dc582 | |
cmpilato | fe6b7afb66 | |
cmpilato | a6565f89f9 | |
cmpilato | 59e6fa414e | |
cmpilato | eda31f6050 | |
cmpilato | 438eb061bb | |
cmpilato | 3a4ca4d18a | |
cmpilato | d1cbb81fb5 | |
cmpilato | cd62600043 | |
cmpilato | 7e3a9d7f4d | |
cmpilato | 11efd97b23 | |
cmpilato | 54086fd651 | |
cmpilato | 1f8c5aca37 | |
cmpilato | f182d12e97 | |
cmpilato | 4c9aa8e1a6 | |
cmpilato | 6e4710d1c6 | |
cmpilato | 98f1b93068 | |
cmpilato | 9015d12885 | |
cmpilato | 0f376ac9a4 | |
cmpilato | 761a97cb47 | |
cmpilato | f72e67fa3e | |
cmpilato | 0b42d41e43 | |
cmpilato | e7a9e33a36 | |
cmpilato | 8a8e8cd1f5 | |
cmpilato | 40581a211c | |
cmpilato | 6b4297e7f5 | |
cmpilato | 884a5de16d | |
cmpilato | 589f111f20 | |
cmpilato | a2cd81f304 | |
vfilippov | 04d3b88f6a | |
vfilippov | d85d6578da | |
cmpilato | eb69c40687 | |
cmpilato | 6cbb3fadac | |
cmpilato | cc4589ab10 | |
cmpilato | fcff592db3 | |
cmpilato | 694a14e0d2 | |
vfilippov | 7a40e1c902 | |
cmpilato | 205b3b67e1 | |
cmpilato | 8df8e878f4 | |
cmpilato | f038efef96 | |
cmpilato | 52584dec66 | |
cmpilato | 5c9f504727 | |
cmpilato | 7817608915 | |
cmpilato | 0292a54ec0 | |
cmpilato | 6c93d8c8d1 | |
cmpilato | 4f622d375b | |
stas | c8dbd38e0c | |
stas | 82ea92e4a4 | |
vfilippov | be67aab7dc | |
cmpilato | 867514f9ef | |
cmpilato | b36d8584e8 | |
stas | 8ecc076ebc | |
stas | 6a0562d708 | |
cmpilato | 8e848a4025 | |
vfilippov | 6835e74f20 | |
cmpilato | e7e8beca0a | |
cmpilato | c3bdeea60b | |
cmpilato | 3d8aecfd95 | |
cmpilato | c713952d5e | |
svnuser | 4b05147064 | |
cmpilato | 8910c295cc | |
cmpilato | 1d496a8f51 | |
cmpilato | 892a951493 | |
cmpilato | 1371a71f20 | |
cmpilato | aba3033c27 | |
cmpilato | 74bfd3e9d8 | |
cmpilato | 7cb54076fe | |
cmpilato | 197f352804 | |
cmpilato | f48559766a | |
cmpilato | 546501816b | |
cmpilato | 8089335fc6 | |
svnuser | a208ec46ab | |
cmpilato | d739127ea4 | |
cmpilato | 4b4f450ecb | |
cmpilato | 588f9000e9 | |
cmpilato | 7ecae1790a | |
cmpilato | a154179492 | |
cmpilato | cc4f8254d6 | |
cmpilato | c695ede476 | |
cmpilato | c910df0835 | |
cmpilato | 914e0e7521 | |
cmpilato | 4c81b1fd91 | |
cmpilato | 92a95601d1 | |
cmpilato | 211bc90343 | |
cmpilato | fdff86c5f4 | |
cmpilato | 7ca7528869 | |
cmpilato | dfa98b490f | |
cmpilato | bacb71b1d2 | |
cmpilato | 3da11f485a | |
cmpilato | a8e6f976ef | |
stas | 86c313bcf8 | |
vfilippov | a2e45b4468 | |
stas | 5ed8c4967a | |
cmpilato | 6d6a0287ac | |
cmpilato | 63af297920 | |
cmpilato | d7ac8ee2d4 | |
cmpilato | 11b4c4f4f8 | |
cmpilato | c6671ecc50 | |
cmpilato | 0bcb42c158 | |
cmpilato | 586c6bfb9e | |
cmpilato | ca12b5257c | |
cmpilato | 7fd9e405a1 | |
cmpilato | 6361a849a6 | |
cmpilato | e72184e288 | |
cmpilato | 2dc51276ce | |
cmpilato | e1575692be | |
cmpilato | 748efe3815 | |
cmpilato | d681df85d3 | |
cmpilato | e53b3af42f | |
stas | dbd3e4af59 | |
vfilippov | 5349a36a18 | |
stas | 81df47c357 | |
stas | c916450eac | |
stas | e4ea3a9f85 | |
vfilippov | e6be979387 | |
vfilippov | 2896c70f26 | |
vfilippov | 50b67b3ddb | |
vfilippov | 3c7ad9405c | |
cmpilato | d1a7412c6d | |
cmpilato | ee692db2b0 | |
vfilippov | ab286694fe | |
vfilippov | 1cf0815b3d | |
cmpilato | 544ca74ed9 | |
vfilippov | 355033b015 | |
vfilippov | 2f99f7b72c | |
vfilippov | e8d7fb16ff | |
vfilippov | e1cc47c375 | |
cmpilato | f6844dda91 | |
cmpilato | 5fdfefa137 | |
cmpilato | cd64b5da8b | |
cmpilato | 623ab85805 | |
cmpilato | ceb7057b9f | |
cmpilato | b6486f5324 | |
cmpilato | af83138e5c | |
stas | 5a55d3c0cd | |
vfilippov | 00d1ffe3e0 | |
cmpilato | 8f8dea6051 | |
cmpilato | ba9cf67fae | |
cmpilato | 09a5adb85d | |
cmpilato | 0b1ac97f75 | |
cmpilato | 3e77755819 | |
cmpilato | 1433941124 | |
vfilippov | 0d3176a320 | |
vfilippov | 053cc33ffd | |
vfilippov | 93144b2168 | |
vfilippov | c102b6b2a0 | |
vfilippov | 7cd0e372bb | |
vfilippov | 4e047ae281 | |
cmpilato | c733fceb9f | |
cmpilato | ca5a2bfbc9 | |
cmpilato | 77fd2759c7 | |
vfilippov | 1128625ac3 | |
stas | 15e2d27b7d | |
vfilippov | 86dcf849e3 | |
vfilippov | 5f66346633 | |
vfilippov | 6586c8e4d7 | |
vfilippov | d34f8f5946 | |
vfilippov | 842f0e712a | |
vfilippov | 0ad8ee1554 | |
vfilippov | 0f545ca76b | |
vfilippov | c3f2777a4e | |
vfilippov | 45c636fd11 | |
vfilippov | 2d9276a06d | |
vfilippov | eb6edef712 | |
vfilippov | b574b8594d | |
vfilippov | 3bfb004158 | |
cmpilato | 08a8b110ac | |
vfilippov | 23eea873fa | |
vfilippov | 9f0557ff85 | |
vfilippov | 00f38a1b55 | |
vfilippov | 3b4f7698af | |
vfilippov | 0114b46db0 | |
vfilippov | a0c895b5a6 | |
vfilippov | e74a8ac42d | |
vfilippov | d94e658457 | |
vfilippov | cbcffad79a | |
vfilippov | 025eb36df4 | |
vfilippov | 33a8f2849c | |
vfilippov | 1bbf731b83 | |
vfilippov | cd68fb0f79 | |
vfilippov | 97e5d91c18 | |
vfilippov | 28ba6929af | |
vfilippov | 3187e57026 | |
vfilippov | a30b597260 | |
vfilippov | 1480000938 | |
vfilippov | bfe175e5cd | |
vfilippov | 2cadb542a2 | |
vfilippov | 13b23a5696 | |
vfilippov | 822ec29624 | |
cmpilato | 38a7338c9d | |
cmpilato | bf40ef2683 | |
cmpilato | 11f5685955 | |
cmpilato | 4904e03324 | |
vfilippov | f9b1b8a50c | |
vfilippov | 6978ac9e5d | |
vfilippov | 230e2f1700 | |
vfilippov | 899204468b | |
vfilippov | 712761df3f | |
vfilippov | 73eaad686b | |
vfilippov | 6556287ff3 | |
vfilippov | 4b51a62390 | |
vfilippov | 5ea538f50e | |
vfilippov | 521261bb34 | |
vfilippov | 9e55dba9f9 | |
vfilippov | 9ac8f10967 | |
vfilippov | 6ef2a85ae9 | |
vfilippov | 1200a15887 | |
vfilippov | 0fddc0bb87 | |
vfilippov | 28a41fb268 | |
cmpilato | bd1254aa5f | |
vfilippov | 585580ec57 | |
vfilippov | f3aa325419 | |
vfilippov | 9b00bc278f | |
cmpilato | 8b6e568ae1 | |
cmpilato | bc13ce9938 | |
cmpilato | 0ddf057bbc | |
cmpilato | 5dbdea76ce | |
cmpilato | 8a9b9562f3 | |
cmpilato | 51994aabc9 | |
cmpilato | f3edee505d | |
cmpilato | bcfb8f2c97 |
251
CHANGES
251
CHANGES
|
@ -1,4 +1,209 @@
|
|||
Version 1.1.0 (released ??-???-????)
|
||||
4Intra.net/CUSTIS improvements
|
||||
|
||||
* Support for full-text search over file contents, including binary
|
||||
documents like *.doc and so on using Sphinx Search and Apache Tika
|
||||
server. Patched Tika with fixes for #TIKA709 and #TIKA964 is highly
|
||||
recommended:
|
||||
http://wiki.4intra.net/public/tika-app-1.2-fix-TIKA709-TIKA964.jar
|
||||
(SHA1 efef722a5e2322f7c2616d096552a48134dc5faa)
|
||||
* Access right checks in query results.
|
||||
* Access right checks for repository root directories.
|
||||
* New query parameters: repository, repo type, revision number.
|
||||
* Authorizer for CVSnt ACLs.
|
||||
* InnoDB, additional database indexes and some search query
|
||||
optimisations.
|
||||
* Support for specifying path to MySQL UNIX socket.
|
||||
* Asynchronous hook examples for updating SVN and CVS repos.
|
||||
* Slightly more correct charset guessing, especially for Russian.
|
||||
* Support for diffing added/removed files.
|
||||
* File lists in RSS feeds for 'classic' template.
|
||||
* Path configuration via a single 'viewvcinstallpath.py' file,
|
||||
not via editing multiple bin/* files.
|
||||
* Link to repository list instead of viewvc.org from the logo
|
||||
* "rcsfile service" support used to workaround command execution
|
||||
problems (forks) from Apache mod_python.
|
||||
|
||||
Version 1.2.0 (released ??-???-????)
|
||||
|
||||
* bumped minimum support Python version to 2.4
|
||||
* implemented support for property diffs (issue #383)
|
||||
* allow user-configurable cvsgraph display (issue #336)
|
||||
* allow rNNNN syntax for Subversion revision numbers (issue #441)
|
||||
|
||||
Version 1.1.20 (released 24-Apr-2013)
|
||||
|
||||
* fix tab-to-space handling regression in markup view
|
||||
* fix regression in root lookup handling (issue #526)
|
||||
|
||||
Version 1.1.19 (released 22-Apr-2013)
|
||||
|
||||
* improve root lookup performance (issue #523)
|
||||
* new 'max_filesize_kbytes' config option and handling (issue #524)
|
||||
* tarball generation improvements:
|
||||
- preserve Subversion symlinks in generated tarballs (issue #487)
|
||||
- reduce memory usage of tarball generation logic
|
||||
- fix double compression of generated tarballs (issue #525)
|
||||
* file content handling improvements:
|
||||
- expanded support for encoding detection and transcoding (issue #11)
|
||||
- fix tab-to-space conversion bugs in markup, annotate, and diff views
|
||||
- fix handling of trailing whitespace in diff view
|
||||
* add support for timestamp display in ISO8601 format (issue #46)
|
||||
|
||||
Version 1.1.18 (released 28-Feb-2013)
|
||||
|
||||
* fix exception raised by BDB-backed SVN repositories (issue #519)
|
||||
* hide revision-less files when rcsparse is in use
|
||||
* include branchpoints in branch views using rcsparse (issue #347)
|
||||
* miscellaneous cvsdb improvements:
|
||||
- add --port option to make-database (issue #521)
|
||||
- explicitly name columns in queries (issue #522)
|
||||
- update MySQL syntax to avoid discontinued "TYPE=" terms
|
||||
|
||||
Version 1.1.17 (released 25-Oct-2012)
|
||||
|
||||
* fix exception caused by uninitialized variable usage (issue #516)
|
||||
|
||||
Version 1.1.16 (released 24-Oct-2012)
|
||||
|
||||
* security fix: escape "extra" diff info to avoid XSS attack (issue #515)
|
||||
* add 'binary_mime_types' configuration option and handling (issue #510)
|
||||
* fix 'select for diffs' persistence across log pages (issue #512)
|
||||
* remove lock status and filesize check on directories in remote SVN views
|
||||
* fix bogus 'Annotation of' page title for non-annotated view (issue #514)
|
||||
|
||||
Version 1.1.15 (released 22-Jun-2012)
|
||||
|
||||
* security fix: complete authz support for remote SVN views (issue #353)
|
||||
* security fix: log msg leak in SVN revision view with unreadable copy source
|
||||
* fix several instances of incorrect information in remote SVN views
|
||||
* increase performance of some revision metadata lookups in remote SVN views
|
||||
* fix RSS feed regression introduced in 1.1.14
|
||||
|
||||
Version 1.1.14 (released 12-Jun-2012)
|
||||
|
||||
* fix annotation of svn files with non-URI-safe paths (issue #504)
|
||||
* handle file:/// Subversion rootpaths as local roots (issue #446)
|
||||
* fix bug caused by trying to case-normalize anon usernames (issue #505)
|
||||
* speed up log handling by reusing tokenization results (issue #506)
|
||||
* add support for custom revision log markup rules (issue #246)
|
||||
|
||||
Version 1.1.13 (released 23-Jan-2012)
|
||||
|
||||
* fix svndbadmin failure on deleted paths under Subversion 1.7 (issue #499)
|
||||
* fix annotation of files in svn roots with non-URI-safe paths
|
||||
* fix stray annotation warning in markup display of images
|
||||
* more gracefully handle attempts to display binary content (issue #501)
|
||||
|
||||
Version 1.1.12 (released 03-Nov-2011)
|
||||
|
||||
* fix path display in patch and certain diff views (issue #485)
|
||||
* fix broken cvsdb glob searching (issue 486)
|
||||
* allow svn revision specifiers to have leading r's (issue #441, #448)
|
||||
* allow environmental override of configuration location (issue #494)
|
||||
* fix exception HTML-escaping non-string data under WSGI (issue #454)
|
||||
* add links to root logs from roots view (issue #470)
|
||||
* use Pygments lexer-guessing functionality (issue #495)
|
||||
|
||||
Version 1.1.11 (released 17-May-2011)
|
||||
|
||||
* security fix: remove user-reachable override of cvsdb row limit
|
||||
* fix broken standalone.py -c and -d options handling
|
||||
* add --help option to standalone.py
|
||||
* fix stack trace when asked to checkout a directory (issue #478)
|
||||
* improve memory usage and speed of revision log markup (issue #477)
|
||||
* fix broken annotation view in CVS keyword-bearing files (issue #479)
|
||||
* warn users when query results are incomplete (issue #433)
|
||||
* avoid parsing errors on RCS newphrases in the admin section (issue #483)
|
||||
* make rlog parsing code more robust in certain error cases (issue #444)
|
||||
|
||||
Version 1.1.10 (released 15-Mar-2011)
|
||||
|
||||
* fix stack trace in Subversion revision info logic (issue #475, issue #476)
|
||||
|
||||
Version 1.1.9 (released 18-Feb-2011)
|
||||
|
||||
* vcauth universal access determinations (issue #425)
|
||||
* rework svn revision info cache for performance
|
||||
* make revision log "extra pages" count configurable
|
||||
* fix Subversion 1.4.x revision log compatibility code regression
|
||||
* display sanitized error when authzfile is malformed
|
||||
* restore markup of URLs in file contents (issue #455)
|
||||
* optionally display last-committed metadata in roots view (issue #457)
|
||||
|
||||
Version 1.1.8 (released 02-Dec-2010)
|
||||
|
||||
* fix slowness triggered by allow_compress=1 configuration (issue #467)
|
||||
* allow use of 'fcrypt' for Windows standalone.py authn support (issue #471)
|
||||
* yield more useful error on directory markup/annotate request (issue #472)
|
||||
|
||||
Version 1.1.7 (released 09-Sep-2010)
|
||||
|
||||
* display Subversion revision properties in the revision view (issue #453)
|
||||
* fix exception in 'standalone.py -r REPOS' when run without a config file
|
||||
* fix standalone.py server root deployments (--script-alias='')
|
||||
* add rudimentary Basic authentication support to standalone.py (issue #49)
|
||||
* fix obscure "unexpected NULL parent pool" Subversion bindings error
|
||||
* enable path info / link display in remote Subversion root revision view
|
||||
* fix vhost name case handling inconsistency (issue #466)
|
||||
* use svn:mime-type property charset param as encoding hint
|
||||
* markup Subversion revision references in log messages (issue #313)
|
||||
* add rudimentary support for FastCGI-based deployments (issue #464)
|
||||
* fix query script WSGI deployment
|
||||
* add configuration to fix query script cross-linking to ViewVC
|
||||
|
||||
Version 1.1.6 (released 02-Jun-2010)
|
||||
|
||||
* add rudimentary support for WSGI-based deployments (issue #397)
|
||||
* fix exception caused by trying to HTML-escape non-string data (issue #454)
|
||||
* fix incorrect RSS feed Content-Type header (issue #449)
|
||||
* fix RSS <title> encoding problem (issue #451)
|
||||
* allow 'svndbadmin purge' to work on missing repositories (issue #452)
|
||||
|
||||
Version 1.1.5 (released 29-Mar-2010)
|
||||
|
||||
* security fix: escape user-provided search_re input to avoid XSS attack
|
||||
|
||||
Version 1.1.4 (released 10-Mar-2010)
|
||||
|
||||
* security fix: escape user-provided query form input to avoid XSS attack
|
||||
* fix standalone.py failure (when per-root options aren't used) (issue #445)
|
||||
* fix annotate failure caused by ignored svn_config_dir (issue #447)
|
||||
|
||||
Version 1.1.3 (released 22-Dec-2009)
|
||||
|
||||
* security fix: add root listing support of per-root authz config
|
||||
* security fix: query.py requires 'forbidden' authorizer (or none) in config
|
||||
* fix URL-ification of truncated log messages (issue #3)
|
||||
* fix regexp input validation (issue #426, #427, #440)
|
||||
* add support for configurable tab-to-spaces conversion
|
||||
* fix not-a-sequence error in diff view
|
||||
* allow viewvc-install to work when templates-contrib is absent
|
||||
* minor template improvements/corrections
|
||||
* expose revision metadata in diff view (issue #431)
|
||||
* markup file/directory item property URLs and email addresses (issue #434)
|
||||
* make ViewVC cross copies in Subversion history by default
|
||||
* fix bug that caused standalone.py failure under Python 1.5.2 (issue #442)
|
||||
* fix support for per-vhost overrides of authorizer parameters (issue #411)
|
||||
* fix root name identification in query.py interface
|
||||
|
||||
Version 1.1.2 (released 11-Aug-2009)
|
||||
|
||||
* security fix: validate the 'view' parameter to avoid XSS attack
|
||||
* security fix: avoid printing illegal parameter names and values
|
||||
* add optional support for character encoding detection (issue #400)
|
||||
* fix username case handling in svnauthz module (issue #419)
|
||||
* fix cvsdbadmin/svnadmin rebuild error on missing repos (issue #420)
|
||||
* don't drop leading blank lines from colorized file contents (issue #422)
|
||||
* add file.ezt template logic for optionally hiding binary file contents
|
||||
|
||||
Version 1.1.1 (released 03-Jun-2009)
|
||||
|
||||
* fix broken query form (missing required template variables) (issue #416)
|
||||
* fix bug in cvsdb which caused rebuild operations to lose data (issue #417)
|
||||
* fix cvsdb purge/rebuild repos lookup to error on missing repos
|
||||
* fix misleading file contents view page title
|
||||
|
||||
Version 1.1.0 (released 13-May-2009)
|
||||
|
||||
* add support for full content diffs (issue #153)
|
||||
* make many more data dictionary items available to all views
|
||||
|
@ -12,9 +217,7 @@ Version 1.1.0 (released ??-???-????)
|
|||
* add support for query by log message (issues #22, #121)
|
||||
* fix bug parsing 'svn blame' output with too-long author names (issue #221)
|
||||
* fix default standalone.py port to be within private IANA range (issue #234)
|
||||
* add support for integration with GNU source-highlight (issue #285)
|
||||
* add unified configury of allowed views
|
||||
* add support for disabling the checkout view (now the default state)
|
||||
* add unified configury of allowed views; checkout view disabled by default
|
||||
* add support for ranges of revisions to svndbadmin (issue #224)
|
||||
* make the query handling more forgiving of malformatted subdirs (issue #244)
|
||||
* add support for per-root configuration overrides (issue #371)
|
||||
|
@ -36,7 +239,45 @@ Version 1.1.0 (released ??-???-????)
|
|||
* show RSS/query links only for roots found in commits database (issue #357)
|
||||
* recognize Subversion svn:mime-type property values (issue #364)
|
||||
* hide CVS files when viewing tags/branches on which they don't exist
|
||||
* add support for hiding errorful entries from the directory view (issue #105)
|
||||
* allow hiding of errorful entries from the directory view (issue #105)
|
||||
* fix directory view sorting UI
|
||||
* tolerate malformed Accept-Language headers (issue #396)
|
||||
* allow MIME type mapping overrides in ViewVC configuration (issue #401)
|
||||
* fix exception in rev-sorted remote Subversion directory views (issue #409)
|
||||
* allow setting of page sizes for log and dir views individually (issue #402)
|
||||
|
||||
Version 1.0.13 (released 24-Oct-2012)
|
||||
|
||||
* security fix: escape "extra" diff info to avoid XSS attack (issue #515)
|
||||
* security fix: remove user-reachable override of cvsdb row limit
|
||||
* fix obscure "unexpected NULL parent pool" Subversion bindings error
|
||||
* fix svndbadmin failure on deleted paths under Subversion 1.7 (issue #499)
|
||||
|
||||
Version 1.0.12 (released 02-Jun-2010)
|
||||
|
||||
* fix exception caused by trying to HTML-escape non-string data (issue #454)
|
||||
|
||||
Version 1.0.11 (released 29-Mar-2010)
|
||||
|
||||
* security fix: escape user-provided search_re input to avoid XSS attack
|
||||
|
||||
Version 1.0.10 (released 10-Mar-2010)
|
||||
|
||||
* security fix: escape user-provided query form input to avoid XSS attack
|
||||
* fix errors viewing remote Subversion paths with URI-unsafe characters
|
||||
* fix regexp input validation (issue #426, #427, #440)
|
||||
|
||||
Version 1.0.9 (released 11-Aug-2009)
|
||||
|
||||
* security fix: validate the 'view' parameter to avoid XSS attack
|
||||
* security fix: avoid printing illegal parameter names and values
|
||||
|
||||
Version 1.0.8 (released 05-May-2009)
|
||||
|
||||
* fix directory view sorting UI
|
||||
* tolerate malformed Accept-Language headers (issue #396)
|
||||
* fix directory log views in revision-less Subversion repositories
|
||||
* fix exception in rev-sorted remote Subversion directory views (issue #409)
|
||||
|
||||
Version 1.0.7 (released 14-Oct-2008)
|
||||
|
||||
|
|
205
INSTALL
205
INSTALL
|
@ -17,10 +17,13 @@ Congratulations on getting this far. :-)
|
|||
|
||||
Required Software And Configuration Needed To Run ViewVC:
|
||||
|
||||
In General:
|
||||
|
||||
* Python 2, version 2.4 or later (sorry, no 3.x support yet)
|
||||
(http://www.python.org/)
|
||||
|
||||
For CVS Support:
|
||||
|
||||
* Python 1.5.2 or later
|
||||
(http://www.python.org/)
|
||||
* RCS, Revision Control System
|
||||
(http://www.cs.purdue.edu/homes/trinkle/RCS/)
|
||||
* GNU-diff to replace diff implementations without the -u option
|
||||
|
@ -30,11 +33,9 @@ Congratulations on getting this far. :-)
|
|||
|
||||
For Subversion Support:
|
||||
|
||||
* Python 2.0 or later
|
||||
(http://www.python.org/)
|
||||
* Subversion, Version Control System, 1.3.1 or later
|
||||
(binary installation and Python bindings)
|
||||
(http://subversion.tigris.org/)
|
||||
(http://subversion.apache.org/)
|
||||
|
||||
Optional:
|
||||
|
||||
|
@ -139,7 +140,7 @@ installation instructions.
|
|||
default_root
|
||||
root_as_url_component
|
||||
rcs_dir
|
||||
mime_types_file
|
||||
mime_types_files
|
||||
|
||||
There are some other options that are usually nice to change. See
|
||||
viewvc.conf for more information. ViewVC provides a working,
|
||||
|
@ -168,72 +169,185 @@ checkin database working are below.
|
|||
APACHE CONFIGURATION
|
||||
--------------------
|
||||
|
||||
1) Find out where the web server configuration file is kept. Typical
|
||||
locations are /etc/httpd/httpd.conf, /etc/httpd/conf/httpd.conf,
|
||||
and /etc/apache/httpd.conf. Depending on how apache was installed,
|
||||
you may also look under /usr/local/etc or /etc/local. Use the vendor
|
||||
documentation or the find utility if in doubt.
|
||||
1) Locate your Apache configuration file(s).
|
||||
|
||||
Either METHOD A:
|
||||
2) The ScriptAlias directive is very useful for pointing
|
||||
Typical locations are /etc/httpd/httpd.conf,
|
||||
/etc/httpd/conf/httpd.conf, and /etc/apache/httpd.conf. Depending
|
||||
on how Apache was installed, you may also look under /usr/local/etc
|
||||
or /etc/local. Use the vendor documentation or the find utility if
|
||||
in doubt.
|
||||
|
||||
2) Depending on how your Apache configuration is setup by default, you
|
||||
might need to explicitly allow high-level access to the ViewVC
|
||||
install location.
|
||||
|
||||
<Directory <VIEWVC_INSTALLATION_DIRECTORY>>
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</Directory>
|
||||
|
||||
For example, if ViewVC is installed in /usr/local/viewvc-1.0 on
|
||||
your system:
|
||||
|
||||
<Directory /usr/local/viewvc-1.0>
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</Directory>
|
||||
|
||||
3) Configure Apache to expose ViewVC to users at the URL of your choice.
|
||||
|
||||
ViewVC provides several different ways to do this. Choose one of
|
||||
the following methods:
|
||||
|
||||
-----------------------------------
|
||||
METHOD A: CGI mode via ScriptAlias
|
||||
-----------------------------------
|
||||
The ScriptAlias directive is very useful for pointing
|
||||
directly to the viewvc.cgi script. Simply insert a line containing
|
||||
|
||||
ScriptAlias /viewvc <VIEWVC_INSTALLATION_DIRECTORY>/bin/cgi/viewvc.cgi
|
||||
ScriptAlias /viewvc <VIEWVC_INSTALLATION_DIRECTORY>/bin/cgi/viewvc.cgi
|
||||
|
||||
into your httpd.conf file. Choose the location in httpd.conf where
|
||||
also the other ScriptAlias lines reside. Some examples:
|
||||
|
||||
ScriptAlias /viewvc /usr/local/viewvc-1.0/bin/cgi/viewvc.cgi
|
||||
ScriptAlias /query /usr/local/viewvc-1.0/bin/cgi/query.cgi
|
||||
ScriptAlias /viewvc /usr/local/viewvc-1.0/bin/cgi/viewvc.cgi
|
||||
ScriptAlias /query /usr/local/viewvc-1.0/bin/cgi/query.cgi
|
||||
|
||||
continue with step 3).
|
||||
|
||||
or alternatively METHOD B:
|
||||
2) Copy the CGI scripts from
|
||||
----------------------------------------
|
||||
METHOD B: CGI mode in cgi-bin directory
|
||||
----------------------------------------
|
||||
Copy the CGI scripts from
|
||||
<VIEWVC_INSTALLATION_DIRECTORY>/bin/cgi/*.cgi
|
||||
to the /cgi-bin/ directory configured in your httpd.conf file.
|
||||
|
||||
continue with step 3).
|
||||
You can override configuration file location using:
|
||||
|
||||
SetEnv VIEWVC_CONF_PATHNAME /etc/viewvc.conf
|
||||
|
||||
and then there's METHOD C:
|
||||
2) Copy the CGI scripts from
|
||||
------------------------------------------
|
||||
METHOD C: CGI mode in ExecCGI'd directory
|
||||
------------------------------------------
|
||||
Copy the CGI scripts from
|
||||
<VIEWVC_INSTALLATION_DIRECTORY>/bin/cgi/*.cgi
|
||||
to the directory of your choosing in the Document Root adding the following
|
||||
apache directives for the directory in httpd.conf or an .htaccess file:
|
||||
Apache directives for the directory in httpd.conf or an .htaccess file:
|
||||
|
||||
Options +ExecCGI
|
||||
AddHandler cgi-script .cgi
|
||||
Options +ExecCGI
|
||||
AddHandler cgi-script .cgi
|
||||
|
||||
(Note: For this to work mod_cgi has to be loaded. And for the .htaccess file
|
||||
Note: For this to work mod_cgi has to be loaded. And for the .htaccess file
|
||||
to be effective, "AllowOverride All" or "AllowOverride Options FileInfo"
|
||||
need to have been specified for the directory.)
|
||||
needs to have been specified for the directory.
|
||||
|
||||
continue with step 3).
|
||||
|
||||
or if you've got Mod_Python installed you can use METHOD D:
|
||||
2) Copy the Python scripts and .htaccess file from
|
||||
------------------------------------------
|
||||
METHOD D: Using mod_python (if installed)
|
||||
------------------------------------------
|
||||
Copy the Python scripts and .htaccess file from
|
||||
<VIEWVC_INSTALLATION_DIRECTORY>/bin/mod_python/
|
||||
to a directory being served by apache.
|
||||
to a directory being served by Apache.
|
||||
|
||||
In httpd.conf, make sure that "AllowOverride All" or at least
|
||||
"AllowOverride FileInfo Options" are enabled for the directory
|
||||
you copied the files to.
|
||||
|
||||
You can override configuration file location using:
|
||||
|
||||
SetEnv VIEWVC_CONF_PATHNAME /etc/viewvc.conf
|
||||
|
||||
Note: If you are using Mod_Python under Apache 1.3 the tarball generation
|
||||
feature may not work because it uses multithreading. This works fine
|
||||
under Apache 2.
|
||||
|
||||
continue with step 3).
|
||||
----------------------------------------
|
||||
METHOD E: Using mod_wsgi (if installed)
|
||||
----------------------------------------
|
||||
Copy the Python scripts file from
|
||||
<VIEWVC_INSTALLATION_DIRECTORY>/bin/wsgi/
|
||||
to the directory of your choosing. Modify httpd.conf with the
|
||||
following directives:
|
||||
|
||||
3) Restart apache. The commands to do this vary. "httpd -k restart" and
|
||||
"apache -k restart" are two common variants. On RedHat Linux it is
|
||||
done using the command "/sbin/service httpd restart" and on SuSE Linux
|
||||
it is done with "rcapache restart"
|
||||
WSGIScriptAlias /viewvc <VIEWVC_INSTALLATION_DIRECTORY>/bin/wsgi/viewvc.wsgi
|
||||
WSGIScriptAlias /query <VIEWVC_INSTALLATION_DIRECTORY>/bin/wsgi/query.wsgi
|
||||
|
||||
4) Optional: Add access control.
|
||||
You'll probably also need the following directive because of the
|
||||
not-quite-sanctioned way that ViewVC manipulates Python objects.
|
||||
|
||||
In your httpd.conf you can control access to certain modules by adding
|
||||
directives like this:
|
||||
WSGIApplicationGroup %{GLOBAL}
|
||||
|
||||
Note: WSGI support in ViewVC is at this time quite rudimentary,
|
||||
bordering on downright experimental. Your mileage may vary.
|
||||
|
||||
-----------------------------------------
|
||||
METHOD F: Using mod_fcgid (if installed)
|
||||
-----------------------------------------
|
||||
|
||||
This uses ViewVC's WSGI support (from above), but supports using FastCGI,
|
||||
and is a somewhat hybrid approach of several of the above methods.
|
||||
|
||||
Especially if fcgi is already being used for other purposes, e.g. PHP,
|
||||
also using fcgi can prevent the need for including additional modules
|
||||
(e.g. mod_python or mod_wsgi) within Apache, which may help lessen Apache's
|
||||
memory usage and/or help improve performance.
|
||||
|
||||
This depends on mod_fcgid:
|
||||
|
||||
http://httpd.apache.org/mod_fcgid/
|
||||
|
||||
as well as the fcgi server from Python's flup package:
|
||||
|
||||
http://pypi.python.org/pypi/flup
|
||||
http://trac.saddi.com/flup
|
||||
|
||||
The following are some example httpd.conf fragments you can use to
|
||||
support this configuration:
|
||||
|
||||
ScriptAlias /viewvc /usr/local/viewvc/bin/wsgi/viewvc.fcgi
|
||||
ScriptAlias /query /usr/local/viewvc/bin/wsgi/query.fcgi
|
||||
|
||||
4) [Optional] Provide direct access to icons, stylesheets, etc.
|
||||
|
||||
ViewVC's HTML templates reference various stylesheets and icons
|
||||
provided by ViewVC itself. By default, ViewVC generates URLs to
|
||||
those artifacts which point back into ViewVC (using a magic
|
||||
syntax); ViewVC in turn handles such magic URL requests by
|
||||
streaming back the contents of the requested icon or stylesheet
|
||||
file. While this simplifies the configuration and initial
|
||||
deployment of ViewVC, it's not the most efficient approach to
|
||||
deliver what is essentially static content.
|
||||
|
||||
To improve performance, consider carving out a URL space in your
|
||||
webserver's configuration solely for this static content and
|
||||
instruct ViewVC to use that space when generating URLs for that
|
||||
content. For example, you might add an Alias such as the following
|
||||
to your httpd.conf:
|
||||
|
||||
Alias /viewvc-docroot /usr/local/viewvc/templates/default/docroot
|
||||
|
||||
And then, in viewvc.conf, set the 'docroot' option to the same
|
||||
location:
|
||||
|
||||
docroot = /viewvc-docroot
|
||||
|
||||
WARNING: As always when using Alias directives, be careful that you
|
||||
have them in the correct order. For example, if you use an
|
||||
ordering such as the following, Apache will hand requests for your
|
||||
static documents off to ViewVC as if they were versioned resources:
|
||||
|
||||
ScriptAlias /viewvc /usr/local/viewvc/bin/wsgi/viewvc.fcgi
|
||||
Alias /viewvc/static /usr/local/viewvc/templates/default/docroot
|
||||
|
||||
The correct order would be:
|
||||
|
||||
Alias /viewvc/static /usr/local/viewvc/templates/default/docroot
|
||||
ScriptAlias /viewvc /usr/local/viewvc/bin/wsgi/viewvc.fcgi
|
||||
|
||||
(That said, it's best to avoid such namespace nesting altogether if
|
||||
you can.)
|
||||
|
||||
5) [Optional] Add access control.
|
||||
|
||||
In your httpd.conf you can control access to certain modules by
|
||||
adding directives like this:
|
||||
|
||||
<Location "<url to viewvc.cgi>/<modname_you_wish_to_access_ctl>">
|
||||
AllowOverride None
|
||||
|
@ -251,7 +365,14 @@ or if you've got Mod_Python installed you can use METHOD D:
|
|||
http://<server_name>/viewvc/~checkout~/<module_name>
|
||||
http://<server_name>/viewvc/<module_name>.tar.gz?view=tar
|
||||
|
||||
5) Optional: Protect your ViewVC instance from server-whacking webcrawlers.
|
||||
6) Restart Apache.
|
||||
|
||||
The commands to do this vary. "httpd -k restart" and "apache -k
|
||||
restart" are two common variants. On RedHat Linux it is done using
|
||||
the command "/sbin/service httpd restart" and on SuSE Linux it is
|
||||
done with "rcapache restart". Other systems use "apachectl restart".
|
||||
|
||||
7) [Optional] Protect your ViewVC instance from server-whacking webcrawlers.
|
||||
|
||||
As ViewVC is a web-based application which each page containing various
|
||||
links to other pages and views, you can expect your server's performance
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
<blockquote>
|
||||
|
||||
<p><strong>Copyright © 1999-2008 The ViewCVS Group. All rights
|
||||
<p><strong>Copyright © 1999-2013 The ViewCVS Group. All rights
|
||||
reserved.</strong></p>
|
||||
|
||||
<p>By using ViewVC, you agree to the terms and conditions set forth
|
||||
|
@ -59,6 +59,11 @@
|
|||
<li>March 17, 2006 — software renamed from "ViewCVS"</li>
|
||||
<li>April 10, 2007 — copyright years updated</li>
|
||||
<li>February 22, 2008 — copyright years updated</li>
|
||||
<li>March 18, 2009 — copyright years updated</li>
|
||||
<li>March 29, 2010 — copyright years updated</li>
|
||||
<li>February 18, 2011 — copyright years updated</li>
|
||||
<li>January 23, 2012 — copyright years updated</li>
|
||||
<li>January 04, 2013 — copyright years updated</li>
|
||||
</ul>
|
||||
|
||||
</body>
|
||||
|
|
3
README
3
README
|
@ -1,6 +1,9 @@
|
|||
ViewVC -- Viewing the content of CVS/SVN repositories with a Webbrowser.
|
||||
|
||||
This is the 4Intra.net patched version with some extra features.
|
||||
|
||||
Please read the file INSTALL for more information.
|
||||
|
||||
And see windows/README for more information on running ViewVC on
|
||||
Microsoft Windows.
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2006 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -24,15 +24,15 @@
|
|||
#
|
||||
|
||||
#########################################################################
|
||||
#
|
||||
# INSTALL-TIME CONFIGURATION
|
||||
#
|
||||
# These values will be set during the installation process. During
|
||||
# development, they will remain None.
|
||||
# development, there will be no 'viewvcinstallpath.py'
|
||||
#
|
||||
|
||||
LIBRARY_DIR = None
|
||||
CONF_PATHNAME = None
|
||||
import viewvcinstallpath
|
||||
LIBRARY_DIR = viewvcinstallpath.LIBRARY_DIR
|
||||
CONF_PATHNAME = viewvcinstallpath.CONF_PATHNAME
|
||||
|
||||
#########################################################################
|
||||
#
|
||||
|
@ -54,7 +54,10 @@ import query
|
|||
server = sapi.AspServer(Server, Request, Response, Application)
|
||||
try:
|
||||
cfg = viewvc.load_config(CONF_PATHNAME, server)
|
||||
query.main(server, cfg, "viewvc.asp")
|
||||
viewvc_base_url = cfg.query.viewvc_base_url
|
||||
if viewvc_base_url is None:
|
||||
viewvc_base_url = "viewvc.asp"
|
||||
query.main(server, cfg, viewvc_base_url)
|
||||
finally:
|
||||
s.close()
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2006 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -24,15 +24,15 @@
|
|||
#
|
||||
|
||||
#########################################################################
|
||||
#
|
||||
# INSTALL-TIME CONFIGURATION
|
||||
#
|
||||
# These values will be set during the installation process. During
|
||||
# development, they will remain None.
|
||||
# development, there will be no 'viewvcinstallpath.py'
|
||||
#
|
||||
|
||||
LIBRARY_DIR = None
|
||||
CONF_PATHNAME = None
|
||||
import viewvcinstallpath
|
||||
LIBRARY_DIR = viewvcinstallpath.LIBRARY_DIR
|
||||
CONF_PATHNAME = viewvcinstallpath.CONF_PATHNAME
|
||||
|
||||
#########################################################################
|
||||
#
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python
|
||||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2006 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -22,19 +22,19 @@
|
|||
#
|
||||
|
||||
#########################################################################
|
||||
#
|
||||
# INSTALL-TIME CONFIGURATION
|
||||
#
|
||||
# These values will be set during the installation process. During
|
||||
# development, they will remain None.
|
||||
# development, there will be no 'viewvcinstallpath.py'
|
||||
#
|
||||
|
||||
LIBRARY_DIR = None
|
||||
CONF_PATHNAME = None
|
||||
import viewvcinstallpath
|
||||
LIBRARY_DIR = viewvcinstallpath.LIBRARY_DIR
|
||||
CONF_PATHNAME = viewvcinstallpath.CONF_PATHNAME
|
||||
|
||||
#########################################################################
|
||||
#
|
||||
# Adjust sys.path to include our library directory
|
||||
# Adjust sys.path to include our library directory.
|
||||
#
|
||||
|
||||
import sys
|
||||
|
@ -47,6 +47,20 @@ else:
|
|||
"../../../lib")))
|
||||
|
||||
#########################################################################
|
||||
#
|
||||
# If admins want nicer processes, here's the place to get them.
|
||||
#
|
||||
|
||||
#try:
|
||||
# os.nice(20) # bump the nice level of this process
|
||||
#except:
|
||||
# pass
|
||||
|
||||
|
||||
#########################################################################
|
||||
#
|
||||
# Go do the work.
|
||||
#
|
||||
|
||||
import sapi
|
||||
import viewvc
|
||||
|
@ -54,4 +68,7 @@ import query
|
|||
|
||||
server = sapi.CgiServer()
|
||||
cfg = viewvc.load_config(CONF_PATHNAME, server)
|
||||
query.main(server, cfg, "viewvc.cgi")
|
||||
viewvc_base_url = cfg.query.viewvc_base_url
|
||||
if viewvc_base_url is None:
|
||||
viewvc_base_url = "viewvc.cgi"
|
||||
query.main(server, cfg, viewvc_base_url)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python
|
||||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2006 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -22,19 +22,19 @@
|
|||
#
|
||||
|
||||
#########################################################################
|
||||
#
|
||||
# INSTALL-TIME CONFIGURATION
|
||||
#
|
||||
# These values will be set during the installation process. During
|
||||
# development, they will remain None.
|
||||
# development, there will be no 'viewvcinstallpath.py'
|
||||
#
|
||||
|
||||
LIBRARY_DIR = None
|
||||
CONF_PATHNAME = None
|
||||
import viewvcinstallpath
|
||||
LIBRARY_DIR = viewvcinstallpath.LIBRARY_DIR
|
||||
CONF_PATHNAME = viewvcinstallpath.CONF_PATHNAME
|
||||
|
||||
#########################################################################
|
||||
#
|
||||
# Adjust sys.path to include our library directory
|
||||
# Adjust sys.path to include our library directory.
|
||||
#
|
||||
|
||||
import sys
|
||||
|
@ -47,12 +47,21 @@ else:
|
|||
"../../../lib")))
|
||||
|
||||
#########################################################################
|
||||
#
|
||||
# If admins want nicer processes, here's the place to get them.
|
||||
#
|
||||
|
||||
#try:
|
||||
# os.nice(20) # bump the nice level of this process
|
||||
#except:
|
||||
# pass
|
||||
|
||||
### add code for checking the load average
|
||||
|
||||
#########################################################################
|
||||
#
|
||||
# Go do the work.
|
||||
#
|
||||
|
||||
# go do the work
|
||||
import sapi
|
||||
import viewvc
|
||||
|
||||
|
|
|
@ -0,0 +1,216 @@
|
|||
#!/bin/sh
|
||||
# ViewVC installation script for CustIS
|
||||
|
||||
if [ -f custis-install-config ]; then
|
||||
. custis-install-config
|
||||
else
|
||||
cat >custis-install-config <<EOF
|
||||
CVS_ASYNC=
|
||||
SVN_ASYNC=
|
||||
CVS_USER=www-data
|
||||
CVS_GROUP=cvs.users
|
||||
CVSROOTS=
|
||||
SVNROOT=
|
||||
SVN_FORBIDDENRE=
|
||||
|
||||
DB_HOST=
|
||||
DB_PORT=
|
||||
DB_SOCKET=/var/run/mysqld/mysqld.sock
|
||||
DB=
|
||||
DB_USER=
|
||||
DB_PASSWD=
|
||||
|
||||
VIEWVC_DIR=
|
||||
VIEWVC_URI=/
|
||||
VIEWVC_URI_SLASH=/
|
||||
VIEWVC_STATIC_URI=/static
|
||||
http_proxy=
|
||||
no_proxy=
|
||||
EOF
|
||||
echo Empty 'custis-install-config' initialized, please edit it before installation.
|
||||
exit
|
||||
fi
|
||||
|
||||
if [ ! "$DB" -o ! "$VIEWVC_DIR" ]; then
|
||||
echo Please set up 'custis-install-config' before installation.
|
||||
exit
|
||||
fi
|
||||
|
||||
################################################################################
|
||||
|
||||
export http_proxy
|
||||
export no_proxy
|
||||
|
||||
DEPS="python libapache2-mod-python rcs diff cvsnt subversion subversion-tools python-setuptools python-subversion python-mysqldb cvsgraph"
|
||||
|
||||
echo "*** Installing dependency packages: $DEPS"
|
||||
apt-get install $DEPS
|
||||
|
||||
echo "*** Installing Pygments for Python"
|
||||
wget http://pypi.python.org/packages/source/P/Pygments/Pygments-0.11.1.tar.gz
|
||||
tar -zxf Pygments-0.11.1.tar.gz
|
||||
cd Pygments-0.11.1
|
||||
python setup.py install
|
||||
cd ..
|
||||
|
||||
echo "*** Installing ViewVC into $VIEWVC_DIR"
|
||||
if [ ! -e $VIEWVC_DIR/viewvc.conf ]; then
|
||||
../viewvc-install <<EOF
|
||||
$VIEWVC_DIR
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
EOF
|
||||
fi
|
||||
|
||||
echo "*** Writing ViewVC configuration into $VIEWVC_DIR/viewvc.conf"
|
||||
for CVSROOT in $CVSROOTS; do
|
||||
if [ "$vccvsroots" ]; then
|
||||
vccvsroots="$vccvsroots, "
|
||||
fi
|
||||
vcrootname=`basename $CVSROOT`
|
||||
vccvsroots="$vccvsroots$vcrootname: $CVSROOT"
|
||||
done;
|
||||
cat >"$VIEWVC_DIR/viewvc.conf" <<EOF
|
||||
[general]
|
||||
cvs_roots = $vccvsroots
|
||||
root_parents = $SVNROOT : svn
|
||||
cvsnt_exe_path = /usr/bin/cvsnt
|
||||
mime_types_file = /etc/mime.types
|
||||
address = Admin address: stas [gav-gav] custis [ru]
|
||||
kv_files =
|
||||
languages = en-us, ru-ru
|
||||
|
||||
[utilities]
|
||||
rcs_dir = /usr/bin
|
||||
cvsnt = /usr/bin/cvsnt
|
||||
svn = /usr/bin/svn
|
||||
diff = /usr/bin/diff
|
||||
cvsgraph = /usr/bin/cvsgraph
|
||||
|
||||
[options]
|
||||
allowed_views = markup, annotate, roots
|
||||
authorizer = forbiddenre
|
||||
checkout_magic = 0
|
||||
cross_copies = 1
|
||||
cvsgraph_conf = $VIEWVC_DIR/cvsgraph.conf
|
||||
default_file_view = log
|
||||
diff_format = h
|
||||
docroot = $VIEWVC_STATIC_URI
|
||||
enable_syntax_coloration = 1
|
||||
generate_etags = 1
|
||||
hide_attic = 1
|
||||
hide_cvsroot = 1
|
||||
hide_errorful_entries = 0
|
||||
hr_breakable = 1
|
||||
hr_funout = 0
|
||||
hr_ignore_keyword_subst = 1
|
||||
hr_ignore_white = 1
|
||||
hr_intraline = 0
|
||||
http_expiration_time = 600
|
||||
limit_changes = 100
|
||||
log_sort = date
|
||||
mangle_email_addresses = 1
|
||||
root_as_url_component = 1
|
||||
short_log_len = 80
|
||||
show_log_in_markup = 1
|
||||
show_logs = 1
|
||||
show_subdir_lastmod = 0
|
||||
sort_by = file
|
||||
sort_group_dirs = 1
|
||||
svn_config_dir =
|
||||
template_dir = templates
|
||||
use_cvsgraph = 1
|
||||
use_localtime = 1
|
||||
use_pagesize = 0
|
||||
use_rcsparse = 0
|
||||
use_re_search = 0
|
||||
|
||||
[templates]
|
||||
|
||||
[cvsdb]
|
||||
enabled = 1
|
||||
host = $DB_HOST
|
||||
socket = $DB_SOCKET
|
||||
database_name = $DB
|
||||
user = $DB_USER
|
||||
passwd = $DB_PASSWD
|
||||
readonly_user = $DB_USER
|
||||
readonly_passwd = $DB_PASSWD
|
||||
|
||||
[vhosts]
|
||||
|
||||
[authz-forbidden]
|
||||
forbidden =
|
||||
|
||||
[authz-forbiddenre]
|
||||
forbiddenre = $SVN_FORBIDDENRE
|
||||
|
||||
[authz-svnauthz]
|
||||
authzfile =
|
||||
EOF
|
||||
|
||||
echo "*** Initializing database: $DB using $DB_USER@$DB_HOST"
|
||||
$VIEWVC_DIR/bin/make-database <<EOF
|
||||
$DB_HOST
|
||||
$DB_USER
|
||||
$DB_PASSWD
|
||||
$DB
|
||||
EOF
|
||||
|
||||
echo "*** Configuring Apache"
|
||||
cat >/etc/apache2/sites-available/viewvc <<EOF
|
||||
<VirtualHost *:80>
|
||||
ServerName viewvc.office.custis.ru
|
||||
ServerAlias viewvc
|
||||
ServerAdmin sysadmins@custis.ru
|
||||
ServerSignature Off
|
||||
ErrorLog /var/log/apache2/viewvc-error.log
|
||||
TransferLog /var/log/apache2/viewvc-access.log
|
||||
LogLevel warn
|
||||
# ViewVC at $VIEWVC_URI installed at $VIEWVC_DIR
|
||||
DocumentRoot $VIEWVC_DIR/bin/mod_python
|
||||
Alias $VIEWVC_STATIC_URI $VIEWVC_DIR/templates/docroot
|
||||
Alias $VIEWVC_URI $VIEWVC_DIR/bin/mod_python/
|
||||
<Location ~ ^${VIEWVC_URI_SLASH}*(\?.*)?$>
|
||||
Options -Indexes
|
||||
RewriteEngine On
|
||||
RewriteRule .* ${VIEWVC_URI_SLASH}viewvc.py%{REQUEST_URI} [R,L]
|
||||
</Location>
|
||||
<Directory $VIEWVC_DIR/bin/mod_python>
|
||||
Options +ExecCGI
|
||||
AddHandler python-program .py
|
||||
PythonHandler handler
|
||||
PythonDebug Off
|
||||
</Directory>
|
||||
</VirtualHost>
|
||||
EOF
|
||||
a2enmod python
|
||||
a2enmod mod_python
|
||||
a2enmod rewrite
|
||||
a2ensite viewvc
|
||||
|
||||
echo "*** Restarting Apache"
|
||||
apache2ctl stop
|
||||
sleep 1
|
||||
apache2ctl start
|
||||
|
||||
echo "*** Building commit database for CVS"
|
||||
for CVSROOT in $CVSROOTS; do
|
||||
$VIEWVC_DIR/bin/cvsdbadmin rebuild $CVSROOT
|
||||
done;
|
||||
|
||||
echo "*** Building commit database for Subversion repositories"
|
||||
for i in `ls $SVNROOT`; do
|
||||
if [ -d "$SVNROOT/$i" ]; then
|
||||
$VIEWVC_DIR/bin/svndbadmin -v rebuild "$SVNROOT/$i"
|
||||
fi
|
||||
done;
|
||||
|
||||
# setup hooks for CVS
|
||||
./setup-cvs-hooks "$CVSROOTS" "$VIEWVC_DIR" "$CVS_USER" "$CVS_GROUP" "$CVS_ASYNC"
|
||||
|
||||
# setup hooks for Subversion
|
||||
./setup-svn-hooks "$SVNROOT" "$VIEWVC_DIR" "$SVN_ASYNC"
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python
|
||||
#!/usr/bin/python
|
||||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2008 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -18,15 +18,15 @@
|
|||
#
|
||||
|
||||
#########################################################################
|
||||
#
|
||||
# INSTALL-TIME CONFIGURATION
|
||||
#
|
||||
# These values will be set during the installation process. During
|
||||
# development, they will remain None.
|
||||
# development, there will be no 'viewvcinstallpath.py'
|
||||
#
|
||||
|
||||
LIBRARY_DIR = None
|
||||
CONF_PATHNAME = None
|
||||
import viewvcinstallpath
|
||||
LIBRARY_DIR = viewvcinstallpath.LIBRARY_DIR
|
||||
CONF_PATHNAME = viewvcinstallpath.CONF_PATHNAME
|
||||
|
||||
# Adjust sys.path to include our library directory
|
||||
import sys
|
||||
|
@ -40,23 +40,28 @@ else:
|
|||
#########################################################################
|
||||
|
||||
import os
|
||||
import string
|
||||
import cvsdb
|
||||
import viewvc
|
||||
import vclib.ccvs
|
||||
from stat import *
|
||||
|
||||
|
||||
|
||||
def UpdateFile(db, repository, path, update, quiet_level):
|
||||
def UpdateFile(db, repository, path, update, latest_checkin, quiet_level, encoding = None):
|
||||
try:
|
||||
if update:
|
||||
mtime = os.stat(repository.rcsfile(path, 1))[ST_MTIME]
|
||||
if mtime < latest_checkin:
|
||||
return
|
||||
commit_list = cvsdb.GetUnrecordedCommitList(repository, path, db)
|
||||
else:
|
||||
commit_list = cvsdb.GetCommitListFromRCSFile(repository, path)
|
||||
except cvsdb.error, e:
|
||||
print '[ERROR] %s' % (e)
|
||||
return
|
||||
except vclib.ItemNotFound, e:
|
||||
return
|
||||
|
||||
file = string.join(path, "/")
|
||||
file = '/'.join(path)
|
||||
printing = 0
|
||||
if update:
|
||||
if quiet_level < 1 or (quiet_level < 2 and len(commit_list)):
|
||||
|
@ -69,6 +74,8 @@ def UpdateFile(db, repository, path, update, quiet_level):
|
|||
|
||||
## add the commits into the database
|
||||
for commit in commit_list:
|
||||
if encoding:
|
||||
commit.SetFile(commit.GetFile().decode(encoding).encode('utf-8'))
|
||||
db.AddCommit(commit)
|
||||
if printing:
|
||||
sys.stdout.write('.')
|
||||
|
@ -77,7 +84,8 @@ def UpdateFile(db, repository, path, update, quiet_level):
|
|||
print
|
||||
|
||||
|
||||
def RecurseUpdate(db, repository, directory, update, quiet_level):
|
||||
def RecurseUpdate(db, repository, directory, update, latest_checkin,
|
||||
quiet_level, encoding = None):
|
||||
for entry in repository.listdir(directory, None, {}):
|
||||
path = directory + [entry.name]
|
||||
|
||||
|
@ -85,11 +93,14 @@ def RecurseUpdate(db, repository, directory, update, quiet_level):
|
|||
continue
|
||||
|
||||
if entry.kind is vclib.DIR:
|
||||
RecurseUpdate(db, repository, path, update, quiet_level)
|
||||
RecurseUpdate(db, repository, path, update, latest_checkin,
|
||||
quiet_level, encoding)
|
||||
continue
|
||||
|
||||
if entry.kind is vclib.FILE:
|
||||
UpdateFile(db, repository, path, update, quiet_level)
|
||||
UpdateFile(db, repository, path, update, latest_checkin,
|
||||
quiet_level, encoding)
|
||||
|
||||
|
||||
def RootPath(path, quiet_level):
|
||||
"""Break os path into cvs root path and other parts"""
|
||||
|
@ -177,15 +188,24 @@ if __name__ == '__main__':
|
|||
if command in ('rebuild', 'purge'):
|
||||
if quiet_level < 2:
|
||||
print "Purging existing data for repository root `%s'" % root
|
||||
db.PurgeRepository(root)
|
||||
try:
|
||||
db.PurgeRepository(root, len(path_parts) and '/'.join(path_parts) or '')
|
||||
except cvsdb.UnknownRepositoryError, e:
|
||||
if command == 'purge':
|
||||
sys.stderr.write("ERROR: " + str(e) + "\n")
|
||||
sys.exit(1)
|
||||
|
||||
if command in ('rebuild', 'update'):
|
||||
repository = vclib.ccvs.CVSRepository(None, rootpath, None,
|
||||
cfg.utilities, 0)
|
||||
cfg.utilities, 0, cfg.guesser())
|
||||
latest_checkin = db.GetLatestCheckinTime(repository)
|
||||
if latest_checkin is None:
|
||||
command = 'rebuild'
|
||||
RecurseUpdate(db, repository, path_parts,
|
||||
command == 'update', quiet_level)
|
||||
command == 'update', latest_checkin, quiet_level,
|
||||
cfg.options.cvs_ondisk_charset)
|
||||
except KeyboardInterrupt:
|
||||
print
|
||||
print '** break **'
|
||||
|
||||
|
||||
sys.exit(0)
|
||||
|
|
|
@ -0,0 +1,57 @@
|
|||
#!/usr/bin/perl
|
||||
|
||||
use strict;
|
||||
my ($type, $path, $branch, $user, $perm);
|
||||
|
||||
my $R = ''; # -R for recursive
|
||||
my $lvl = {
|
||||
r => 1,
|
||||
t => 2,
|
||||
w => 3,
|
||||
c => 4,
|
||||
a => 4,
|
||||
p => 5,
|
||||
};
|
||||
|
||||
while(<>)
|
||||
{
|
||||
chomp;
|
||||
next if /^\s*#/so;
|
||||
($type, $path, $branch, $user, $perm) = split /:/, $_;
|
||||
($user, $perm) = split /!/, $user;
|
||||
next unless $perm;
|
||||
$perm = [ sort { $lvl->{$b} cmp $lvl->{$a} } split //, $perm ];
|
||||
$perm = $perm->[0];
|
||||
if ($perm eq 't')
|
||||
{
|
||||
$perm = 'read,tag,nowrite,nocreate,nocontrol';
|
||||
}
|
||||
elsif ($perm eq 'r')
|
||||
{
|
||||
$perm = 'read,notag,nowrite,nocreate,nocontrol';
|
||||
}
|
||||
elsif ($perm eq 'w')
|
||||
{
|
||||
$perm = 'read,tag,write,nocreate,nocontrol';
|
||||
}
|
||||
elsif ($perm eq 'c' || $perm eq 'a')
|
||||
{
|
||||
$perm = 'read,tag,write,create,nocontrol';
|
||||
}
|
||||
elsif ($perm eq 'p')
|
||||
{
|
||||
$perm = 'read,tag,write,create,control';
|
||||
}
|
||||
print "cvs rchacl$R -a $perm";
|
||||
print " -u '$user'" if $user ne 'ALL';
|
||||
print " -r '$branch'" if $branch ne 'ALL';
|
||||
if ($path ne 'ALL')
|
||||
{
|
||||
print " '$path'";
|
||||
}
|
||||
else
|
||||
{
|
||||
print ' `ls $CVSROOT | grep -v '."'#cvs'`";
|
||||
}
|
||||
print "\n";
|
||||
}
|
|
@ -0,0 +1,21 @@
|
|||
#!/usr/bin/perl
|
||||
# Very simple inetd/xinetd "cvsnt rcsfile" service
|
||||
|
||||
# Useful for ViewVC as there is an unpleasant non-stable bug, probably somewhere
|
||||
# inside mod_python or Apache, which SOMETIMES causes cvsnt subprocesses forked
|
||||
# from mod_python to die. This gives empty diff outputs or different errors like
|
||||
# "Error: Rlog output ended early. Expected RCS file ..."
|
||||
# This script removes forking from mod_python code and solves the issue.
|
||||
# Additional profit of this script is that you can probably browse REMOTE cvs
|
||||
# repositories, if you expose this service to ViewVC, although it is not tested.
|
||||
|
||||
# USAGE: (local) create an inetd service with this script as server listening
|
||||
# on some port of 127.0.0.1 and put "rcsfile_socket = 127.0.0.1:port"
|
||||
# into "utilities" section of viewvc.conf
|
||||
|
||||
$args = <STDIN>;
|
||||
$args =~ s/\s+$//so;
|
||||
@args = $args =~ /\'([^\']+)\'/giso;
|
||||
|
||||
# We don't execute shell, so this is mostly safe, not a backdoor :)
|
||||
exec('/usr/bin/cvsnt', 'rcsfile', @args);
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python
|
||||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2008 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -17,15 +17,15 @@
|
|||
#
|
||||
|
||||
#########################################################################
|
||||
#
|
||||
# INSTALL-TIME CONFIGURATION
|
||||
#
|
||||
# These values will be set during the installation process. During
|
||||
# development, they will remain None.
|
||||
# development, there will be no 'viewvcinstallpath.py'
|
||||
#
|
||||
|
||||
LIBRARY_DIR = None
|
||||
CONF_PATHNAME = None
|
||||
import viewvcinstallpath
|
||||
LIBRARY_DIR = viewvcinstallpath.LIBRARY_DIR
|
||||
CONF_PATHNAME = viewvcinstallpath.CONF_PATHNAME
|
||||
|
||||
# Adjust sys.path to include our library directory
|
||||
import sys
|
||||
|
@ -39,7 +39,6 @@ else:
|
|||
#########################################################################
|
||||
|
||||
import os
|
||||
import string
|
||||
import getopt
|
||||
import re
|
||||
import cvsdb
|
||||
|
@ -152,11 +151,11 @@ def FindLongestDirectory(s, repository):
|
|||
and a file name, either of which may contain spaces. Returns the longest
|
||||
possible directory name that actually exists"""
|
||||
|
||||
parts = string.split(s, " ")
|
||||
parts = s.split()
|
||||
|
||||
for i in range(len(parts)-1, 0, -1):
|
||||
directory = string.join(parts[:i])
|
||||
filename = string.join(parts[i:])
|
||||
directory = ' '.join(parts[:i])
|
||||
filename = ' '.join(parts[i:])
|
||||
if os.path.isdir(os.path.join(repository, directory)):
|
||||
return directory, filename
|
||||
|
||||
|
@ -227,7 +226,7 @@ def ProcessLoginfo(rootpath, directory, files):
|
|||
cfg.utilities, 0)
|
||||
|
||||
# split up the directory components
|
||||
dirpath = filter(None, string.split(os.path.normpath(directory), os.sep))
|
||||
dirpath = filter(None, os.path.normpath(directory).split(os.sep))
|
||||
|
||||
## build a list of Commit objects
|
||||
commit_list = []
|
||||
|
@ -279,7 +278,7 @@ if __name__ == '__main__':
|
|||
else:
|
||||
# if there are no arguments, read version information from
|
||||
# first line of input like old versions of ViewCVS did
|
||||
arg = string.rstrip(sys.stdin.readline())
|
||||
arg = sys.stdin.readline().rstrip()
|
||||
|
||||
if len(sys.argv) > 2:
|
||||
# if there is a second argument it indicates which parser
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python
|
||||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2007 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2009 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -18,32 +18,33 @@
|
|||
|
||||
import os, sys, string
|
||||
import popen2
|
||||
import getopt
|
||||
|
||||
INTRO_TEXT = """\
|
||||
This script creates the database and tables in MySQL used by the
|
||||
ViewVC checkin database. You will be prompted for: database server
|
||||
hostname, database user, database user password, and database name.
|
||||
This script will use the 'mysql' program to create the database for
|
||||
you. You will then need to set the appropriate parameters in the
|
||||
[cvsdb] section of your viewvc.conf file.
|
||||
"""
|
||||
|
||||
DATABASE_SCRIPT="""\
|
||||
## ------------------------------------------------------------------------
|
||||
## Stuff common to all schemas
|
||||
##
|
||||
DATABASE_SCRIPT_COMMON="""\
|
||||
DROP DATABASE IF EXISTS <dbname>;
|
||||
CREATE DATABASE <dbname>;
|
||||
|
||||
USE <dbname>;
|
||||
"""
|
||||
|
||||
## ------------------------------------------------------------------------
|
||||
## Version 0: The original, Bonsai-compatible schema.
|
||||
##
|
||||
DATABASE_SCRIPT_VERSION_0="""\
|
||||
DROP TABLE IF EXISTS branches;
|
||||
CREATE TABLE branches (
|
||||
id mediumint(9) NOT NULL auto_increment,
|
||||
branch varchar(64) binary DEFAULT '' NOT NULL,
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE branch (branch)
|
||||
) TYPE=MyISAM;
|
||||
) TYPE=InnoDB;
|
||||
|
||||
DROP TABLE IF EXISTS checkins;
|
||||
CREATE TABLE checkins (
|
||||
id int NOT NULL AUTO_INCREMENT PRIMARY KEY,
|
||||
type enum('Change','Add','Remove'),
|
||||
ci_when datetime DEFAULT '0000-00-00 00:00:00' NOT NULL,
|
||||
whoid mediumint(9) DEFAULT '0' NOT NULL,
|
||||
|
@ -57,13 +58,14 @@ CREATE TABLE checkins (
|
|||
removedlines int(11) DEFAULT '0' NOT NULL,
|
||||
descid mediumint(9),
|
||||
UNIQUE repositoryid (repositoryid,dirid,fileid,revision),
|
||||
KEY repositoryid_when (repositoryid,ci_when),
|
||||
KEY ci_when (ci_when),
|
||||
KEY whoid (whoid),
|
||||
KEY repositoryid_2 (repositoryid),
|
||||
KEY whoid (whoid,ci_when),
|
||||
KEY dirid (dirid),
|
||||
KEY fileid (fileid),
|
||||
KEY branchid (branchid)
|
||||
) TYPE=MyISAM;
|
||||
KEY branchid (branchid),
|
||||
KEY descid (descid)
|
||||
) TYPE=InnoDB;
|
||||
|
||||
DROP TABLE IF EXISTS descs;
|
||||
CREATE TABLE descs (
|
||||
|
@ -71,7 +73,8 @@ CREATE TABLE descs (
|
|||
description text,
|
||||
hash bigint(20) DEFAULT '0' NOT NULL,
|
||||
PRIMARY KEY (id),
|
||||
KEY hash (hash)
|
||||
KEY hash (hash),
|
||||
FULLTEXT KEY description (description)
|
||||
) TYPE=MyISAM;
|
||||
|
||||
DROP TABLE IF EXISTS dirs;
|
||||
|
@ -80,7 +83,7 @@ CREATE TABLE dirs (
|
|||
dir varchar(255) binary DEFAULT '' NOT NULL,
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE dir (dir)
|
||||
) TYPE=MyISAM;
|
||||
) TYPE=InnoDB;
|
||||
|
||||
DROP TABLE IF EXISTS files;
|
||||
CREATE TABLE files (
|
||||
|
@ -88,7 +91,7 @@ CREATE TABLE files (
|
|||
file varchar(255) binary DEFAULT '' NOT NULL,
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE file (file)
|
||||
) TYPE=MyISAM;
|
||||
) TYPE=InnoDB;
|
||||
|
||||
DROP TABLE IF EXISTS people;
|
||||
CREATE TABLE people (
|
||||
|
@ -96,7 +99,7 @@ CREATE TABLE people (
|
|||
who varchar(128) binary DEFAULT '' NOT NULL,
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE who (who)
|
||||
) TYPE=MyISAM;
|
||||
) TYPE=InnoDB;
|
||||
|
||||
DROP TABLE IF EXISTS repositories;
|
||||
CREATE TABLE repositories (
|
||||
|
@ -104,7 +107,7 @@ CREATE TABLE repositories (
|
|||
repository varchar(64) binary DEFAULT '' NOT NULL,
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE repository (repository)
|
||||
) TYPE=MyISAM;
|
||||
) TYPE=InnoDB;
|
||||
|
||||
DROP TABLE IF EXISTS tags;
|
||||
CREATE TABLE tags (
|
||||
|
@ -118,31 +121,230 @@ CREATE TABLE tags (
|
|||
KEY dirid (dirid),
|
||||
KEY fileid (fileid),
|
||||
KEY branchid (branchid)
|
||||
) TYPE=InnoDB;
|
||||
|
||||
DROP TABLE IF EXISTS contents;
|
||||
CREATE TABLE contents (
|
||||
id int NOT NULL PRIMARY KEY,
|
||||
content MEDIUMTEXT NOT NULL DEFAULT ''
|
||||
) TYPE=MyISAM;
|
||||
"""
|
||||
|
||||
## ------------------------------------------------------------------------
|
||||
## Version 1: Adds the 'metadata' table. Adds 'descid' index to
|
||||
## 'checkins' table, and renames that table to 'commits'.
|
||||
##
|
||||
DATABASE_SCRIPT_VERSION_1="""\
|
||||
DROP TABLE IF EXISTS branches;
|
||||
CREATE TABLE branches (
|
||||
id mediumint(9) NOT NULL auto_increment,
|
||||
branch varchar(64) binary DEFAULT '' NOT NULL,
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE branch (branch)
|
||||
) TYPE=InnoDB;
|
||||
|
||||
DROP TABLE IF EXISTS commits;
|
||||
CREATE TABLE commits (
|
||||
id int NOT NULL AUTO_INCREMENT PRIMARY KEY,
|
||||
type enum('Change','Add','Remove'),
|
||||
ci_when datetime DEFAULT '0000-00-00 00:00:00' NOT NULL,
|
||||
whoid mediumint(9) DEFAULT '0' NOT NULL,
|
||||
repositoryid mediumint(9) DEFAULT '0' NOT NULL,
|
||||
dirid mediumint(9) DEFAULT '0' NOT NULL,
|
||||
fileid mediumint(9) DEFAULT '0' NOT NULL,
|
||||
revision varchar(32) binary DEFAULT '' NOT NULL,
|
||||
stickytag varchar(255) binary DEFAULT '' NOT NULL,
|
||||
branchid mediumint(9) DEFAULT '0' NOT NULL,
|
||||
addedlines int(11) DEFAULT '0' NOT NULL,
|
||||
removedlines int(11) DEFAULT '0' NOT NULL,
|
||||
descid mediumint(9),
|
||||
UNIQUE repositoryid (repositoryid,dirid,fileid,revision),
|
||||
KEY repositoryid_when (repositoryid,ci_when),
|
||||
KEY ci_when (ci_when),
|
||||
KEY whoid (whoid,ci_when),
|
||||
KEY dirid (dirid),
|
||||
KEY fileid (fileid),
|
||||
KEY branchid (branchid),
|
||||
KEY descid (descid)
|
||||
) TYPE=InnoDB;
|
||||
|
||||
DROP TABLE IF EXISTS descs;
|
||||
CREATE TABLE descs (
|
||||
id mediumint(9) NOT NULL auto_increment,
|
||||
description text,
|
||||
hash bigint(20) DEFAULT '0' NOT NULL,
|
||||
PRIMARY KEY (id),
|
||||
KEY hash (hash),
|
||||
FULLTEXT KEY description (description)
|
||||
) TYPE=MyISAM;
|
||||
|
||||
DROP TABLE IF EXISTS dirs;
|
||||
CREATE TABLE dirs (
|
||||
id mediumint(9) NOT NULL auto_increment,
|
||||
dir varchar(255) binary DEFAULT '' NOT NULL,
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE dir (dir)
|
||||
) TYPE=InnoDB;
|
||||
|
||||
DROP TABLE IF EXISTS files;
|
||||
CREATE TABLE files (
|
||||
id mediumint(9) NOT NULL auto_increment,
|
||||
file varchar(255) binary DEFAULT '' NOT NULL,
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE file (file)
|
||||
) TYPE=InnoDB;
|
||||
|
||||
DROP TABLE IF EXISTS people;
|
||||
CREATE TABLE people (
|
||||
id mediumint(9) NOT NULL auto_increment,
|
||||
who varchar(128) binary DEFAULT '' NOT NULL,
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE who (who)
|
||||
) TYPE=InnoDB;
|
||||
|
||||
DROP TABLE IF EXISTS repositories;
|
||||
CREATE TABLE repositories (
|
||||
id mediumint(9) NOT NULL auto_increment,
|
||||
repository varchar(64) binary DEFAULT '' NOT NULL,
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE repository (repository)
|
||||
) TYPE=InnoDB;
|
||||
|
||||
DROP TABLE IF EXISTS tags;
|
||||
CREATE TABLE tags (
|
||||
repositoryid mediumint(9) DEFAULT '0' NOT NULL,
|
||||
branchid mediumint(9) DEFAULT '0' NOT NULL,
|
||||
dirid mediumint(9) DEFAULT '0' NOT NULL,
|
||||
fileid mediumint(9) DEFAULT '0' NOT NULL,
|
||||
revision varchar(32) binary DEFAULT '' NOT NULL,
|
||||
UNIQUE repositoryid (repositoryid,dirid,fileid,branchid,revision),
|
||||
KEY repositoryid_2 (repositoryid),
|
||||
KEY dirid (dirid),
|
||||
KEY fileid (fileid),
|
||||
KEY branchid (branchid)
|
||||
) TYPE=InnoDB;
|
||||
|
||||
DROP TABLE IF EXISTS metadata;
|
||||
CREATE TABLE metadata (
|
||||
name varchar(255) binary DEFAULT '' NOT NULL,
|
||||
value text,
|
||||
PRIMARY KEY (name),
|
||||
UNIQUE name (name)
|
||||
) TYPE=InnoDB;
|
||||
INSERT INTO metadata (name, value) VALUES ('version', '1');
|
||||
|
||||
DROP TABLE IF EXISTS contents;
|
||||
CREATE TABLE contents (
|
||||
id int NOT NULL PRIMARY KEY,
|
||||
content MEDIUMTEXT NOT NULL DEFAULT ''
|
||||
) TYPE=MyISAM;
|
||||
"""
|
||||
|
||||
BONSAI_COMPAT="""
|
||||
WARNING: Creating Bonsai-compatible legacy database version. Some ViewVC
|
||||
features may not be available, or may not perform especially well.
|
||||
|
||||
"""
|
||||
|
||||
## ------------------------------------------------------------------------
|
||||
|
||||
def usage_and_exit(errmsg=None):
|
||||
stream = errmsg is None and sys.stdout or sys.stderr
|
||||
stream.write("""\
|
||||
Usage: %s [OPTIONS]
|
||||
|
||||
This script creates the database and tables in MySQL used by the
|
||||
ViewVC checkin database. In order to operate correctly, it needs to
|
||||
know the following: your database server hostname, database user,
|
||||
database user password, and database name. (You will be prompted for
|
||||
any of this information that you do not provide via command-line
|
||||
options.) This script will use the 'mysql' program to create the
|
||||
database for you. You will then need to set the appropriate
|
||||
parameters in the [cvsdb] section of your viewvc.conf file.
|
||||
|
||||
Options:
|
||||
|
||||
--dbname=ARG Use ARG as the ViewVC database name to create.
|
||||
[Default: ViewVC]
|
||||
|
||||
--help Show this usage message.
|
||||
|
||||
--hostname=ARG Use ARG as the hostname for the MySQL connection.
|
||||
[Default: localhost]
|
||||
|
||||
--password=ARG Use ARG as the password for the MySQL connection.
|
||||
|
||||
--username=ARG Use ARG as the username for the MySQL connection.
|
||||
|
||||
--version=ARG Create the database using the schema employed by
|
||||
version ARG of ViewVC. Valid values are:
|
||||
[ "1.0" ]
|
||||
|
||||
""" % (os.path.basename(sys.argv[0])))
|
||||
if errmsg is not None:
|
||||
stream.write("[ERROR] %s.\n" % (errmsg))
|
||||
sys.exit(1)
|
||||
sys.exit(0)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
try:
|
||||
print INTRO_TEXT
|
||||
# Parse the command-line options, if any.
|
||||
dbname = version = hostname = username = password = None
|
||||
opts, args = getopt.getopt(sys.argv[1:], '', [ 'dbname=',
|
||||
'help',
|
||||
'hostname=',
|
||||
'password=',
|
||||
'username=',
|
||||
'version=',
|
||||
])
|
||||
if len(args) > 0:
|
||||
usage_and_exit("Unexpected command-line parameters")
|
||||
for name, value in opts:
|
||||
if name == '--help':
|
||||
usage_and_exit(0)
|
||||
elif name == '--dbname':
|
||||
dbname = value
|
||||
elif name == '--hostname':
|
||||
hostname = value
|
||||
elif name == '--username':
|
||||
username = value
|
||||
elif name == '--password':
|
||||
password = value
|
||||
elif name == '--version':
|
||||
if value in ["1.0"]:
|
||||
version = value
|
||||
else:
|
||||
usage_and_exit("Invalid version specified")
|
||||
|
||||
# Prompt for necessary information
|
||||
host = raw_input("MySQL Hostname [default: localhost]: ") or ""
|
||||
user = raw_input("MySQL User: ")
|
||||
passwd = raw_input("MySQL Password: ")
|
||||
dbase = raw_input("ViewVC Database Name [default: ViewVC]: ") or "ViewVC"
|
||||
# Prompt for information not provided via command-line options.
|
||||
if hostname is None:
|
||||
hostname = raw_input("MySQL Hostname [default: localhost]: ") or ""
|
||||
if username is None:
|
||||
username = raw_input("MySQL User: ")
|
||||
if password is None:
|
||||
password = raw_input("MySQL Password: ")
|
||||
if dbname is None:
|
||||
dbname = raw_input("ViewVC Database Name [default: ViewVC]: ") or "ViewVC"
|
||||
|
||||
# Create the database
|
||||
dscript = string.replace(DATABASE_SCRIPT, "<dbname>", dbase)
|
||||
host_option = host and "--host=%s" % (host) or ""
|
||||
dscript = string.replace(DATABASE_SCRIPT_COMMON, "<dbname>", dbname)
|
||||
if version == "1.0":
|
||||
print BONSAI_COMPAT
|
||||
dscript = dscript + DATABASE_SCRIPT_VERSION_0
|
||||
else:
|
||||
dscript = dscript + DATABASE_SCRIPT_VERSION_1
|
||||
|
||||
host_option = hostname and "--host=%s" % (hostname) or ""
|
||||
if sys.platform == "win32":
|
||||
cmd = "mysql --user=%s --password=%s %s "\
|
||||
% (user, passwd, host_option)
|
||||
% (username, password, host_option)
|
||||
mysql = os.popen(cmd, "w") # popen2.Popen3 is not provided on windows
|
||||
mysql.write(dscript)
|
||||
status = mysql.close()
|
||||
else:
|
||||
cmd = "{ mysql --user=%s --password=%s %s ; } 2>&1" \
|
||||
% (user, passwd, host_option)
|
||||
% (username, password, host_option)
|
||||
pipes = popen2.Popen3(cmd)
|
||||
pipes.tochild.write(dscript)
|
||||
pipes.tochild.close()
|
||||
|
@ -150,10 +352,11 @@ if __name__ == "__main__":
|
|||
status = pipes.wait()
|
||||
|
||||
if status:
|
||||
print "[ERROR] the database did not create sucessfully."
|
||||
print "[ERROR] The database did not create sucessfully."
|
||||
sys.exit(1)
|
||||
|
||||
print "Database created successfully."
|
||||
print "Database created successfully. Don't forget to configure the "
|
||||
print "[cvsdb] section of your viewvc.conf file."
|
||||
except KeyboardInterrupt:
|
||||
pass
|
||||
sys.exit(0)
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
AddHandler python-program .py
|
||||
PythonHandler handler
|
||||
PythonDebug On
|
||||
PythonDebug Off
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2006 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -20,10 +20,8 @@ import os.path
|
|||
def handler(req):
|
||||
path, module_name = os.path.split(req.filename)
|
||||
module_name, module_ext = os.path.splitext(module_name)
|
||||
try:
|
||||
module = apache.import_module(module_name, path=[path])
|
||||
except ImportError:
|
||||
raise apache.SERVER_RETURN, apache.HTTP_NOT_FOUND
|
||||
# Let it be 500 Internal Server Error in case of import error
|
||||
module = apache.import_module(module_name, path=[path])
|
||||
|
||||
req.add_common_vars()
|
||||
module.index(req)
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
#!/usr/bin/env python
|
||||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2006 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -21,15 +22,15 @@
|
|||
#
|
||||
|
||||
#########################################################################
|
||||
#
|
||||
# INSTALL-TIME CONFIGURATION
|
||||
#
|
||||
# These values will be set during the installation process. During
|
||||
# development, they will remain None.
|
||||
# development, there will be no 'viewvcinstallpath.py'
|
||||
#
|
||||
|
||||
LIBRARY_DIR = None
|
||||
CONF_PATHNAME = None
|
||||
import viewvcinstallpath
|
||||
LIBRARY_DIR = viewvcinstallpath.LIBRARY_DIR
|
||||
CONF_PATHNAME = viewvcinstallpath.CONF_PATHNAME
|
||||
|
||||
#########################################################################
|
||||
#
|
||||
|
@ -65,7 +66,10 @@ cfg = viewvc.load_config(CONF_PATHNAME)
|
|||
def index(req):
|
||||
server = sapi.ModPythonServer(req)
|
||||
try:
|
||||
query.main(server, cfg, "viewvc.py")
|
||||
viewvc_base_url = cfg.query.viewvc_base_url
|
||||
if viewvc_base_url is None:
|
||||
viewvc_base_url = "viewvc.py"
|
||||
query.main(server, cfg, viewvc_base_url)
|
||||
finally:
|
||||
server.close()
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
#!/usr/bin/env python
|
||||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2006 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -21,15 +22,15 @@
|
|||
#
|
||||
|
||||
#########################################################################
|
||||
#
|
||||
# INSTALL-TIME CONFIGURATION
|
||||
#
|
||||
# These values will be set during the installation process. During
|
||||
# development, they will remain None.
|
||||
# development, there will be no 'viewvcinstallpath.py'
|
||||
#
|
||||
|
||||
LIBRARY_DIR = None
|
||||
CONF_PATHNAME = None
|
||||
import viewvcinstallpath
|
||||
LIBRARY_DIR = viewvcinstallpath.LIBRARY_DIR
|
||||
CONF_PATHNAME = viewvcinstallpath.CONF_PATHNAME
|
||||
|
||||
#########################################################################
|
||||
#
|
||||
|
@ -43,6 +44,13 @@ if LIBRARY_DIR:
|
|||
|
||||
import sapi
|
||||
import imp
|
||||
import signal
|
||||
|
||||
# Totally ignore SIGPIPE - needed for overcoming popen() errors
|
||||
def sigpipe(signum, frame):
|
||||
pass
|
||||
|
||||
signal.signal(signal.SIGPIPE, sigpipe)
|
||||
|
||||
# Import real ViewVC module
|
||||
fp, pathname, description = imp.find_module('viewvc', [LIBRARY_DIR])
|
||||
|
|
|
@ -0,0 +1,57 @@
|
|||
#!/bin/sh
|
||||
|
||||
CVSROOTS=$1
|
||||
VIEWVC_DIR=$2
|
||||
CVS_USER=$3
|
||||
CVS_GROUP=$4
|
||||
CVS_ASYNC=$5
|
||||
|
||||
if [ ! "$CVSROOTS" -o ! "$VIEWVC_DIR" -o ! "$CVS_USER" -o ! "$CVS_GROUP" ]; then
|
||||
echo "USAGE: $0 <CVS_ROOTS> <VIEWVC_DIR> <CVS_USER> <CVS_GROUP> [CVS_ASYNC]"
|
||||
exit
|
||||
fi
|
||||
|
||||
echo "*** Setting up commit hooks for CVS repositories (job=$CVS_ASYNC)"
|
||||
chgrp $CVS_GROUP $VIEWVC_DIR
|
||||
chmod 775 $VIEWVC_DIR
|
||||
chmod 1777 .
|
||||
for CVSROOT in $CVSROOTS; do
|
||||
vcrootname=`basename $CVSROOT`
|
||||
if [ "$CVS_ASYNC" ]; then
|
||||
VHOOK="touch $VIEWVC_DIR/.cvs-updated-$vcrootname"
|
||||
else
|
||||
VHOOK="$VIEWVC_DIR/bin/cvsdbadmin update $CVSROOT >/dev/null"
|
||||
fi;
|
||||
su $CVS_USER -s /bin/sh <<EOSH
|
||||
CVSROOT=$CVSROOT cvs co CVSROOT
|
||||
if [ $? -eq 0 ]; then
|
||||
cd CVSROOT
|
||||
mv loginfo loginfo.bak
|
||||
grep -v '/.cvs-updated' <loginfo.bak | grep -v '/bin/cvsdbadmin update' >loginfo
|
||||
cat >>loginfo <<EOF
|
||||
ALL $VHOOK
|
||||
EOF
|
||||
cvs ci -m 'CVS commit hook for ViewVC' loginfo
|
||||
cd ..
|
||||
rm -Rf CVSROOT
|
||||
fi
|
||||
EOSH
|
||||
if [ "$CVS_ASYNC" ]; then
|
||||
cat >$VIEWVC_DIR/cvshook-$vcrootname <<EOF
|
||||
#!/bin/sh
|
||||
if [ -e "$VIEWVC_DIR/.cvs-updated-$vcrootname" ]; then
|
||||
rm "$VIEWVC_DIR/.cvs-updated-$vcrootname"
|
||||
$VIEWVC_DIR/bin/cvsdbadmin update $CVSROOT >/dev/null
|
||||
fi
|
||||
EOF
|
||||
chmod 755 $VIEWVC_DIR/cvshook-$vcrootname
|
||||
cat >/etc/cron.d/viewvc-cvs-$vcrootname <<EOF
|
||||
*/5 * * * * root $VIEWVC_DIR/cvshook-$vcrootname
|
||||
EOF
|
||||
fi
|
||||
done;
|
||||
|
||||
if [ "$CVS_ASYNC" ]; then
|
||||
echo "*** Reloading cron daemon"
|
||||
/etc/init.d/cron reload
|
||||
fi
|
|
@ -0,0 +1,36 @@
|
|||
#!/bin/sh
|
||||
|
||||
SVNROOT=$1
|
||||
VIEWVC_DIR=$2
|
||||
SVN_ASYNC=$3
|
||||
|
||||
if [ ! "$SVNROOT" -o ! "$VIEWVC_DIR" ]; then
|
||||
echo "USAGE: $0 <SVNROOT> <VIEWVC_DIR>"
|
||||
exit
|
||||
fi
|
||||
|
||||
echo "*** Setting up commit hooks for Subversion"
|
||||
for i in `ls $SVNROOT`; do
|
||||
if [ -d "$SVNROOT/$i" ]; then
|
||||
if [ "$SVN_ASYNC" ]; then
|
||||
cat >"$SVNROOT/$i/hooks/post-commit.tmp" <<EOF
|
||||
#!/bin/sh
|
||||
echo "\$1 \$2" >> $VIEWVC_DIR/.svn-updated
|
||||
EOF
|
||||
else
|
||||
cat >"$SVNROOT/$i/hooks/post-commit.tmp" <<EOF
|
||||
#!/bin/sh
|
||||
$VIEWVC_DIR/bin/svndbadmin update \$1 \$2
|
||||
EOF
|
||||
fi
|
||||
chmod 755 "$SVNROOT/$i/hooks/post-commit.tmp"
|
||||
mv "$SVNROOT/$i/hooks/post-commit.tmp" "$SVNROOT/$i/hooks/post-commit"
|
||||
fi
|
||||
done;
|
||||
|
||||
if [ "$SVN_ASYNC" ]; then
|
||||
cat >/etc/cron.d/viewvc-svn <<EOF
|
||||
*/10 * * * * root $VIEWVC_DIR/bin/svnupdate-async.sh "$VIEWVC_DIR"
|
||||
EOF
|
||||
/etc/init.d/cron reload
|
||||
fi
|
1092
bin/standalone.py
1092
bin/standalone.py
File diff suppressed because it is too large
Load Diff
249
bin/svndbadmin
249
bin/svndbadmin
|
@ -1,6 +1,7 @@
|
|||
#!/usr/bin/env python
|
||||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 2004-2013 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 2004-2007 James Henstridge
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
|
@ -34,15 +35,15 @@
|
|||
#
|
||||
|
||||
#########################################################################
|
||||
#
|
||||
# INSTALL-TIME CONFIGURATION
|
||||
#
|
||||
# These values will be set during the installation process. During
|
||||
# development, they will remain None.
|
||||
# development, there will be no 'viewvcinstallpath.py'
|
||||
#
|
||||
|
||||
LIBRARY_DIR = None
|
||||
CONF_PATHNAME = None
|
||||
import viewvcinstallpath
|
||||
LIBRARY_DIR = viewvcinstallpath.LIBRARY_DIR
|
||||
CONF_PATHNAME = viewvcinstallpath.CONF_PATHNAME
|
||||
|
||||
# Adjust sys.path to include our library directory
|
||||
import sys
|
||||
|
@ -57,7 +58,11 @@ else:
|
|||
|
||||
import os
|
||||
import string
|
||||
import socket
|
||||
import select
|
||||
import re
|
||||
import mimetypes
|
||||
import time
|
||||
|
||||
import svn.core
|
||||
import svn.repos
|
||||
|
@ -67,14 +72,21 @@ import svn.delta
|
|||
import cvsdb
|
||||
import viewvc
|
||||
import vclib
|
||||
from viewvcmagic import ContentMagic
|
||||
|
||||
class SvnRepo:
|
||||
"""Class used to manage a connection to a SVN repository."""
|
||||
def __init__(self, path):
|
||||
def __init__(self, path, index_content = None, tika_client = None, guesser = None,
|
||||
svn_ignore_mimetype = False, verbose = False):
|
||||
self.path = path
|
||||
self.repo = svn.repos.svn_repos_open(path)
|
||||
self.fs = svn.repos.svn_repos_fs(self.repo)
|
||||
self.rev_max = svn.fs.youngest_rev(self.fs)
|
||||
self.index_content = index_content
|
||||
self.tika_client = tika_client
|
||||
self.guesser = guesser
|
||||
self.verbose = verbose
|
||||
self.svn_ignore_mimetype = svn_ignore_mimetype
|
||||
def __getitem__(self, rev):
|
||||
if rev is None:
|
||||
rev = self.rev_max
|
||||
|
@ -84,7 +96,36 @@ class SvnRepo:
|
|||
rev = SvnRev(self, rev)
|
||||
return rev
|
||||
|
||||
_re_diff_change_command = re.compile('(\d+)(?:,(\d+))?([acd])(\d+)(?:,(\d+))?')
|
||||
_re_diff_change_command = re.compile('^(\d+)(?:,(\d+))?([acd])(\d+)(?:,(\d+))?')
|
||||
|
||||
class StupidBufferedReader:
|
||||
def __init__(self, fp, buffer = 262144):
|
||||
self.fp = fp
|
||||
self.bufsize = buffer
|
||||
self.buffer = ''
|
||||
self.eof = False
|
||||
def __iter__(self):
|
||||
return self
|
||||
def next(self):
|
||||
if self.eof:
|
||||
raise StopIteration
|
||||
return self.readline()
|
||||
def readline(self):
|
||||
if self.eof:
|
||||
return ''
|
||||
p = self.buffer.find('\n')
|
||||
while p < 0:
|
||||
b = self.fp.read(self.bufsize)
|
||||
if not len(b):
|
||||
r = self.buffer
|
||||
self.buffer = ''
|
||||
self.eof = True
|
||||
return r
|
||||
self.buffer = self.buffer + b
|
||||
p = self.buffer.find('\n')
|
||||
r = self.buffer[0:p+1]
|
||||
self.buffer = self.buffer[p+1:]
|
||||
return r
|
||||
|
||||
def _get_diff_counts(diff_fp):
|
||||
"""Calculate the plus/minus counts by parsing the output of a
|
||||
|
@ -97,8 +138,7 @@ def _get_diff_counts(diff_fp):
|
|||
GNU diff manual."""
|
||||
|
||||
plus, minus = 0, 0
|
||||
line = diff_fp.readline()
|
||||
while line:
|
||||
for line in diff_fp:
|
||||
match = re.match(_re_diff_change_command, line)
|
||||
if match:
|
||||
# size of first range
|
||||
|
@ -124,9 +164,79 @@ def _get_diff_counts(diff_fp):
|
|||
# RdL - remove range R of file1, which would have been
|
||||
# at line L of file2
|
||||
minus = minus + count1
|
||||
line = diff_fp.readline()
|
||||
return plus, minus
|
||||
|
||||
class TikaClient:
|
||||
# Create tika client
|
||||
def __init__(self, tika_server, mime_types, verbose):
|
||||
self.tika_server = tika_server
|
||||
self.mime_types = mime_types
|
||||
self.verbose = verbose
|
||||
self.addr = tika_server.split(':')
|
||||
# Split address
|
||||
if len(self.addr) != 2:
|
||||
raise Exception('tika_server value is incorrect: \''+tika_server+'\', please use \'host:port\' format')
|
||||
self.addr = (self.addr[0], int(self.addr[1]))
|
||||
# Build regexp for MIME types
|
||||
m = re.split('\s+', mime_types.strip())
|
||||
self.mime_regexp = re.compile('|'.join('^'+re.escape(i).replace('\\*', '.*')+'$' for i in m))
|
||||
|
||||
# Extract text content from file using Tika which runs in server mode
|
||||
def get_text(self, filename, mime_type, log_filename):
|
||||
if not self.mime_regexp.match(mime_type):
|
||||
# Tika can't handle this mime type, return nothing
|
||||
return ''
|
||||
fd = None
|
||||
s = None
|
||||
text = ''
|
||||
fsize = 0
|
||||
try:
|
||||
# Read original file
|
||||
fd = open(filename, 'rb')
|
||||
data = fd.read()
|
||||
fsize = len(data)
|
||||
if not fsize:
|
||||
return ''
|
||||
# Connect to Tika
|
||||
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
s.connect(self.addr)
|
||||
s.setblocking(0)
|
||||
sockfd = s.fileno()
|
||||
# Tika is somewhat delicate about network IO, so:
|
||||
# Read and write using poll(2) system call
|
||||
p = select.poll()
|
||||
p.register(sockfd)
|
||||
while 1:
|
||||
fds = p.poll()
|
||||
if not fds:
|
||||
break
|
||||
(pollfd, event) = fds[0]
|
||||
if event & select.POLLIN:
|
||||
# Exception or empty data means EOF...
|
||||
try: part = os.read(sockfd, 65536)
|
||||
except: break
|
||||
if not part: break
|
||||
text += part
|
||||
if event & select.POLLOUT:
|
||||
if not len(data):
|
||||
# Shutdown output and forget about POLLOUT
|
||||
s.shutdown(socket.SHUT_WR)
|
||||
p.modify(sockfd, select.POLLIN)
|
||||
else:
|
||||
# Write and consume some data
|
||||
l = os.write(sockfd, data)
|
||||
data = data[l:]
|
||||
if len(text) == 0:
|
||||
raise Exception('Empty response from Tika server')
|
||||
if self.verbose:
|
||||
print "Extracted %d bytes from %s (%s) of size %d" % (len(text), log_filename, mime_type, fsize)
|
||||
except Exception, e:
|
||||
if self.verbose:
|
||||
print "Error extracting text from %s (%s) of size %d: %s" % (log_filename, mime_type, fsize, str(e))
|
||||
finally:
|
||||
if fd: fd.close()
|
||||
if s: s.close()
|
||||
return text
|
||||
|
||||
class SvnRev:
|
||||
"""Class used to hold information about a particular revision of
|
||||
|
@ -150,37 +260,97 @@ class SvnRev:
|
|||
|
||||
# get a root for the current revisions
|
||||
fsroot = self._get_root_for_rev(rev)
|
||||
|
||||
|
||||
# find changes in the revision
|
||||
editor = svn.repos.RevisionChangeCollector(repo.fs, rev)
|
||||
editor = svn.repos.ChangeCollector(repo.fs, fsroot)
|
||||
e_ptr, e_baton = svn.delta.make_editor(editor)
|
||||
svn.repos.svn_repos_replay(fsroot, e_ptr, e_baton)
|
||||
|
||||
self.changes = []
|
||||
changes_hash = {}
|
||||
for path, change in editor.changes.items():
|
||||
# skip non-file changes
|
||||
if change.item_kind != svn.core.svn_node_file:
|
||||
continue
|
||||
|
||||
# deal with the change types we handle
|
||||
action = None
|
||||
base_root = None
|
||||
base_path = change.base_path
|
||||
if change.base_path:
|
||||
base_root = self._get_root_for_rev(change.base_rev)
|
||||
|
||||
if not change.path:
|
||||
|
||||
# figure out what kind of change this is, and get a diff
|
||||
# object for it. note that prior to 1.4 Subversion's
|
||||
# bindings didn't give us change.action, but that's okay
|
||||
# because back then deleted paths always had a change.path
|
||||
# of None.
|
||||
if hasattr(change, 'action') \
|
||||
and change.action == svn.repos.CHANGE_ACTION_DELETE:
|
||||
action = 'remove'
|
||||
elif not change.path:
|
||||
action = 'remove'
|
||||
elif change.added:
|
||||
action = 'add'
|
||||
else:
|
||||
action = 'change'
|
||||
|
||||
diffobj = svn.fs.FileDiff(base_root and base_root or None,
|
||||
base_root and change.base_path or None,
|
||||
change.path and fsroot or None,
|
||||
change.path and change.path or None)
|
||||
if action == 'remove':
|
||||
diffobj = svn.fs.FileDiff(base_root, change.base_path, None, None, None, ['-b', '-B'])
|
||||
else:
|
||||
diffobj = svn.fs.FileDiff(base_root, change.base_path, fsroot, change.path, None, ['-b', '-B'])
|
||||
|
||||
diff_fp = diffobj.get_pipe()
|
||||
diff_fp = StupidBufferedReader(diff_fp)
|
||||
plus, minus = _get_diff_counts(diff_fp)
|
||||
self.changes.append((path, action, plus, minus))
|
||||
|
||||
# CustIS Bug 50473: a workaround for svnlib behaviour in file movements (FILE1 -> FILE2 + FILE1 -> null)
|
||||
if change.base_path:
|
||||
if not change.path and change.base_path in changes_hash:
|
||||
minus = 0
|
||||
elif change.path:
|
||||
changes_hash[change.base_path] = change.path
|
||||
|
||||
content = ''
|
||||
mime = ''
|
||||
# need to check if binary file's content changed when copying,
|
||||
# if not, don't extract it, just get it from previous revision later
|
||||
if repo.index_content and action != 'remove' and change.path and (not change.base_path
|
||||
or svn.fs.contents_changed(
|
||||
base_root and base_root or None,
|
||||
base_root and change.base_path or None,
|
||||
fsroot, change.path
|
||||
)):
|
||||
props = svn.fs.node_proplist(fsroot, change.path)
|
||||
if not repo.svn_ignore_mimetype:
|
||||
mime = props.get('svn:mime-type', None)
|
||||
else:
|
||||
mime = None
|
||||
mime = repo.guesser.guess_mime(
|
||||
mime,
|
||||
os.path.basename(change.path),
|
||||
diffobj.tempfile2
|
||||
)
|
||||
# Read and guess charset by ourselves for text files
|
||||
if mime and mime.startswith('text/') or (mime.startswith('application/') and mime.endswith('xml')):
|
||||
try:
|
||||
fd = open(diffobj.tempfile2, 'rb')
|
||||
content = fd.read()
|
||||
fd.close()
|
||||
except: pass
|
||||
# Guess charset
|
||||
if content:
|
||||
content, charset = repo.guesser.guess_charset(content)
|
||||
if charset:
|
||||
content = content.encode('utf-8')
|
||||
if repo.verbose:
|
||||
print 'Guessed %s for %s' % (charset, change.path)
|
||||
elif repo.verbose:
|
||||
print 'Failed to guess charset for %s, not indexing' % (change.path, )
|
||||
# Try to extract content using Tika from binary documents
|
||||
elif repo.tika_client:
|
||||
content = repo.tika_client.get_text(diffobj.tempfile2, mime, change.path)
|
||||
self.changes.append((path, action, plus, minus, content, mime))
|
||||
|
||||
def _get_root_for_rev(self, rev):
|
||||
"""Fetch a revision root from a cache of such, or a fresh root
|
||||
|
@ -201,7 +371,7 @@ def handle_revision(db, command, repo, rev, verbose, force=0):
|
|||
if verbose: print "skipped (no changes)."
|
||||
return
|
||||
|
||||
for (path, action, plus, minus) in revision.changes:
|
||||
for (path, action, plus, minus, content, mime) in revision.changes:
|
||||
directory, file = os.path.split(path)
|
||||
commit = cvsdb.CreateCommit()
|
||||
commit.SetRepository(repo.path)
|
||||
|
@ -214,6 +384,8 @@ def handle_revision(db, command, repo, rev, verbose, force=0):
|
|||
commit.SetPlusCount(plus)
|
||||
commit.SetMinusCount(minus)
|
||||
commit.SetBranch(None)
|
||||
commit.SetContent(content)
|
||||
commit.SetMimeType(mime)
|
||||
|
||||
if action == 'add':
|
||||
commit.SetTypeAdd()
|
||||
|
@ -241,15 +413,33 @@ def main(command, repository, revs=[], verbose=0, force=0):
|
|||
cfg = viewvc.load_config(CONF_PATHNAME)
|
||||
db = cvsdb.ConnectDatabase(cfg)
|
||||
|
||||
repository = os.path.realpath(repository)
|
||||
# Purge what must be purged.
|
||||
if command in ('rebuild', 'purge'):
|
||||
if verbose:
|
||||
print "Purging commit info for repository root `%s'" % repository
|
||||
db.PurgeRepository(repository)
|
||||
try:
|
||||
db.PurgeRepository(repository)
|
||||
except cvsdb.UnknownRepositoryError, e:
|
||||
if command == 'purge':
|
||||
sys.stderr.write("ERROR: " + str(e) + "\n")
|
||||
sys.exit(1)
|
||||
|
||||
repo = SvnRepo(repository)
|
||||
tika_client = None
|
||||
if cfg.utilities.tika_server:
|
||||
tika_client = TikaClient(cfg.utilities.tika_server, cfg.utilities.tika_mime_types, verbose)
|
||||
repo = SvnRepo(
|
||||
path = repository,
|
||||
index_content = cfg.cvsdb.index_content,
|
||||
tika_client = tika_client,
|
||||
guesser = cfg.guesser(),
|
||||
svn_ignore_mimetype = cfg.options.svn_ignore_mimetype,
|
||||
verbose = verbose,
|
||||
)
|
||||
# Record what must be recorded.
|
||||
if command == 'rebuild' or (command == 'update' and not revs):
|
||||
for rev in range(repo.rev_max+1):
|
||||
handle_revision(db, command, repo, rev, verbose)
|
||||
handle_revision(db, command, repo, rev, verbose, force)
|
||||
elif command == 'update':
|
||||
if revs[0] is None:
|
||||
revs[0] = repo.rev_max
|
||||
|
@ -275,7 +465,7 @@ def usage():
|
|||
located at REPOS-PATH.
|
||||
|
||||
Usage: 1. %s [-v] rebuild REPOS-PATH
|
||||
2. %s [-v] update REPOS-PATH [REV:[REV2]] [--force]
|
||||
2. %s [-v] update REPOS-PATH [REV[:REV2]] [--force]
|
||||
3. %s [-v] purge REPOS-PATH
|
||||
|
||||
1. Rebuild the commit database information for the repository located
|
||||
|
@ -290,7 +480,7 @@ Usage: 1. %s [-v] rebuild REPOS-PATH
|
|||
the database. If a range is specified, the revisions will be
|
||||
processed in ascending order, and you may specify "HEAD" to
|
||||
indicate "the youngest revision currently in the repository".
|
||||
|
||||
|
||||
3. Purge information specific to the repository located at REPOS-PATH
|
||||
from the database.
|
||||
|
||||
|
@ -315,21 +505,15 @@ if __name__ == '__main__':
|
|||
del args[index]
|
||||
except ValueError:
|
||||
pass
|
||||
|
||||
|
||||
if len(args) < 3:
|
||||
usage()
|
||||
|
||||
command = string.lower(args[1])
|
||||
command = args[1].lower()
|
||||
if command not in ('rebuild', 'update', 'purge'):
|
||||
sys.stderr.write('ERROR: unknown command %s\n' % command)
|
||||
usage()
|
||||
|
||||
repository = args[2]
|
||||
if not os.path.exists(repository):
|
||||
sys.stderr.write('ERROR: could not find repository %s\n' % args[2])
|
||||
usage()
|
||||
repository = vclib.svn.canonicalize_rootpath(repository)
|
||||
|
||||
revs = []
|
||||
if len(sys.argv) > 3:
|
||||
if command == 'rebuild':
|
||||
|
@ -352,6 +536,7 @@ if __name__ == '__main__':
|
|||
rev = None
|
||||
|
||||
try:
|
||||
repository = vclib.svn.canonicalize_rootpath(args[2])
|
||||
repository = cvsdb.CleanRepository(os.path.abspath(repository))
|
||||
main(command, repository, revs, verbose, force)
|
||||
except KeyboardInterrupt:
|
||||
|
|
|
@ -0,0 +1,50 @@
|
|||
#!/usr/bin/perl
|
||||
# Скрипт для обновления SVN репозиториев svndbadmin-ом
|
||||
# Берёт номера ревизий и имена репозиториев из перечисленных файлов или STDIN,
|
||||
# группирует их по номерам и выводит список команд, необходимых для обновления
|
||||
|
||||
use strict;
|
||||
|
||||
# первый аргумент - путь к svndbadmin
|
||||
my $svndbadmin = shift @ARGV
|
||||
|| die "USAGE: $0 <path_to_svndbadmin> FILES...";
|
||||
|
||||
# считываем названия репозиториев и номера ревизий из файла
|
||||
my $tou = {};
|
||||
my ($repos, $rev);
|
||||
while (<>)
|
||||
{
|
||||
s/^\s+//so;
|
||||
s/\s+$//so;
|
||||
($repos, $rev) = split /\s+/, $_;
|
||||
$tou->{$repos}->{$rev} = 1;
|
||||
}
|
||||
|
||||
# превращаем номера ревизий в диапазоны ревизий
|
||||
my ($i, $j, $r, $nr);
|
||||
foreach $repos (keys %$tou)
|
||||
{
|
||||
$rev = [ sort keys %{$tou->{$repos}} ];
|
||||
$nr = [];
|
||||
$j = 0;
|
||||
for $i (1..@$rev)
|
||||
{
|
||||
if ($i > $#$rev || $rev->[$i]-$rev->[$j] > $i-$j)
|
||||
{
|
||||
$r = $rev->[$j];
|
||||
$r .= ":".$rev->[$i-1] if $i-$j > 1;
|
||||
push @$nr, $r;
|
||||
$j = $i;
|
||||
}
|
||||
}
|
||||
$tou->{$repos} = $nr;
|
||||
}
|
||||
|
||||
# выводим список команд для выполнения
|
||||
foreach $repos (keys %$tou)
|
||||
{
|
||||
foreach (@{$tou->{$repos}})
|
||||
{
|
||||
print "$svndbadmin update $repos $_\n";
|
||||
}
|
||||
}
|
|
@ -0,0 +1,8 @@
|
|||
#!/bin/sh
|
||||
|
||||
VIEWVC_DIR=$1
|
||||
|
||||
test -f "$VIEWVC_DIR/.svn-updating" -o ! -f "$VIEWVC_DIR/.svn-updated" && exit 0
|
||||
mv "$VIEWVC_DIR/.svn-updated" "$VIEWVC_DIR/.svn-updating"
|
||||
"$VIEWVC_DIR/bin/svnupdate-async" "$VIEWVC_DIR/bin/svndbadmin" "$VIEWVC_DIR/.svn-updating" | sh &> /tmp/svnupdate-async.log
|
||||
rm "$VIEWVC_DIR/.svn-updating"
|
|
@ -0,0 +1,54 @@
|
|||
#!/usr/bin/python
|
||||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
# distribution or at http://viewvc.org/license-1.html.
|
||||
#
|
||||
# For more information, visit http://viewvc.org/
|
||||
#
|
||||
# -----------------------------------------------------------------------
|
||||
#
|
||||
# viewvc: View CVS/SVN repositories via a web browser
|
||||
#
|
||||
# -----------------------------------------------------------------------
|
||||
#
|
||||
# This is a fcgi entry point for the query ViewVC app. It's appropriate
|
||||
# for use with mod_fcgid and flup. It defines a single application function
|
||||
# that is a valid fcgi entry point.
|
||||
#
|
||||
# mod_fcgid: http://httpd.apache.org/mod_fcgid/
|
||||
# flup:
|
||||
# http://pypi.python.org/pypi/flup
|
||||
# http://trac.saddi.com/flup
|
||||
#
|
||||
# -----------------------------------------------------------------------
|
||||
|
||||
import sys, os
|
||||
|
||||
LIBRARY_DIR = None
|
||||
CONF_PATHNAME = None
|
||||
|
||||
if LIBRARY_DIR:
|
||||
sys.path.insert(0, LIBRARY_DIR)
|
||||
else:
|
||||
sys.path.insert(0, os.path.abspath(os.path.join(sys.argv[0],
|
||||
"../../../lib")))
|
||||
|
||||
import sapi
|
||||
import viewvc
|
||||
import query
|
||||
from flup.server import fcgi
|
||||
|
||||
def application(environ, start_response):
|
||||
server = sapi.WsgiServer(environ, start_response)
|
||||
cfg = viewvc.load_config(CONF_PATHNAME, server)
|
||||
viewvc_base_url = cfg.query.viewvc_base_url
|
||||
if viewvc_base_url is None:
|
||||
viewvc_base_url = "viewvc.fcgi"
|
||||
query.main(server, cfg, viewvc_base_url)
|
||||
return []
|
||||
|
||||
fcgi.WSGIServer(application).run()
|
|
@ -0,0 +1,45 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
# distribution or at http://viewvc.org/license-1.html.
|
||||
#
|
||||
# For more information, visit http://viewvc.org/
|
||||
#
|
||||
# -----------------------------------------------------------------------
|
||||
#
|
||||
# viewvc: View CVS/SVN repositories via a web browser
|
||||
#
|
||||
# -----------------------------------------------------------------------
|
||||
#
|
||||
# This is a wsgi entry point for the query ViewVC app. It's appropriate
|
||||
# for use with mod_wsgi. It defines a single application function that
|
||||
# is a valid wsgi entry point.
|
||||
#
|
||||
# -----------------------------------------------------------------------
|
||||
|
||||
import sys, os
|
||||
|
||||
LIBRARY_DIR = None
|
||||
CONF_PATHNAME = None
|
||||
|
||||
if LIBRARY_DIR:
|
||||
sys.path.insert(0, LIBRARY_DIR)
|
||||
else:
|
||||
sys.path.insert(0, os.path.abspath(os.path.join(sys.argv[0],
|
||||
"../../../lib")))
|
||||
|
||||
import sapi
|
||||
import viewvc
|
||||
import query
|
||||
|
||||
def application(environ, start_response):
|
||||
server = sapi.WsgiServer(environ, start_response)
|
||||
cfg = viewvc.load_config(CONF_PATHNAME, server)
|
||||
viewvc_base_url = cfg.query.viewvc_base_url
|
||||
if viewvc_base_url is None:
|
||||
viewvc_base_url = "viewvc.wsgi"
|
||||
query.main(server, cfg, viewvc_base_url)
|
||||
return []
|
|
@ -0,0 +1,50 @@
|
|||
#!/usr/bin/python
|
||||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
# distribution or at http://viewvc.org/license-1.html.
|
||||
#
|
||||
# For more information, visit http://viewvc.org/
|
||||
#
|
||||
# -----------------------------------------------------------------------
|
||||
#
|
||||
# viewvc: View CVS/SVN repositories via a web browser
|
||||
#
|
||||
# -----------------------------------------------------------------------
|
||||
#
|
||||
# This is a fcgi entry point for the main ViewVC app. It's appropriate
|
||||
# for use with mod_fcgid and flup. It defines a single application function
|
||||
# that is a valid fcgi entry point.
|
||||
#
|
||||
# mod_fcgid: http://httpd.apache.org/mod_fcgid/
|
||||
# flup:
|
||||
# http://pypi.python.org/pypi/flup
|
||||
# http://trac.saddi.com/flup
|
||||
#
|
||||
# -----------------------------------------------------------------------
|
||||
|
||||
import sys, os
|
||||
|
||||
LIBRARY_DIR = None
|
||||
CONF_PATHNAME = None
|
||||
|
||||
if LIBRARY_DIR:
|
||||
sys.path.insert(0, LIBRARY_DIR)
|
||||
else:
|
||||
sys.path.insert(0, os.path.abspath(os.path.join(sys.argv[0],
|
||||
"../../../lib")))
|
||||
|
||||
import sapi
|
||||
import viewvc
|
||||
from flup.server import fcgi
|
||||
|
||||
def application(environ, start_response):
|
||||
server = sapi.WsgiServer(environ, start_response)
|
||||
cfg = viewvc.load_config(CONF_PATHNAME, server)
|
||||
viewvc.main(server, cfg)
|
||||
return []
|
||||
|
||||
fcgi.WSGIServer(application).run()
|
|
@ -0,0 +1,41 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
# distribution or at http://viewvc.org/license-1.html.
|
||||
#
|
||||
# For more information, visit http://viewvc.org/
|
||||
#
|
||||
# -----------------------------------------------------------------------
|
||||
#
|
||||
# viewvc: View CVS/SVN repositories via a web browser
|
||||
#
|
||||
# -----------------------------------------------------------------------
|
||||
#
|
||||
# This is a wsgi entry point for the main ViewVC app. It's appropriate
|
||||
# for use with mod_wsgi. It defines a single application function that
|
||||
# is a valid wsgi entry point.
|
||||
#
|
||||
# -----------------------------------------------------------------------
|
||||
|
||||
import sys, os
|
||||
|
||||
LIBRARY_DIR = None
|
||||
CONF_PATHNAME = None
|
||||
|
||||
if LIBRARY_DIR:
|
||||
sys.path.insert(0, LIBRARY_DIR)
|
||||
else:
|
||||
sys.path.insert(0, os.path.abspath(os.path.join(sys.argv[0],
|
||||
"../../../lib")))
|
||||
|
||||
import sapi
|
||||
import viewvc
|
||||
|
||||
def application(environ, start_response):
|
||||
server = sapi.WsgiServer(environ, start_response)
|
||||
cfg = viewvc.load_config(CONF_PATHNAME, server)
|
||||
viewvc.main(server, cfg)
|
||||
return []
|
|
@ -0,0 +1,41 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
# distribution or at http://viewvc.org/license-1.html.
|
||||
#
|
||||
# For more information, visit http://viewvc.org/
|
||||
#
|
||||
# -----------------------------------------------------------------------
|
||||
#
|
||||
# viewvc: View CVS/SVN repositories via a web browser
|
||||
#
|
||||
# -----------------------------------------------------------------------
|
||||
#
|
||||
# This is a wsgi entry point for the main ViewVC app. It's appropriate
|
||||
# for use with mod_wsgi. It defines a single application function that
|
||||
# is a valid wsgi entry point.
|
||||
#
|
||||
# -----------------------------------------------------------------------
|
||||
|
||||
import sys, os
|
||||
|
||||
import viewvcinstallpath
|
||||
LIBRARY_DIR = viewvcinstallpath.LIBRARY_DIR
|
||||
CONF_PATHNAME = viewvcinstallpath.CONF_PATHNAME
|
||||
|
||||
if LIBRARY_DIR:
|
||||
sys.path.insert(0, LIBRARY_DIR)
|
||||
else:
|
||||
sys.path.insert(0, os.path.abspath(os.path.join(
|
||||
os.path.dirname(__file__), "../../lib")))
|
||||
import sapi
|
||||
import viewvc
|
||||
|
||||
def application(environ, start_response):
|
||||
server = sapi.WsgiServer(environ, start_response)
|
||||
cfg = viewvc.load_config(CONF_PATHNAME, server)
|
||||
viewvc.main(server, cfg)
|
||||
return []
|
|
@ -0,0 +1,32 @@
|
|||
#---------------------------------------------------------------------------
|
||||
#
|
||||
# MIME type mapping file for ViewVC
|
||||
#
|
||||
# Information on ViewVC is located at the following web site:
|
||||
# http://viewvc.org/
|
||||
#
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
# THE FORMAT OF THIS FILE
|
||||
#
|
||||
# This file contains records -- one per line -- of the following format:
|
||||
#
|
||||
# MIME_TYPE [EXTENSION [EXTENSION ...]]
|
||||
#
|
||||
# where whitespace separates the MIME_TYPE from the EXTENSION(s),
|
||||
# and the EXTENSIONs from each other.
|
||||
#
|
||||
# For example:
|
||||
#
|
||||
# text/x-csh csh
|
||||
# text/x-csrc c
|
||||
# text/x-diff diff patch
|
||||
# image/png png
|
||||
# image/jpeg jpeg jpg jpe
|
||||
#
|
||||
# By default, this file is left empty, allowing ViewVC to continue
|
||||
# consulting it first without overriding the MIME type mappings
|
||||
# found in more standard mapping files (such as those provided as
|
||||
# part of the operating system or web server software).
|
||||
#
|
||||
#
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,213 @@
|
|||
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
|
||||
<html>
|
||||
<head>
|
||||
<title>ViewVC: 1.1.0 Release Notes</title>
|
||||
<style>
|
||||
.h2, .h3 {
|
||||
padding: 0.25em 0em;
|
||||
background: white;
|
||||
}
|
||||
.warning {
|
||||
font-style: italic;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<h1>ViewVC 1.1.0 Release Notes</h1>
|
||||
|
||||
<div class="h2">
|
||||
<h2 id="introduction">Introduction</h2>
|
||||
|
||||
<p>ViewVC 1.1.0 is the superset of all previous ViewVC releases.</p>
|
||||
|
||||
</div> <!-- h2 -->
|
||||
|
||||
<div class="h2">
|
||||
<h2 id="compatibility">Compatibility</h2>
|
||||
|
||||
<p>Each ViewVC release strives to maintain URL stability with previous
|
||||
releases, and 1.1.0 is no exception. All URLs considered valid for
|
||||
previous ViewVC releases should continue to work correctly in this
|
||||
release, though possibly only via the use of HTTP redirects
|
||||
(generated by ViewVC itself).</p>
|
||||
|
||||
<p>The commits database functionality has changed in ViewVC 1.1.0 in
|
||||
way that breaks compatibility with prior ViewVC releases, but only
|
||||
for new database instantiations. ViewVC 1.1.0 will continue to
|
||||
understand (for both read and write operations) the previous
|
||||
schema, so you are not required to rebuild your commits database
|
||||
for ViewVC 1.1.0 compatibility. By default, new commits databases
|
||||
created using the 1.1.0 version of the <code>make-database</code>
|
||||
script will use a new database schema that is unreadable by
|
||||
previous ViewVC versions. However, if you need a database which
|
||||
can co-exist with a previous ViewVC version, you can use
|
||||
the <code>--version=1.0</code> option
|
||||
to <code>make-database</code>.</p>
|
||||
|
||||
<p>The ViewVC configuration files and template language have changed
|
||||
dramatically. See the file <code>docs/upgrading-howto.html</code>
|
||||
in the release for information on porting existing versions of
|
||||
those items for use with ViewVC 1.1.0.</p>
|
||||
|
||||
</div> <!-- h2 -->
|
||||
|
||||
<div class="h2">
|
||||
<h2 id="compatibility">Features and Fixes</h2>
|
||||
|
||||
<div class="h3">
|
||||
<h3 id="">Extensible path-based authorization w/ Subversion authz support</h3>
|
||||
|
||||
<p>In a nutshell, ViewVC is now able to do path-based authorization.
|
||||
ViewVC 1.0 has a configuration option for naming 'forbidden'
|
||||
modules, but it is really limited — it basically just makes a
|
||||
universal decision about which top-level directories in every
|
||||
hosted repository should be hidden by ViewVC. People want
|
||||
more, and specifically requested that ViewVC learn how to honor
|
||||
Subversion's authz files and semantics. So, along with some other
|
||||
types of authorization approaches, that's what ViewVC 1.1 can now
|
||||
do. If you are using mod_authz_svn with Apache today, or
|
||||
svnserve's built-in authorization support, then you can now point
|
||||
ViewVC to the same authz configuration file and have it honor the
|
||||
access rules you've defined for your repositories.</p>
|
||||
|
||||
<p>Note that ViewVC does <strong>not</strong> handle authentication,
|
||||
though. You'll need to configure your web server to demand login
|
||||
credentials from users, which the web server itself can then hand
|
||||
off to ViewVC for application against the authorization rules
|
||||
you've defined.</p>
|
||||
|
||||
<p class="warning">WARNING: The root listing view does not consult the
|
||||
authorization subsystem when deciding what roots to display to a
|
||||
given user. If you need to protect your root names, consider
|
||||
disabling it by removing <code>roots</code> from the set of views
|
||||
listed in the <code>allowed_views</code> configuration option.
|
||||
<strong>UPDATE: This was fixed in ViewVC 1.1.3.</strong></p>
|
||||
|
||||
<p class="warning">WARNING: Support for path-based authorization is
|
||||
incomplete in the experimental version control backend modules,
|
||||
including the one that permits display of remote Subversion
|
||||
repositories. <strong>UPDATE: This was fixed in ViewVC
|
||||
1.1.15.</strong></p>
|
||||
|
||||
</div> <!-- h3 -->
|
||||
|
||||
<div class="h3">
|
||||
<h3 id="">Subversion versioned properties display</h3>
|
||||
|
||||
<p>ViewVC 1.1 displays the properties that Subversion lets you store
|
||||
on files and directories
|
||||
(<code>svn:mime-type</code>, <code>svn:mergeinfo</code>,
|
||||
<code>svn:ignore</code>, etc.). Directory properties are shown by
|
||||
default at the bottom of that directory's entry listing. File
|
||||
properties are displayed at the bottom of that file's
|
||||
markup/annotate view.</p>
|
||||
|
||||
</div> <!-- h3 -->
|
||||
|
||||
<div class="h3">
|
||||
<h3 id="">Unified markup and annotation views</h3>
|
||||
|
||||
<p>The "markup" and "annotate" views in ViewVC now have a unified look
|
||||
and feel (driven by a single EZT template). Both views support
|
||||
syntax highlighting and Subversion file property display.</p>
|
||||
|
||||
</div> <!-- h3 -->
|
||||
|
||||
<div class="h3">
|
||||
<h3 id="">Unified, hassle-free Pygments-based syntax highlighting</h3>
|
||||
|
||||
<p>ViewVC 1.0 does syntax highlighting by working with GNU enscript, or
|
||||
highlight, or php, or py2html — all these external tools just
|
||||
to accomplish a single task. But they all do things in slightly
|
||||
different ways. And if you configure them wrongly, you get strange
|
||||
errors. <a href="http://www.pygments.org/">Pygments</a> (which is
|
||||
also used by <a href="http://trac.edgewall.org/">Trac</a> for
|
||||
syntax highlighting) is a Python package that requires no
|
||||
configuration, is easier to use inside ViewVC, and so on. So
|
||||
ViewVC 1.1 drops support for all those various old integrations,
|
||||
and just uses Pygments for everything now. This change was about
|
||||
developer and administrator sanity. There will be complaints, to
|
||||
be sure, about how various color schemes differ and what file types
|
||||
now are and aren't understood by the syntax highlighting engine,
|
||||
but this change should vastly simplify the discussions of such
|
||||
things.</p>
|
||||
|
||||
</div> <!-- h3 -->
|
||||
|
||||
<div class="h3">
|
||||
<h3 id="">Better MIME detection and handling</h3>
|
||||
|
||||
<p>ViewVC typically consults a MIME types file to determine what kind
|
||||
of file a given document is, based on its filename extension
|
||||
(<code>.jpg</code> = <code>image/jpeg</code>, …). But
|
||||
Subversion lets you dictate a file's MIME type using
|
||||
the <code>svn:mime-type</code> property. ViewVC now recognizes and
|
||||
honors that property as the preferred source of a file's MIME type.
|
||||
This can be disabled in the configuration, though, which might be
|
||||
desirable if many of your Subversion-versioned files carry the
|
||||
generic <code>application/octet-stream</code> MIME type that
|
||||
Subversion uses by default for non-human-readable files.</p>
|
||||
|
||||
<p>Also, ViewVC now allows you to specify multiple MIME type mapping
|
||||
files that you'd like it to consult when determine the MIME type of
|
||||
files based on their extensions. This allows administrators to
|
||||
easily define their own custom mappings for ViewVC's benefit
|
||||
without potentially affecting the mappings used by other site
|
||||
services.</p>
|
||||
|
||||
</div> <!-- h3 -->
|
||||
|
||||
<div class="h3">
|
||||
<h3 id="">Support for full content diffs</h3>
|
||||
|
||||
<p>ViewVC 1.1 expands the previously existing options of "colored
|
||||
diff" and "long colored diff" with a new "full colored diff", which
|
||||
shows the full contents of the changed file (instead of only the 3
|
||||
or 15 lines of context shown via the older diff display types).</p>
|
||||
|
||||
</div> <!-- h3 -->
|
||||
|
||||
<div class="h3">
|
||||
<h3 id="">Support for per-root configuration overrides</h3>
|
||||
|
||||
<p>In ViewVC 1.1, you can setup configuration option overrides on a
|
||||
per-root (per-repository) basis (if you need/care to do so). See
|
||||
the comments in the <code>viewvc.conf.dist</code> file for more on
|
||||
how to do this.</p>
|
||||
|
||||
</div> <!-- h3 -->
|
||||
|
||||
<div class="h3">
|
||||
<h3 id="">Optional email address obfuscation/mangling</h3>
|
||||
|
||||
<p>ViewVC can, when displaying revision metadata, munge strings that
|
||||
look like email addresses to protect them from screen-scraping
|
||||
spammers. For example, a log message that says, "Patch by:
|
||||
cmpilato@red-bean.com" can optionally be displayed by ViewVC using
|
||||
HTML entity encoding for the characters (a trick that causes no
|
||||
visible change to the output, but that might confuse
|
||||
unsophisticated spam bot crawlers) or as "Patch by: cmpilato@..."
|
||||
(which isn't a complete email address at all, but might be enough
|
||||
information for the human reading the log message to know who to
|
||||
blame for the patch).</p>
|
||||
|
||||
</div> <!-- h3 -->
|
||||
|
||||
<div class="h3">
|
||||
<h3 id="">Pagination improvements</h3>
|
||||
|
||||
<p>The way that ViewVC splits directory and log views across pages has
|
||||
been reworked. The old way was "Fetch all the information you can
|
||||
find, then display only one page's worth." The new way is "Fetch
|
||||
only what you need to display the page requested, plus a little bit
|
||||
of border information." This provides a large performance
|
||||
enhancement for the default sort orderings.</p>
|
||||
|
||||
</div> <!-- h3 -->
|
||||
|
||||
</div> <!-- h2 -->
|
||||
|
||||
</body>
|
||||
</html>
|
|
@ -0,0 +1,49 @@
|
|||
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
|
||||
<html>
|
||||
<head>
|
||||
<title>ViewVC: 1.2.0 Release Notes</title>
|
||||
<style>
|
||||
.h2, .h3 {
|
||||
padding: 0.25em 0em;
|
||||
background: white;
|
||||
}
|
||||
.warning {
|
||||
font-style: italic;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<h1>ViewVC 1.2.0 Release Notes</h1>
|
||||
|
||||
<div class="h2">
|
||||
<h2 id="introduction">Introduction</h2>
|
||||
|
||||
<p>ViewVC 1.2.0 is the superset of all previous ViewVC releases.</p>
|
||||
|
||||
</div> <!-- h2 -->
|
||||
|
||||
<div class="h2">
|
||||
<h2 id="compatibility">Compatibility</h2>
|
||||
|
||||
<p>Each ViewVC release strives to maintain URL stability with previous
|
||||
releases, and 1.2.0 is no exception. All URLs considered valid for
|
||||
previous ViewVC releases should continue to work correctly in this
|
||||
release, though possibly only via the use of HTTP redirects
|
||||
(generated by ViewVC itself).</p>
|
||||
|
||||
</div> <!-- h2 -->
|
||||
|
||||
<div class="h2">
|
||||
<h2 id="compatibility">Features and Fixes</h2>
|
||||
|
||||
<div class="h3">
|
||||
<h3 id=""></h3>
|
||||
|
||||
</div> <!-- h3 -->
|
||||
|
||||
</div> <!-- h2 -->
|
||||
|
||||
</body>
|
||||
</html>
|
|
@ -1,6 +1,6 @@
|
|||
<html>
|
||||
<head>
|
||||
<title>ViewVC 1.0 Template Authoring Guide</title>
|
||||
<title>ViewVC 1.2 Template Authoring Guide</title>
|
||||
<style>
|
||||
body {
|
||||
background-color: rgb(180,193,205);
|
||||
|
@ -29,22 +29,26 @@ td {
|
|||
.varlevel1 { background: rgb(65%,85%,65%); }
|
||||
.varlevel2 { background: rgb(70%,90%,70%); }
|
||||
.varlevel3 { background: rgb(75%,95%,75%); }
|
||||
.varlevel4 { background: rgb(80%,100%,80%); }
|
||||
.varlevel5 { background: rgb(85%,100%,85%); }
|
||||
.varname { font-family: monospace; }
|
||||
.varlevel1 .varname { padding-left: 0; }
|
||||
.varlevel2 .varname { padding-left: 2em; }
|
||||
.varlevel3 .varname { padding-left: 4em; }
|
||||
.varlevel4 .varname { padding-left: 6em; }
|
||||
.varlevel5 .varname { padding-left: 8em; }
|
||||
.toc-list { font-size: 90%; }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<h1>ViewVC 1.0 Template Authoring Guide</h1>
|
||||
<h1>ViewVC 1.2 Template Authoring Guide</h1>
|
||||
|
||||
<div class="h2">
|
||||
<h2 id="introduction">Introduction</h2>
|
||||
|
||||
<p>This document represents an (unfinished) attempt at providing
|
||||
documentation for how to customize ViewVC 1.0-dev's HTML output via
|
||||
instructions for how to customize ViewVC's HTML output via
|
||||
modification of its templates.</p>
|
||||
|
||||
</div>
|
||||
|
@ -161,12 +165,6 @@ td {
|
|||
resource. Valid only when <var>pathtype</var> is <tt>file</tt>
|
||||
or (for Subversion roots) <tt>dir</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">log_rev_href</td>
|
||||
<td>String</td>
|
||||
<td>Revision number of the file-revision currently being viewed, or
|
||||
None.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">nav_path</td>
|
||||
<td>List</td>
|
||||
|
@ -321,7 +319,7 @@ td {
|
|||
<tr class="varlevel1">
|
||||
<td class="varname">pathrev_hidden_values</td>
|
||||
<td>List</td>
|
||||
<td>Hidden value name/value pairs for the revision/tag selection form.</td>
|
||||
<td>Hidden field name/value pairs for the revision/tag selection form.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">pathrev_clear_action</td>
|
||||
|
@ -331,7 +329,7 @@ td {
|
|||
<tr class="varlevel1">
|
||||
<td class="varname">pathrev_clear_hidden_values</td>
|
||||
<td>List</td>
|
||||
<td>Hidden value name/value pairs for the path revision clear button.</td>
|
||||
<td>Hidden field name/value pairs for the path revision clear button.</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
@ -450,10 +448,10 @@ td {
|
|||
<tr class="varlevel1">
|
||||
<td class="varname">annotation</td>
|
||||
<td>String</td>
|
||||
<td>If set, indicates that annotations were requested. Valid values
|
||||
are "annotated" (annotation was successful), "binary" (file contents
|
||||
are not line-based and human-readable), and "error" (something went
|
||||
wrong during annotation).</td>
|
||||
<td>Valid values are "none" (no annotations were attempted),
|
||||
"annotated" (annotation was successful), "binary" (file contents
|
||||
are not line-based and human-readable), and "error" (something
|
||||
went wrong during annotation).</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">author</td>
|
||||
|
@ -604,6 +602,45 @@ td {
|
|||
<td colspan="3">Includes all variables from the
|
||||
<a href="#variables-common">COMMON</a> variable set</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">gbbox</td>
|
||||
<td>Boolean</td>
|
||||
<td>Toggle generation of a branch box at the tip of all branches in
|
||||
the revision graph.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">gflip</td>
|
||||
<td>Boolean</td>
|
||||
<td>Toggle the direction of the revision graph.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">gleft</td>
|
||||
<td>Boolean</td>
|
||||
<td>Toggle the orientation of the revision graph.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">gmaxtag</td>
|
||||
<td>String</td>
|
||||
<td>Number of tags per revision to display in the revision graph.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">graph_action</td>
|
||||
<td>String</td>
|
||||
<td>Form action URL for the graph customization form.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">graph_hidden_values</td>
|
||||
<td>String</td>
|
||||
<td>Hidden value name/value pairs for the graph customization form.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">gshow</td>
|
||||
<td>String</td>
|
||||
<td>Classes of revisions to show in the revision graph. Valid values
|
||||
are <tt>all</tt> (all revision), <tt>inittagged</tt> (initial
|
||||
revision(s) and tagged revisions), and <tt>tagged</tt> (tagged
|
||||
revisions only).</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">imagemap</td>
|
||||
<td>String</td>
|
||||
|
@ -616,6 +653,37 @@ td {
|
|||
<td>URL of the ViewVC revision graph image for the current
|
||||
resource.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">opt_gbbox</td>
|
||||
<td>Boolean</td>
|
||||
<td>Specifies whether the user is allowed to toggle the generation
|
||||
of branch boxes at the tip of all branches in the revision
|
||||
graph.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">opt_gflip</td>
|
||||
<td>Boolean</td>
|
||||
<td>Specifies whether the user is allowed to toggle the direction
|
||||
of the revision graph.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">opt_gleft</td>
|
||||
<td>Boolean</td>
|
||||
<td>Specifies whether the user is allowed to toggle the orientation
|
||||
of the revision graph.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">opt_gmaxtag</td>
|
||||
<td>Boolean</td>
|
||||
<td>Specifies whether the user is allowed to configure the maximum
|
||||
number of tags per revision show in the revision graph.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">opt_gshow</td>
|
||||
<td>Boolean</td>
|
||||
<td>Specifies whether the user is allowed to configure which
|
||||
classes of revisions are shown in the revision graph.</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
@ -636,30 +704,64 @@ td {
|
|||
<a href="#variables-common">COMMON</a> variable set</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">changes</td>
|
||||
<td class="varname">diffs</td>
|
||||
<td>List</td>
|
||||
<td>Set of objects which contain information about a single line of
|
||||
file difference data. Valid only when <var>diff_format</var> is
|
||||
<tt>h</tt> or <tt>l</tt>.</td>
|
||||
<td>List of all blocks of differences between the two sides, including content
|
||||
and property differences.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">changes.have_left</td>
|
||||
<td>Boolean</td>
|
||||
<td>Specifies whether the left file has a line of content relevant
|
||||
to the difference data line. Valid only when
|
||||
<var>changes.type</var> is <tt>change</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">changes.have_right</td>
|
||||
<td>Boolean</td>
|
||||
<td>Specifies whether the right file has a line of content relevant
|
||||
to the difference data line. Valid only when
|
||||
<var>changes.type</var> is <tt>change</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">changes.left</td>
|
||||
<td class="varname">diffs.diff_block_format</td>
|
||||
<td>String</td>
|
||||
<td>Textual contents of the relevant line in the left file. Valid
|
||||
<td>Indicates the type of this block. One of the <tt>anchor</tt> (no display,
|
||||
create an anchor), <tt>raw</tt> (non-colored diff, display as produced),
|
||||
<tt>sidebyside-1</tt> (traditional side-by-side diff),
|
||||
<tt>sidebyside-2</tt> (newer side-by-side diff with intraline changes),
|
||||
<tt>unified</tt> (colored unified diff).</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">diffs.anchor</td>
|
||||
<td>String</td>
|
||||
<td>If <var>diffs.diff_block_format</var> is <tt>anchor</tt>, this variable specifies
|
||||
the anchor name.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">diffs.changes</td>
|
||||
<td>List/Container</td>
|
||||
<td>Set of objects which contain information about a change in a single
|
||||
object (file or property). Not present if <var>diffs.diff_block_format</var> is
|
||||
<tt>anchor</tt>, otherwise has different format depending on
|
||||
<var>diffs.diff_block_format</var> (applicable as indicated in brackets below).</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.changes.raw</td>
|
||||
<td>String</td>
|
||||
<td>[raw] Diff text. Valid only if <var>diffs.changes.type</var> is
|
||||
<tt>raw</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.changes.type</td>
|
||||
<td>String</td>
|
||||
<td>[raw] The type of change. Values: <tt>binary-diff</tt>,
|
||||
<tt>error</tt>, <tt>no-changes</tt>, <tt>raw</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.changes.have_left</td>
|
||||
<td>Boolean</td>
|
||||
<td>[sidebyside-1] Specifies whether the left file has a line of content relevant
|
||||
to the difference data line. Valid only when
|
||||
<var>changes.type</var> is <tt>change</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.changes.have_right</td>
|
||||
<td>Boolean</td>
|
||||
<td>[sidebyside-1] Specifies whether the right file has a line of content relevant
|
||||
to the difference data line. Valid only when
|
||||
<var>changes.type</var> is <tt>change</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.changes.left</td>
|
||||
<td>String</td>
|
||||
<td>[sidebyside-1] Textual contents of the relevant line in the left file. Valid
|
||||
only when <var>changes.type</var> is <tt>change</tt>,
|
||||
<tt>context</tt>, or <tt>remove</tt>. When
|
||||
<var>changes.type</var> is <tt>change</tt>, valid only when
|
||||
|
@ -667,10 +769,10 @@ td {
|
|||
between missing lines and empty lines, which EZT does not
|
||||
support).</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">changes.right</td>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.changes.right</td>
|
||||
<td>String</td>
|
||||
<td>Textual contents of the relevant line in the right file. Valid
|
||||
<td>[sidebyside-1] Textual contents of the relevant line in the right file. Valid
|
||||
only when <var>changes.type</var> is <tt>add</tt>, <tt>change</tt>,
|
||||
or <tt>context</tt>. When
|
||||
<var>changes.type</var> is <tt>change</tt>, valid only when
|
||||
|
@ -678,40 +780,264 @@ td {
|
|||
between missing lines and empty lines, which EZT does not
|
||||
support).</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">changes.line_info_extra</td>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.changes.line_info_extra</td>
|
||||
<td>String</td>
|
||||
<td>Additional line information for the current difference hunk.
|
||||
<td>[sidebyside-1] Additional line information for the current difference hunk.
|
||||
Valid only when <var>changes.type</var> is <tt>header</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">changes.line_info_left</td>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.changes.line_info_left</td>
|
||||
<td>String</td>
|
||||
<td>First line number represented by the current hunk in the left
|
||||
<td>[sidebyside-1] First line number represented by the current hunk in the left
|
||||
file. Valid only when <var>changes.type</var> is <tt>header</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">changes.line_info_right</td>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.changes.line_info_right</td>
|
||||
<td>String</td>
|
||||
<td>First line number represented by the current hunk in the right
|
||||
<td>[sidebyside-1] First line number represented by the current hunk in the right
|
||||
file. Valid only when <var>changes.type</var> is <tt>header</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">changes.line_number</td>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.changes.line_number</td>
|
||||
<td>String</td>
|
||||
<td>Line number (1-based) of the line.</td>
|
||||
<td>[sidebyside-1] Line number (1-based) of the line.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">changes.type</td>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.changes.type</td>
|
||||
<td>String</td>
|
||||
<td>The type of change. Value values: <tt>add</tt>,
|
||||
<tt>change</tt>, <tt>context</tt>, <tt>header</tt>,
|
||||
<td>[sidebyside-1] The type of change. Values: <tt>add</tt>, <tt>binary-diff</tt>,
|
||||
<tt>change</tt>, <tt>context</tt>, <tt>error</tt>, <tt>header</tt>,
|
||||
<tt>no-changes</tt>, <tt>remove</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.changes.columns</td>
|
||||
<td>List</td>
|
||||
<td>[sidebyside-2] List of two columns for left and right parts of the diff.</td>
|
||||
</tr>
|
||||
<tr class="varlevel4">
|
||||
<td class="varname">diffs.changes.columns.line_number</td>
|
||||
<td>String</td>
|
||||
<td>[sidebyside-2] Line number in the left/right column.</td>
|
||||
</tr>
|
||||
<tr class="varlevel4">
|
||||
<td class="varname">diffs.changes.columns.segments</td>
|
||||
<td>List</td>
|
||||
<td>[sidebyside-2] Left/right line, broken into change segments.</td>
|
||||
</tr>
|
||||
<tr class="varlevel5">
|
||||
<td class="varname">diffs.changes.columns.segments.text</td>
|
||||
<td>String</td>
|
||||
<td>[sidebyside-2] Text of this segment.</td>
|
||||
</tr>
|
||||
<tr class="varlevel5">
|
||||
<td class="varname">diffs.changes.columns.segments.type</td>
|
||||
<td>String</td>
|
||||
<td>[sidebyside-2] Not set if the segment is the same in both left and right sides;
|
||||
otherwise, one of the <tt>add</tt>, <tt>remove</tt> or <tt>change</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.changes.gap</td>
|
||||
<td>Boolean</td>
|
||||
<td>[sidebyside-2] If true, indicates that change blocks are non-contiguous
|
||||
and that the template should display some sort of ellipsis before the
|
||||
current block.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.changes.type</td>
|
||||
<td>String</td>
|
||||
<td>[sidebyside-2] The type of change. Values: <tt>binary-diff</tt>,
|
||||
<tt>error</tt>, <tt>intraline</tt>, <tt>no-changes</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.changes.segments</td>
|
||||
<td>List</td>
|
||||
<td>[unified] Left/right line, broken into change segments.</td>
|
||||
</tr>
|
||||
<tr class="varlevel4">
|
||||
<td class="varname">diffs.changes.segments.text</td>
|
||||
<td>String</td>
|
||||
<td>[unified] Text of this segment.</td>
|
||||
</tr>
|
||||
<tr class="varlevel4">
|
||||
<td class="varname">diffs.changes.segments.type</td>
|
||||
<td>String</td>
|
||||
<td>[unified] Not set if the segment is the same in both left and right sides;
|
||||
otherwise, one of the <tt>add</tt>, <tt>remove</tt> or <tt>change</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.changes.type</td>
|
||||
<td>String</td>
|
||||
<td>[unified] The type of change. Values: <tt>add</tt>, <tt>binary-diff</tt>,
|
||||
<tt>error</tt>, <tt>no-changes</tt>, <tt>remove</tt> or empty string
|
||||
if the line was not changed (context line).</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">diffs.left</td>
|
||||
<td>Container</td>
|
||||
<td>Container object for grouping information about the left file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.left.ago</td>
|
||||
<td>String</td>
|
||||
<td>Text description of the time elapsed since <var>left.date</date>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.left.annotate_href</td>
|
||||
<td>String</td>
|
||||
<td>URL of the ViewVC annotation view for the left file.
|
||||
Valid only when <var>entries.pathtype</var> is <tt>file</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.left.author</td>
|
||||
<td>String</td>
|
||||
<td>Author of the revision of the left file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.left.date</td>
|
||||
<td>String</td>
|
||||
<td>Date (in UTC if not otherwise configured) in which the left file
|
||||
revision was created.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.left.download_href</td>
|
||||
<td>String</td>
|
||||
<td>URL to download the HEAD revision of the left file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.left.download_text_href</td>
|
||||
<td>String</td>
|
||||
<td>URL to download the HEAD revision of the left file as
|
||||
<tt>text/plain</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.left.log</td>
|
||||
<td>String</td>
|
||||
<td>Log message of the left file revision.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.left.path</td>
|
||||
<td>String</td>
|
||||
<td>Path of the left file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.left.prefer_markup</td>
|
||||
<td>Boolean</td>
|
||||
<td>Indicates whether to make the default file link a link to the markup
|
||||
page instead of the checkout page.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.left.rev</td>
|
||||
<td>String</td>
|
||||
<td>Revision of the left file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.left.revision_href</td>
|
||||
<td>String</td>
|
||||
<td>URL of the Subversion revision view for the left file's
|
||||
current revision. Valid only when <var>roottype</var> is
|
||||
<tt>svn</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.left.size</td>
|
||||
<td>String</td>
|
||||
<td>Size of the left file revision, in bytes. Subversion only.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.left.tag</td>
|
||||
<td>String</td>
|
||||
<td>Tag of the left file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.left.view_href</td>
|
||||
<td>String</td>
|
||||
<td>This is a URL for the markup view of the left file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">diffs.right</td>
|
||||
<td>Container</td>
|
||||
<td>Container object for grouping information about the right file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.right.ago</td>
|
||||
<td>String</td>
|
||||
<td>Text description of the time elapsed since <var>right.date</var>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.right.annotate_href</td>
|
||||
<td>String</td>
|
||||
<td>URL of the ViewVC annotation view for the right file.
|
||||
Valid only when <var>entries.pathtype</var> is <tt>file</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.right.author</td>
|
||||
<td>String</td>
|
||||
<td>Author of the revision of the right file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.right.date</td>
|
||||
<td>String</td>
|
||||
<td>Date (in UTC if not otherwise configured) in which the right file
|
||||
revision was created.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.right.download_href</td>
|
||||
<td>String</td>
|
||||
<td>URL to download the HEAD revision of the right file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.right.download_text_href</td>
|
||||
<td>String</td>
|
||||
<td>URL to download the HEAD revision of the right file as
|
||||
<tt>text/plain</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.right.log</td>
|
||||
<td>String</td>
|
||||
<td>Log message of the right file revision.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.right.path</td>
|
||||
<td>String</td>
|
||||
<td>Path of the right file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.right.prefer_markup</td>
|
||||
<td>Boolean</td>
|
||||
<td>Indicates whether to make the default file link a link to the markup
|
||||
page instead of the checkout page.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.right.rev</td>
|
||||
<td>String</td>
|
||||
<td>Revision of the right file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.right.revision_href</td>
|
||||
<td>String</td>
|
||||
<td>URL of the Subversion revision view for the right file's
|
||||
current revision. Valid only when <var>roottype</var> is
|
||||
<tt>svn</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.right.size</td>
|
||||
<td>String</td>
|
||||
<td>Size of the right file revision, in bytes. Subversion only.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.right.tag</td>
|
||||
<td>String</td>
|
||||
<td>Tag of the right file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel3">
|
||||
<td class="varname">diffs.right.view_href</td>
|
||||
<td>String</td>
|
||||
<td>This is a URL for the markup view of the right file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">diff_format</td>
|
||||
<td>String</td>
|
||||
<td>Difference dislay format: Valid values are <tt>c</tt>
|
||||
<td>Difference display format: Valid values are <tt>c</tt>
|
||||
(context), <tt>f</tt> (full human-readable),
|
||||
<tt>h</tt> (human-readable, or colored), <tt>l</tt> (long
|
||||
human-readable), <tt>s</tt> (side-by-side), <tt>u</tt>
|
||||
|
@ -725,135 +1051,17 @@ td {
|
|||
<tr class="varlevel1">
|
||||
<td class="varname">diff_format_hidden_values</td>
|
||||
<td>List</td>
|
||||
<td>Hidden value name/value pairs for the diff format selection form.</td>
|
||||
<td>Hidden field name/value pairs for the diff format selection form.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">left</td>
|
||||
<td>Container</td>
|
||||
<td>Container object for grouping information about the left file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">left.annotate_href</td>
|
||||
<td>String</td>
|
||||
<td>URL of the ViewVC annotation view for the left file.
|
||||
Valid only when <var>entries.pathtype</var> is <tt>file</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">left.date</td>
|
||||
<td>String</td>
|
||||
<td>Date (in UTC if not otherwise configured) in which the left file
|
||||
revision was created.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">left.download_href</td>
|
||||
<td>String</td>
|
||||
<td>URL to download the HEAD revision of the left file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">left.download_text_href</td>
|
||||
<td>String</td>
|
||||
<td>URL to download the HEAD revision of the left file as
|
||||
<tt>text/plain</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">left.path</td>
|
||||
<td>String</td>
|
||||
<td>Path of the left file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">left.prefer_markup</td>
|
||||
<td class="varname">hide_legend</td>
|
||||
<td>Boolean</td>
|
||||
<td>Indicates whether to make the default file link a link to the markup
|
||||
page instead of the checkout page.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">left.rev</td>
|
||||
<td>String</td>
|
||||
<td>Revision of the left file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">left.revision_href</td>
|
||||
<td>String</td>
|
||||
<td>URL of the Subversion revision view for the left file's
|
||||
current revision. Valid only when <var>roottype</var> is
|
||||
<tt>svn</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">left.tag</td>
|
||||
<td>String</td>
|
||||
<td>Tag of the left file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">left.view_href</td>
|
||||
<td>String</td>
|
||||
<td>This is a URL for the markup view of the left file.</td>
|
||||
<td>Indicates whether the display format requires displaying a legend</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">raw_diff</td>
|
||||
<td class="varname">patch_href</td>
|
||||
<td>String</td>
|
||||
<td>Raw difference text. Valid only when <var>diff_format</var> is
|
||||
<tt>c</tt>, <tt>s</tt>, or <tt>u</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">right</td>
|
||||
<td>Container</td>
|
||||
<td>Container object for grouping information about the right file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">right.annotate_href</td>
|
||||
<td>String</td>
|
||||
<td>URL of the ViewVC annotation view for the right file.
|
||||
Valid only when <var>entries.pathtype</var> is <tt>file</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">right.date</td>
|
||||
<td>String</td>
|
||||
<td>Date (in UTC if not otherwise configured) in which the right file
|
||||
revision was created.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">right.download_href</td>
|
||||
<td>String</td>
|
||||
<td>URL to download the HEAD revision of the right file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">right.download_text_href</td>
|
||||
<td>String</td>
|
||||
<td>URL to download the HEAD revision of the right file as
|
||||
<tt>text/plain</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">right.path</td>
|
||||
<td>String</td>
|
||||
<td>Path of the right file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">right.prefer_markup</td>
|
||||
<td>Boolean</td>
|
||||
<td>Indicates whether to make the default file link a link to the markup
|
||||
page instead of the checkout page.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">right.rev</td>
|
||||
<td>String</td>
|
||||
<td>Revision of the right file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">right.revision_href</td>
|
||||
<td>String</td>
|
||||
<td>URL of the Subversion revision view for the right file's
|
||||
current revision. Valid only when <var>roottype</var> is
|
||||
<tt>svn</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">right.tag</td>
|
||||
<td>String</td>
|
||||
<td>Tag of the right file.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">right.view_href</td>
|
||||
<td>String</td>
|
||||
<td>This is a URL for the markup view of the right file.</td>
|
||||
<td>URL of the patch view for the file.</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
@ -905,7 +1113,7 @@ td {
|
|||
<tr class="varlevel1">
|
||||
<td class="varname">dir_paging_hidden_values</td>
|
||||
<td>List</td>
|
||||
<td>Hidden value name/value pairs for the page selection form.</td>
|
||||
<td>Hidden field name/value pairs for the page selection form.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">entries</td>
|
||||
|
@ -1087,23 +1295,16 @@ td {
|
|||
<td>String</td>
|
||||
<td>Current search expression, if any.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">search_re_form</td>
|
||||
<td>Boolean</td>
|
||||
<td>Indicates whether or not to display the regular expression search
|
||||
form. Value depends on the whether searching is enabled in the
|
||||
configuration and whether or not the current directory is
|
||||
empty.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">search_re_action</td>
|
||||
<td>String</td>
|
||||
<td>Form action URL for the regular expression search form.</td>
|
||||
<td>Form action URL for the regular expression search form,
|
||||
if searching is available.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">search_re_hidden_values</td>
|
||||
<td>List</td>
|
||||
<td>Hidden value name/value pairs for the regular expression search form.</td>
|
||||
<td>Hidden field name/value pairs for the regular expression search form.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">show_attic_href</td>
|
||||
|
@ -1249,7 +1450,7 @@ td {
|
|||
<tr class="varlevel1">
|
||||
<td class="varname">diff_select_hidden_values</td>
|
||||
<td>List</td>
|
||||
<td>Hidden value name/value pairs for the diff selection form.</td>
|
||||
<td>Hidden field name/value pairs for the diff selection form.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">entries</td>
|
||||
|
@ -1530,7 +1731,7 @@ td {
|
|||
<tr class="varlevel1">
|
||||
<td class="varname">log_paging_hidden_values</td>
|
||||
<td>List</td>
|
||||
<td>Hidden value name/value pairs for the page selection form.</td>
|
||||
<td>Hidden field name/value pairs for the page selection form.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">logsort</td>
|
||||
|
@ -1546,7 +1747,7 @@ td {
|
|||
<tr class="varlevel1">
|
||||
<td class="varname">logsort_hidden_values</td>
|
||||
<td>List</td>
|
||||
<td>Hidden value name/value pairs for the log sort drop down box</td>
|
||||
<td>Hidden field name/value pairs for the log sort drop down box</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">mime_type</td>
|
||||
|
@ -1794,6 +1995,14 @@ td {
|
|||
<td>Indicates how query results are being sorted. Possible values:
|
||||
<tt>date</tt>, <tt>author</tt>, and <tt>file</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">row_limit_reached</td>
|
||||
<td>Boolean</td>
|
||||
<td>Indicates whether the internal database row limit threshold (set
|
||||
via the <code>cvsdb.row_limit</code>
|
||||
and <code>cvsdb.rss_row_limit</code> configuration options) was
|
||||
reached by the query.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">show_branch</td>
|
||||
<td>Boolean</td>
|
||||
|
@ -1910,7 +2119,7 @@ td {
|
|||
<tr class="varlevel1">
|
||||
<td class="varname">query_hidden_values</td>
|
||||
<td>List</td>
|
||||
<td>Hidden value name/value pairs for query form.</td>
|
||||
<td>Hidden field name/value pairs for query form.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">querysort</td>
|
||||
|
@ -2050,7 +2259,7 @@ td {
|
|||
<tr class="varlevel1">
|
||||
<td class="varname">jump_rev_hidden_values</td>
|
||||
<td>List</td>
|
||||
<td>Hidden value name/value pairs for revision jump form.</td>
|
||||
<td>Hidden field name/value pairs for revision jump form.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">limit_changes</td>
|
||||
|
@ -2073,6 +2282,11 @@ td {
|
|||
<td>String</td>
|
||||
<td>URL for the current view but with <tt>limit_changes</tt> disabled.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">num_changes</td>
|
||||
<td>String</td>
|
||||
<td>Number of paths changed in this revision.</td>
|
||||
</tr>
|
||||
<tr class="varlevel1">
|
||||
<td class="varname">next_href</td>
|
||||
<td>String</td>
|
||||
|
@ -2112,6 +2326,38 @@ td {
|
|||
<td>List</td>
|
||||
<td>Set of configured viewable repositories.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">roots.ago</td>
|
||||
<td>String</td>
|
||||
<td>Textual description of the time since <var>roots.date</var>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">roots.author</td>
|
||||
<td>String</td>
|
||||
<td>Username of the last modifier of the root.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">root.date</td>
|
||||
<td>String</td>
|
||||
<td>Date (in UTC if not otherwise configured) of the last
|
||||
modification of the root.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">roots.href</td>
|
||||
<td>String</td>
|
||||
<td>URL of root directory view for a configured repository.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">roots.log</td>
|
||||
<td>String</td>
|
||||
<td>Log message of last modification to the root.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">roots.log_href</td>
|
||||
<td>String</td>
|
||||
<td>URL of log revision view for the top-most (root) directory of
|
||||
the root (repository).</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">roots.name</td>
|
||||
<td>String</td>
|
||||
|
@ -2125,17 +2371,24 @@ td {
|
|||
configuration can have negative security implications. Use this
|
||||
token at your own risk.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">roots.rev</td>
|
||||
<td>String</td>
|
||||
<td>Youngest revision of the root.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">roots.short_log</td>
|
||||
<td>String</td>
|
||||
<td>Log message of last modification to the root, truncated to
|
||||
contain no more than the number of characters specified by
|
||||
the <code>short_log_len</code> configuration option.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">roots.type</td>
|
||||
<td>String</td>
|
||||
<td>Version control type of a configured repository. Valid
|
||||
values: <tt>cvs</tt>, <tt>svn</tt>.</td>
|
||||
</tr>
|
||||
<tr class="varlevel2">
|
||||
<td class="varname">roots.href</td>
|
||||
<td>String</td>
|
||||
<td>URL of root directory view for a configured repository.</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
|
|
|
@ -28,12 +28,12 @@ td {
|
|||
.h3 { border-width: 1px 0 0 0; }
|
||||
.toc-list { font-size: 90%; }
|
||||
.varname { font-family: monospace; }
|
||||
.added { background: rgb(50%,75%,25%); }
|
||||
.added { background: rgb(60%,90%,60%); }
|
||||
.unchanged { background: rgb(75%,75%,75%); }
|
||||
.renamed { background: rgb(75%,50%,75%); }
|
||||
.changed { background: rgb(100%,100%,25%); }
|
||||
.replaced { background: rgb(100%,75%,0%); }
|
||||
.removed { background: rgb(100%,25%,25%); }
|
||||
.renamed { background: rgb(80%,60%,80%); }
|
||||
.changed { background: rgb(100%,100%,50%); }
|
||||
.replaced { background: rgb(100%,80%,40%); }
|
||||
.removed { background: rgb(100%,70%,70%); }
|
||||
</style>
|
||||
</head>
|
||||
|
||||
|
@ -67,12 +67,21 @@ td {
|
|||
<h2 id="toc">Table of Contents</h2>
|
||||
<ul class="toc-list">
|
||||
<li><a href="#introduction">Introduction</a></li>
|
||||
<li><a href="#sec-from-1-1">Upgrading From ViewVC 1.1</a></li>
|
||||
<li><a href="#sec-from-1-0">Upgrading From ViewVC 1.0</a></li>
|
||||
<li><a href="#sec-from-0-9">Upgrading From ViewCVS 0.9</a></li>
|
||||
<li><a href="#sec-from-0-8">Upgrading From ViewCVS 0.8</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="h2">
|
||||
<h2 id="sec-from-1-0">Upgrading From ViewVC 1.1</h2>
|
||||
|
||||
<p>This section discusses how to upgrade ViewVC 1.1.x to ViewVC 1.2.x.</p>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="h2">
|
||||
<h2 id="sec-from-1-0">Upgrading From ViewVC 1.0</h2>
|
||||
|
||||
|
@ -314,7 +323,7 @@ td {
|
|||
all = viewvc.*
|
||||
|
||||
[all-options]
|
||||
allow_tar = 1
|
||||
allowed_views = annotate, diff, markup, tar
|
||||
</pre>
|
||||
</blockquote>
|
||||
|
||||
|
@ -324,7 +333,7 @@ allow_tar = 1
|
|||
all = viewvc.*
|
||||
|
||||
[vhost-all/options]
|
||||
allow_tar = 1
|
||||
allowed_views = annotate, diff, markup, tar
|
||||
</pre>
|
||||
</blockquote>
|
||||
|
||||
|
@ -1563,13 +1572,8 @@ allow_tar = 1
|
|||
<div class="h2">
|
||||
<h2 id="sec-from-0-8">Upgrading From ViewCVS 0.8</h2>
|
||||
|
||||
<p>This section discusses how to upgrade ViewCVS 0.8 to version
|
||||
0.9 or a later version of the software.</p>
|
||||
<p>This section discusses how to upgrade ViewCVS 0.8 to ViewCVS 0.9.x.</p>
|
||||
|
||||
<p><strong>NOTE:</strong> these changes will bring you up to the
|
||||
requirements of version 0.9. You must also follow the directions
|
||||
for <a href="#sec-from-0-9">upgrading from 0.9</a>.</p>
|
||||
|
||||
<div class="h3">
|
||||
<h3>Configuration Options</h3>
|
||||
|
||||
|
@ -1579,92 +1583,50 @@ allow_tar = 1
|
|||
options, then you will need to make corresponding changes in the
|
||||
templates.</p>
|
||||
|
||||
<dl>
|
||||
<dt>
|
||||
Colors:
|
||||
<strong>diff_heading</strong>,
|
||||
<strong>diff_empty</strong>,
|
||||
<strong>diff_remove</strong>,
|
||||
<strong>diff_change</strong>,
|
||||
<strong>diff_add</strong>,
|
||||
and <strong>diff_dark_change</strong>
|
||||
</dt>
|
||||
<dd>
|
||||
These options have been incorporated into the
|
||||
<code>diff.ezt</code> template.
|
||||
<dl>
|
||||
<dt>Colors: <code>diff_heading</code>, <code>diff_empty</code>,
|
||||
<code>diff_remove</code>, <code>diff_change</code>,
|
||||
<code>diff_add</code>, and <code>diff_dark_change</code></dt>
|
||||
<dd>These options have been incorporated into the
|
||||
<code>diff.ezt</code> template.</dd>
|
||||
|
||||
<p></p>
|
||||
</dd>
|
||||
<dt><code>markup_log</code></dt>
|
||||
<dd>This option has been incorporated into the
|
||||
<code>markup.ezt</code> template.</dd>
|
||||
|
||||
<dt><strong>markup_log</strong></dt>
|
||||
<dd>
|
||||
This option has been incorporated into the
|
||||
<code>markup.ezt</code> template.
|
||||
<dt>Colors: <code>nav_header</code> and
|
||||
<code>alt_background</code></dt>
|
||||
<dd>These options have been incorporated into the
|
||||
<code>header.ezt</code> template.</dd>
|
||||
|
||||
<p></p>
|
||||
</dd>
|
||||
<dt>Images: <code>back_icon</code>, <code>dir_icon</code>,
|
||||
and <code>file_icon</code></dt>
|
||||
<dd>These options have been incorporated into the
|
||||
<code>directory.ezt</code>, <code>header.ezt</code>,
|
||||
<code>log.ezt</code>, <code>log_table.ezt</code>, and
|
||||
<code>query.ezt</code> templates.</dd>
|
||||
|
||||
<dt>Colors: <strong>nav_header</strong>
|
||||
and <strong>alt_background</strong></dt>
|
||||
<dd>
|
||||
These options have been incorporated into the
|
||||
<code>header.ezt</code> template.
|
||||
<dt><code>use_java_script</code>
|
||||
and <code>open_extern_window</code></dt>
|
||||
<dd>The templates now use JavaScript in all applicable places, and
|
||||
open external windows for most downloading and viewing of
|
||||
files. If you wish to not use JavaScript and/or external
|
||||
windows, then remove the feature(s) from the templates.</dd>
|
||||
|
||||
<p></p>
|
||||
</dd>
|
||||
<dt><code>show_author</code></dt>
|
||||
<dd>Changing this option would be quite strange and rare. If you
|
||||
do not want to show the author for the revisions, then you
|
||||
should remove it from the various templates.</dd>
|
||||
|
||||
<dt>
|
||||
Images:
|
||||
<strong>back_icon</strong>,
|
||||
<strong>dir_icon</strong>,
|
||||
and <strong>file_icon</strong>
|
||||
</dt>
|
||||
<dd>
|
||||
These options have been incorporated into the
|
||||
<code>directory.ezt</code>, <code>header.ezt</code>,
|
||||
<code>log.ezt</code>, <code>log_table.ezt</code>, and
|
||||
<code>query.ezt</code> templates.
|
||||
<dt><code>hide_non_readable</code></dt>
|
||||
<dd>This option was never used, so it has been removed.</dd>
|
||||
|
||||
<p></p>
|
||||
</dd>
|
||||
<dt><code>flip_links_in_dirview</code></dt>
|
||||
<dd>This option is no longer available. If you want the links in
|
||||
your directory view flipped, then you may use the
|
||||
<code>dir_alternate.ezt</code> template.</dd>
|
||||
|
||||
<dt><strong>use_java_script</strong>
|
||||
and <strong>open_extern_window</strong></dt>
|
||||
<dd>
|
||||
The templates now use JavaScript in all applicable places,
|
||||
and open external windows for most downloading and viewing
|
||||
of files. If you wish to not use JavaScript and/or external
|
||||
windows, then remove the feature(s) from the templates.
|
||||
|
||||
<p></p>
|
||||
</dd>
|
||||
|
||||
<dt><strong>show_author</strong></dt>
|
||||
<dd>
|
||||
Changing this option would be quite strange and rare. If you
|
||||
do not want to show the author for the revisions, then you
|
||||
should remove it from the various templates.
|
||||
|
||||
<p></p>
|
||||
</dd>
|
||||
|
||||
<dt><strong>hide_non_readable</strong></dt>
|
||||
<dd>
|
||||
This option was never used, so it has been removed.
|
||||
|
||||
<p></p>
|
||||
</dd>
|
||||
|
||||
<dt><strong>flip_links_in_dirview</strong></dt>
|
||||
<dd>
|
||||
This option is no longer available. If you want the links in
|
||||
your directory view flipped, then you may use the
|
||||
<code>dir_alternate.ezt</code> template.
|
||||
|
||||
<p></p>
|
||||
</dd>
|
||||
|
||||
</dl>
|
||||
</dl>
|
||||
|
||||
</div>
|
||||
|
||||
|
@ -1675,53 +1637,65 @@ allow_tar = 1
|
|||
removed in 0.9. If you have custom templates that refer to these
|
||||
variables, then you will need to modify your templates.</p>
|
||||
|
||||
<dl>
|
||||
<dt><code>directory.ezt</code>: <var>headers</var></dt>
|
||||
<dd>
|
||||
The headers are now listed explicitly in the template,
|
||||
rather than made available through a list.
|
||||
<p></p>
|
||||
</dd>
|
||||
|
||||
<dt>
|
||||
<code>directory.ezt</code>:
|
||||
<var>rows.cols</var>,
|
||||
and <var>rows.span</var>
|
||||
</dt>
|
||||
<dd>
|
||||
These variables were used in conjunction with the
|
||||
<var>headers</var> variable to control the column
|
||||
displays. This is now controlled explicitly within the
|
||||
templates.
|
||||
<p></p>
|
||||
</dd>
|
||||
|
||||
<dt><code>directory.ezt</code>:
|
||||
<var>rev_in_front</var></dt>
|
||||
<dd>
|
||||
This was used to indicate that revision links should
|
||||
be used in the first column, rather than in their
|
||||
standard place in the second column. Changing the
|
||||
links should now be done in the template, rather than
|
||||
according to this variable. You may want to look at
|
||||
the <code>dir_alternate.ezt</code> template, which has
|
||||
the revision in front.
|
||||
<p></p>
|
||||
</dd>
|
||||
|
||||
<dt><code>directory.ezt</code>:
|
||||
<var>rows.attic</var>
|
||||
and <var>rows.hide_attic_href</var></dt>
|
||||
<dd>
|
||||
These variable were used to manage the hide and
|
||||
showing of the contents of the <code>Attic/</code>
|
||||
subdirectory. Several new variables were introduced
|
||||
which can be used to replace this functionality:
|
||||
<var>show_attic_href</var>,
|
||||
<var>hide_attic_href</var>, and <var>rows.state</var>.
|
||||
<p></p>
|
||||
</dd>
|
||||
</dl>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Variable</th>
|
||||
<th>Location</th>
|
||||
<th>Changes</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr class="removed">
|
||||
<td class="varname">headers</td>
|
||||
<td>directory.ezt</td>
|
||||
<td>removed; headers are now listed explicitly in the template, rather
|
||||
than made available through a list.</td>
|
||||
</tr>
|
||||
<tr class="removed">
|
||||
<td class="varname">rows.cols</td>
|
||||
<td>directory.ezt</td>
|
||||
<td>removed; was used in conjunction with the <var>headers</var>
|
||||
variable to control the column displays. This is now controlled
|
||||
explicitly within the templates.</td>
|
||||
</tr>
|
||||
<tr class="removed">
|
||||
<td class="varname">rows.span</td>
|
||||
<td>directory.ezt</td>
|
||||
<td>removed; was used in conjunction with the <var>headers</var>
|
||||
variable to control the column displays. This is now controlled
|
||||
explicitly within the templates.</td>
|
||||
</tr>
|
||||
<tr class="removed">
|
||||
<td class="varname">rev_in_front</td>
|
||||
<td>directory.ezt</td>
|
||||
<td>removed; was used to indicate that revision links should be used in
|
||||
the first column, rather than in their standard place in the
|
||||
second column. Changing the links should now be done in the
|
||||
template, rather than according to this variable. You may want
|
||||
to look at the <code>dir_alternate.ezt</code> template, which
|
||||
has the revision in front.</dd>
|
||||
</tr>
|
||||
<tr class="removed">
|
||||
<td class="varname">rows.attic</td>
|
||||
<td>directory.ezt</td>
|
||||
<td>removed; used to manage the hide and showing of the
|
||||
contents of the <code>Attic/</code> subdirectory. Several new
|
||||
variables were introduced which can be used to replace this
|
||||
functionality: <var>show_attic_href</var>,
|
||||
<var>hide_attic_href</var>, and <var>rows.state</var>.</td>
|
||||
</tr>
|
||||
<tr class="removed">
|
||||
<td class="varname">rows.hide_attic_href</td>
|
||||
<td>directory.ezt</td>
|
||||
<td>removed; used to manage the hide and showing of the
|
||||
contents of the <code>Attic/</code> subdirectory. Several new
|
||||
variables were introduced which can be used to replace this
|
||||
functionality: <var>show_attic_href</var>,
|
||||
<var>hide_attic_href</var>, and <var>rows.state</var>.</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -654,6 +654,35 @@ th.caption {
|
|||
<td>depends</td>
|
||||
<td><a href="#root-param"><code>root</code> parameter</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>gflip=<var>GFLIP</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>"1" if the revisions in the graph should run
|
||||
youngest-to-oldest; "0" for the reverse</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>gbbox=<var>GBBOX</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>"1" if the revision graph should contain branch boxes at the
|
||||
tip of each branch; "0" otherwise</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>gleft=<var>GLEFT</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>"1" if the revision graph should be orientated left-to-right;
|
||||
"0" otherwise</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>gmaxtag=<var>GMAXTAG</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>maximum number of per-revision tags to show in the revision graph</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>gshow=<var>GSHOW</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>"all", "inittagged", or "tagged" — user-selected classes
|
||||
of revision to show in the graph</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<h3 id="graphimg-view">Graph Image View</h3>
|
||||
|
@ -700,6 +729,35 @@ th.caption {
|
|||
<td>depends</td>
|
||||
<td><a href="#root-param"><code>root</code> parameter</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>gflip=<var>GFLIP</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>"1" if the revisions in the graph should run
|
||||
youngest-to-oldest; "0" for the reverse</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>gbbox=<var>GBBOX</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>"1" if the revision graph should contain branch boxes at the
|
||||
tip of each branch; "0" otherwise</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>gleft=<var>GLEFT</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>"1" if the revision graph should be orientated left-to-right;
|
||||
"0" otherwise</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>gmaxtag=<var>GMAXTAG</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>maximum number of per-revision tags to show in the revision graph</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>gshow=<var>GSHOW</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>"all", "inittagged", or "tagged" — user-selected classes
|
||||
of revision to show in the graph</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<h3 id="log-view">Log View</h3>
|
||||
|
@ -996,7 +1054,7 @@ th.caption {
|
|||
<td>file query string</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>file_match=FILE_MATCH</code></td>
|
||||
<td><code>file_match=<var>FILE_MATCH</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>"exact" "like" "glob" "regex" or "notregex" determining type
|
||||
of file match</td>
|
||||
|
@ -1007,7 +1065,7 @@ th.caption {
|
|||
<td>author query string</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>who_match=WHO_MATCH</code></td>
|
||||
<td><code>who_match=<var>WHO_MATCH</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>"exact" "like" "glob" "regex" or "notregex" determining type
|
||||
of author match</td>
|
||||
|
@ -1024,36 +1082,36 @@ th.caption {
|
|||
of log message match</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>querysort=SORT</code></td>
|
||||
<td><code>querysort=<var>SORT</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>"date" "author" or "file" determining order of query results</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>date=DATE</code></td>
|
||||
<td><code>date=<var>DATE</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>"hours" "day" "week" "month" "all" or "explicit" to filter
|
||||
query results by date</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>hours=HOURS</code></td>
|
||||
<td><code>hours=<var>HOURS</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>number of hours back to include results from when
|
||||
<code><var>DATE</var></code> is "hours"</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>mindate=MINDATE</code></td>
|
||||
<td><code>mindate=<var>MINDATE</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>earliest date to include results from when
|
||||
<code><var>DATE</var></code> is "explicit"</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>maxdate=MAXDATE</code></td>
|
||||
<td><code>maxdate=<var>MAXDATE</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>latest date to include results from when
|
||||
<code><var>DATE</var></code> is "explicit"</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>limit_changes=LIMIT_CHANGES</code></td>
|
||||
<td><code>limit_changes=<var>LIMIT_CHANGES</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>maximum number of files to list per commit in query
|
||||
results. Default is value of <code>limit_changes</code>
|
||||
|
@ -1113,7 +1171,7 @@ th.caption {
|
|||
<td>branch query string</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>branch_match=BRANCH_MATCH</code></td>
|
||||
<td><code>branch_match=<var>BRANCH_MATCH</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>"exact" "like" "glob" "regex" or "notregex" determining type
|
||||
of branch match</td>
|
||||
|
@ -1129,7 +1187,7 @@ th.caption {
|
|||
<td>file query string</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>file_match=FILE_MATCH</code></td>
|
||||
<td><code>file_match=<var>FILE_MATCH</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>"exact" "like" "glob" "regex" or "notregex" determining type
|
||||
of file match</td>
|
||||
|
@ -1140,7 +1198,7 @@ th.caption {
|
|||
<td>author query string</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>who_match=WHO_MATCH</code></td>
|
||||
<td><code>who_match=<var>WHO_MATCH</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>"exact" "like" "glob" "regex" or "notregex" determining type
|
||||
of author match</td>
|
||||
|
@ -1157,50 +1215,43 @@ th.caption {
|
|||
of log message match</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>querysort=SORT</code></td>
|
||||
<td><code>querysort=<var>SORT</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>"date" "author" or "file" determining order of query results</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>date=DATE</code></td>
|
||||
<td><code>date=<var>DATE</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>"hours" "day" "week" "month" "all" or "explicit" to filter
|
||||
query results by date</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>hours=HOURS</code></td>
|
||||
<td><code>hours=<var>HOURS</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>number of hours back to include results from when
|
||||
<code><var>DATE</var></code> is "hours"</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>mindate=MINDATE</code></td>
|
||||
<td><code>mindate=<var>MINDATE</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>earliest date to include results from when
|
||||
<code><var>DATE</var></code> is "explicit"</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>maxdate=MAXDATE</code></td>
|
||||
<td><code>maxdate=<var>MAXDATE</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>latest date to include results from when
|
||||
<code><var>DATE</var></code> is "explicit"</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>format=FORMAT</code></td>
|
||||
<td><code>format=<var>FORMAT</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>"rss" or "backout" values to generate an rss feed or list of
|
||||
commands to back out changes instead showing a normal query result
|
||||
page</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>limit=LIMIT</code></td>
|
||||
<td>optional</td>
|
||||
<td>maximum number of file-revisions to process during a
|
||||
query. Default is value of <code>row_limit</code> configuration
|
||||
option</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>limit_changes=LIMIT_CHANGES</code></td>
|
||||
<td><code>limit_changes=<var>LIMIT_CHANGES</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>maximum number of files to list per commit in query
|
||||
results. Default is value of <code>limit_changes</code>
|
||||
|
@ -1254,7 +1305,7 @@ th.caption {
|
|||
<td><a href="#revision-param"><code>revision</code> parameter</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><code>limit_changes=LIMIT_CHANGES</code></td>
|
||||
<td><code>limit_changes=<var>LIMIT_CHANGES</var></code></td>
|
||||
<td>optional</td>
|
||||
<td>maximum number of files to list per commit. Default is value
|
||||
of <code>limit_changes</code> configuration option</td>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2006 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -15,7 +15,6 @@
|
|||
# -----------------------------------------------------------------------
|
||||
|
||||
import re
|
||||
import string
|
||||
|
||||
|
||||
def language(hdr):
|
||||
|
@ -39,8 +38,8 @@ def _parse(hdr, result):
|
|||
while pos < len(hdr):
|
||||
name = _re_token.match(hdr, pos)
|
||||
if not name:
|
||||
raise AcceptParseError()
|
||||
a = result.item_class(string.lower(name.group(1)))
|
||||
raise AcceptLanguageParseError()
|
||||
a = result.item_class(name.group(1).lower())
|
||||
pos = name.end()
|
||||
while 1:
|
||||
# are we looking at a parameter?
|
||||
|
@ -56,7 +55,7 @@ def _parse(hdr, result):
|
|||
# the "=" was probably missing
|
||||
continue
|
||||
|
||||
pname = string.lower(match.group(1))
|
||||
pname = match.group(1).lower()
|
||||
if pname == 'q' or pname == 'qs':
|
||||
try:
|
||||
a.quality = float(match.group(2))
|
||||
|
@ -70,7 +69,7 @@ def _parse(hdr, result):
|
|||
# bad float literal
|
||||
pass
|
||||
elif pname == 'charset':
|
||||
a.charset = string.lower(match.group(2))
|
||||
a.charset = match.group(2).lower()
|
||||
|
||||
result.append(a)
|
||||
if hdr[pos:pos+1] == ',':
|
||||
|
@ -210,7 +209,7 @@ class _LanguageSelector:
|
|||
def append(self, item):
|
||||
self.requested.append(item)
|
||||
|
||||
class AcceptParseError(Exception):
|
||||
class AcceptLanguageParseError(Exception):
|
||||
pass
|
||||
|
||||
def _test():
|
||||
|
|
26
lib/blame.py
26
lib/blame.py
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python
|
||||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2007 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 2000 Curt Hagenlocher <curt@hagenlocher.org>
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
|
@ -27,14 +27,14 @@
|
|||
# -----------------------------------------------------------------------
|
||||
|
||||
import sys
|
||||
import string
|
||||
import os
|
||||
import re
|
||||
import time
|
||||
import math
|
||||
import cgi
|
||||
import vclib
|
||||
|
||||
from common import _item
|
||||
import vclib
|
||||
import sapi
|
||||
|
||||
re_includes = re.compile('\\#(\\s*)include(\\s*)"(.*?)"')
|
||||
|
||||
|
@ -43,7 +43,7 @@ def link_includes(text, repos, path_parts, include_url):
|
|||
if match:
|
||||
incfile = match.group(3)
|
||||
include_path_parts = path_parts[:-1]
|
||||
for part in filter(None, string.split(incfile, '/')):
|
||||
for part in filter(None, incfile.split('/')):
|
||||
if part == "..":
|
||||
if not include_path_parts:
|
||||
# nothing left to pop; don't bother marking up this include.
|
||||
|
@ -55,14 +55,14 @@ def link_includes(text, repos, path_parts, include_url):
|
|||
include_path = None
|
||||
try:
|
||||
if repos.itemtype(include_path_parts, None) == vclib.FILE:
|
||||
include_path = string.join(include_path_parts, '/')
|
||||
include_path = '/'.join(include_path_parts)
|
||||
except vclib.ItemNotFound:
|
||||
pass
|
||||
|
||||
if include_path:
|
||||
return '#%sinclude%s<a href="%s">"%s"</a>' % \
|
||||
(match.group(1), match.group(2),
|
||||
string.replace(include_url, '/WHERE/', include_path), incfile)
|
||||
include_url.replace('/WHERE/', include_path), incfile)
|
||||
|
||||
return text
|
||||
|
||||
|
@ -75,14 +75,15 @@ class HTMLBlameSource:
|
|||
self.path_parts = path_parts
|
||||
self.diff_url = diff_url
|
||||
self.include_url = include_url
|
||||
self.annotation, self.revision = self.repos.annotate(path_parts, opt_rev)
|
||||
self.annotation, self.revision = self.repos.annotate(path_parts, opt_rev,
|
||||
True)
|
||||
|
||||
def __getitem__(self, idx):
|
||||
item = self.annotation.__getitem__(idx)
|
||||
diff_url = None
|
||||
if item.prev_rev:
|
||||
diff_url = '%sr1=%s&r2=%s' % (self.diff_url, item.prev_rev, item.rev)
|
||||
thisline = link_includes(cgi.escape(item.text), self.repos,
|
||||
thisline = link_includes(sapi.escape(item.text), self.repos,
|
||||
self.path_parts, self.include_url)
|
||||
return _item(text=thisline, line_number=item.line_number,
|
||||
rev=item.rev, prev_rev=item.prev_rev,
|
||||
|
@ -94,11 +95,6 @@ def blame(repos, path_parts, diff_url, include_url, opt_rev=None):
|
|||
return source, source.revision
|
||||
|
||||
|
||||
class _item:
|
||||
def __init__(self, **kw):
|
||||
vars(self).update(kw)
|
||||
|
||||
|
||||
def make_html(root, rcs_path):
|
||||
import vclib.ccvs.blame
|
||||
bs = vclib.ccvs.blame.BlameSource(os.path.join(root, rcs_path))
|
||||
|
@ -136,7 +132,7 @@ def make_html(root, rcs_path):
|
|||
sys.stdout.write('<td> </td><td> </td>')
|
||||
rev_count = rev_count + 1
|
||||
|
||||
sys.stdout.write('<td%s>%s</td></tr>\n' % (align % 'left', string.rstrip(thisline) or ' '))
|
||||
sys.stdout.write('<td%s>%s</td></tr>\n' % (align % 'left', thisline.rstrip() or ' '))
|
||||
sys.stdout.write('</table>\n')
|
||||
|
||||
|
||||
|
|
|
@ -0,0 +1,60 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
# distribution or at http://viewvc.org/license-1.html.
|
||||
#
|
||||
# For more information, visit http://viewvc.org/
|
||||
#
|
||||
# -----------------------------------------------------------------------
|
||||
#
|
||||
# common: common definitions for the viewvc library
|
||||
#
|
||||
# -----------------------------------------------------------------------
|
||||
|
||||
# Special type indicators for diff header processing and idiff return codes
|
||||
_RCSDIFF_IS_BINARY = 'binary-diff'
|
||||
_RCSDIFF_ERROR = 'error'
|
||||
_RCSDIFF_NO_CHANGES = "no-changes"
|
||||
|
||||
|
||||
class _item:
|
||||
def __init__(self, **kw):
|
||||
vars(self).update(kw)
|
||||
|
||||
|
||||
class TemplateData:
|
||||
"""A custom dictionary-like object that allows one-time definition
|
||||
of keys, and only value fetches and changes, and key deletions,
|
||||
thereafter.
|
||||
|
||||
EZT doesn't require the use of this special class -- a normal
|
||||
dict-type data dictionary works fine. But use of this class will
|
||||
assist those who want the data sent to their templates to have a
|
||||
consistent set of keys."""
|
||||
|
||||
def __init__(self, initial_data={}):
|
||||
self._items = initial_data
|
||||
|
||||
def __getitem__(self, key):
|
||||
return self._items.__getitem__(key)
|
||||
|
||||
def __setitem__(self, key, item):
|
||||
assert self._items.has_key(key)
|
||||
return self._items.__setitem__(key, item)
|
||||
|
||||
def __delitem__(self, key):
|
||||
return self._items.__delitem__(key)
|
||||
|
||||
def keys(self):
|
||||
return self._items.keys()
|
||||
|
||||
def merge(self, template_data):
|
||||
"""Merge the data in TemplataData instance TEMPLATA_DATA into this
|
||||
instance. Avoid the temptation to use this conditionally in your
|
||||
code -- it rather defeats the purpose of this class."""
|
||||
|
||||
assert isinstance(template_data, TemplateData)
|
||||
self._items.update(template_data._items)
|
180
lib/compat.py
180
lib/compat.py
|
@ -1,180 +0,0 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2007 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
# distribution or at http://viewvc.org/license-1.html.
|
||||
#
|
||||
# For more information, visit http://viewvc.org/
|
||||
#
|
||||
# -----------------------------------------------------------------------
|
||||
#
|
||||
# compat.py: compatibility functions for operation across Python 1.5.x to 2.2.x
|
||||
#
|
||||
# -----------------------------------------------------------------------
|
||||
|
||||
import urllib
|
||||
import string
|
||||
import time
|
||||
import calendar
|
||||
import re
|
||||
import os
|
||||
import rfc822
|
||||
import tempfile
|
||||
import errno
|
||||
|
||||
#
|
||||
# urllib.urlencode() is new to Python 1.5.2
|
||||
#
|
||||
try:
|
||||
urlencode = urllib.urlencode
|
||||
except AttributeError:
|
||||
def urlencode(dict):
|
||||
"Encode a dictionary as application/x-url-form-encoded."
|
||||
if not dict:
|
||||
return ''
|
||||
quote = urllib.quote_plus
|
||||
keyvalue = [ ]
|
||||
for key, value in dict.items():
|
||||
keyvalue.append(quote(key) + '=' + quote(str(value)))
|
||||
return string.join(keyvalue, '&')
|
||||
|
||||
#
|
||||
# time.strptime() is new to Python 1.5.2
|
||||
#
|
||||
if hasattr(time, 'strptime'):
|
||||
def cvs_strptime(timestr):
|
||||
'Parse a CVS-style date/time value.'
|
||||
return time.strptime(timestr, '%Y/%m/%d %H:%M:%S')[:-1] + (0,)
|
||||
else:
|
||||
_re_rev_date = re.compile('([0-9]{4})/([0-9][0-9])/([0-9][0-9]) '
|
||||
'([0-9][0-9]):([0-9][0-9]):([0-9][0-9])')
|
||||
def cvs_strptime(timestr):
|
||||
'Parse a CVS-style date/time value.'
|
||||
match = _re_rev_date.match(timestr)
|
||||
if match:
|
||||
return tuple(map(int, match.groups())) + (0, 1, 0)
|
||||
else:
|
||||
raise ValueError('date is not in cvs format')
|
||||
|
||||
#
|
||||
# os.makedirs() is new to Python 1.5.2
|
||||
#
|
||||
try:
|
||||
makedirs = os.makedirs
|
||||
except AttributeError:
|
||||
def makedirs(path, mode=0777):
|
||||
head, tail = os.path.split(path)
|
||||
if head and tail and not os.path.exists(head):
|
||||
makedirs(head, mode)
|
||||
os.mkdir(path, mode)
|
||||
|
||||
#
|
||||
# rfc822.formatdate() is new to Python 1.6
|
||||
#
|
||||
try:
|
||||
formatdate = rfc822.formatdate
|
||||
except AttributeError:
|
||||
def formatdate(timeval):
|
||||
if timeval is None:
|
||||
timeval = time.time()
|
||||
timeval = time.gmtime(timeval)
|
||||
return "%s, %02d %s %04d %02d:%02d:%02d GMT" % (
|
||||
["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"][timeval[6]],
|
||||
timeval[2],
|
||||
["Jan", "Feb", "Mar", "Apr", "May", "Jun",
|
||||
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"][timeval[1]-1],
|
||||
timeval[0], timeval[3], timeval[4], timeval[5])
|
||||
|
||||
#
|
||||
# calendar.timegm() is new to Python 2.x and
|
||||
# calendar.leapdays() was wrong in Python 1.5.2
|
||||
#
|
||||
try:
|
||||
timegm = calendar.timegm
|
||||
except AttributeError:
|
||||
def leapdays(year1, year2):
|
||||
"""Return number of leap years in range [year1, year2).
|
||||
Assume year1 <= year2."""
|
||||
year1 = year1 - 1
|
||||
year2 = year2 - 1
|
||||
return (year2/4 - year1/4) - (year2/100 -
|
||||
year1/100) + (year2/400 - year1/400)
|
||||
|
||||
EPOCH = 1970
|
||||
def timegm(tuple):
|
||||
"""Unrelated but handy function to calculate Unix timestamp from GMT."""
|
||||
year, month, day, hour, minute, second = tuple[:6]
|
||||
# assert year >= EPOCH
|
||||
# assert 1 <= month <= 12
|
||||
days = 365*(year-EPOCH) + leapdays(EPOCH, year)
|
||||
for i in range(1, month):
|
||||
days = days + calendar.mdays[i]
|
||||
if month > 2 and calendar.isleap(year):
|
||||
days = days + 1
|
||||
days = days + day - 1
|
||||
hours = days*24 + hour
|
||||
minutes = hours*60 + minute
|
||||
seconds = minutes*60 + second
|
||||
return seconds
|
||||
|
||||
#
|
||||
# tempfile.mkdtemp() is new to Python 2.3
|
||||
#
|
||||
try:
|
||||
mkdtemp = tempfile.mkdtemp
|
||||
except AttributeError:
|
||||
def mkdtemp(suffix="", prefix="tmp", dir=None):
|
||||
# mktemp() only took a single suffix argument until Python 2.3.
|
||||
# We'll do the best we can.
|
||||
oldtmpdir = os.environ.get('TMPDIR')
|
||||
try:
|
||||
for i in range(10):
|
||||
if dir:
|
||||
os.environ['TMPDIR'] = dir
|
||||
dir = tempfile.mktemp(suffix)
|
||||
if prefix:
|
||||
parent, base = os.path.split(dir)
|
||||
dir = os.path.join(parent, prefix + base)
|
||||
try:
|
||||
os.mkdir(dir, 0700)
|
||||
return dir
|
||||
except OSError, e:
|
||||
if e.errno == errno.EEXIST:
|
||||
continue # try again
|
||||
raise
|
||||
finally:
|
||||
if oldtmpdir:
|
||||
os.environ['TMPDIR'] = oldtmpdir
|
||||
elif os.environ.has_key('TMPDIR'):
|
||||
del(os.environ['TMPDIR'])
|
||||
|
||||
raise IOError, (errno.EEXIST, "No usable temporary directory name found")
|
||||
|
||||
#
|
||||
# the following stuff is *ONLY* needed for standalone.py.
|
||||
# For that reason I've encapsulated it into a function.
|
||||
#
|
||||
|
||||
def for_standalone():
|
||||
import SocketServer
|
||||
if not hasattr(SocketServer.TCPServer, "close_request"):
|
||||
#
|
||||
# method close_request() was missing until Python 2.1
|
||||
#
|
||||
class TCPServer(SocketServer.TCPServer):
|
||||
def process_request(self, request, client_address):
|
||||
"""Call finish_request.
|
||||
|
||||
Overridden by ForkingMixIn and ThreadingMixIn.
|
||||
|
||||
"""
|
||||
self.finish_request(request, client_address)
|
||||
self.close_request(request)
|
||||
|
||||
def close_request(self, request):
|
||||
"""Called to clean up an individual request."""
|
||||
request.close()
|
||||
|
||||
SocketServer.TCPServer = TCPServer
|
378
lib/config.py
378
lib/config.py
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2008 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -16,65 +16,179 @@
|
|||
|
||||
import sys
|
||||
import os
|
||||
import string
|
||||
import ConfigParser
|
||||
import fnmatch
|
||||
|
||||
import vclib
|
||||
import vclib.ccvs
|
||||
import vclib.svn
|
||||
import cvsdb
|
||||
import viewvc
|
||||
import copy
|
||||
from viewvcmagic import ContentMagic
|
||||
|
||||
#########################################################################
|
||||
#
|
||||
# CONFIGURATION
|
||||
# -------------
|
||||
#
|
||||
# There are three forms of configuration:
|
||||
#
|
||||
# 1) edit the viewvc.conf created by the viewvc-install(er)
|
||||
# 2) as (1), but delete all unchanged entries from viewvc.conf
|
||||
# 3) do not use viewvc.conf and just edit the defaults in this file
|
||||
# 1. edit the viewvc.conf created by the viewvc-install(er)
|
||||
# 2. as (1), but delete all unchanged entries from viewvc.conf
|
||||
# 3. do not use viewvc.conf and just edit the defaults in this file
|
||||
#
|
||||
# Most users will want to use (1), but there are slight speed advantages
|
||||
# to the other two options. Note that viewvc.conf values are a bit easier
|
||||
# to work with since it is raw text, rather than python literal values.
|
||||
#
|
||||
#
|
||||
# A WORD ABOUT OPTION LAYERING/OVERRIDES
|
||||
# --------------------------------------
|
||||
#
|
||||
# ViewVC has three "layers" of configuration options:
|
||||
#
|
||||
# 1. base configuration options - very basic configuration bits
|
||||
# found in sections like 'general', 'options', etc.
|
||||
# 2. vhost overrides - these options overlay/override the base
|
||||
# configuration on a per-vhost basis.
|
||||
# 3. root overrides - these options overlay/override the base
|
||||
# configuration and vhost overrides on a per-root basis.
|
||||
#
|
||||
# Here's a diagram of the valid overlays/overrides:
|
||||
#
|
||||
# PER-ROOT PER-VHOST BASE
|
||||
#
|
||||
# ,-----------. ,-----------.
|
||||
# | vhost-*/ | | |
|
||||
# | general | --> | general |
|
||||
# | | | |
|
||||
# `-----------' `-----------'
|
||||
# ,-----------. ,-----------. ,-----------.
|
||||
# | root-*/ | | vhost-*/ | | |
|
||||
# | options | --> | options | --> | options |
|
||||
# | | | | | |
|
||||
# `-----------' `-----------' `-----------'
|
||||
# ,-----------. ,-----------. ,-----------.
|
||||
# | root-*/ | | vhost-*/ | | |
|
||||
# | templates | --> | templates | --> | templates |
|
||||
# | | | | | |
|
||||
# `-----------' `-----------' `-----------'
|
||||
# ,-----------. ,-----------. ,-----------.
|
||||
# | root-*/ | | vhost-*/ | | |
|
||||
# | utilities | --> | utilities | --> | utilities |
|
||||
# | | | | | |
|
||||
# `-----------' `-----------' `-----------'
|
||||
# ,-----------. ,-----------.
|
||||
# | vhost-*/ | | |
|
||||
# | cvsdb | --> | cvsdb |
|
||||
# | | | |
|
||||
# `-----------' `-----------'
|
||||
# ,-----------. ,-----------. ,-----------.
|
||||
# | root-*/ | | vhost-*/ | | |
|
||||
# | authz-* | --> | authz-* | --> | authz-* |
|
||||
# | | | | | |
|
||||
# `-----------' `-----------' `-----------'
|
||||
# ,-----------.
|
||||
# | |
|
||||
# | vhosts |
|
||||
# | |
|
||||
# `-----------'
|
||||
# ,-----------.
|
||||
# | |
|
||||
# | query |
|
||||
# | |
|
||||
# `-----------'
|
||||
#
|
||||
# ### TODO: Figure out what this all means for the 'kv' stuff.
|
||||
#
|
||||
#########################################################################
|
||||
|
||||
class Config:
|
||||
_sections = ('general', 'utilities', 'options', 'cvsdb', 'templates')
|
||||
_force_multi_value = ('cvs_roots', 'svn_roots', 'languages', 'kv_files',
|
||||
'root_parents', 'allowed_views')
|
||||
_base_sections = (
|
||||
# Base configuration sections.
|
||||
'authz-*',
|
||||
'cvsdb',
|
||||
'general',
|
||||
'options',
|
||||
'query',
|
||||
'templates',
|
||||
'utilities',
|
||||
)
|
||||
_force_multi_value = (
|
||||
# Configuration values with multiple, comma-separated values.
|
||||
'allowed_views',
|
||||
'binary_mime_types',
|
||||
'custom_log_formatting',
|
||||
'cvs_roots',
|
||||
'kv_files',
|
||||
'languages',
|
||||
'mime_types_files',
|
||||
'root_parents',
|
||||
'svn_roots',
|
||||
)
|
||||
_allowed_overrides = {
|
||||
# Mapping of override types to allowed overridable sections.
|
||||
'vhost' : ('authz-*',
|
||||
'cvsdb',
|
||||
'general',
|
||||
'options',
|
||||
'templates',
|
||||
'utilities',
|
||||
),
|
||||
'root' : ('authz-*',
|
||||
'options',
|
||||
'templates',
|
||||
'utilities',
|
||||
)
|
||||
}
|
||||
|
||||
def __init__(self):
|
||||
for section in self._sections:
|
||||
self.__guesser = None
|
||||
self.__root_configs = {}
|
||||
self.__parent = None
|
||||
self.root_options_overlayed = 0
|
||||
for section in self._base_sections:
|
||||
if section[-1] == '*':
|
||||
continue
|
||||
setattr(self, section, _sub_config())
|
||||
|
||||
def load_config(self, pathname, vhost=None, rootname=None):
|
||||
def load_config(self, pathname, vhost=None):
|
||||
"""Load the configuration file at PATHNAME, applying configuration
|
||||
settings there as overrides to the built-in default values. If
|
||||
VHOST is provided, also process the configuration overrides
|
||||
specific to that virtual host."""
|
||||
|
||||
self.conf_path = os.path.isfile(pathname) and pathname or None
|
||||
self.base = os.path.dirname(pathname)
|
||||
self.parser = ConfigParser.ConfigParser()
|
||||
self.parser.optionxform = lambda x: x # don't case-normalize option names.
|
||||
self.parser.read(self.conf_path or [])
|
||||
|
||||
for section in self._sections:
|
||||
if self.parser.has_section(section):
|
||||
|
||||
for section in self.parser.sections():
|
||||
if self._is_allowed_section(section, self._base_sections):
|
||||
self._process_section(self.parser, section, section)
|
||||
|
||||
if vhost and self.parser.has_section('vhosts'):
|
||||
self._process_vhost(self.parser, vhost)
|
||||
|
||||
if rootname:
|
||||
self._process_root_options(self.parser, rootname)
|
||||
|
||||
def load_kv_files(self, language):
|
||||
"""Process the key/value (kv) files specified in the
|
||||
configuration, merging their values into the configuration as
|
||||
dotted heirarchical items."""
|
||||
|
||||
kv = _sub_config()
|
||||
|
||||
for fname in self.general.kv_files:
|
||||
if fname[0] == '[':
|
||||
idx = string.index(fname, ']')
|
||||
parts = string.split(fname[1:idx], '.')
|
||||
fname = string.strip(fname[idx+1:])
|
||||
idx = fname.index(']')
|
||||
parts = fname[1:idx].split('.')
|
||||
fname = fname[idx+1:].strip()
|
||||
else:
|
||||
parts = [ ]
|
||||
fname = string.replace(fname, '%lang%', language)
|
||||
fname = fname.replace('%lang%', language)
|
||||
|
||||
parser = ConfigParser.ConfigParser()
|
||||
parser.optionxform = lambda x: x # don't case-normalize option names.
|
||||
parser.read(os.path.join(self.base, fname))
|
||||
for section in parser.sections():
|
||||
for option in parser.options(section):
|
||||
|
@ -92,75 +206,137 @@ class Config:
|
|||
return kv
|
||||
|
||||
def path(self, path):
|
||||
"""Return path relative to the config file directory"""
|
||||
"""Return PATH relative to the config file directory."""
|
||||
return os.path.join(self.base, path)
|
||||
|
||||
def _process_section(self, parser, section, subcfg_name):
|
||||
if not hasattr(self, subcfg_name):
|
||||
setattr(self, subcfg_name, _sub_config())
|
||||
sc = getattr(self, subcfg_name)
|
||||
|
||||
for opt in parser.options(section):
|
||||
value = parser.get(section, opt)
|
||||
if opt in self._force_multi_value:
|
||||
value = map(string.strip, filter(None, string.split(value, ',')))
|
||||
value = map(lambda x: x.strip(), filter(None, value.split(',')))
|
||||
else:
|
||||
try:
|
||||
value = int(value)
|
||||
except ValueError:
|
||||
pass
|
||||
|
||||
### FIXME: This feels like unnecessary depth of knowledge for a
|
||||
### semi-generic configuration object.
|
||||
if opt == 'cvs_roots' or opt == 'svn_roots':
|
||||
value = _parse_roots(opt, value)
|
||||
|
||||
setattr(sc, opt, value)
|
||||
|
||||
def _is_allowed_section(self, section, allowed_sections):
|
||||
"""Return 1 iff SECTION is an allowed section, defined as being
|
||||
explicitly present in the ALLOWED_SECTIONS list or present in the
|
||||
form 'someprefix-*' in that list."""
|
||||
|
||||
for allowed_section in allowed_sections:
|
||||
if allowed_section[-1] == '*':
|
||||
if _startswith(section, allowed_section[:-1]):
|
||||
return 1
|
||||
elif allowed_section == section:
|
||||
return 1
|
||||
return 0
|
||||
|
||||
def _is_allowed_override(self, sectype, secspec, section):
|
||||
"""Test if SECTION is an allowed override section for sections of
|
||||
type SECTYPE ('vhosts' or 'root', currently) and type-specifier
|
||||
SECSPEC (a rootname or vhostname, currently). If it is, return
|
||||
the overridden base section name. If it's not an override section
|
||||
at all, return None. And if it's an override section but not an
|
||||
allowed one, raise IllegalOverrideSection."""
|
||||
|
||||
cv = '%s-%s/' % (sectype, secspec)
|
||||
lcv = len(cv)
|
||||
if section[:lcv] != cv:
|
||||
return None
|
||||
base_section = section[lcv:]
|
||||
if self._is_allowed_section(base_section,
|
||||
self._allowed_overrides[sectype]):
|
||||
return base_section
|
||||
raise IllegalOverrideSection(sectype, section)
|
||||
|
||||
def _process_vhost(self, parser, vhost):
|
||||
# find a vhost name for this vhost, if any (if not, we've nothing to do)
|
||||
# Find a vhost name for this VHOST, if any (else, we've nothing to do).
|
||||
canon_vhost = self._find_canon_vhost(parser, vhost)
|
||||
if not canon_vhost:
|
||||
return
|
||||
|
||||
# overlay any option sections associated with this vhost name
|
||||
cv = 'vhost-%s/' % (canon_vhost)
|
||||
lcv = len(cv)
|
||||
# Overlay any option sections associated with this vhost name.
|
||||
for section in parser.sections():
|
||||
if section[:lcv] == cv:
|
||||
base_section = section[lcv:]
|
||||
if base_section not in self._sections:
|
||||
raise IllegalOverrideSection('vhost', section)
|
||||
base_section = self._is_allowed_override('vhost', canon_vhost, section)
|
||||
if base_section:
|
||||
self._process_section(parser, section, base_section)
|
||||
|
||||
def _find_canon_vhost(self, parser, vhost):
|
||||
vhost = string.split(string.lower(vhost), ':')[0] # lower-case, no port
|
||||
vhost = vhost.lower().split(':')[0] # lower-case, no port
|
||||
for canon_vhost in parser.options('vhosts'):
|
||||
value = parser.get('vhosts', canon_vhost)
|
||||
patterns = map(string.lower, map(string.strip,
|
||||
filter(None, string.split(value, ','))))
|
||||
patterns = map(lambda x: x.lower().strip(),
|
||||
filter(None, value.split(',')))
|
||||
for pat in patterns:
|
||||
if fnmatch.fnmatchcase(vhost, pat):
|
||||
return canon_vhost
|
||||
|
||||
return None
|
||||
|
||||
def _process_root_options(self, parser, rootname):
|
||||
rn = 'root-%s/' % (rootname)
|
||||
lrn = len(rn)
|
||||
for section in parser.sections():
|
||||
if section[:lrn] == rn:
|
||||
base_section = section[lrn:]
|
||||
if base_section in self._sections:
|
||||
if base_section == 'general':
|
||||
raise IllegalOverrideSection('root', section)
|
||||
self._process_section(parser, section, base_section)
|
||||
elif _startswith(base_section, 'authz-'):
|
||||
pass
|
||||
else:
|
||||
raise IllegalOverrideSection('root', section)
|
||||
|
||||
def get_root_config(self, rootname):
|
||||
"""Get configuration object with per-root overrides for 'rootname'"""
|
||||
if self.__parent:
|
||||
return self.__parent.get_root_config(rootname)
|
||||
elif rootname in self.__root_configs:
|
||||
return self.__root_configs[rootname]
|
||||
__guesser = self.__guesser
|
||||
__root_configs = self.__root_configs
|
||||
parser = self.parser
|
||||
self.parser = None
|
||||
self.__guesser = None
|
||||
self.__root_configs = None
|
||||
sub = copy.deepcopy(self)
|
||||
sub.parser = parser
|
||||
self.parser = parser
|
||||
self.__guesser = __guesser
|
||||
self.__root_configs = __root_configs
|
||||
self.__root_configs[rootname] = sub
|
||||
sub.__parent = self
|
||||
sub.overlay_root_options(rootname)
|
||||
return sub
|
||||
|
||||
def get_parent_config(self):
|
||||
"""Get the parent non-overridden config."""
|
||||
if self.__parent:
|
||||
return self.__parent
|
||||
return self
|
||||
|
||||
def overlay_root_options(self, rootname):
|
||||
"Overly per-root options atop the existing option set."
|
||||
"""Overlay per-root options for ROOTNAME atop the existing option
|
||||
set. This is a destructive change to the configuration."""
|
||||
|
||||
did_overlay = 0
|
||||
|
||||
if not self.conf_path:
|
||||
return
|
||||
self._process_root_options(self.parser, rootname)
|
||||
|
||||
for section in self.parser.sections():
|
||||
base_section = self._is_allowed_override('root', rootname, section)
|
||||
if base_section:
|
||||
# We can currently only deal with root overlays happening
|
||||
# once, so check that we've not yet done any overlaying of
|
||||
# per-root options.
|
||||
assert(self.root_options_overlayed == 0)
|
||||
self._process_section(self.parser, section, base_section)
|
||||
did_overlay = 1
|
||||
|
||||
# If we actually did any overlaying, remember this fact so we
|
||||
# don't do it again later.
|
||||
if did_overlay:
|
||||
self.root_options_overlayed = 1
|
||||
|
||||
def _get_parser_items(self, parser, section):
|
||||
"""Basically implement ConfigParser.items() for pre-Python-2.3 versions."""
|
||||
|
@ -171,25 +347,27 @@ class Config:
|
|||
for option in parser.options(section):
|
||||
d[option] = parser.get(section, option)
|
||||
return d.items()
|
||||
|
||||
def get_authorizer_params(self, authorizer, rootname=None):
|
||||
if not self.conf_path:
|
||||
return {}
|
||||
|
||||
def get_authorizer_params(self, authorizer=None):
|
||||
"""Return a dictionary of parameter names and values which belong
|
||||
to the configured authorizer (or AUTHORIZER, if provided)."""
|
||||
params = {}
|
||||
authz_section = 'authz-%s' % (authorizer)
|
||||
for section in self.parser.sections():
|
||||
if section == authz_section:
|
||||
for key, value in self._get_parser_items(self.parser, section):
|
||||
params[key] = value
|
||||
if rootname:
|
||||
root_authz_section = 'root-%s/authz-%s' % (rootname, authorizer)
|
||||
for section in self.parser.sections():
|
||||
if section == root_authz_section:
|
||||
for key, value in self._get_parser_items(self.parser, section):
|
||||
params[key] = value
|
||||
if authorizer is None:
|
||||
authorizer = self.options.authorizer
|
||||
if authorizer:
|
||||
authz_section = 'authz-%s' % (self.options.authorizer)
|
||||
if hasattr(self, authz_section):
|
||||
sub_config = getattr(self, authz_section)
|
||||
for attr in dir(sub_config):
|
||||
params[attr] = getattr(sub_config, attr)
|
||||
params['__config'] = self
|
||||
return params
|
||||
|
||||
|
||||
def guesser(self):
|
||||
if not self.__guesser:
|
||||
self.__guesser = ContentMagic(self.options.encodings)
|
||||
return self.__guesser
|
||||
|
||||
def set_defaults(self):
|
||||
"Set some default values in the configuration."
|
||||
|
||||
|
@ -197,7 +375,7 @@ class Config:
|
|||
self.general.svn_roots = { }
|
||||
self.general.root_parents = []
|
||||
self.general.default_root = ''
|
||||
self.general.mime_types_file = ''
|
||||
self.general.mime_types_files = ["mimetypes.conf"]
|
||||
self.general.address = ''
|
||||
self.general.kv_files = [ ]
|
||||
self.general.languages = ['en-us']
|
||||
|
@ -207,19 +385,26 @@ class Config:
|
|||
self.utilities.cvsnt = 'cvs'
|
||||
else:
|
||||
self.utilities.cvsnt = None
|
||||
self.utilities.rcsfile_socket = ''
|
||||
self.utilities.svn = ''
|
||||
self.utilities.diff = ''
|
||||
self.utilities.cvsgraph = ''
|
||||
self.utilities.tika_server = ''
|
||||
self.utilities.tika_mime_types = ''
|
||||
|
||||
self.options.root_as_url_component = 1
|
||||
self.options.checkout_magic = 0
|
||||
self.options.allowed_views = ['markup', 'annotate', 'roots']
|
||||
self.options.authorizer = 'forbidden'
|
||||
self.options.allowed_views = ['annotate', 'diff', 'markup', 'roots']
|
||||
self.options.authorizer = None
|
||||
self.options.mangle_email_addresses = 0
|
||||
self.options.custom_log_formatting = []
|
||||
self.options.default_file_view = "log"
|
||||
self.options.binary_mime_types = []
|
||||
self.options.http_expiration_time = 600
|
||||
self.options.generate_etags = 1
|
||||
self.options.svn_ignore_mimetype = 0
|
||||
self.options.svn_config_dir = None
|
||||
self.options.max_filesize_kbytes = 512
|
||||
self.options.use_rcsparse = 0
|
||||
self.options.sort_by = 'file'
|
||||
self.options.sort_group_dirs = 1
|
||||
|
@ -234,20 +419,29 @@ class Config:
|
|||
self.options.hr_ignore_keyword_subst = 1
|
||||
self.options.hr_intraline = 0
|
||||
self.options.allow_compress = 0
|
||||
self.options.template_dir = "templates"
|
||||
self.options.template_dir = "templates/default"
|
||||
self.options.docroot = None
|
||||
self.options.show_subdir_lastmod = 0
|
||||
self.options.show_roots_lastmod = 0
|
||||
self.options.show_logs = 1
|
||||
self.options.show_log_in_markup = 1
|
||||
self.options.cross_copies = 0
|
||||
self.options.cross_copies = 1
|
||||
self.options.use_localtime = 0
|
||||
self.options.iso8601_timestamps = 0
|
||||
self.options.short_log_len = 80
|
||||
self.options.enable_syntax_coloration = 1
|
||||
self.options.tabsize = 8
|
||||
self.options.detect_encoding = 0
|
||||
self.options.use_cvsgraph = 0
|
||||
self.options.cvsgraph_conf = "cvsgraph.conf"
|
||||
self.options.allowed_cvsgraph_useropts = []
|
||||
self.options.use_re_search = 0
|
||||
self.options.use_pagesize = 0
|
||||
self.options.dir_pagesize = 0
|
||||
self.options.log_pagesize = 0
|
||||
self.options.log_pagesextra = 3
|
||||
self.options.limit_changes = 100
|
||||
self.options.cvs_ondisk_charset = 'cp1251'
|
||||
self.options.encodings = 'cp1251:iso-8859-1'
|
||||
|
||||
self.templates.diff = None
|
||||
self.templates.directory = None
|
||||
|
@ -261,28 +455,47 @@ class Config:
|
|||
self.templates.roots = None
|
||||
|
||||
self.cvsdb.enabled = 0
|
||||
self.cvsdb.index_content = 0
|
||||
self.cvsdb.enable_snippets = 1
|
||||
self.cvsdb.content_max_size = 0
|
||||
self.cvsdb.host = ''
|
||||
self.cvsdb.port = 3306
|
||||
self.cvsdb.socket = ''
|
||||
self.cvsdb.database_name = ''
|
||||
self.cvsdb.user = ''
|
||||
self.cvsdb.passwd = ''
|
||||
self.cvsdb.readonly_user = ''
|
||||
self.cvsdb.readonly_passwd = ''
|
||||
self.cvsdb.readonly_passwd = ''
|
||||
self.cvsdb.row_limit = 1000
|
||||
self.cvsdb.rss_row_limit = 100
|
||||
self.cvsdb.check_database_for_root = 0
|
||||
self.cvsdb.fulltext_min_relevance = 0.2
|
||||
|
||||
self.cvsdb.sphinx_host = ''
|
||||
self.cvsdb.sphinx_port = 3307
|
||||
self.cvsdb.sphinx_socket = ''
|
||||
self.cvsdb.sphinx_index = ''
|
||||
self.cvsdb.sphinx_preformatted_mime = 'text/(?!html|xml).*'
|
||||
self.cvsdb.sphinx_snippet_options = \
|
||||
'around: 15\n'\
|
||||
'limit: 200\n'\
|
||||
'before_match: <span style="color:red">\n'\
|
||||
'after_match: </span>\n'\
|
||||
'chunk_separator: ... \n\n'
|
||||
|
||||
self.query.viewvc_base_url = None
|
||||
|
||||
def _startswith(somestr, substr):
|
||||
return somestr[:len(substr)] == substr
|
||||
|
||||
def _parse_roots(config_name, config_value):
|
||||
roots = { }
|
||||
for root in config_value:
|
||||
pos = string.find(root, ':')
|
||||
if pos < 0:
|
||||
try:
|
||||
name, path = root.split(':', 1)
|
||||
except:
|
||||
raise MalformedRoot(config_name, root)
|
||||
name, path = map(string.strip, (root[:pos], root[pos+1:]))
|
||||
roots[name] = path
|
||||
roots[name.strip()] = path.strip()
|
||||
return roots
|
||||
|
||||
class ViewVCConfigurationError(Exception):
|
||||
|
@ -295,7 +508,7 @@ class IllegalOverrideSection(ViewVCConfigurationError):
|
|||
def __str__(self):
|
||||
return "malformed configuration: illegal %s override section: %s" \
|
||||
% (self.override_type, self.section_name)
|
||||
|
||||
|
||||
class MalformedRoot(ViewVCConfigurationError):
|
||||
def __init__(self, config_name, value_given):
|
||||
Exception.__init__(self, config_name, value_given)
|
||||
|
@ -308,10 +521,3 @@ class MalformedRoot(ViewVCConfigurationError):
|
|||
|
||||
class _sub_config:
|
||||
pass
|
||||
|
||||
if not hasattr(sys, 'hexversion'):
|
||||
# Python 1.5 or 1.5.1. fix the syntax for ConfigParser options.
|
||||
import regex
|
||||
ConfigParser.option_cre = regex.compile('^\([-A-Za-z0-9._]+\)\(:\|['
|
||||
+ string.whitespace
|
||||
+ ']*=\)\(.*\)$')
|
||||
|
|
904
lib/cvsdb.py
904
lib/cvsdb.py
File diff suppressed because it is too large
Load Diff
18
lib/dbi.py
18
lib/dbi.py
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2006 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -14,7 +14,7 @@ import sys
|
|||
import time
|
||||
import types
|
||||
import re
|
||||
import compat
|
||||
import calendar
|
||||
import MySQLdb
|
||||
|
||||
# set to 1 to store commit times in UTC, or 0 to use the ViewVC machine's
|
||||
|
@ -55,9 +55,17 @@ def TicksFromDateTime(datetime):
|
|||
t = datetime.tuple()
|
||||
|
||||
if utc_time:
|
||||
return compat.timegm(t)
|
||||
return calendar.timegm(t)
|
||||
else:
|
||||
return time.mktime(t[:8] + (-1,))
|
||||
|
||||
def connect(host, port, user, passwd, db):
|
||||
return MySQLdb.connect(host=host, port=port, user=user, passwd=passwd, db=db)
|
||||
def connect(host, port, socket, user, passwd, db, charset = 'utf8'):
|
||||
return MySQLdb.connect(
|
||||
host = host,
|
||||
port = port,
|
||||
unix_socket = socket,
|
||||
user = user,
|
||||
passwd = passwd,
|
||||
db = db,
|
||||
charset = charset,
|
||||
use_unicode = charset == 'utf8')
|
||||
|
|
14
lib/debug.py
14
lib/debug.py
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2007 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -48,13 +48,17 @@ if SHOW_TIMES:
|
|||
else:
|
||||
_times[which] = t
|
||||
|
||||
def dump():
|
||||
for name, value in _times.items():
|
||||
print '%s: %.6f<br />' % (name, value)
|
||||
def t_dump(out):
|
||||
out.write('<div>')
|
||||
names = _times.keys()
|
||||
names.sort()
|
||||
for name in names:
|
||||
out.write('%s: %.6fs<br/>\n' % (name, _times[name]))
|
||||
out.write('</div>')
|
||||
|
||||
else:
|
||||
|
||||
t_start = t_end = dump = lambda *args: None
|
||||
t_start = t_end = t_dump = lambda *args: None
|
||||
|
||||
|
||||
class ViewVCException:
|
||||
|
|
95
lib/ezt.py
95
lib/ezt.py
|
@ -347,7 +347,7 @@ class Template:
|
|||
for_names = [ ]
|
||||
|
||||
if base_format:
|
||||
program.append((self._cmd_format, _printers[base_format]))
|
||||
program.append((self._cmd_format, _formatters[base_format]))
|
||||
|
||||
for i in range(len(parts)):
|
||||
piece = parts[i]
|
||||
|
@ -405,13 +405,13 @@ class Template:
|
|||
elif cmd == 'format':
|
||||
if args[1][0]:
|
||||
# argument is a variable reference
|
||||
printer = args[1]
|
||||
formatter = args[1]
|
||||
else:
|
||||
# argument is a string constant referring to built-in printer
|
||||
printer = _printers.get(args[1][1])
|
||||
if not printer:
|
||||
# argument is a string constant referring to built-in formatter
|
||||
formatter = _formatters.get(args[1][1])
|
||||
if not formatter:
|
||||
raise UnknownFormatConstantError(str(args[1:]))
|
||||
program.append((self._cmd_format, printer))
|
||||
program.append((self._cmd_format, formatter))
|
||||
|
||||
# remember the cmd, current pos, args, and a section placeholder
|
||||
stack.append([cmd, len(program), args[1:], None])
|
||||
|
@ -460,15 +460,18 @@ class Template:
|
|||
def _cmd_print(self, valrefs, ctx):
|
||||
value = _get_value(valrefs[0], ctx)
|
||||
args = map(lambda valref, ctx=ctx: _get_value(valref, ctx), valrefs[1:])
|
||||
_write_value(value, args, ctx)
|
||||
try:
|
||||
_write_value(value, args, ctx)
|
||||
except TypeError:
|
||||
raise Exception("Unprintable value type for '%s'" % (str(valrefs[0][0])))
|
||||
|
||||
def _cmd_format(self, printer, ctx):
|
||||
if type(printer) is TupleType:
|
||||
printer = _get_value(printer, ctx)
|
||||
ctx.printers.append(printer)
|
||||
def _cmd_format(self, formatter, ctx):
|
||||
if type(formatter) is TupleType:
|
||||
formatter = _get_value(formatter, ctx)
|
||||
ctx.formatters.append(formatter)
|
||||
|
||||
def _cmd_end_format(self, valref, ctx):
|
||||
ctx.printers.pop()
|
||||
ctx.formatters.pop()
|
||||
|
||||
def _cmd_include(self, (valref, reader), ctx):
|
||||
fname = _get_value(valref, ctx)
|
||||
|
@ -522,7 +525,8 @@ class Template:
|
|||
((valref,), unused, section) = args
|
||||
list = _get_value(valref, ctx)
|
||||
if isinstance(list, StringType):
|
||||
raise NeedSequenceError()
|
||||
raise NeedSequenceError("The value of '%s' is not a sequence"
|
||||
% (valref[0]))
|
||||
refname = valref[0]
|
||||
ctx.for_iterators[refname] = iterator = _iter(list)
|
||||
for unused in iterator:
|
||||
|
@ -633,14 +637,23 @@ def _get_value((refname, start, rest), ctx):
|
|||
# string or a sequence
|
||||
return ob
|
||||
|
||||
def _print_formatted(formatters, ctx, chunk):
|
||||
# print chunk to ctx.fp after running it sequentially through formatters
|
||||
for formatter in formatters:
|
||||
chunk = formatter(chunk)
|
||||
ctx.fp.write(chunk)
|
||||
|
||||
def _write_value(value, args, ctx):
|
||||
# value is a callback function, generates its own output
|
||||
if callable(value):
|
||||
apply(value, [ctx] + list(args))
|
||||
return
|
||||
|
||||
# pop printer in case it recursively calls _write_value
|
||||
printer = ctx.printers.pop()
|
||||
# squirrel away formatters in case one of them recursively calls
|
||||
# _write_value() -- we'll use them (in reverse order) to format our
|
||||
# output.
|
||||
formatters = ctx.formatters[:]
|
||||
formatters.reverse()
|
||||
|
||||
try:
|
||||
# if the value has a 'read' attribute, then it is a stream: copy it
|
||||
|
@ -649,7 +662,7 @@ def _write_value(value, args, ctx):
|
|||
chunk = value.read(16384)
|
||||
if not chunk:
|
||||
break
|
||||
printer(ctx, chunk)
|
||||
_print_formatted(formatters, ctx, chunk)
|
||||
|
||||
# value is a substitution pattern
|
||||
elif args:
|
||||
|
@ -662,21 +675,23 @@ def _write_value(value, args, ctx):
|
|||
piece = args[idx]
|
||||
else:
|
||||
piece = '<undef>'
|
||||
printer(ctx, piece)
|
||||
_print_formatted(formatters, ctx, piece)
|
||||
|
||||
# plain old value, write to output
|
||||
else:
|
||||
printer(ctx, value)
|
||||
_print_formatted(formatters, ctx, value)
|
||||
|
||||
finally:
|
||||
ctx.printers.append(printer)
|
||||
# restore our formatters
|
||||
formatters.reverse()
|
||||
ctx.formatters = formatters
|
||||
|
||||
|
||||
class Context:
|
||||
"""A container for the execution context"""
|
||||
def __init__(self, fp):
|
||||
self.fp = fp
|
||||
self.printers = []
|
||||
self.formatters = []
|
||||
def write(self, value, args=()):
|
||||
_write_value(value, args, self)
|
||||
|
||||
|
@ -789,20 +804,34 @@ class BaseUnavailableError(EZTException):
|
|||
class UnknownFormatConstantError(EZTException):
|
||||
"""The format specifier is an unknown value."""
|
||||
|
||||
def _raw_printer(ctx, s):
|
||||
ctx.fp.write(s)
|
||||
|
||||
def _html_printer(ctx, s):
|
||||
ctx.fp.write(cgi.escape(s))
|
||||
def _raw_formatter(s):
|
||||
try: s = s.encode('utf-8')
|
||||
except: pass
|
||||
return s
|
||||
|
||||
def _uri_printer(ctx, s):
|
||||
ctx.fp.write(urllib.quote(s))
|
||||
def _html_formatter(s):
|
||||
try: s = s.encode('utf-8')
|
||||
except: pass
|
||||
return cgi.escape(s)
|
||||
|
||||
_printers = {
|
||||
FORMAT_RAW : _raw_printer,
|
||||
FORMAT_HTML : _html_printer,
|
||||
FORMAT_XML : _html_printer,
|
||||
FORMAT_URI : _uri_printer,
|
||||
def _xml_formatter(s):
|
||||
try: s = s.encode('utf-8')
|
||||
except: pass
|
||||
s = s.replace('&', '&')
|
||||
s = s.replace('<', '<')
|
||||
s = s.replace('>', '>')
|
||||
return s
|
||||
|
||||
def _uri_formatter(s):
|
||||
try: s = s.encode('utf-8')
|
||||
except: pass
|
||||
return urllib.quote(s)
|
||||
|
||||
_formatters = {
|
||||
FORMAT_RAW : _raw_formatter,
|
||||
FORMAT_HTML : _html_formatter,
|
||||
FORMAT_XML : _xml_formatter,
|
||||
FORMAT_URI : _uri_formatter,
|
||||
}
|
||||
|
||||
# --- standard test environment ---
|
||||
|
@ -820,7 +849,7 @@ def test_parse():
|
|||
['', '["a \\"b[foo]" c.d f]', None, '']
|
||||
|
||||
def _test(argv):
|
||||
import doctest, ezt
|
||||
import doctest, ezt
|
||||
verbose = "-v" in argv
|
||||
return doctest.testmod(ezt, verbose=verbose)
|
||||
|
||||
|
|
|
@ -0,0 +1,283 @@
|
|||
# -*-python-*-
|
||||
# -----------------------------------------------------------------------
|
||||
# Simple Global Authentication client for ViewVC
|
||||
# License: GPLv2+
|
||||
# Author: Vitaliy Filippov
|
||||
# -----------------------------------------------------------------------
|
||||
#
|
||||
# USAGE:
|
||||
#
|
||||
# import globalauth
|
||||
# c = globalauth.GlobalAuthClient()
|
||||
# c.auth(server)
|
||||
# user_name = c.user_name
|
||||
# user_url = c.user_url
|
||||
#
|
||||
# auth() will call sys.exit() when it needs to stop request processing
|
||||
#
|
||||
# -----------------------------------------------------------------------
|
||||
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
import struct
|
||||
import cgi
|
||||
import binascii
|
||||
import time
|
||||
import datetime
|
||||
import urllib
|
||||
import urllib2
|
||||
import anyjson
|
||||
import random
|
||||
import Cookie
|
||||
|
||||
import ga_config
|
||||
|
||||
class FileCache:
|
||||
|
||||
def __init__(self, dir):
|
||||
self.dir = dir
|
||||
if not os.path.isdir(dir):
|
||||
os.mkdir(dir)
|
||||
|
||||
def fn(self, key):
|
||||
key = re.sub('([^a-zA-Z0-9_\-]+)', lambda x: binascii.hexlify(x.group(1)), key)
|
||||
return self.dir+'/'+key
|
||||
|
||||
def clean(self):
|
||||
t = time.time()
|
||||
for fn in os.listdir(self.dir):
|
||||
if t > os.stat(self.dir+'/'+fn).st_mtime:
|
||||
os.unlink(self.dir+'/'+fn)
|
||||
|
||||
def set(self, key, value, expire = 86400):
|
||||
fn = self.fn(key)
|
||||
try:
|
||||
f = open(fn,'w')
|
||||
if not expire:
|
||||
expire = 86400
|
||||
expire = time.time()+expire
|
||||
f.write(value)
|
||||
f.close()
|
||||
os.chmod(fn, 0600)
|
||||
os.utime(fn, (expire, expire))
|
||||
except:
|
||||
raise
|
||||
return 1
|
||||
|
||||
def get(self, key):
|
||||
fn = self.fn(key)
|
||||
try:
|
||||
f = open(fn,'r')
|
||||
value = f.read()
|
||||
f.close()
|
||||
if time.time() > os.stat(fn).st_mtime:
|
||||
os.unlink(fn)
|
||||
return ''
|
||||
return value
|
||||
except:
|
||||
pass
|
||||
return ''
|
||||
|
||||
def delete(self, key):
|
||||
fn = self.fn(key)
|
||||
try:
|
||||
os.unlink(fn)
|
||||
except:
|
||||
pass
|
||||
|
||||
class GlobalAuthClient:
|
||||
|
||||
wd = { 0 : 'Mon', 1 : 'Tue', 2 : 'Wed', 3 : 'Thu', 4 : 'Fri', 5 : 'Sat', 6 : 'Sun' }
|
||||
ms = { 1 : 'Jan', 2 : 'Feb', 3 : 'Mar', 4 : 'Apr', 5 : 'May', 6 : 'Jun', 7 : 'Jul', 8 : 'Aug', 9 : 'Sep', 10 : 'Oct', 11 : 'Nov', 12 : 'Dec' }
|
||||
|
||||
def __init__(self, server):
|
||||
|
||||
self.server = server
|
||||
self.v = {}
|
||||
for name, values in server.params().items():
|
||||
self.v[name] = values[0]
|
||||
fs = server.FieldStorage()
|
||||
for name in fs:
|
||||
self.v[name] = fs[name].value
|
||||
|
||||
self.cookies = Cookie.SimpleCookie()
|
||||
# '' default value is needed here - else we die here under WSGI without any exception O_o
|
||||
self.cookies.load(self.server.getenv('HTTP_COOKIE', ''))
|
||||
self.user_name = ''
|
||||
self.user_url = ''
|
||||
|
||||
if not ga_config.gac.get('globalauth_server', '') and not ga_config.gac.get('fof_sudo_server', ''):
|
||||
raise Exception('ga_config.gac must contain at least globalauth_server="URL" or fof_sudo_server="URL"')
|
||||
|
||||
self.gac = {
|
||||
'cookie_name' : 'simple_global_auth',
|
||||
'cookie_expire' : 86400*7,
|
||||
'cookie_path' : '/',
|
||||
'cookie_domain' : '',
|
||||
'globalauth_server' : '',
|
||||
'cache_dir' : os.path.abspath(os.path.dirname(__file__))+'/cache',
|
||||
'cut_email_at' : 0,
|
||||
'ga_always_require' : 0,
|
||||
'fof_sudo_server' : '',
|
||||
'fof_sudo_cookie' : 'fof_sudo_id',
|
||||
'gc_probability' : 20,
|
||||
}
|
||||
|
||||
for i in self.gac:
|
||||
if ga_config.gac.get(i, None) is not None:
|
||||
self.gac[i] = ga_config.gac[i]
|
||||
|
||||
self.cache = FileCache(self.gac['cache_dir'])
|
||||
|
||||
def auth(self):
|
||||
if self.gac['fof_sudo_server']:
|
||||
self.auth_fof_sudo()
|
||||
if not self.user_name and self.gac['globalauth_server']:
|
||||
self.auth_ga()
|
||||
|
||||
def auth_ga(self):
|
||||
i = random.randint(1, self.gac['gc_probability'])
|
||||
if i == 1:
|
||||
self.cache.clean()
|
||||
r_id = self.cookies.get(self.gac['cookie_name'], '')
|
||||
if r_id:
|
||||
r_id = r_id.value
|
||||
ga_id = self.v.get('ga_id', '')
|
||||
if self.v.get('ga_client', ''):
|
||||
self.ga_client(r_id, ga_id)
|
||||
return
|
||||
r_data = ''
|
||||
if r_id == 'nologin':
|
||||
r_data = 'nologin'
|
||||
elif r_id != '':
|
||||
r_data = self.cache.get('D'+r_id)
|
||||
if r_data != 'nologin':
|
||||
try: r_data = anyjson.deserialize(r_data)
|
||||
except: r_data = ''
|
||||
is_browser = re.match('opera|firefox|chrome|safari', self.server.getenv('HTTP_USER_AGENT'), re.I)
|
||||
if not r_data and (is_browser or self.gac['ga_always_require']) or self.v.get('ga_require', None):
|
||||
self.ga_begin()
|
||||
elif r_data and r_data != 'nologin':
|
||||
self.set_user(r_data)
|
||||
|
||||
def ga_client(self, r_id, ga_id):
|
||||
ga_key = self.v.get('ga_key', '')
|
||||
if ga_key and ga_key == self.cache.get('K'+ga_id):
|
||||
# Server-to-server request
|
||||
self.cache.delete('K'+ga_id)
|
||||
data = ''
|
||||
if self.v.get('ga_nologin','') != '':
|
||||
data = 'nologin'
|
||||
else:
|
||||
try: data = anyjson.deserialize(self.v.get('ga_data',''))
|
||||
except: raise
|
||||
if data != '':
|
||||
if data != 'nologin':
|
||||
data = anyjson.serialize(data)
|
||||
self.cache.set('D'+ga_id, data)
|
||||
self.server.header('text/plain')
|
||||
self.server.write('1')
|
||||
sys.exit()
|
||||
elif ga_key == '' and r_id != ga_id:
|
||||
# User redirect with different key
|
||||
d = self.cache.get('D'+ga_id)
|
||||
if d != 'nologin' and d != '':
|
||||
try: d = anyjson.deserialize(d)
|
||||
except: d = ''
|
||||
if d != '':
|
||||
self.setcookie(ga_id)
|
||||
self.redirect(self.clean_uri())
|
||||
self.server.header('text/plain', status=404)
|
||||
self.server.write('GlobalAuth key doesn\'t match')
|
||||
sys.exit()
|
||||
|
||||
def ga_begin(self):
|
||||
ga_id = binascii.hexlify(os.urandom(16))
|
||||
ga_key = binascii.hexlify(os.urandom(16))
|
||||
url = self.add_param(self.gac['globalauth_server'], '')
|
||||
try:
|
||||
resp = urllib2.urlopen(url+'ga_id='+urllib2.quote(ga_id)+'&ga_key='+urllib2.quote(ga_key))
|
||||
resp.read()
|
||||
if resp.code != 200:
|
||||
raise Exception(resp)
|
||||
except:
|
||||
self.setcookie('nologin')
|
||||
self.redirect(self.clean_uri())
|
||||
return_uri = 'http://'+self.server.getenv('HTTP_HOST')+self.server.getenv('REQUEST_URI')
|
||||
return_uri = self.add_param(return_uri, 'ga_client=1')
|
||||
self.cache.set('K'+ga_id, ga_key)
|
||||
url = url+'ga_id='+urllib2.quote(ga_id)+'&ga_url='+urllib2.quote(return_uri)
|
||||
if self.v.get('ga_require', '') == '' and not self.gac['ga_always_require']:
|
||||
url = url+'&ga_check=1'
|
||||
self.redirect(url)
|
||||
|
||||
def add_param(self, url, param):
|
||||
if url.find('?') != -1:
|
||||
url = url+'&'
|
||||
else:
|
||||
url = url+'?'
|
||||
return url+param
|
||||
|
||||
def auth_fof_sudo(self):
|
||||
sudo_id = self.cookies.get(self.gac['fof_sudo_cookie'], '')
|
||||
if sudo_id:
|
||||
sudo_id = sudo_id.value
|
||||
if sudo_id != '':
|
||||
url = self.gac['fof_sudo_server']
|
||||
if url.find('?') != -1:
|
||||
url = url+'&'
|
||||
else:
|
||||
url = url+'?'
|
||||
try:
|
||||
resp = urllib2.urlopen(url+'id='+urllib2.quote(sudo_id))
|
||||
d = resp.read()
|
||||
if resp.code != 200:
|
||||
raise Exception(resp)
|
||||
d = anyjson.deserialize(d)
|
||||
self.set_user(d)
|
||||
except:
|
||||
pass
|
||||
|
||||
def log(self, s):
|
||||
sys.stderr.write(s+"\n")
|
||||
sys.stderr.flush()
|
||||
|
||||
def redirect(self, url):
|
||||
self.server.addheader('Location', url)
|
||||
self.server.header(status='302 Moved Temporarily')
|
||||
self.server.write('This document is located <a href="%s">here</a>.' % url)
|
||||
sys.exit()
|
||||
|
||||
def setcookie(self, value):
|
||||
dom = self.gac['cookie_domain']
|
||||
if not dom:
|
||||
dom = self.server.getenv('HTTP_HOST')
|
||||
exp = ''
|
||||
if self.gac['cookie_expire'] > 0:
|
||||
tm = int(time.time()+self.gac['cookie_expire'])
|
||||
tm = datetime.datetime.utcfromtimestamp(tm)
|
||||
tm = "%s, %02d-%s-%04d %02d:%02d:%02d GMT" % (self.wd[tm.weekday()], tm.day, self.ms[tm.month], tm.year, tm.hour, tm.minute, tm.second)
|
||||
exp = '; expires='+tm
|
||||
self.server.addheader('Set-Cookie', "%s=%s; path=%s; domain=%s%s" % (self.gac['cookie_name'], value, self.gac['cookie_path'], dom, exp))
|
||||
|
||||
def clean_uri(self):
|
||||
uriargs = self.v.copy()
|
||||
for i in [ 'ga_id', 'ga_res', 'ga_key', 'ga_client', 'ga_nologin', 'ga_require' ]:
|
||||
uriargs.pop(i, None)
|
||||
uri = self.server.getenv('REQUEST_URI')
|
||||
p = uri.find('?')
|
||||
if p != -1:
|
||||
uri = uri[0:p]
|
||||
uri = 'http://'+self.server.getenv('HTTP_HOST')+uri+'?'+urllib.urlencode(uriargs)
|
||||
return uri
|
||||
|
||||
def set_user(self, r_data):
|
||||
r_email = r_data.get('user_email', '').encode('utf-8')
|
||||
r_url = r_data.get('user_url', '').encode('utf-8')
|
||||
if self.gac['cut_email_at']:
|
||||
p = r_email.find('@')
|
||||
if p != -1:
|
||||
r_email = r_email[0:p]
|
||||
self.user_name = r_email
|
||||
self.user_url = r_url
|
39
lib/idiff.py
39
lib/idiff.py
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2006 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -19,8 +19,10 @@ from __future__ import generators
|
|||
import difflib
|
||||
import sys
|
||||
import re
|
||||
|
||||
from common import _item, _RCSDIFF_NO_CHANGES
|
||||
import ezt
|
||||
import cgi
|
||||
import sapi
|
||||
|
||||
def sidebyside(fromlines, tolines, context):
|
||||
"""Generate side by side diff"""
|
||||
|
@ -29,6 +31,7 @@ def sidebyside(fromlines, tolines, context):
|
|||
line_strip = lambda line: line.rstrip("\n")
|
||||
fromlines = map(line_strip, fromlines)
|
||||
tolines = map(line_strip, tolines)
|
||||
had_changes = 0
|
||||
|
||||
gap = False
|
||||
for fromdata, todata, flag in difflib._mdiff(fromlines, tolines, context):
|
||||
|
@ -37,8 +40,11 @@ def sidebyside(fromlines, tolines, context):
|
|||
else:
|
||||
from_item = _mdiff_split(flag, fromdata)
|
||||
to_item = _mdiff_split(flag, todata)
|
||||
yield _item(gap=ezt.boolean(gap), columns=(from_item, to_item))
|
||||
had_changes = 1
|
||||
yield _item(gap=ezt.boolean(gap), columns=(from_item, to_item), type="intraline")
|
||||
gap = False
|
||||
if not had_changes:
|
||||
yield _item(type=_RCSDIFF_NO_CHANGES)
|
||||
|
||||
_re_mdiff = re.compile("\0([+-^])(.*?)\1")
|
||||
|
||||
|
@ -49,18 +55,18 @@ def _mdiff_split(flag, (line_number, text)):
|
|||
while True:
|
||||
m = _re_mdiff.search(text, pos)
|
||||
if not m:
|
||||
segments.append(_item(text=cgi.escape(text[pos:]), type=None))
|
||||
segments.append(_item(text=sapi.escape(text[pos:]), type=None))
|
||||
break
|
||||
|
||||
if m.start() > pos:
|
||||
segments.append(_item(text=cgi.escape(text[pos:m.start()]), type=None))
|
||||
segments.append(_item(text=sapi.escape(text[pos:m.start()]), type=None))
|
||||
|
||||
if m.group(1) == "+":
|
||||
segments.append(_item(text=cgi.escape(m.group(2)), type="add"))
|
||||
segments.append(_item(text=sapi.escape(m.group(2)), type="add"))
|
||||
elif m.group(1) == "-":
|
||||
segments.append(_item(text=cgi.escape(m.group(2)), type="remove"))
|
||||
segments.append(_item(text=sapi.escape(m.group(2)), type="remove"))
|
||||
elif m.group(1) == "^":
|
||||
segments.append(_item(text=cgi.escape(m.group(2)), type="change"))
|
||||
segments.append(_item(text=sapi.escape(m.group(2)), type="change"))
|
||||
|
||||
pos = m.end()
|
||||
|
||||
|
@ -71,19 +77,26 @@ def unified(fromlines, tolines, context):
|
|||
|
||||
diff = difflib.Differ().compare(fromlines, tolines)
|
||||
lastrow = None
|
||||
had_changes = 0
|
||||
|
||||
for row in _trim_context(diff, context):
|
||||
if row[0].startswith("? "):
|
||||
had_changes = 1
|
||||
yield _differ_split(lastrow, row[0])
|
||||
lastrow = None
|
||||
else:
|
||||
if lastrow:
|
||||
had_changes = 1
|
||||
yield _differ_split(lastrow, None)
|
||||
lastrow = row
|
||||
|
||||
if lastrow:
|
||||
had_changes = 1
|
||||
yield _differ_split(lastrow, None)
|
||||
|
||||
if not had_changes:
|
||||
yield _item(type=_RCSDIFF_NO_CHANGES)
|
||||
|
||||
def _trim_context(lines, context_size):
|
||||
"""Trim context lines that don't surround changes from Differ results
|
||||
|
||||
|
@ -166,20 +179,16 @@ def _differ_split(row, guide):
|
|||
|
||||
for m in _re_differ.finditer(guide, pos):
|
||||
if m.start() > pos:
|
||||
segments.append(_item(text=cgi.escape(line[pos:m.start()]), type=None))
|
||||
segments.append(_item(text=cgi.escape(line[m.start():m.end()]),
|
||||
segments.append(_item(text=sapi.escape(line[pos:m.start()]), type=None))
|
||||
segments.append(_item(text=sapi.escape(line[m.start():m.end()]),
|
||||
type="change"))
|
||||
pos = m.end()
|
||||
|
||||
segments.append(_item(text=cgi.escape(line[pos:]), type=None))
|
||||
segments.append(_item(text=sapi.escape(line[pos:]), type=None))
|
||||
|
||||
return _item(gap=ezt.boolean(gap), type=type, segments=segments,
|
||||
left_number=left_number, right_number=right_number)
|
||||
|
||||
class _item:
|
||||
def __init__(self, **kw):
|
||||
vars(self).update(kw)
|
||||
|
||||
try:
|
||||
### Using difflib._mdiff function here was the easiest way of obtaining
|
||||
### intraline diffs for use in ViewVC, but it doesn't exist prior to
|
||||
|
|
199
lib/popen.py
199
lib/popen.py
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2007 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -23,7 +23,6 @@ import os
|
|||
import sys
|
||||
import sapi
|
||||
import threading
|
||||
import string
|
||||
|
||||
if sys.platform == "win32":
|
||||
import win32popen
|
||||
|
@ -36,7 +35,7 @@ def popen(cmd, args, mode, capture_err=1):
|
|||
if sys.platform == "win32":
|
||||
command = win32popen.CommandLine(cmd, args)
|
||||
|
||||
if string.find(mode, 'r') >= 0:
|
||||
if mode.find('r') >= 0:
|
||||
hStdIn = None
|
||||
|
||||
if debug.SHOW_CHILD_PROCESSES:
|
||||
|
@ -85,7 +84,7 @@ def popen(cmd, args, mode, capture_err=1):
|
|||
# in the parent
|
||||
|
||||
# close the descriptor that we don't need and return the other one.
|
||||
if string.find(mode, 'r') >= 0:
|
||||
if mode.find('r') >= 0:
|
||||
os.close(w)
|
||||
return _pipe(os.fdopen(r, mode), pid)
|
||||
os.close(r)
|
||||
|
@ -96,7 +95,7 @@ def popen(cmd, args, mode, capture_err=1):
|
|||
# we'll need /dev/null for the discarded I/O
|
||||
null = os.open('/dev/null', os.O_RDWR)
|
||||
|
||||
if string.find(mode, 'r') >= 0:
|
||||
if mode.find('r') >= 0:
|
||||
# hook stdout/stderr to the "write" channel
|
||||
os.dup2(w, 1)
|
||||
# "close" stdin; the child shouldn't use it
|
||||
|
@ -125,200 +124,12 @@ def popen(cmd, args, mode, capture_err=1):
|
|||
os.execvp(cmd, (cmd,) + tuple(args))
|
||||
except:
|
||||
# aid debugging, if the os.execvp above fails for some reason:
|
||||
print "<h2>exec failed:</h2><pre>", cmd, string.join(args), "</pre>"
|
||||
print "<h2>exec failed:</h2><pre>", cmd, ' '.join(args), "</pre>"
|
||||
raise
|
||||
|
||||
# crap. shouldn't be here.
|
||||
sys.exit(127)
|
||||
|
||||
def pipe_cmds(cmds, out=None):
|
||||
"""Executes a sequence of commands. The output of each command is directed to
|
||||
the input of the next command. A _pipe object is returned for writing to the
|
||||
first command's input. The output of the last command is directed to the
|
||||
"out" file object or the standard output if "out" is None. If "out" is not an
|
||||
OS file descriptor, a separate thread will be spawned to send data to its
|
||||
write() method."""
|
||||
|
||||
if out is None:
|
||||
out = sys.stdout
|
||||
|
||||
if sys.platform == "win32":
|
||||
### FIXME: windows implementation ignores "out" argument, always
|
||||
### writing last command's output to standard out
|
||||
|
||||
if debug.SHOW_CHILD_PROCESSES:
|
||||
dbgIn = StringIO.StringIO()
|
||||
hStdIn, handle = win32popen.MakeSpyPipe(1, 0, (dbgIn,))
|
||||
|
||||
i = 0
|
||||
for cmd in cmds:
|
||||
i = i + 1
|
||||
|
||||
dbgOut, dbgErr = StringIO.StringIO(), StringIO.StringIO()
|
||||
|
||||
if i < len(cmds):
|
||||
nextStdIn, hStdOut = win32popen.MakeSpyPipe(1, 1, (dbgOut,))
|
||||
x, hStdErr = win32popen.MakeSpyPipe(None, 1, (dbgErr,))
|
||||
else:
|
||||
ehandle = win32event.CreateEvent(None, 1, 0, None)
|
||||
nextStdIn, hStdOut = win32popen.MakeSpyPipe(None, 1, (dbgOut, sapi.server.file()), ehandle)
|
||||
x, hStdErr = win32popen.MakeSpyPipe(None, 1, (dbgErr,))
|
||||
|
||||
command = win32popen.CommandLine(cmd[0], cmd[1:])
|
||||
phandle, pid, thandle, tid = win32popen.CreateProcess(command, hStdIn, hStdOut, hStdErr)
|
||||
if debug.SHOW_CHILD_PROCESSES:
|
||||
debug.Process(command, dbgIn, dbgOut, dbgErr)
|
||||
|
||||
dbgIn = dbgOut
|
||||
hStdIn = nextStdIn
|
||||
|
||||
|
||||
else:
|
||||
|
||||
hStdIn, handle = win32popen.CreatePipe(1, 0)
|
||||
spool = None
|
||||
|
||||
i = 0
|
||||
for cmd in cmds:
|
||||
i = i + 1
|
||||
if i < len(cmds):
|
||||
nextStdIn, hStdOut = win32popen.CreatePipe(1, 1)
|
||||
else:
|
||||
# very last process
|
||||
nextStdIn = None
|
||||
|
||||
if sapi.server.inheritableOut:
|
||||
# send child output to standard out
|
||||
hStdOut = win32popen.MakeInheritedHandle(win32popen.FileObject2File(sys.stdout),0)
|
||||
ehandle = None
|
||||
else:
|
||||
ehandle = win32event.CreateEvent(None, 1, 0, None)
|
||||
x, hStdOut = win32popen.MakeSpyPipe(None, 1, (sapi.server.file(),), ehandle)
|
||||
|
||||
command = win32popen.CommandLine(cmd[0], cmd[1:])
|
||||
phandle, pid, thandle, tid = win32popen.CreateProcess(command, hStdIn, hStdOut, None)
|
||||
hStdIn = nextStdIn
|
||||
|
||||
return _pipe(win32popen.File2FileObject(handle, 'wb'), phandle, ehandle)
|
||||
|
||||
# flush the stdio buffers since we are about to change the FD under them
|
||||
sys.stdout.flush()
|
||||
sys.stderr.flush()
|
||||
|
||||
prev_r, parent_w = os.pipe()
|
||||
|
||||
null = os.open('/dev/null', os.O_RDWR)
|
||||
|
||||
child_pids = []
|
||||
|
||||
for cmd in cmds[:-1]:
|
||||
r, w = os.pipe()
|
||||
pid = os.fork()
|
||||
if not pid:
|
||||
# in the child
|
||||
|
||||
# hook up stdin to the "read" channel
|
||||
os.dup2(prev_r, 0)
|
||||
|
||||
# hook up stdout to the output channel
|
||||
os.dup2(w, 1)
|
||||
|
||||
# toss errors
|
||||
os.dup2(null, 2)
|
||||
|
||||
# close these extra descriptors
|
||||
os.close(prev_r)
|
||||
os.close(parent_w)
|
||||
os.close(null)
|
||||
os.close(r)
|
||||
os.close(w)
|
||||
|
||||
# time to run the command
|
||||
try:
|
||||
os.execvp(cmd[0], cmd)
|
||||
except:
|
||||
pass
|
||||
|
||||
sys.exit(127)
|
||||
|
||||
# in the parent
|
||||
child_pids.append(pid)
|
||||
|
||||
# we don't need these any more
|
||||
os.close(prev_r)
|
||||
os.close(w)
|
||||
|
||||
# the read channel of this pipe will feed into to the next command
|
||||
prev_r = r
|
||||
|
||||
# no longer needed
|
||||
os.close(null)
|
||||
|
||||
# done with most of the commands. set up the last command to write to "out"
|
||||
if not hasattr(out, 'fileno'):
|
||||
r, w = os.pipe()
|
||||
|
||||
pid = os.fork()
|
||||
if not pid:
|
||||
# in the child (the last command)
|
||||
|
||||
# hook up stdin to the "read" channel
|
||||
os.dup2(prev_r, 0)
|
||||
|
||||
# hook up stdout to "out"
|
||||
if hasattr(out, 'fileno'):
|
||||
if out.fileno() != 1:
|
||||
os.dup2(out.fileno(), 1)
|
||||
out.close()
|
||||
|
||||
else:
|
||||
# "out" can't be hooked up directly, so use a pipe and a thread
|
||||
os.dup2(w, 1)
|
||||
os.close(r)
|
||||
os.close(w)
|
||||
|
||||
# close these extra descriptors
|
||||
os.close(prev_r)
|
||||
os.close(parent_w)
|
||||
|
||||
# run the last command
|
||||
try:
|
||||
os.execvp(cmds[-1][0], cmds[-1])
|
||||
except:
|
||||
pass
|
||||
|
||||
sys.exit(127)
|
||||
|
||||
child_pids.append(pid)
|
||||
# not needed any more
|
||||
os.close(prev_r)
|
||||
|
||||
if not hasattr(out, 'fileno'):
|
||||
os.close(w)
|
||||
thread = _copy(r, out)
|
||||
thread.start()
|
||||
else:
|
||||
thread = None
|
||||
|
||||
# write into the first pipe, wait on the final process
|
||||
return _pipe(os.fdopen(parent_w, 'w'), child_pids, thread=thread)
|
||||
|
||||
class _copy(threading.Thread):
|
||||
def __init__(self, srcfd, destfile):
|
||||
self.srcfd = srcfd
|
||||
self.destfile = destfile
|
||||
threading.Thread.__init__(self)
|
||||
|
||||
def run(self):
|
||||
try:
|
||||
while 1:
|
||||
s = os.read(self.srcfd, 1024)
|
||||
if not s:
|
||||
break
|
||||
self.destfile.write(s)
|
||||
finally:
|
||||
os.close(self.srcfd)
|
||||
|
||||
class _pipe:
|
||||
"Wrapper for a file which can wait() on a child process at close time."
|
||||
|
||||
|
|
|
@ -0,0 +1,154 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
"""
|
||||
pygments.lexers.sp4
|
||||
~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Lexer for CustIS m4-preprocessed PL/SQL.
|
||||
|
||||
:copyright: 2009+ by Vitaliy Filippov <vitalif@mail.ru>.
|
||||
:license: BSD, see LICENSE for more details.
|
||||
,
|
||||
'Sp4Lexer': ('pygments.lexers.sp4', 'SP4', ('sp4',), ('*.sp4'), ('text/x-sp4',))
|
||||
"""
|
||||
|
||||
import re
|
||||
|
||||
from pygments.lexer import Lexer, RegexLexer, include, bygroups, using, this, \
|
||||
do_insertions
|
||||
from pygments.token import Error, Punctuation, \
|
||||
Text, Comment, Operator, Keyword, Name, String, Number, Generic
|
||||
from pygments.util import shebang_matches
|
||||
|
||||
|
||||
__all__ = ['Sp4Lexer']
|
||||
|
||||
line_re = re.compile('.*?\n')
|
||||
|
||||
|
||||
class Sp4Lexer(RegexLexer):
|
||||
name = 'SP4'
|
||||
aliases = ['sp4']
|
||||
filenames = ['*.sp4']
|
||||
mimetypes = ['text/x-sp4']
|
||||
|
||||
flags = re.IGNORECASE
|
||||
tokens = {
|
||||
'root': [
|
||||
(r'\s+', Text),
|
||||
(r'--.*?\n', Comment.Single),
|
||||
(r'/\*', Comment.Multiline, 'multiline-comments'),
|
||||
(r'(ABORT|ABS|ABSOLUTE|ACCESS|ADA|ADD|ADMIN|AFTER|AGGREGATE|'
|
||||
r'ALIAS|ALL|ALLOCATE|ALTER|ANALYSE|ANALYZE|AND|ANY|ARE|AS|'
|
||||
r'ASC|ASENSITIVE|ASSERTION|ASSIGNMENT|ASYMMETRIC|AT|ATOMIC|'
|
||||
r'AUTHORIZATION|AVG|BACKWARD|BEFORE|BEGIN|BETWEEN|BITVAR|'
|
||||
r'BIT_LENGTH|BOTH|BREADTH|BY|C|CACHE|CALL|CALLED|CARDINALITY|'
|
||||
r'CASCADE|CASCADED|CASE|CAST|CATALOG|CATALOG_NAME|CHAIN|'
|
||||
r'CHARACTERISTICS|CHARACTER_LENGTH|CHARACTER_SET_CATALOG|'
|
||||
r'CHARACTER_SET_NAME|CHARACTER_SET_SCHEMA|CHAR_LENGTH|CHECK|'
|
||||
r'CHECKED|CHECKPOINT|CLASS|CLASS_ORIGIN|CLOB|CLOSE|CLUSTER|'
|
||||
r'COALSECE|COBOL|COLLATE|COLLATION|COLLATION_CATALOG|'
|
||||
r'COLLATION_NAME|COLLATION_SCHEMA|COLUMN|COLUMN_NAME|'
|
||||
r'COMMAND_FUNCTION|COMMAND_FUNCTION_CODE|COMMENT|COMMIT|'
|
||||
r'COMMITTED|COMPLETION|CONDITION_NUMBER|CONNECT|CONNECTION|'
|
||||
r'CONNECTION_NAME|CONSTRAINT|CONSTRAINTS|CONSTRAINT_CATALOG|'
|
||||
r'CONSTRAINT_NAME|CONSTRAINT_SCHEMA|CONSTRUCTOR|CONTAINS|'
|
||||
r'CONTINUE|CONVERSION|CONVERT|COPY|CORRESPONTING|COUNT|'
|
||||
r'CREATE|CREATEDB|CREATEUSER|CROSS|CUBE|CURRENT|CURRENT_DATE|'
|
||||
r'CURRENT_PATH|CURRENT_ROLE|CURRENT_TIME|CURRENT_TIMESTAMP|'
|
||||
r'CURRENT_USER|CURSOR|CURSOR_NAME|CYCLE|DATA|DATABASE|'
|
||||
r'DATETIME_INTERVAL_CODE|DATETIME_INTERVAL_PRECISION|DAY|'
|
||||
r'DEALLOCATE|DECLARE|DEFAULT|DEFAULTS|DEFERRABLE|DEFERRED|'
|
||||
r'DEFINED|DEFINER|DELETE|DELIMITER|DELIMITERS|DEREF|DESC|'
|
||||
r'DESCRIBE|DESCRIPTOR|DESTROY|DESTRUCTOR|DETERMINISTIC|'
|
||||
r'DIAGNOSTICS|DICTIONARY|DISCONNECT|DISPATCH|DISTINCT|DO|'
|
||||
r'DOMAIN|DROP|DYNAMIC|DYNAMIC_FUNCTION|DYNAMIC_FUNCTION_CODE|'
|
||||
r'EACH|ELSE|ENCODING|ENCRYPTED|END|END-EXEC|EQUALS|ESCAPE|EVERY|'
|
||||
r'EXCEPT|ESCEPTION|EXCLUDING|EXCLUSIVE|EXEC|EXECUTE|EXISTING|'
|
||||
r'EXISTS|EXPLAIN|EXTERNAL|EXTRACT|FALSE|FETCH|FINAL|FIRST|FOR|'
|
||||
r'FORCE|FOREIGN|FORTRAN|FORWARD|FOUND|FREE|FREEZE|FROM|FULL|'
|
||||
r'FUNCTION|G|GENERAL|GENERATED|GET|GLOBAL|GO|GOTO|GRANT|GRANTED|'
|
||||
r'GROUP|GROUPING|HANDLER|HAVING|HIERARCHY|HOLD|HOST|IDENTITY|'
|
||||
r'IGNORE|ILIKE|IMMEDIATE|IMMUTABLE|IMPLEMENTATION|IMPLICIT|IN|'
|
||||
r'INCLUDING|INCREMENT|INDEX|INDITCATOR|INFIX|INHERITS|INITIALIZE|'
|
||||
r'INITIALLY|INNER|INOUT|INPUT|INSENSITIVE|INSERT|INSTANTIABLE|'
|
||||
r'INSTEAD|INTERSECT|INTO|INVOKER|IS|ISNULL|ISOLATION|ITERATE|JOIN|'
|
||||
r'K|KEY|KEY_MEMBER|KEY_TYPE|LANCOMPILER|LANGUAGE|LARGE|LAST|'
|
||||
r'LATERAL|LEADING|LEFT|LENGTH|LESS|LEVEL|LIKE|LILMIT|LISTEN|LOAD|'
|
||||
r'LOCAL|LOCALTIME|LOCALTIMESTAMP|LOCATION|LOCATOR|LOCK|LOWER|M|'
|
||||
r'MAP|MATCH|MAX|MAXVALUE|MESSAGE_LENGTH|MESSAGE_OCTET_LENGTH|'
|
||||
r'MESSAGE_TEXT|METHOD|MIN|MINUTE|MINVALUE|MOD|MODE|MODIFIES|'
|
||||
r'MODIFY|MONTH|MORE|MOVE|MUMPS|NAMES|NATIONAL|NATURAL|NCHAR|'
|
||||
r'NCLOB|NEW|NEXT|NO|NOCREATEDB|NOCREATEUSER|NONE|NOT|NOTHING|'
|
||||
r'NOTIFY|NOTNULL|NULL|NULLABLE|NULLIF|OBJECT|OCTET_LENGTH|OF|OFF|'
|
||||
r'OFFSET|OIDS|OLD|ON|ONLY|OPEN|OPERATION|OPERATOR|OPTION|OPTIONS|'
|
||||
r'OR|ORDER|ORDINALITY|OUT|OUTER|OUTPUT|OVERLAPS|OVERLAY|OVERRIDING|'
|
||||
r'OWNER|PAD|PARAMETER|PARAMETERS|PARAMETER_MODE|PARAMATER_NAME|'
|
||||
r'PARAMATER_ORDINAL_POSITION|PARAMETER_SPECIFIC_CATALOG|'
|
||||
r'PARAMETER_SPECIFIC_NAME|PARAMATER_SPECIFIC_SCHEMA|PARTIAL|'
|
||||
r'PASCAL|PENDANT|PLACING|PLI|POSITION|POSTFIX|PRECISION|PREFIX|'
|
||||
r'PREORDER|PREPARE|PRESERVE|PRIMARY|PRIOR|PRIVILEGES|PROCEDURAL|'
|
||||
r'PROCEDURE|PUBLIC|READ|READS|RECHECK|RECURSIVE|REF|REFERENCES|'
|
||||
r'REFERENCING|REINDEX|RELATIVE|RENAME|REPEATABLE|REPLACE|RESET|'
|
||||
r'RESTART|RESTRICT|RESULT|RETURN|RETURNED_LENGTH|'
|
||||
r'RETURNED_OCTET_LENGTH|RETURNED_SQLSTATE|RETURNS|REVOKE|RIGHT|'
|
||||
r'ROLE|ROLLBACK|ROLLUP|ROUTINE|ROUTINE_CATALOG|ROUTINE_NAME|'
|
||||
r'ROUTINE_SCHEMA|ROW|ROWS|ROW_COUNT|RULE|SAVE_POINT|SCALE|SCHEMA|'
|
||||
r'SCHEMA_NAME|SCOPE|SCROLL|SEARCH|SECOND|SECURITY|SELECT|SELF|'
|
||||
r'SENSITIVE|SERIALIZABLE|SERVER_NAME|SESSION|SESSION_USER|SET|'
|
||||
r'SETOF|SETS|SHARE|SHOW|SIMILAR|SIMPLE|SIZE|SOME|SOURCE|SPACE|'
|
||||
r'SPECIFIC|SPECIFICTYPE|SPECIFIC_NAME|SQL|SQLCODE|SQLERROR|'
|
||||
r'SQLEXCEPTION|SQLSTATE|SQLWARNINIG|STABLE|START|STATE|STATEMENT|'
|
||||
r'STATIC|STATISTICS|STDIN|STDOUT|STORAGE|STRICT|STRUCTURE|STYPE|'
|
||||
r'SUBCLASS_ORIGIN|SUBLIST|SUBSTRING|SUM|SYMMETRIC|SYSID|SYSTEM|'
|
||||
r'SYSTEM_USER|TABLE|TABLE_NAME| TEMP|TEMPLATE|TEMPORARY|TERMINATE|'
|
||||
r'THAN|THEN|TIMESTAMP|TIMEZONE_HOUR|TIMEZONE_MINUTE|TO|TOAST|'
|
||||
r'TRAILING|TRANSATION|TRANSACTIONS_COMMITTED|'
|
||||
r'TRANSACTIONS_ROLLED_BACK|TRANSATION_ACTIVE|TRANSFORM|'
|
||||
r'TRANSFORMS|TRANSLATE|TRANSLATION|TREAT|TRIGGER|TRIGGER_CATALOG|'
|
||||
r'TRIGGER_NAME|TRIGGER_SCHEMA|TRIM|TRUE|TRUNCATE|TRUSTED|TYPE|'
|
||||
r'UNCOMMITTED|UNDER|UNENCRYPTED|UNION|UNIQUE|UNKNOWN|UNLISTEN|'
|
||||
r'UNNAMED|UNNEST|UNTIL|UPDATE|UPPER|USAGE|USER|'
|
||||
r'USER_DEFINED_TYPE_CATALOG|USER_DEFINED_TYPE_NAME|'
|
||||
r'USER_DEFINED_TYPE_SCHEMA|USING|VACUUM|VALID|VALIDATOR|VALUES|'
|
||||
r'VARIABLE|VERBOSE|VERSION|VIEW|VOLATILE|WHEN|WHENEVER|WHERE|'
|
||||
r'WITH|WITHOUT|WORK|WRITE|YEAR|ZONE|BINARY_INTEGER|BODY|BREAK|'
|
||||
r'CONSTANT|DEFINITION|DELETING|DLOB|DUMMY|ELSIF|ERRLVL|ERROR|'
|
||||
r'EXCEPTION|EXIT|IF|INSERTING|ISOPEN|LOOP|NO_DATA_FOUND|NOTFOUND|'
|
||||
r'OTHERS|PACKAGE|PRAGMA|RAISE|RECORD|RESTRICT_REFERENCES|RETURNING|'
|
||||
r'RNDS|RNPS|ROWCOUNT|ROWNUM|ROWTYPE|SAVEPOINT|SQLERRM|TOO_MANY_ROWS|'
|
||||
r'UPDATING|WHILE|WNDS|WNPS|BULK|CHR|COLLECT|GREATEST|INSTR|LEAST|'
|
||||
r'LENGTHB|NOCOPY|NOWAIT|NVL|RPAD|SUBST|SUBSTB|SUBSTR|SYSDATE|'
|
||||
r'TABLESPACE|TO_CHAR|TO_DATE|TO_NUMBER|TRUNC)\b', Keyword),
|
||||
(r'(ARRAY|BIGINT|BINARY|BIT|BLOB|BOOLEAN|CHAR|CHARACTER|DATE|'
|
||||
r'DEC|DECIMAL|FLOAT|INT|INTEGER|INTERVAL|NUMBER|NUMERIC|REAL|'
|
||||
r'SERIAL|SMALLINT|VARCHAR|VARCHAR2|VARYING|INT8|SERIAL8|TEXT)\b',
|
||||
Name.Builtin),
|
||||
(r'(_5date_args|_actual_area|_ASSERT|_doc_code|_doc_var|_doc_var_list|'
|
||||
r'_enforce|_ent|_enum|_enums_define|_enums_member_define|_field|'
|
||||
r'_fields|_first|_FMT|_in_list|_index|_index_unique|_indexes'
|
||||
r'_MAX_STRLEN|_MID_STRLEN|_param|_package|_pk|_plsql_param|_plsql_return|'
|
||||
r'_private_function|_private_procedure|_private_type|_private_var|'
|
||||
r'_protected_function|_protected_procedure|_protected_type|_protected_var|'
|
||||
r'_public_function|_public_procedure|_public_type|_public_var|_quote|_RAISE|'
|
||||
r'_RAISEW|_reference|_references|_request_arg|_request_define|'
|
||||
r'_request_res|_STR_CONST|_substr|_table|_tail|builtin|cdr|changecom|'
|
||||
r'changequote|changeword|debugfile|decr|define|divert|dummy_list|dumpdef|'
|
||||
r'errprint|eval|foreach|forloop|GetNth|ifelse|include|incr|index|indir|'
|
||||
r'len|lowcase|maketemp|Nth|patsubst|popdef|pushdef|regexp|'
|
||||
r'remove_prefix|shift|sinclude|Size|syscmd|TRACE|traceoff|traceon|'
|
||||
r'translit|undefine|undivert|upcase)\b',
|
||||
Name.Function),
|
||||
(r'[+*/<>=~!@#%^&|`?^-]', Operator),
|
||||
(r'[0-9]+', Number.Integer),
|
||||
(r"'(''|[^'\\]|\\\'|\\\\)*'", String.Single),
|
||||
(r'"(""|[^"\\]|\\\"|\\\\)*"', String.Symbol),
|
||||
(r'[a-zA-Z_][a-zA-Z0-9_]*', Name),
|
||||
(r'[;:()\[\],\.]', Punctuation)
|
||||
],
|
||||
'multiline-comments': [
|
||||
(r'/\*', Comment.Multiline, 'multiline-comments'),
|
||||
(r'\*/', Comment.Multiline, '#pop'),
|
||||
(r'[^/\*]+', Comment.Multiline),
|
||||
(r'[/*]', Comment.Multiline)
|
||||
]
|
||||
}
|
152
lib/query.py
152
lib/query.py
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python
|
||||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2008 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -23,6 +23,7 @@ import sys
|
|||
import string
|
||||
import time
|
||||
|
||||
from common import _item, TemplateData
|
||||
import cvsdb
|
||||
import viewvc
|
||||
import ezt
|
||||
|
@ -40,6 +41,7 @@ class FormData:
|
|||
self.file = ""
|
||||
self.who = ""
|
||||
self.sortby = ""
|
||||
self.textquery = ""
|
||||
self.date = ""
|
||||
self.hours = 0
|
||||
|
||||
|
@ -47,7 +49,7 @@ class FormData:
|
|||
|
||||
def decode_thyself(self, form):
|
||||
try:
|
||||
self.repository = string.strip(form["repository"].value)
|
||||
self.textquery = string.strip(form["textquery"].value)
|
||||
except KeyError:
|
||||
pass
|
||||
except TypeError:
|
||||
|
@ -56,7 +58,16 @@ class FormData:
|
|||
self.valid = 1
|
||||
|
||||
try:
|
||||
self.branch = string.strip(form["branch"].value)
|
||||
self.repository = form["repository"].value.strip()
|
||||
except KeyError:
|
||||
pass
|
||||
except TypeError:
|
||||
pass
|
||||
else:
|
||||
self.valid = 1
|
||||
|
||||
try:
|
||||
self.branch = form["branch"].value.strip()
|
||||
except KeyError:
|
||||
pass
|
||||
except TypeError:
|
||||
|
@ -65,7 +76,7 @@ class FormData:
|
|||
self.valid = 1
|
||||
|
||||
try:
|
||||
self.directory = string.strip(form["directory"].value)
|
||||
self.directory = form["directory"].value.strip()
|
||||
except KeyError:
|
||||
pass
|
||||
except TypeError:
|
||||
|
@ -74,7 +85,7 @@ class FormData:
|
|||
self.valid = 1
|
||||
|
||||
try:
|
||||
self.file = string.strip(form["file"].value)
|
||||
self.file = form["file"].value.strip()
|
||||
except KeyError:
|
||||
pass
|
||||
except TypeError:
|
||||
|
@ -83,7 +94,7 @@ class FormData:
|
|||
self.valid = 1
|
||||
|
||||
try:
|
||||
self.who = string.strip(form["who"].value)
|
||||
self.who = form["who"].value.strip()
|
||||
except KeyError:
|
||||
pass
|
||||
except TypeError:
|
||||
|
@ -92,14 +103,14 @@ class FormData:
|
|||
self.valid = 1
|
||||
|
||||
try:
|
||||
self.sortby = string.strip(form["sortby"].value)
|
||||
self.sortby = form["sortby"].value.strip()
|
||||
except KeyError:
|
||||
pass
|
||||
except TypeError:
|
||||
pass
|
||||
|
||||
try:
|
||||
self.date = string.strip(form["date"].value)
|
||||
self.date = form["date"].value.strip()
|
||||
except KeyError:
|
||||
pass
|
||||
except TypeError:
|
||||
|
@ -158,7 +169,7 @@ def listparse_string(str):
|
|||
## command; add the command and start over
|
||||
elif c == ",":
|
||||
## strip ending whitespace on un-quoted data
|
||||
temp = string.rstrip(temp)
|
||||
temp = temp.rstrip()
|
||||
return_list.append( ("", temp) )
|
||||
temp = ""
|
||||
state = "eat leading whitespace"
|
||||
|
@ -217,8 +228,9 @@ def decode_command(cmd):
|
|||
else:
|
||||
return "exact"
|
||||
|
||||
def form_to_cvsdb_query(form_data):
|
||||
def form_to_cvsdb_query(cfg, form_data):
|
||||
query = cvsdb.CreateCheckinQuery()
|
||||
query.SetLimit(cfg.cvsdb.row_limit)
|
||||
|
||||
if form_data.repository:
|
||||
for cmd, str in listparse_string(form_data.repository):
|
||||
|
@ -245,10 +257,15 @@ def form_to_cvsdb_query(form_data):
|
|||
cmd = decode_command(cmd)
|
||||
query.SetAuthor(str, cmd)
|
||||
|
||||
if form_data.textquery:
|
||||
query.SetTextQuery(form_data.textquery)
|
||||
|
||||
if form_data.sortby == "author":
|
||||
query.SetSortMethod("author")
|
||||
elif form_data.sortby == "file":
|
||||
query.SetSortMethod("file")
|
||||
elif form_data.sortby == "relevance" and form_data.textquery:
|
||||
query.SetSortMethod("relevance")
|
||||
else:
|
||||
query.SetSortMethod("date")
|
||||
|
||||
|
@ -266,18 +283,39 @@ def form_to_cvsdb_query(form_data):
|
|||
|
||||
def prev_rev(rev):
|
||||
'''Returns a string representing the previous revision of the argument.'''
|
||||
r = string.split(rev, '.')
|
||||
r = rev.split('.')
|
||||
# decrement final revision component
|
||||
r[-1] = str(int(r[-1]) - 1)
|
||||
# prune if we pass the beginning of the branch
|
||||
if len(r) > 2 and r[-1] == '0':
|
||||
r = r[:-2]
|
||||
return string.join(r, '.')
|
||||
return '.'.join(r)
|
||||
|
||||
def is_forbidden(cfg, cvsroot_name, module):
|
||||
auth_params = cfg.get_authorizer_params('forbidden', cvsroot_name)
|
||||
forbidden = auth_params.get('forbidden', '')
|
||||
forbidden = map(string.strip, filter(None, string.split(forbidden, ',')))
|
||||
'''Return 1 if MODULE in CVSROOT_NAME is forbidden; return 0 otherwise.'''
|
||||
|
||||
# CVSROOT_NAME might be None here if the data comes from an
|
||||
# unconfigured root. This interfaces doesn't care that the root
|
||||
# isn't configured, but if that's the case, it will consult only
|
||||
# the base and per-vhost configuration for authorizer and
|
||||
# authorizer parameters.
|
||||
if cvsroot_name:
|
||||
cfg = cfg.get_root_config(cvsroot_name)
|
||||
authorizer = cfg.options.authorizer
|
||||
params = cfg.get_authorizer_params()
|
||||
|
||||
# If CVSROOT_NAME isn't configured to use an authorizer, nothing
|
||||
# is forbidden. If it's configured to use something other than
|
||||
# the 'forbidden' authorizer, complain. Otherwise, check for
|
||||
# forbiddenness per the PARAMS as expected.
|
||||
if not authorizer:
|
||||
return 0
|
||||
if authorizer != 'forbidden':
|
||||
raise Exception("The 'forbidden' authorizer is the only one supported "
|
||||
"by this interface. The '%s' root is configured to "
|
||||
"use a different one." % (cvsroot_name))
|
||||
forbidden = params.get('forbidden', '')
|
||||
forbidden = map(lambda x: x.strip(), filter(None, forbidden.split(',')))
|
||||
default = 0
|
||||
for pat in forbidden:
|
||||
if pat[0] == '!':
|
||||
|
@ -290,11 +328,7 @@ def is_forbidden(cfg, cvsroot_name, module):
|
|||
|
||||
def build_commit(server, cfg, desc, files, cvsroots, viewvc_link):
|
||||
ob = _item(num_files=len(files), files=[])
|
||||
|
||||
if desc:
|
||||
ob.log = string.replace(server.escape(desc), '\n', '<br />')
|
||||
else:
|
||||
ob.log = ' '
|
||||
ob.log = desc and server.escape(desc).replace('\n', '<br />') or ' '
|
||||
|
||||
for commit in files:
|
||||
repository = commit.GetRepository()
|
||||
|
@ -303,7 +337,7 @@ def build_commit(server, cfg, desc, files, cvsroots, viewvc_link):
|
|||
|
||||
## find the module name (if any)
|
||||
try:
|
||||
module = filter(None, string.split(directory, '/'))[0]
|
||||
module = filter(None, directory.split('/'))[0]
|
||||
except IndexError:
|
||||
module = None
|
||||
|
||||
|
@ -328,9 +362,10 @@ def build_commit(server, cfg, desc, files, cvsroots, viewvc_link):
|
|||
except:
|
||||
raise Exception, str([directory, commit.GetFile()])
|
||||
|
||||
## if we couldn't find the cvsroot path configured in the
|
||||
## viewvc.conf file, then don't make the link
|
||||
if cvsroot_name:
|
||||
## If we couldn't find the cvsroot path configured in the
|
||||
## viewvc.conf file, or we don't have a VIEWVC_LINK, then
|
||||
## don't make the link.
|
||||
if cvsroot_name and viewvc_link:
|
||||
flink = '[%s] <a href="%s/%s?root=%s">%s</a>' % (
|
||||
cvsroot_name, viewvc_link, urllib.quote(file),
|
||||
cvsroot_name, file)
|
||||
|
@ -344,6 +379,9 @@ def build_commit(server, cfg, desc, files, cvsroots, viewvc_link):
|
|||
flink = '[%s] %s' % (repository, file)
|
||||
dlink = None
|
||||
|
||||
ob.relevance = commit.GetRelevance()
|
||||
ob.plus += int(commit.GetPlusCount())
|
||||
ob.minus += int(commit.GetMinusCount())
|
||||
ob.files.append(_item(date=ctime,
|
||||
author=commit.GetAuthor(),
|
||||
link=flink,
|
||||
|
@ -357,24 +395,27 @@ def build_commit(server, cfg, desc, files, cvsroots, viewvc_link):
|
|||
|
||||
return ob
|
||||
|
||||
def run_query(server, cfg, form_data, viewvc_link):
|
||||
query = form_to_cvsdb_query(form_data)
|
||||
db = cvsdb.ConnectDatabaseReadOnly(cfg)
|
||||
def run_query(server, cfg, db, form_data, viewvc_link):
|
||||
query = form_to_cvsdb_query(cfg, form_data)
|
||||
db.RunQuery(query)
|
||||
|
||||
if not query.commit_list:
|
||||
return [ ]
|
||||
commit_list = query.GetCommitList()
|
||||
if not commit_list:
|
||||
return [ ], 0
|
||||
|
||||
row_limit_reached = query.GetLimitReached()
|
||||
|
||||
commits = [ ]
|
||||
files = [ ]
|
||||
|
||||
cvsroots = {}
|
||||
viewvc.expand_root_parents(cfg)
|
||||
rootitems = cfg.general.svn_roots.items() + cfg.general.cvs_roots.items()
|
||||
for key, value in rootitems:
|
||||
cvsroots[cvsdb.CleanRepository(value)] = key
|
||||
|
||||
current_desc = query.commit_list[0].GetDescription()
|
||||
for commit in query.commit_list:
|
||||
current_desc = commit_list[0].GetDescription()
|
||||
for commit in commit_list:
|
||||
desc = commit.GetDescription()
|
||||
if current_desc == desc:
|
||||
files.append(commit)
|
||||
|
@ -397,7 +438,7 @@ def run_query(server, cfg, form_data, viewvc_link):
|
|||
return len(commit.files) > 0
|
||||
commits = filter(_only_with_files, commits)
|
||||
|
||||
return commits
|
||||
return commits, row_limit_reached
|
||||
|
||||
def main(server, cfg, viewvc_link):
|
||||
try:
|
||||
|
@ -405,46 +446,43 @@ def main(server, cfg, viewvc_link):
|
|||
form = server.FieldStorage()
|
||||
form_data = FormData(form)
|
||||
|
||||
db = cvsdb.ConnectDatabaseReadOnly(cfg, None)
|
||||
if form_data.valid:
|
||||
commits = run_query(server, cfg, form_data, viewvc_link)
|
||||
commits, row_limit_reached = run_query(server, cfg, db, form_data, viewvc_link)
|
||||
query = None
|
||||
else:
|
||||
commits = [ ]
|
||||
row_limit_reached = 0
|
||||
query = 'skipped'
|
||||
|
||||
script_name = server.getenv('SCRIPT_NAME', '')
|
||||
|
||||
data = {
|
||||
docroot = cfg.options.docroot
|
||||
if docroot is None and viewvc_link:
|
||||
docroot = viewvc_link + '/' + viewvc.docroot_magic_path
|
||||
|
||||
data = TemplateData({
|
||||
'cfg' : cfg,
|
||||
'address' : cfg.general.address,
|
||||
'vsn' : viewvc.__version__,
|
||||
|
||||
'repository' : server.escape(form_data.repository, 1),
|
||||
'branch' : server.escape(form_data.branch, 1),
|
||||
'directory' : server.escape(form_data.directory, 1),
|
||||
'file' : server.escape(form_data.file, 1),
|
||||
'who' : server.escape(form_data.who, 1),
|
||||
'docroot' : cfg.options.docroot is None \
|
||||
and viewvc_link + '/' + viewvc.docroot_magic_path \
|
||||
or cfg.options.docroot,
|
||||
|
||||
'textquery' : server.escape(form_data.textquery),
|
||||
'repository' : server.escape(form_data.repository),
|
||||
'branch' : server.escape(form_data.branch),
|
||||
'directory' : server.escape(form_data.directory),
|
||||
'file' : server.escape(form_data.file),
|
||||
'who' : server.escape(form_data.who),
|
||||
'docroot' : docroot,
|
||||
'sortby' : form_data.sortby,
|
||||
'date' : form_data.date,
|
||||
|
||||
'query' : query,
|
||||
'row_limit_reached' : ezt.boolean(row_limit_reached),
|
||||
'commits' : commits,
|
||||
'num_commits' : len(commits),
|
||||
'rss_href' : None,
|
||||
}
|
||||
|
||||
if form_data.hours:
|
||||
data['hours'] = form_data.hours
|
||||
else:
|
||||
data['hours'] = 2
|
||||
|
||||
server.header()
|
||||
'repositories' : db.GetRepositoryList(),
|
||||
'hours' : form_data.hours and form_data.hours or 2,
|
||||
})
|
||||
|
||||
# generate the page
|
||||
server.header()
|
||||
template = viewvc.get_view_template(cfg, "query")
|
||||
template.generate(server.file(), data)
|
||||
|
||||
|
@ -454,7 +492,3 @@ def main(server, cfg, viewvc_link):
|
|||
exc_info = debug.GetExceptionData()
|
||||
server.header(status=exc_info['status'])
|
||||
debug.PrintException(server, exc_info)
|
||||
|
||||
class _item:
|
||||
def __init__(self, **kw):
|
||||
vars(self).update(kw)
|
||||
|
|
104
lib/sapi.py
104
lib/sapi.py
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2006 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -16,17 +16,32 @@
|
|||
# -----------------------------------------------------------------------
|
||||
|
||||
import types
|
||||
import string
|
||||
import os
|
||||
import sys
|
||||
import re
|
||||
import cgi
|
||||
|
||||
|
||||
# global server object. It will be either a CgiServer or a proxy to
|
||||
# an AspServer or ModPythonServer object.
|
||||
# global server object. It will be either a CgiServer, a WsgiServer,
|
||||
# or a proxy to an AspServer or ModPythonServer object.
|
||||
server = None
|
||||
|
||||
|
||||
# Simple HTML string escaping. Note that we always escape the
|
||||
# double-quote character -- ViewVC shouldn't ever need to preserve
|
||||
# that character as-is, and sometimes needs to embed escaped values
|
||||
# into HTML attributes.
|
||||
def escape(s):
|
||||
try: s = s.encode('utf8')
|
||||
except: pass
|
||||
s = str(s)
|
||||
s = s.replace('&', '&')
|
||||
s = s.replace('>', '>')
|
||||
s = s.replace('<', '<')
|
||||
s = s.replace('"', """)
|
||||
return s
|
||||
|
||||
|
||||
class Server:
|
||||
def __init__(self):
|
||||
self.pageGlobals = {}
|
||||
|
@ -34,6 +49,9 @@ class Server:
|
|||
def self(self):
|
||||
return self
|
||||
|
||||
def escape(self, s):
|
||||
return escape(s)
|
||||
|
||||
def close(self):
|
||||
pass
|
||||
|
||||
|
@ -129,9 +147,6 @@ class CgiServer(Server):
|
|||
global server
|
||||
server = self
|
||||
|
||||
global cgi
|
||||
import cgi
|
||||
|
||||
def addheader(self, name, value):
|
||||
self.headers.append((name, value))
|
||||
|
||||
|
@ -158,11 +173,7 @@ class CgiServer(Server):
|
|||
if self.iis: url = fix_iis_url(self, url)
|
||||
self.addheader('Location', url)
|
||||
self.header(status='301 Moved')
|
||||
print 'This document is located <a href="%s">here</a>.' % url
|
||||
sys.exit(0)
|
||||
|
||||
def escape(self, s, quote = None):
|
||||
return cgi.escape(s, quote)
|
||||
sys.stdout.write('This document is located <a href="%s">here</a>.\n' % url)
|
||||
|
||||
def getenv(self, name, value=None):
|
||||
ret = os.environ.get(name, value)
|
||||
|
@ -176,7 +187,7 @@ class CgiServer(Server):
|
|||
def FieldStorage(fp=None, headers=None, outerboundary="",
|
||||
environ=os.environ, keep_blank_values=0, strict_parsing=0):
|
||||
return cgi.FieldStorage(fp, headers, outerboundary, environ,
|
||||
keep_blank_values, strict_parsing)
|
||||
keep_blank_values, strict_parsing)
|
||||
|
||||
def write(self, s):
|
||||
sys.stdout.write(s)
|
||||
|
@ -188,6 +199,60 @@ class CgiServer(Server):
|
|||
return sys.stdout
|
||||
|
||||
|
||||
class WsgiServer(Server):
|
||||
def __init__(self, environ, start_response):
|
||||
Server.__init__(self)
|
||||
|
||||
self._environ = environ
|
||||
self._start_response = start_response;
|
||||
self._headers = []
|
||||
self._wsgi_write = None
|
||||
self.headerSent = False
|
||||
|
||||
global server
|
||||
server = self
|
||||
|
||||
def addheader(self, name, value):
|
||||
self._headers.append((name, value))
|
||||
|
||||
def header(self, content_type='text/html; charset=UTF-8', status=None):
|
||||
if not status:
|
||||
status = "200 OK"
|
||||
if not self.headerSent:
|
||||
self.headerSent = True
|
||||
self._headers.insert(0, ("Content-Type", content_type),)
|
||||
self._wsgi_write = self._start_response("%s" % status, self._headers)
|
||||
|
||||
def redirect(self, url):
|
||||
"""Redirect client to url. This discards any data that has been queued
|
||||
to be sent to the user. But there should never by any anyway.
|
||||
"""
|
||||
self.addheader('Location', url)
|
||||
self.header(status='301 Moved')
|
||||
self._wsgi_write('This document is located <a href="%s">here</a>.' % url)
|
||||
|
||||
def getenv(self, name, value=None):
|
||||
return self._environ.get(name, value)
|
||||
|
||||
def params(self):
|
||||
return cgi.parse(environ=self._environ, fp=self._environ["wsgi.input"])
|
||||
|
||||
def FieldStorage(self, fp=None, headers=None, outerboundary="",
|
||||
environ=os.environ, keep_blank_values=0, strict_parsing=0):
|
||||
return cgi.FieldStorage(self._environ["wsgi.input"], headers,
|
||||
outerboundary, self._environ, keep_blank_values,
|
||||
strict_parsing)
|
||||
|
||||
def write(self, s):
|
||||
self._wsgi_write(s)
|
||||
|
||||
def flush(self):
|
||||
pass
|
||||
|
||||
def file(self):
|
||||
return File(self)
|
||||
|
||||
|
||||
class AspServer(ThreadedServer):
|
||||
def __init__(self, Server, Request, Response, Application):
|
||||
ThreadedServer.__init__(self)
|
||||
|
@ -219,10 +284,6 @@ class AspServer(ThreadedServer):
|
|||
|
||||
def redirect(self, url):
|
||||
self.response.Redirect(url)
|
||||
sys.exit()
|
||||
|
||||
def escape(self, s, quote = None):
|
||||
return self.server.HTMLEncode(str(s))
|
||||
|
||||
def getenv(self, name, value = None):
|
||||
ret = self.request.ServerVariables(name)()
|
||||
|
@ -285,9 +346,6 @@ class ModPythonServer(ThreadedServer):
|
|||
self.request = request
|
||||
self.headerSent = 0
|
||||
|
||||
global cgi
|
||||
import cgi
|
||||
|
||||
def addheader(self, name, value):
|
||||
self.request.headers_out.add(name, value)
|
||||
|
||||
|
@ -308,11 +366,7 @@ class ModPythonServer(ThreadedServer):
|
|||
self.request.headers_out['Location'] = url
|
||||
self.request.status = mod_python.apache.HTTP_MOVED_TEMPORARILY
|
||||
self.request.write("You are being redirected to <a href=\"%s\">%s</a>"
|
||||
% (url, url))
|
||||
sys.exit()
|
||||
|
||||
def escape(self, s, quote = None):
|
||||
return cgi.escape(s, quote)
|
||||
% (url, url))
|
||||
|
||||
def getenv(self, name, value = None):
|
||||
try:
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 2006-2008 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 2006-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -12,10 +12,6 @@
|
|||
|
||||
"""Generic API for implementing authorization checks employed by ViewVC."""
|
||||
|
||||
import string
|
||||
import vclib
|
||||
|
||||
|
||||
class GenericViewVCAuthorizer:
|
||||
"""Abstract class encapsulating version control authorization routines."""
|
||||
|
||||
|
@ -29,7 +25,15 @@ class GenericViewVCAuthorizer:
|
|||
def check_root_access(self, rootname):
|
||||
"""Return 1 iff the associated username is permitted to read ROOTNAME."""
|
||||
pass
|
||||
|
||||
|
||||
def check_universal_access(self, rootname):
|
||||
"""Return 1 if the associated username is permitted to read every
|
||||
path in the repository at every revision, 0 if the associated
|
||||
username is prohibited from reading any path in the repository, or
|
||||
None if no such determination can be made (perhaps because the
|
||||
cost of making it is too great)."""
|
||||
pass
|
||||
|
||||
def check_path_access(self, rootname, path_parts, pathtype, rev=None):
|
||||
"""Return 1 iff the associated username is permitted to read
|
||||
revision REV of the path PATH_PARTS (of type PATHTYPE) in
|
||||
|
@ -37,13 +41,16 @@ class GenericViewVCAuthorizer:
|
|||
pass
|
||||
|
||||
|
||||
|
||||
|
||||
##############################################################################
|
||||
|
||||
class ViewVCAuthorizer(GenericViewVCAuthorizer):
|
||||
"""The uber-permissive authorizer."""
|
||||
def check_root_access(self, rootname):
|
||||
return 1
|
||||
|
||||
def check_universal_access(self, rootname):
|
||||
return 1
|
||||
|
||||
def check_path_access(self, rootname, path_parts, pathtype, rev=None):
|
||||
return 1
|
||||
|
|
|
@ -0,0 +1,92 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 2009 Vitaliy Filippov.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
# distribution or at http://viewvc.org/license-1.html.
|
||||
#
|
||||
# For more information, visit http://viewvc.org/
|
||||
#
|
||||
# -----------------------------------------------------------------------
|
||||
|
||||
import vcauth
|
||||
import vclib
|
||||
import string
|
||||
from xml.dom.minidom import parse
|
||||
|
||||
class ViewVCAuthorizer(vcauth.GenericViewVCAuthorizer):
|
||||
"""An authorizer which uses CVSnt access control lists (which are in form
|
||||
of XML files in CVS/ subdirectories in the repository)."""
|
||||
|
||||
def __init__(self, username, params={}):
|
||||
self.username = username
|
||||
self.params = params
|
||||
self.cfg = params['__config']
|
||||
self.default = params.get('default', 0)
|
||||
self.cached = {}
|
||||
self.xmlcache = {}
|
||||
|
||||
def dom_rights(self, doc, rightname, filename, username):
|
||||
result = None
|
||||
if filename:
|
||||
for node in doc.getElementsByTagName('file'):
|
||||
if node.getAttribute('name') == filename:
|
||||
for acl in node.getElementsByTagName('acl'):
|
||||
if not acl.getAttribute('branch'):
|
||||
u = acl.getAttribute('user')
|
||||
if result is None and (not u or u == 'anonymous') or u == username:
|
||||
for r in acl.getElementsByTag(rightname):
|
||||
result = not r.getAttribute('deny')
|
||||
break
|
||||
if result is None:
|
||||
for node in doc.getElementsByTagName('directory'):
|
||||
for acl in node.getElementsByTagName('acl'):
|
||||
if not acl.getAttribute('branch'):
|
||||
u = acl.getAttribute('user')
|
||||
if result is None and (not u or u == 'anonymous') or u == username:
|
||||
for r in acl.getElementsByTag(rightname):
|
||||
result = not r.getAttribute('deny')
|
||||
return result
|
||||
|
||||
def check(self, rootname, path_parts, filename):
|
||||
d = self.cfg.general.cvs_roots.get(rootname,None)
|
||||
if not d:
|
||||
return self.default
|
||||
i = len(path_parts)
|
||||
r = None
|
||||
while i >= 0:
|
||||
try:
|
||||
xml = d
|
||||
if len(path_parts):
|
||||
xml = xml + '/' + string.join(path_parts, '/')
|
||||
xml = xml + '/CVS/fileattr.xml'
|
||||
if self.cached.get(xml, None) is not None:
|
||||
return self.cached.get(xml, None)
|
||||
doc = self.xmlcache.get(xml, None)
|
||||
if doc is None:
|
||||
doc = parse(xml)
|
||||
self.xmlcache[xml] = doc
|
||||
r = self.dom_rights(doc, 'read', filename, self.username)
|
||||
if r is not None:
|
||||
self.cached[xml] = r
|
||||
return r
|
||||
raise Exception(None)
|
||||
except:
|
||||
if len(path_parts) > 0:
|
||||
path_parts = path_parts[:-1]
|
||||
filename = ''
|
||||
i = i-1
|
||||
return self.default
|
||||
|
||||
def check_root_access(self, rootname):
|
||||
return self.check(rootname, [], '')
|
||||
|
||||
def check_path_access(self, rootname, path_parts, pathtype, rev=None):
|
||||
if not path_parts:
|
||||
return self.check(rootname, [], '')
|
||||
if pathtype == vclib.DIR:
|
||||
return self.check(rootname, path_parts, '')
|
||||
f = path_parts[-1]
|
||||
path_parts = path_parts[:-1]
|
||||
return self.check(rootname, path_parts, f)
|
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 2006-2008 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 2006-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -12,18 +12,24 @@
|
|||
import vcauth
|
||||
import vclib
|
||||
import fnmatch
|
||||
import string
|
||||
|
||||
class ViewVCAuthorizer(vcauth.GenericViewVCAuthorizer):
|
||||
"""A simple top-level module authorizer."""
|
||||
def __init__(self, username, params={}):
|
||||
forbidden = params.get('forbidden', '')
|
||||
self.forbidden = map(string.strip,
|
||||
filter(None, string.split(forbidden, ',')))
|
||||
self.forbidden = map(lambda x: x.strip(),
|
||||
filter(None, forbidden.split(',')))
|
||||
|
||||
def check_root_access(self, rootname):
|
||||
return 1
|
||||
|
||||
|
||||
def check_universal_access(self, rootname):
|
||||
# If there aren't any forbidden paths, we can grant universal read
|
||||
# access. Otherwise, we make no claim.
|
||||
if not self.forbidden:
|
||||
return 1
|
||||
return None
|
||||
|
||||
def check_path_access(self, rootname, path_parts, pathtype, rev=None):
|
||||
# No path? No problem.
|
||||
if not path_parts:
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 2008 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 2008-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -12,7 +12,6 @@
|
|||
import vcauth
|
||||
import vclib
|
||||
import fnmatch
|
||||
import string
|
||||
import re
|
||||
|
||||
|
||||
|
@ -29,8 +28,8 @@ class ViewVCAuthorizer(vcauth.GenericViewVCAuthorizer):
|
|||
"""A simple regular-expression-based authorizer."""
|
||||
def __init__(self, username, params={}):
|
||||
forbidden = params.get('forbiddenre', '')
|
||||
self.forbidden = map(lambda x: _split_regexp(string.strip(x)),
|
||||
filter(None, string.split(forbidden, ',')))
|
||||
self.forbidden = map(lambda x: _split_regexp(x.strip()),
|
||||
filter(None, forbidden.split(',')))
|
||||
|
||||
def _check_root_path_access(self, root_path):
|
||||
default = 1
|
||||
|
@ -46,10 +45,17 @@ class ViewVCAuthorizer(vcauth.GenericViewVCAuthorizer):
|
|||
def check_root_access(self, rootname):
|
||||
return self._check_root_path_access(rootname)
|
||||
|
||||
def check_universal_access(self, rootname):
|
||||
# If there aren't any forbidden regexps, we can grant universal
|
||||
# read access. Otherwise, we make no claim.
|
||||
if not self.forbidden:
|
||||
return 1
|
||||
return None
|
||||
|
||||
def check_path_access(self, rootname, path_parts, pathtype, rev=None):
|
||||
root_path = rootname
|
||||
if path_parts:
|
||||
root_path = root_path + '/' + string.join(path_parts, '/')
|
||||
root_path = root_path + '/' + '/'.join(path_parts)
|
||||
if pathtype == vclib.DIR:
|
||||
root_path = root_path + '/'
|
||||
else:
|
||||
|
|
|
@ -0,0 +1,62 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 2009 Vitaliy Filippov.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
# distribution or at http://viewvc.org/license-1.html.
|
||||
#
|
||||
# For more information, visit http://viewvc.org/
|
||||
#
|
||||
# -----------------------------------------------------------------------
|
||||
|
||||
import vcauth
|
||||
import vclib
|
||||
import string
|
||||
import grp
|
||||
import re
|
||||
|
||||
class ViewVCAuthorizer(vcauth.GenericViewVCAuthorizer):
|
||||
"""A simple authorizer checking system group membership for every
|
||||
repository and every user."""
|
||||
|
||||
def __init__(self, username, params={}):
|
||||
self.username = username
|
||||
self.params = params
|
||||
self.cfg = params['__config']
|
||||
self.cached = {}
|
||||
self.grp = {}
|
||||
self.byroot = {}
|
||||
self.fmt = map(lambda l: l.strip(), params.get('group_name_format', 'svn.%s|svn.%s.ro').split('|'))
|
||||
byr = params.get('by_root', '')
|
||||
for i in byr.split(','):
|
||||
if i.find(':') < 0:
|
||||
continue
|
||||
(root, auth) = i.split(':', 2)
|
||||
self.byroot[root.strip()] = map(lambda l: l.strip(), auth.split('|'))
|
||||
|
||||
def check_root_access(self, rootname):
|
||||
r = self.cached.get(rootname, None)
|
||||
if r is not None:
|
||||
return r
|
||||
grent = self.grp.get(rootname, None)
|
||||
if grent is None:
|
||||
grent = map(lambda grn: self.getgrnam(grn, rootname), self.byroot.get(rootname, self.fmt))
|
||||
self.grp[rootname] = grent
|
||||
r = 0
|
||||
for i in grent:
|
||||
if i and i.gr_mem and len(i.gr_mem) and self.username in i.gr_mem:
|
||||
r = 1
|
||||
break
|
||||
self.cached[rootname] = r
|
||||
return r
|
||||
|
||||
def getgrnam(self, grn, rootname):
|
||||
try:
|
||||
r = grp.getgrnam(grn.replace('%s', re.sub('[^\w\.\-]+', '', rootname)))
|
||||
except KeyError:
|
||||
r = None
|
||||
return r
|
||||
|
||||
def check_path_access(self, rootname, path_parts, pathtype, rev=None):
|
||||
return self.check_root_access(rootname)
|
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 2006-2008 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 2006-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -12,7 +12,6 @@
|
|||
# (c) 2006 Sergey Lapin <slapin@dataart.com>
|
||||
|
||||
import vcauth
|
||||
import string
|
||||
import os.path
|
||||
import debug
|
||||
|
||||
|
@ -22,7 +21,6 @@ class ViewVCAuthorizer(vcauth.GenericViewVCAuthorizer):
|
|||
"""Subversion authz authorizer module"""
|
||||
|
||||
def __init__(self, username, params={}):
|
||||
self.username = username
|
||||
self.rootpaths = { } # {root -> { paths -> access boolean for USERNAME }}
|
||||
|
||||
# Get the authz file location from a passed-in parameter.
|
||||
|
@ -32,15 +30,33 @@ class ViewVCAuthorizer(vcauth.GenericViewVCAuthorizer):
|
|||
if not os.path.exists(self.authz_file):
|
||||
raise debug.ViewVCException("Configured authzfile file not found")
|
||||
|
||||
# See if the admin wants us to do case normalization of usernames.
|
||||
self.force_username_case = params.get('force_username_case')
|
||||
if self.force_username_case == "upper":
|
||||
self.username = username and username.upper() or username
|
||||
elif self.force_username_case == "lower":
|
||||
self.username = username and username.lower() or username
|
||||
elif not self.force_username_case:
|
||||
self.username = username
|
||||
else:
|
||||
raise debug.ViewVCException("Invalid value for force_username_case "
|
||||
"option")
|
||||
|
||||
def _get_paths_for_root(self, rootname):
|
||||
if self.rootpaths.has_key(rootname):
|
||||
return self.rootpaths[rootname]
|
||||
|
||||
paths_for_root = { }
|
||||
|
||||
# Parse the authz file.
|
||||
# Parse the authz file, replacing ConfigParser's optionxform()
|
||||
# method with something that won't futz with the case of the
|
||||
# option names.
|
||||
cp = ConfigParser()
|
||||
cp.read(self.authz_file)
|
||||
cp.optionxform = lambda x: x
|
||||
try:
|
||||
cp.read(self.authz_file)
|
||||
except:
|
||||
raise debug.ViewVCException("Unable to parse configured authzfile file")
|
||||
|
||||
# Figure out if there are any aliases for the current username
|
||||
aliases = []
|
||||
|
@ -80,9 +96,9 @@ class ViewVCAuthorizer(vcauth.GenericViewVCAuthorizer):
|
|||
all_groups.append(groupname)
|
||||
group_member = 0
|
||||
groupname = groupname.strip()
|
||||
entries = string.split(cp.get('groups', groupname), ',')
|
||||
entries = cp.get('groups', groupname).split(',')
|
||||
for entry in entries:
|
||||
entry = string.strip(entry)
|
||||
entry = entry.strip()
|
||||
if entry == self.username:
|
||||
group_member = 1
|
||||
break
|
||||
|
@ -123,13 +139,13 @@ class ViewVCAuthorizer(vcauth.GenericViewVCAuthorizer):
|
|||
# Figure if this path is explicitly allowed or denied to USERNAME.
|
||||
allow = deny = 0
|
||||
for user in cp.options(section):
|
||||
user = string.strip(user)
|
||||
user = user.strip()
|
||||
if _userspec_matches_user(user):
|
||||
# See if the 'r' permission is among the ones granted to
|
||||
# USER. If so, we can stop looking. (Entry order is not
|
||||
# relevant -- we'll use the most permissive entry, meaning
|
||||
# one 'allow' is all we need.)
|
||||
allow = string.find(cp.get(section, user), 'r') != -1
|
||||
allow = cp.get(section, user).find('r') != -1
|
||||
deny = not allow
|
||||
if allow:
|
||||
break
|
||||
|
@ -158,7 +174,7 @@ class ViewVCAuthorizer(vcauth.GenericViewVCAuthorizer):
|
|||
if section.find(':') == -1:
|
||||
path = section
|
||||
else:
|
||||
name, path = string.split(section, ':', 1)
|
||||
name, path = section.split(':', 1)
|
||||
if name == rootname:
|
||||
root_sections.append(section)
|
||||
continue
|
||||
|
@ -170,14 +186,14 @@ class ViewVCAuthorizer(vcauth.GenericViewVCAuthorizer):
|
|||
# USERNAME, record it.
|
||||
if allow or deny:
|
||||
if path != '/':
|
||||
path = '/' + string.join(filter(None, string.split(path, '/')), '/')
|
||||
path = '/' + '/'.join(filter(None, path.split('/')))
|
||||
paths_for_root[path] = allow
|
||||
|
||||
# Okay. Superimpose those root-specific values now.
|
||||
for section in root_sections:
|
||||
|
||||
# Get the path again.
|
||||
name, path = string.split(section, ':', 1)
|
||||
name, path = section.split(':', 1)
|
||||
|
||||
# Check for a specific access determination.
|
||||
allow, deny = _process_access_section(section)
|
||||
|
@ -186,7 +202,7 @@ class ViewVCAuthorizer(vcauth.GenericViewVCAuthorizer):
|
|||
# USERNAME, record it.
|
||||
if allow or deny:
|
||||
if path != '/':
|
||||
path = '/' + string.join(filter(None, string.split(path, '/')), '/')
|
||||
path = '/' + '/'.join(filter(None, path.split('/')))
|
||||
paths_for_root[path] = allow
|
||||
|
||||
# If the root isn't readable, there's no point in caring about all
|
||||
|
@ -207,6 +223,36 @@ class ViewVCAuthorizer(vcauth.GenericViewVCAuthorizer):
|
|||
paths = self._get_paths_for_root(rootname)
|
||||
return (paths is not None) and 1 or 0
|
||||
|
||||
def check_universal_access(self, rootname):
|
||||
paths = self._get_paths_for_root(rootname)
|
||||
if not paths: # None or empty.
|
||||
return 0
|
||||
|
||||
# Search the access determinations. If there's a mix, we can't
|
||||
# claim a universal access determination.
|
||||
found_allow = 0
|
||||
found_deny = 0
|
||||
for access in paths.values():
|
||||
if access:
|
||||
found_allow = 1
|
||||
else:
|
||||
found_deny = 1
|
||||
if found_allow and found_deny:
|
||||
return None
|
||||
|
||||
# We didn't find both allowances and denials, so we must have
|
||||
# found one or the other. Denials only is a universal denial.
|
||||
if found_deny:
|
||||
return 0
|
||||
|
||||
# ... but allowances only is only a universal allowance if read
|
||||
# access is granted to the root directory.
|
||||
if found_allow and paths.has_key('/'):
|
||||
return 1
|
||||
|
||||
# Anything else is indeterminable.
|
||||
return None
|
||||
|
||||
def check_path_access(self, rootname, path_parts, pathtype, rev=None):
|
||||
# Crawl upward from the path represented by PATH_PARTS toward to
|
||||
# the root of the repository, looking for an explicitly grant or
|
||||
|
@ -216,7 +262,7 @@ class ViewVCAuthorizer(vcauth.GenericViewVCAuthorizer):
|
|||
return 0
|
||||
parts = path_parts[:]
|
||||
while parts:
|
||||
path = '/' + string.join(parts, '/')
|
||||
path = '/' + '/'.join(parts)
|
||||
if paths.has_key(path):
|
||||
return paths[path]
|
||||
del parts[-1]
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2008 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -14,7 +14,6 @@
|
|||
such as CVS.
|
||||
"""
|
||||
|
||||
import string
|
||||
import types
|
||||
|
||||
|
||||
|
@ -76,7 +75,7 @@ class Repository:
|
|||
"""
|
||||
pass
|
||||
|
||||
def openfile(self, path_parts, rev):
|
||||
def openfile(self, path_parts, rev, options):
|
||||
"""Open a file object to read file contents at a given path and revision.
|
||||
|
||||
The return value is a 2-tuple of containg the file object and revision
|
||||
|
@ -86,6 +85,8 @@ class Repository:
|
|||
of the repository. e.g. ["subdir1", "subdir2", "filename"]
|
||||
|
||||
rev is the revision of the file to check out
|
||||
|
||||
options is a dictionary of implementation specific options
|
||||
"""
|
||||
|
||||
def listdir(self, path_parts, rev, options):
|
||||
|
@ -168,20 +169,29 @@ class Repository:
|
|||
Return value is a python file object
|
||||
"""
|
||||
|
||||
def annotate(self, path_parts, rev):
|
||||
"""Return a list of annotate file content lines and a revision.
|
||||
def annotate(self, path_parts, rev, include_text=False):
|
||||
"""Return a list of Annotation object, sorted by their
|
||||
"line_number" components, which describe the lines of given
|
||||
version of a file.
|
||||
|
||||
The result is a list of Annotation objects, sorted by their
|
||||
line_number components.
|
||||
"""
|
||||
The file path is specified as a list of components, relative to
|
||||
the root of the repository. e.g. ["subdir1", "subdir2", "filename"]
|
||||
|
||||
rev is the revision of the item to return information about.
|
||||
|
||||
If include_text is true, populate the Annotation objects' "text"
|
||||
members with the corresponding line of file content; otherwise,
|
||||
leave that member set to None."""
|
||||
|
||||
def revinfo(self, rev):
|
||||
"""Return information about a global revision
|
||||
|
||||
rev is the revision of the item to return information about
|
||||
|
||||
Return value is a 4-tuple containing the date, author, log
|
||||
message, and a list of ChangedPath items representing paths changed
|
||||
Return value is a 5-tuple containing: the date, author, log
|
||||
message, a list of ChangedPath items representing paths changed,
|
||||
and a dictionary mapping property names to property values for
|
||||
properties stored on an item.
|
||||
|
||||
Raise vclib.UnsupportedFeature if the version control system
|
||||
doesn't support a global revision concept.
|
||||
|
@ -196,7 +206,21 @@ class Repository:
|
|||
|
||||
rev is the revision of the item to return information about
|
||||
"""
|
||||
|
||||
def filesize(self, path_parts, rev):
|
||||
"""Return the size of a versioned file's contents if it can be
|
||||
obtained without a brute force measurement; -1 otherwise.
|
||||
|
||||
NOTE: Callers that require a filesize answer when this function
|
||||
returns -1 may obtain it by measuring the data returned via
|
||||
openfile().
|
||||
|
||||
The path is specified as a list of components, relative to the root
|
||||
of the repository. e.g. ["subdir1", "subdir2", "filename"]
|
||||
|
||||
rev is the revision of the item to return information about
|
||||
"""
|
||||
|
||||
|
||||
# ======================================================================
|
||||
class DirEntry:
|
||||
|
@ -302,7 +326,7 @@ class ItemNotFound(Error):
|
|||
# use '/' rather than os.sep because this is for user consumption, and
|
||||
# it was defined using URL separators
|
||||
if type(path) in (types.TupleType, types.ListType):
|
||||
path = string.join(path, '/')
|
||||
path = '/'.join(path)
|
||||
Error.__init__(self, path)
|
||||
|
||||
class InvalidRevision(Error):
|
||||
|
@ -318,7 +342,7 @@ class NonTextualFileContents(Error):
|
|||
# ======================================================================
|
||||
# Implementation code used by multiple vclib modules
|
||||
|
||||
import popen
|
||||
import tempfile
|
||||
import os
|
||||
import time
|
||||
|
||||
|
@ -328,7 +352,7 @@ def _diff_args(type, options):
|
|||
if type == CONTEXT:
|
||||
if options.has_key('context'):
|
||||
if options['context'] is None:
|
||||
args.append('--context=-1')
|
||||
args.append('--context=%i' % 0x01ffffff)
|
||||
else:
|
||||
args.append('--context=%i' % options['context'])
|
||||
else:
|
||||
|
@ -336,7 +360,7 @@ def _diff_args(type, options):
|
|||
elif type == UNIFIED:
|
||||
if options.has_key('context'):
|
||||
if options['context'] is None:
|
||||
args.append('--unified=-1')
|
||||
args.append('--unified=%i' % 0x01ffffff)
|
||||
else:
|
||||
args.append('--unified=%i' % options['context'])
|
||||
else:
|
||||
|
@ -362,11 +386,15 @@ class _diff_fp:
|
|||
def __init__(self, temp1, temp2, info1=None, info2=None, diff_cmd='diff', diff_opts=[]):
|
||||
self.temp1 = temp1
|
||||
self.temp2 = temp2
|
||||
self.temp3 = tempfile.mktemp()
|
||||
args = diff_opts[:]
|
||||
if info1 and info2:
|
||||
args.extend(["-L", self._label(info1), "-L", self._label(info2)])
|
||||
args.extend([temp1, temp2])
|
||||
self.fp = popen.popen(diff_cmd, args, "r")
|
||||
args.insert(0, diff_cmd)
|
||||
os.system("'"+"' '".join(args)+"' > '"+self.temp3+"' 2> '"+self.temp3+"'")
|
||||
self.fp = open(self.temp3, 'rb')
|
||||
self.fp.seek(0)
|
||||
|
||||
def read(self, bytes):
|
||||
return self.fp.read(bytes)
|
||||
|
@ -374,6 +402,9 @@ class _diff_fp:
|
|||
def readline(self):
|
||||
return self.fp.readline()
|
||||
|
||||
def readlines(self):
|
||||
return self.fp.readlines()
|
||||
|
||||
def close(self):
|
||||
try:
|
||||
if self.fp:
|
||||
|
@ -381,13 +412,17 @@ class _diff_fp:
|
|||
self.fp = None
|
||||
finally:
|
||||
try:
|
||||
if self.temp1:
|
||||
if self.temp1 and self.temp1 != '/dev/null':
|
||||
os.remove(self.temp1)
|
||||
self.temp1 = None
|
||||
self.temp1 = None
|
||||
finally:
|
||||
if self.temp2:
|
||||
if self.temp2 and self.temp2 != '/dev/null':
|
||||
os.remove(self.temp2)
|
||||
self.temp2 = None
|
||||
self.temp2 = None
|
||||
try:
|
||||
os.remove(self.temp3)
|
||||
finally:
|
||||
self.temp3 = None
|
||||
|
||||
def __del__(self):
|
||||
self.close()
|
||||
|
@ -405,7 +440,7 @@ def check_root_access(repos):
|
|||
if not auth:
|
||||
return 1
|
||||
return auth.check_root_access(repos.rootname())
|
||||
|
||||
|
||||
def check_path_access(repos, path_parts, pathtype=None, rev=None):
|
||||
"""Return 1 iff the associated username is permitted to read
|
||||
revision REV of the path PATH_PARTS (of type PATHTYPE) in repository
|
||||
|
@ -416,5 +451,7 @@ def check_path_access(repos, path_parts, pathtype=None, rev=None):
|
|||
return 1
|
||||
if not pathtype:
|
||||
pathtype = repos.itemtype(path_parts, rev)
|
||||
if not path_parts:
|
||||
return auth.check_root_access(repos.rootname())
|
||||
return auth.check_path_access(repos.rootname(), path_parts, pathtype, rev)
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2008 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -11,33 +11,57 @@
|
|||
# -----------------------------------------------------------------------
|
||||
import os
|
||||
import os.path
|
||||
import time
|
||||
|
||||
|
||||
def cvs_strptime(timestr):
|
||||
return time.strptime(timestr, '%Y/%m/%d %H:%M:%S')[:-1] + (0,)
|
||||
|
||||
|
||||
def canonicalize_rootpath(rootpath):
|
||||
assert os.path.isabs(rootpath)
|
||||
return os.path.normpath(rootpath)
|
||||
|
||||
|
||||
def _is_cvsroot(path):
|
||||
return os.path.exists(os.path.join(path, "CVSROOT", "config"))
|
||||
|
||||
|
||||
def expand_root_parent(parent_path):
|
||||
# Each subdirectory of PARENT_PATH that contains a child
|
||||
# "CVSROOT/config" is added the set of returned roots. Or, if the
|
||||
# PARENT_PATH itself contains a child "CVSROOT/config", then all its
|
||||
# subdirectories are returned as roots.
|
||||
assert os.path.isabs(parent_path)
|
||||
roots = {}
|
||||
subpaths = os.listdir(parent_path)
|
||||
cvsroot = os.path.exists(os.path.join(parent_path, "CVSROOT", "config"))
|
||||
for rootname in subpaths:
|
||||
rootpath = os.path.join(parent_path, rootname)
|
||||
if cvsroot \
|
||||
or (os.path.exists(os.path.join(rootpath, "CVSROOT", "config"))):
|
||||
if _is_cvsroot(parent_path) or _is_cvsroot(rootpath):
|
||||
roots[rootname] = canonicalize_rootpath(rootpath)
|
||||
return roots
|
||||
|
||||
|
||||
def CVSRepository(name, rootpath, authorizer, utilities, use_rcsparse):
|
||||
def find_root_in_parent(parent_path, rootname):
|
||||
"""Search PARENT_PATH for a root named ROOTNAME, returning the
|
||||
canonicalized ROOTPATH of the root if found; return None if no such
|
||||
root is found."""
|
||||
# Is PARENT_PATH itself a CVS repository? If so, we allow ROOTNAME
|
||||
# to be any subdir within it. Otherwise, we expect
|
||||
# PARENT_PATH/ROOTNAME to be a CVS repository.
|
||||
assert os.path.isabs(parent_path)
|
||||
rootpath = os.path.join(parent_path, rootname)
|
||||
if (_is_cvsroot(parent_path) and os.path.exists(rootpath)) \
|
||||
or _is_cvsroot(rootpath):
|
||||
return canonicalize_rootpath(rootpath)
|
||||
return None
|
||||
|
||||
|
||||
def CVSRepository(name, rootpath, authorizer, utilities, use_rcsparse, charset_guesser = None):
|
||||
rootpath = canonicalize_rootpath(rootpath)
|
||||
if use_rcsparse:
|
||||
import ccvs
|
||||
return ccvs.CCVSRepository(name, rootpath, authorizer, utilities)
|
||||
return ccvs.CCVSRepository(name, rootpath, authorizer, utilities, charset_guesser)
|
||||
else:
|
||||
import bincvs
|
||||
return bincvs.BinCVSRepository(name, rootpath, authorizer, utilities)
|
||||
return bincvs.BinCVSRepository(name, rootpath, authorizer, utilities, charset_guesser)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2008 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -18,28 +18,39 @@ import os
|
|||
import os.path
|
||||
import sys
|
||||
import stat
|
||||
import string
|
||||
import re
|
||||
import time
|
||||
import cvsdb
|
||||
import socket
|
||||
import calendar
|
||||
|
||||
# ViewVC libs
|
||||
import compat
|
||||
import popen
|
||||
import vclib.ccvs
|
||||
|
||||
def _path_join(path_parts):
|
||||
return '/'.join(path_parts)
|
||||
|
||||
class BaseCVSRepository(vclib.Repository):
|
||||
def __init__(self, name, rootpath, authorizer, utilities):
|
||||
def __init__(self, name, rootpath, authorizer, utilities, charset_guesser = None):
|
||||
if not os.path.isdir(rootpath):
|
||||
raise vclib.ReposNotFound(name)
|
||||
|
||||
raise vclib.ReposNotFound(name)
|
||||
|
||||
self.name = name
|
||||
self.rootpath = rootpath
|
||||
self.auth = authorizer
|
||||
self.utilities = utilities
|
||||
self.guesser = charset_guesser
|
||||
|
||||
# See if this repository is even viewable, authz-wise.
|
||||
if not vclib.check_root_access(self):
|
||||
raise vclib.ReposNotFound(name)
|
||||
|
||||
def open(self):
|
||||
# See if a universal read access determination can be made.
|
||||
if self.auth and self.auth.check_universal_access(self.name) == 1:
|
||||
self.auth = None
|
||||
|
||||
def rootname(self):
|
||||
return self.name
|
||||
|
||||
|
@ -51,7 +62,7 @@ class BaseCVSRepository(vclib.Repository):
|
|||
|
||||
def authorizer(self):
|
||||
return self.auth
|
||||
|
||||
|
||||
def itemtype(self, path_parts, rev):
|
||||
basepath = self._getpath(path_parts)
|
||||
kind = None
|
||||
|
@ -72,11 +83,11 @@ class BaseCVSRepository(vclib.Repository):
|
|||
def itemprops(self, path_parts, rev):
|
||||
self.itemtype(path_parts, rev) # does auth-check
|
||||
return {} # CVS doesn't support properties
|
||||
|
||||
|
||||
def listdir(self, path_parts, rev, options):
|
||||
if self.itemtype(path_parts, rev) != vclib.DIR: # does auth-check
|
||||
raise vclib.Error("Path '%s' is not a directory."
|
||||
% (string.join(path_parts, "/")))
|
||||
% (_path_join(path_parts)))
|
||||
|
||||
# Only RCS files (*,v) and subdirs are returned.
|
||||
data = [ ]
|
||||
|
@ -113,7 +124,7 @@ class BaseCVSRepository(vclib.Repository):
|
|||
data.append(CVSDirEntry(name, kind, errors, 1))
|
||||
|
||||
return data
|
||||
|
||||
|
||||
def _getpath(self, path_parts):
|
||||
return apply(os.path.join, (self.rootpath,) + tuple(path_parts))
|
||||
|
||||
|
@ -133,17 +144,21 @@ class BaseCVSRepository(vclib.Repository):
|
|||
if root:
|
||||
ret = ret_file
|
||||
else:
|
||||
ret = string.join(ret_parts, "/")
|
||||
ret = _path_join(ret_parts)
|
||||
if v:
|
||||
ret = ret + ",v"
|
||||
return ret
|
||||
|
||||
def isexecutable(self, path_parts, rev):
|
||||
if self.itemtype(path_parts, rev) != vclib.FILE: # does auth-check
|
||||
raise vclib.Error("Path '%s' is not a file."
|
||||
% (string.join(path_parts, "/")))
|
||||
raise vclib.Error("Path '%s' is not a file." % (_path_join(path_parts)))
|
||||
rcsfile = self.rcsfile(path_parts, 1)
|
||||
return os.access(rcsfile, os.X_OK)
|
||||
|
||||
def filesize(self, path_parts, rev):
|
||||
if self.itemtype(path_parts, rev) != vclib.FILE: # does auth-check
|
||||
raise vclib.Error("Path '%s' is not a file." % (_path_join(path_parts)))
|
||||
return -1
|
||||
|
||||
|
||||
class BinCVSRepository(BaseCVSRepository):
|
||||
|
@ -154,7 +169,7 @@ class BinCVSRepository(BaseCVSRepository):
|
|||
filename, default_branch, tags, lockinfo, msg, eof = _parse_log_header(fp)
|
||||
revs = []
|
||||
while not eof:
|
||||
revision, eof = _parse_log_entry(fp)
|
||||
revision, eof = _parse_log_entry(fp, self.guesser)
|
||||
if revision:
|
||||
revs.append(revision)
|
||||
revs = _file_log(revs, tags, lockinfo, default_branch, rev)
|
||||
|
@ -162,20 +177,28 @@ class BinCVSRepository(BaseCVSRepository):
|
|||
return revs[-1]
|
||||
return None
|
||||
|
||||
def openfile(self, path_parts, rev):
|
||||
def openfile(self, path_parts, rev, options):
|
||||
"""see vclib.Repository.openfile docstring
|
||||
|
||||
Option values recognized by this implementation:
|
||||
|
||||
cvs_oldkeywords
|
||||
boolean. true to use the original keyword substitution values.
|
||||
"""
|
||||
if self.itemtype(path_parts, rev) != vclib.FILE: # does auth-check
|
||||
raise vclib.Error("Path '%s' is not a file."
|
||||
% (string.join(path_parts, "/")))
|
||||
raise vclib.Error("Path '%s' is not a file." % (_path_join(path_parts)))
|
||||
if not rev or rev == 'HEAD' or rev == 'MAIN':
|
||||
rev_flag = '-p'
|
||||
else:
|
||||
rev_flag = '-p' + rev
|
||||
if options.get('cvs_oldkeywords', 0):
|
||||
kv_flag = '-ko'
|
||||
else:
|
||||
kv_flag = '-kkv'
|
||||
full_name = self.rcsfile(path_parts, root=1, v=0)
|
||||
|
||||
used_rlog = 0
|
||||
tip_rev = None # used only if we have to fallback to using rlog
|
||||
|
||||
fp = self.rcs_popen('co', (rev_flag, full_name), 'rb')
|
||||
fp = self.rcs_popen('co', (kv_flag, rev_flag, full_name), 'rb')
|
||||
try:
|
||||
filename, revision = _parse_co_header(fp)
|
||||
except COMissingRevision:
|
||||
|
@ -189,14 +212,14 @@ class BinCVSRepository(BaseCVSRepository):
|
|||
used_rlog = 1
|
||||
if not tip_rev:
|
||||
raise vclib.Error("Unable to find valid revision")
|
||||
fp = self.rcs_popen('co', ('-p' + tip_rev.string, full_name), 'rb')
|
||||
fp = self.rcs_popen('co', ('-p' + tip_rev.string, full_name), 'rb')
|
||||
filename, revision = _parse_co_header(fp)
|
||||
|
||||
|
||||
if filename is None:
|
||||
# CVSNT's co exits without any output if a dead revision is requested.
|
||||
# Bug at http://www.cvsnt.org/cgi-bin/bugzilla/show_bug.cgi?id=190
|
||||
# As a workaround, we invoke rlog to find the first non-dead revision
|
||||
# that precedes it and check out that revision instead. Of course,
|
||||
# that precedes it and check out that revision instead. Of course,
|
||||
# if we've already invoked rlog above, we just reuse its output.
|
||||
if not used_rlog:
|
||||
tip_rev = self._get_tip_revision(full_name + ',v', rev)
|
||||
|
@ -205,7 +228,7 @@ class BinCVSRepository(BaseCVSRepository):
|
|||
raise vclib.Error(
|
||||
'Could not find non-dead revision preceding "%s"' % rev)
|
||||
fp = self.rcs_popen('co', ('-p' + tip_rev.undead.string,
|
||||
full_name), 'rb')
|
||||
full_name), 'rb')
|
||||
filename, revision = _parse_co_header(fp)
|
||||
|
||||
if filename is None:
|
||||
|
@ -237,14 +260,14 @@ class BinCVSRepository(BaseCVSRepository):
|
|||
"""
|
||||
if self.itemtype(path_parts, rev) != vclib.DIR: # does auth-check
|
||||
raise vclib.Error("Path '%s' is not a directory."
|
||||
% (string.join(path_parts, "/")))
|
||||
% (_path_join(path_parts)))
|
||||
|
||||
subdirs = options.get('cvs_subdirs', 0)
|
||||
entries_to_fetch = []
|
||||
for entry in entries:
|
||||
if vclib.check_path_access(self, path_parts + [entry.name], None, rev):
|
||||
entries_to_fetch.append(entry)
|
||||
alltags = _get_logs(self, path_parts, entries_to_fetch, rev, subdirs)
|
||||
alltags = _get_logs(self, path_parts, entries_to_fetch, rev, subdirs, self.guesser)
|
||||
branches = options['cvs_branches'] = []
|
||||
tags = options['cvs_tags'] = []
|
||||
for name, rev in alltags.items():
|
||||
|
@ -274,8 +297,7 @@ class BinCVSRepository(BaseCVSRepository):
|
|||
"""
|
||||
|
||||
if self.itemtype(path_parts, rev) != vclib.FILE: # does auth-check
|
||||
raise vclib.Error("Path '%s' is not a file."
|
||||
% (string.join(path_parts, "/")))
|
||||
raise vclib.Error("Path '%s' is not a file." % (_path_join(path_parts)))
|
||||
|
||||
# Invoke rlog
|
||||
rcsfile = self.rcsfile(path_parts, 1)
|
||||
|
@ -290,7 +312,7 @@ class BinCVSRepository(BaseCVSRepository):
|
|||
# Retrieve revision objects
|
||||
revs = []
|
||||
while not eof:
|
||||
revision, eof = _parse_log_entry(fp)
|
||||
revision, eof = _parse_log_entry(fp, self.guesser)
|
||||
if revision:
|
||||
revs.append(revision)
|
||||
|
||||
|
@ -309,7 +331,17 @@ class BinCVSRepository(BaseCVSRepository):
|
|||
return filtered_revs
|
||||
|
||||
def rcs_popen(self, rcs_cmd, rcs_args, mode, capture_err=1):
|
||||
if self.utilities.cvsnt:
|
||||
a = []
|
||||
if self.utilities.rcsfile_socket:
|
||||
a = self.utilities.rcsfile_socket.split(':')
|
||||
if len(a) == 2:
|
||||
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
s.connect((a[0], int(a[1])))
|
||||
s = s.makefile()
|
||||
s.write('\''+rcs_cmd+'\' \''+'\' \''.join(rcs_args)+"\'\x0d\x0a")
|
||||
s.flush()
|
||||
return s
|
||||
elif self.utilities.cvsnt:
|
||||
cmd = self.utilities.cvsnt
|
||||
args = ['rcsfile', rcs_cmd]
|
||||
args.extend(list(rcs_args))
|
||||
|
@ -318,18 +350,17 @@ class BinCVSRepository(BaseCVSRepository):
|
|||
args = rcs_args
|
||||
return popen.popen(cmd, args, mode, capture_err)
|
||||
|
||||
def annotate(self, path_parts, rev=None):
|
||||
def annotate(self, path_parts, rev=None, include_text=False):
|
||||
if self.itemtype(path_parts, rev) != vclib.FILE: # does auth-check
|
||||
raise vclib.Error("Path '%s' is not a file."
|
||||
% (string.join(path_parts, "/")))
|
||||
raise vclib.Error("Path '%s' is not a file." % (_path_join(path_parts)))
|
||||
|
||||
from vclib.ccvs import blame
|
||||
source = blame.BlameSource(self.rcsfile(path_parts, 1), rev)
|
||||
source = blame.BlameSource(self.rcsfile(path_parts, 1), rev, self.guesser, include_text)
|
||||
return source, source.revision
|
||||
|
||||
def revinfo(self, rev):
|
||||
raise vclib.UnsupportedFeature
|
||||
|
||||
|
||||
def rawdiff(self, path_parts1, rev1, path_parts2, rev2, type, options={}):
|
||||
"""see vclib.Repository.rawdiff docstring
|
||||
|
||||
|
@ -337,12 +368,16 @@ class BinCVSRepository(BaseCVSRepository):
|
|||
|
||||
ignore_keyword_subst - boolean, ignore keyword substitution
|
||||
"""
|
||||
if not path_parts1:
|
||||
path_parts1 = path_parts2
|
||||
rev1 = '1.0'
|
||||
if not path_parts2:
|
||||
path_parts2 = path_parts1
|
||||
rev2 = '1.0'
|
||||
if self.itemtype(path_parts1, rev1) != vclib.FILE: # does auth-check
|
||||
raise vclib.Error("Path '%s' is not a file."
|
||||
% (string.join(path_parts1, "/")))
|
||||
raise vclib.Error("Path '%s' is not a file." % (_path_join(path_parts1)))
|
||||
if self.itemtype(path_parts2, rev2) != vclib.FILE: # does auth-check
|
||||
raise vclib.Error("Path '%s' is not a file."
|
||||
% (string.join(path_parts2, "/")))
|
||||
raise vclib.Error("Path '%s' is not a file." % (_path_join(path_parts2)))
|
||||
|
||||
args = vclib._diff_args(type, options)
|
||||
if options.get('ignore_keyword_subst', 0):
|
||||
|
@ -351,8 +386,7 @@ class BinCVSRepository(BaseCVSRepository):
|
|||
rcsfile = self.rcsfile(path_parts1, 1)
|
||||
if path_parts1 != path_parts2:
|
||||
raise NotImplementedError, "cannot diff across paths in cvs"
|
||||
args.extend(['-r' + rev1, '-r' + rev2, rcsfile])
|
||||
|
||||
args.extend(['-N', '-r' + rev1, '-r' + rev2, rcsfile])
|
||||
fp = self.rcs_popen('rcsdiff', args, 'rt')
|
||||
|
||||
# Eat up the non-GNU-diff-y headers.
|
||||
|
@ -361,7 +395,6 @@ class BinCVSRepository(BaseCVSRepository):
|
|||
if not line or line[0:5] == 'diff ':
|
||||
break
|
||||
return fp
|
||||
|
||||
|
||||
class CVSDirEntry(vclib.DirEntry):
|
||||
def __init__(self, name, kind, errors, in_attic, absent=0):
|
||||
|
@ -423,9 +456,9 @@ def _match_revs_tags(revlist, taglist):
|
|||
example: if revision is 1.2.3.4, parent is 1.2
|
||||
|
||||
"undead"
|
||||
If the revision is dead, then this is a reference to the first
|
||||
If the revision is dead, then this is a reference to the first
|
||||
previous revision which isn't dead, otherwise it's a reference
|
||||
to itself. If all the previous revisions are dead it's None.
|
||||
to itself. If all the previous revisions are dead it's None.
|
||||
|
||||
"branch_number"
|
||||
tuple representing branch number or empty tuple if on trunk
|
||||
|
@ -550,7 +583,7 @@ def _remove_tag(tag):
|
|||
|
||||
def _revision_tuple(revision_string):
|
||||
"""convert a revision number into a tuple of integers"""
|
||||
t = tuple(map(int, string.split(revision_string, '.')))
|
||||
t = tuple(map(int, revision_string.split('.')))
|
||||
if len(t) % 2 == 0:
|
||||
return t
|
||||
raise ValueError
|
||||
|
@ -558,7 +591,7 @@ def _revision_tuple(revision_string):
|
|||
def _tag_tuple(revision_string):
|
||||
"""convert a revision number or branch number into a tuple of integers"""
|
||||
if revision_string:
|
||||
t = map(int, string.split(revision_string, '.'))
|
||||
t = map(int, revision_string.split('.'))
|
||||
l = len(t)
|
||||
if l == 1:
|
||||
return ()
|
||||
|
@ -637,7 +670,7 @@ def _parse_co_header(fp):
|
|||
pass
|
||||
else:
|
||||
break
|
||||
|
||||
|
||||
raise COMalformedOutput, "Unable to find revision in co output stream"
|
||||
|
||||
# if your rlog doesn't use 77 '=' characters, then this must change
|
||||
|
@ -658,7 +691,7 @@ _EOF_ERROR = 'error message found' # rlog issued an error
|
|||
# ^rlog\: (.*)(?:\:\d+)?\: (.*)$
|
||||
#
|
||||
# But for some reason the windows version of rlog omits the "rlog: " prefix
|
||||
# for the first error message when the standard error stream has been
|
||||
# for the first error message when the standard error stream has been
|
||||
# redirected to a file or pipe. (the prefix is present in subsequent errors
|
||||
# and when rlog is run from the console). So the expression below is more
|
||||
# complicated
|
||||
|
@ -687,7 +720,7 @@ def _parse_log_header(fp):
|
|||
Returns: filename, default branch, tag dictionary, lock dictionary,
|
||||
rlog error message, and eof flag
|
||||
"""
|
||||
|
||||
|
||||
filename = head = branch = msg = ""
|
||||
taginfo = { } # tag name => number
|
||||
lockinfo = { } # revision => locker
|
||||
|
@ -703,7 +736,7 @@ def _parse_log_header(fp):
|
|||
|
||||
if state == 1:
|
||||
if line[0] == '\t':
|
||||
[ tag, rev ] = map(string.strip, string.split(line, ':'))
|
||||
[ tag, rev ] = map(lambda x: x.strip(), line.split(':'))
|
||||
taginfo[tag] = rev
|
||||
else:
|
||||
# oops. this line isn't tag info. stop parsing tags.
|
||||
|
@ -711,12 +744,12 @@ def _parse_log_header(fp):
|
|||
|
||||
if state == 2:
|
||||
if line[0] == '\t':
|
||||
[ locker, rev ] = map(string.strip, string.split(line, ':'))
|
||||
[ locker, rev ] = map(lambda x: x.strip(), line.split(':'))
|
||||
lockinfo[rev] = locker
|
||||
else:
|
||||
# oops. this line isn't lock info. stop parsing tags.
|
||||
state = 0
|
||||
|
||||
|
||||
if state == 0:
|
||||
if line[:9] == 'RCS file:':
|
||||
filename = line[10:-1]
|
||||
|
@ -767,7 +800,7 @@ _re_log_info = re.compile(r'^date:\s+([^;]+);'
|
|||
r'(\s+commitid:\s+([a-zA-Z0-9]+))?\n$')
|
||||
### _re_rev should be updated to extract the "locked" flag
|
||||
_re_rev = re.compile(r'^revision\s+([0-9.]+).*')
|
||||
def _parse_log_entry(fp):
|
||||
def _parse_log_entry(fp, guesser):
|
||||
"""Parse a single log entry.
|
||||
|
||||
On entry, fp should point to the first line of the entry (the "revision"
|
||||
|
@ -820,7 +853,7 @@ def _parse_log_entry(fp):
|
|||
return None, eof
|
||||
|
||||
# parse out a time tuple for the local time
|
||||
tm = compat.cvs_strptime(match.group(1))
|
||||
tm = vclib.ccvs.cvs_strptime(match.group(1))
|
||||
|
||||
# rlog seems to assume that two-digit years are 1900-based (so, "04"
|
||||
# comes out as "1904", not "2004").
|
||||
|
@ -831,7 +864,10 @@ def _parse_log_entry(fp):
|
|||
tm[0] = tm[0] + 100
|
||||
if tm[0] < EPOCH:
|
||||
raise ValueError, 'invalid year'
|
||||
date = compat.timegm(tm)
|
||||
date = calendar.timegm(tm)
|
||||
|
||||
if guesser:
|
||||
log = guesser.utf8(log)
|
||||
|
||||
return Revision(rev, date,
|
||||
# author, state, lines changed
|
||||
|
@ -884,7 +920,7 @@ def _file_log(revs, taginfo, lockinfo, cur_branch, filter):
|
|||
except ValueError:
|
||||
view_tag = None
|
||||
else:
|
||||
tags.append(view_tag)
|
||||
tags.append(view_tag)
|
||||
|
||||
# Match up tags and revisions
|
||||
_match_revs_tags(revs, tags)
|
||||
|
@ -892,13 +928,13 @@ def _file_log(revs, taginfo, lockinfo, cur_branch, filter):
|
|||
# Match up lockinfo and revision
|
||||
for rev in revs:
|
||||
rev.lockinfo = lockinfo.get(rev.string)
|
||||
|
||||
|
||||
# Add artificial ViewVC tag HEAD, which acts like a non-branch tag pointing
|
||||
# at the latest revision on the MAIN branch. The HEAD revision doesn't have
|
||||
# anything to do with the "head" revision number specified in the RCS file
|
||||
# and in rlog output. HEAD refers to the revision that the CVS and RCS co
|
||||
# commands will check out by default, whereas the "head" field just refers
|
||||
# to the highest revision on the trunk.
|
||||
# to the highest revision on the trunk.
|
||||
taginfo['HEAD'] = _add_tag('HEAD', taginfo['MAIN'].co_rev)
|
||||
|
||||
# Determine what revisions to return
|
||||
|
@ -936,10 +972,10 @@ def _file_log(revs, taginfo, lockinfo, cur_branch, filter):
|
|||
_remove_tag(view_tag)
|
||||
else:
|
||||
filtered_revs = revs
|
||||
|
||||
|
||||
return filtered_revs
|
||||
|
||||
def _get_logs(repos, dir_path_parts, entries, view_tag, get_dirs):
|
||||
def _get_logs(repos, dir_path_parts, entries, view_tag, get_dirs, guesser):
|
||||
alltags = { # all the tags seen in the files of this dir
|
||||
'MAIN' : '',
|
||||
'HEAD' : '1.1'
|
||||
|
@ -986,7 +1022,7 @@ def _get_logs(repos, dir_path_parts, entries, view_tag, get_dirs):
|
|||
= _parse_log_header(rlog)
|
||||
|
||||
if eof == _EOF_LOG:
|
||||
# the rlog output ended early. this can happen on errors that rlog
|
||||
# the rlog output ended early. this can happen on errors that rlog
|
||||
# thinks are so serious that it stops parsing the current file and
|
||||
# refuses to parse any of the files that come after it. one of the
|
||||
# errors that triggers this obnoxious behavior looks like:
|
||||
|
@ -1022,20 +1058,20 @@ def _get_logs(repos, dir_path_parts, entries, view_tag, get_dirs):
|
|||
file.errors.append("rlog error: %s" % msg)
|
||||
continue
|
||||
|
||||
tag = None
|
||||
if view_tag == 'MAIN' or view_tag == 'HEAD':
|
||||
tag = Tag(None, default_branch)
|
||||
elif taginfo.has_key(view_tag):
|
||||
tag = Tag(None, taginfo[view_tag])
|
||||
elif view_tag:
|
||||
# the tag wasn't found, so skip this file
|
||||
elif view_tag and (eof != _EOF_FILE):
|
||||
# the tag wasn't found, so skip this file (unless we already
|
||||
# know there's nothing left of it to read)
|
||||
_skip_file(rlog)
|
||||
eof = 1
|
||||
else:
|
||||
tag = None
|
||||
eof = _EOF_FILE
|
||||
|
||||
# we don't care about the specific values -- just the keys and whether
|
||||
# the values point to branches or revisions. this the fastest way to
|
||||
# merge the set of keys and keep values that allow us to make the
|
||||
# the values point to branches or revisions. this the fastest way to
|
||||
# merge the set of keys and keep values that allow us to make the
|
||||
# distinction between branch tags and normal tags
|
||||
alltags.update(taginfo)
|
||||
|
||||
|
@ -1044,7 +1080,7 @@ def _get_logs(repos, dir_path_parts, entries, view_tag, get_dirs):
|
|||
while not eof:
|
||||
|
||||
# fetch one of the log entries
|
||||
entry, eof = _parse_log_entry(rlog)
|
||||
entry, eof = _parse_log_entry(rlog, guesser)
|
||||
|
||||
if not entry:
|
||||
# parsing error
|
||||
|
@ -1080,7 +1116,7 @@ def _get_logs(repos, dir_path_parts, entries, view_tag, get_dirs):
|
|||
file.dead = 0
|
||||
#file.errors.append("No revisions exist on %s" % (view_tag or "MAIN"))
|
||||
file.absent = 1
|
||||
|
||||
|
||||
# done with this file now, skip the rest of this file's revisions
|
||||
if not eof:
|
||||
_skip_file(rlog)
|
||||
|
@ -1193,7 +1229,7 @@ def _newest_file(dirpath):
|
|||
newest_time = 0
|
||||
|
||||
### FIXME: This sucker is leaking unauthorized paths! ###
|
||||
|
||||
|
||||
for subfile in os.listdir(dirpath):
|
||||
### filter CVS locks? stale NFS handles?
|
||||
if subfile[-2:] != ',v':
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python
|
||||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2007 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 2000 Curt Hagenlocher <curt@hagenlocher.org>
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
|
@ -26,12 +26,12 @@
|
|||
#
|
||||
# -----------------------------------------------------------------------
|
||||
|
||||
import string
|
||||
import re
|
||||
import time
|
||||
import math
|
||||
import rcsparse
|
||||
import vclib
|
||||
import cvsdb
|
||||
|
||||
class CVSParser(rcsparse.Sink):
|
||||
# Precompiled regular expressions
|
||||
|
@ -100,7 +100,7 @@ class CVSParser(rcsparse.Sink):
|
|||
|
||||
# Split deltatext specified by rev to each line.
|
||||
def deltatext_split(self, rev):
|
||||
lines = string.split(self.revision_deltatext[rev], '\n')
|
||||
lines = self.revision_deltatext[rev].split('\n')
|
||||
if lines[-1] == '':
|
||||
del lines[-1]
|
||||
return lines
|
||||
|
@ -139,16 +139,16 @@ class CVSParser(rcsparse.Sink):
|
|||
adjust = adjust + 1
|
||||
elif dmatch:
|
||||
# "d" - Delete command
|
||||
start_line = string.atoi(dmatch.group(1))
|
||||
count = string.atoi(dmatch.group(2))
|
||||
start_line = int(dmatch.group(1))
|
||||
count = int(dmatch.group(2))
|
||||
begin = start_line + adjust - 1
|
||||
del text[begin:begin + count]
|
||||
adjust = adjust - count
|
||||
lines_removed_now = lines_removed_now + count
|
||||
elif amatch:
|
||||
# "a" - Add command
|
||||
start_line = string.atoi(amatch.group(1))
|
||||
count = string.atoi(amatch.group(2))
|
||||
start_line = int(amatch.group(1))
|
||||
count = int(amatch.group(2))
|
||||
add_lines_remaining = count
|
||||
lines_added_now = lines_added_now + count
|
||||
else:
|
||||
|
@ -311,13 +311,13 @@ class CVSParser(rcsparse.Sink):
|
|||
skip = skip - 1
|
||||
elif dmatch:
|
||||
# "d" - Delete command
|
||||
start_line = string.atoi(dmatch.group(1))
|
||||
count = string.atoi(dmatch.group(2))
|
||||
start_line = int(dmatch.group(1))
|
||||
count = int(dmatch.group(2))
|
||||
line_count = line_count - count
|
||||
elif amatch:
|
||||
# "a" - Add command
|
||||
start_line = string.atoi(amatch.group(1))
|
||||
count = string.atoi(amatch.group(2))
|
||||
start_line = int(amatch.group(1))
|
||||
count = int(amatch.group(2))
|
||||
skip = count
|
||||
line_count = line_count + count
|
||||
else:
|
||||
|
@ -359,8 +359,8 @@ class CVSParser(rcsparse.Sink):
|
|||
dmatch = self.d_command.match(command)
|
||||
amatch = self.a_command.match(command)
|
||||
if dmatch:
|
||||
start_line = string.atoi(dmatch.group(1))
|
||||
count = string.atoi(dmatch.group(2))
|
||||
start_line = int(dmatch.group(1))
|
||||
count = int(dmatch.group(2))
|
||||
temp = []
|
||||
while count > 0:
|
||||
temp.append(revision)
|
||||
|
@ -368,8 +368,8 @@ class CVSParser(rcsparse.Sink):
|
|||
self.revision_map = (self.revision_map[:start_line - 1] +
|
||||
temp + self.revision_map[start_line - 1:])
|
||||
elif amatch:
|
||||
start_line = string.atoi(amatch.group(1))
|
||||
count = string.atoi(amatch.group(2))
|
||||
start_line = int(amatch.group(1))
|
||||
count = int(amatch.group(2))
|
||||
del self.revision_map[start_line:start_line + count]
|
||||
skip = count
|
||||
else:
|
||||
|
@ -388,15 +388,15 @@ class CVSParser(rcsparse.Sink):
|
|||
dmatch = self.d_command.match(command)
|
||||
amatch = self.a_command.match(command)
|
||||
if dmatch:
|
||||
start_line = string.atoi(dmatch.group(1))
|
||||
count = string.atoi(dmatch.group(2))
|
||||
start_line = int(dmatch.group(1))
|
||||
count = int(dmatch.group(2))
|
||||
adj_begin = start_line + adjust - 1
|
||||
adj_end = start_line + adjust - 1 + count
|
||||
del self.revision_map[adj_begin:adj_end]
|
||||
adjust = adjust - count
|
||||
elif amatch:
|
||||
start_line = string.atoi(amatch.group(1))
|
||||
count = string.atoi(amatch.group(2))
|
||||
start_line = int(amatch.group(1))
|
||||
count = int(amatch.group(2))
|
||||
skip = count
|
||||
temp = []
|
||||
while count > 0:
|
||||
|
@ -414,7 +414,7 @@ class CVSParser(rcsparse.Sink):
|
|||
|
||||
|
||||
class BlameSource:
|
||||
def __init__(self, rcs_file, opt_rev=None):
|
||||
def __init__(self, rcs_file, opt_rev=None, charset_guesser=None, include_text=False):
|
||||
# Parse the CVS file
|
||||
parser = CVSParser()
|
||||
revision = parser.parse_cvs_file(rcs_file, opt_rev)
|
||||
|
@ -428,6 +428,8 @@ class BlameSource:
|
|||
self.lines = lines
|
||||
self.num_lines = count
|
||||
self.parser = parser
|
||||
self.guesser = charset_guesser
|
||||
self.include_text = include_text
|
||||
|
||||
# keep track of where we are during an iteration
|
||||
self.idx = -1
|
||||
|
@ -446,7 +448,14 @@ class BlameSource:
|
|||
prev_rev = self.parser.prev_revision.get(rev)
|
||||
line_number = idx + 1
|
||||
author = self.parser.revision_author[rev]
|
||||
thisline = self.lines[idx]
|
||||
|
||||
if not self.include_text:
|
||||
thisline = None
|
||||
elif self.guesser:
|
||||
thisline = self.guesser.utf8(self.lines[idx])
|
||||
else:
|
||||
thisline = self.lines[idx]
|
||||
|
||||
### TODO: Put a real date in here.
|
||||
item = vclib.Annotation(thisline, line_number, rev, prev_rev, author, None)
|
||||
self.last = item
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2008 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -11,7 +11,6 @@
|
|||
# -----------------------------------------------------------------------
|
||||
|
||||
import os
|
||||
import string
|
||||
import re
|
||||
import cStringIO
|
||||
import tempfile
|
||||
|
@ -19,10 +18,12 @@ import tempfile
|
|||
import vclib
|
||||
import rcsparse
|
||||
import blame
|
||||
import cvsdb
|
||||
|
||||
### The functionality shared with bincvs should probably be moved to a
|
||||
### separate module
|
||||
from bincvs import BaseCVSRepository, Revision, Tag, _file_log, _log_path, _logsort_date_cmp, _logsort_rev_cmp
|
||||
from bincvs import BaseCVSRepository, Revision, Tag, _file_log, _log_path, _logsort_date_cmp, _logsort_rev_cmp, _path_join
|
||||
|
||||
|
||||
class CCVSRepository(BaseCVSRepository):
|
||||
def dirlogs(self, path_parts, rev, entries, options):
|
||||
|
@ -44,7 +45,7 @@ class CCVSRepository(BaseCVSRepository):
|
|||
"""
|
||||
if self.itemtype(path_parts, rev) != vclib.DIR: # does auth-check
|
||||
raise vclib.Error("Path '%s' is not a directory."
|
||||
% (string.join(path_parts, "/")))
|
||||
% (part2path(path_parts)))
|
||||
entries_to_fetch = []
|
||||
for entry in entries:
|
||||
if vclib.check_path_access(self, path_parts + [entry.name], None, rev):
|
||||
|
@ -66,6 +67,8 @@ class CCVSRepository(BaseCVSRepository):
|
|||
entry.path = path
|
||||
try:
|
||||
rcsparse.parse(open(path, 'rb'), InfoSink(entry, rev, alltags))
|
||||
if self.guesser:
|
||||
entry.log = self.guesser.utf8(entry.log)
|
||||
except IOError, e:
|
||||
entry.errors.append("rcsparse error: %s" % e)
|
||||
except RuntimeError, e:
|
||||
|
@ -94,8 +97,7 @@ class CCVSRepository(BaseCVSRepository):
|
|||
dictionary of Tag objects for all tags encountered
|
||||
"""
|
||||
if self.itemtype(path_parts, rev) != vclib.FILE: # does auth-check
|
||||
raise vclib.Error("Path '%s' is not a file."
|
||||
% (string.join(path_parts, "/")))
|
||||
raise vclib.Error("Path '%s' is not a file." % (_path_join(path_parts)))
|
||||
|
||||
path = self.rcsfile(path_parts, 1)
|
||||
sink = TreeSink()
|
||||
|
@ -119,48 +121,53 @@ class CCVSRepository(BaseCVSRepository):
|
|||
return filtered_revs
|
||||
|
||||
def rawdiff(self, path_parts1, rev1, path_parts2, rev2, type, options={}):
|
||||
if self.itemtype(path_parts1, rev1) != vclib.FILE: # does auth-check
|
||||
raise vclib.Error("Path '%s' is not a file."
|
||||
% (string.join(path_parts1, "/")))
|
||||
if self.itemtype(path_parts2, rev2) != vclib.FILE: # does auth-check
|
||||
raise vclib.Error("Path '%s' is not a file."
|
||||
% (string.join(path_parts2, "/")))
|
||||
if path_parts1 and self.itemtype(path_parts1, rev1) != vclib.FILE: # does auth-check
|
||||
raise vclib.Error("Path '%s' is not a file." % (_path_join(path_parts1)))
|
||||
if path_parts2 and self.itemtype(path_parts2, rev2) != vclib.FILE: # does auth-check
|
||||
raise vclib.Error("Path '%s' is not a file." % (_path_join(path_parts2)))
|
||||
if not path_parts1 and not path_parts2:
|
||||
raise vclib.Error("Nothing to diff.")
|
||||
|
||||
temp1 = tempfile.mktemp()
|
||||
open(temp1, 'wb').write(self.openfile(path_parts1, rev1)[0].getvalue())
|
||||
temp2 = tempfile.mktemp()
|
||||
open(temp2, 'wb').write(self.openfile(path_parts2, rev2)[0].getvalue())
|
||||
if path_parts1:
|
||||
temp1 = tempfile.mktemp()
|
||||
open(temp1, 'wb').write(self.openfile(path_parts1, rev1, {})[0].getvalue())
|
||||
r1 = self.itemlog(path_parts1, rev1, vclib.SORTBY_DEFAULT, 0, 0, {})[-1]
|
||||
info1 = (self.rcsfile(path_parts1, root=1, v=0), r1.date, r1.string)
|
||||
else:
|
||||
temp1 = '/dev/null'
|
||||
info1 = ('/dev/null', '', '')
|
||||
|
||||
r1 = self.itemlog(path_parts1, rev1, vclib.SORTBY_DEFAULT, 0, 0, {})[-1]
|
||||
r2 = self.itemlog(path_parts2, rev2, vclib.SORTBY_DEFAULT, 0, 0, {})[-1]
|
||||
|
||||
info1 = (self.rcsfile(path_parts1, root=1, v=0), r1.date, r1.string)
|
||||
info2 = (self.rcsfile(path_parts2, root=1, v=0), r2.date, r2.string)
|
||||
if path_parts2:
|
||||
temp2 = tempfile.mktemp()
|
||||
open(temp2, 'wb').write(self.openfile(path_parts2, rev2, {})[0].getvalue())
|
||||
r2 = self.itemlog(path_parts2, rev2, vclib.SORTBY_DEFAULT, 0, 0, {})[-1]
|
||||
info2 = (self.rcsfile(path_parts2, root=1, v=0), r2.date, r2.string)
|
||||
else:
|
||||
temp2 = '/dev/null'
|
||||
info2 = ('/dev/null', '', '')
|
||||
|
||||
diff_args = vclib._diff_args(type, options)
|
||||
|
||||
return vclib._diff_fp(temp1, temp2, info1, info2,
|
||||
self.utilities.diff or 'diff', diff_args)
|
||||
|
||||
def annotate(self, path_parts, rev=None):
|
||||
def annotate(self, path_parts, rev=None, include_text=False):
|
||||
if self.itemtype(path_parts, rev) != vclib.FILE: # does auth-check
|
||||
raise vclib.Error("Path '%s' is not a file."
|
||||
% (string.join(path_parts, "/")))
|
||||
source = blame.BlameSource(self.rcsfile(path_parts, 1), rev)
|
||||
raise vclib.Error("Path '%s' is not a file." % (_path_join(path_parts)))
|
||||
source = blame.BlameSource(self.rcsfile(path_parts, 1), rev, self.guesser, include_text)
|
||||
return source, source.revision
|
||||
|
||||
def revinfo(self, rev):
|
||||
raise vclib.UnsupportedFeature
|
||||
|
||||
def openfile(self, path_parts, rev=None):
|
||||
def openfile(self, path_parts, rev, options):
|
||||
if self.itemtype(path_parts, rev) != vclib.FILE: # does auth-check
|
||||
raise vclib.Error("Path '%s' is not a file."
|
||||
% (string.join(path_parts, "/")))
|
||||
raise vclib.Error("Path '%s' is not a file." % (_path_join(path_parts)))
|
||||
path = self.rcsfile(path_parts, 1)
|
||||
sink = COSink(rev)
|
||||
rcsparse.parse(open(path, 'rb'), sink)
|
||||
revision = sink.last and sink.last.string
|
||||
return cStringIO.StringIO(string.join(sink.sstext.text, "\n")), revision
|
||||
return cStringIO.StringIO('\n'.join(sink.sstext.text)), revision
|
||||
|
||||
class MatchingSink(rcsparse.Sink):
|
||||
"""Superclass for sinks that search for revisions based on tag or number"""
|
||||
|
@ -200,6 +207,7 @@ class InfoSink(MatchingSink):
|
|||
self.matching_rev = None
|
||||
self.perfect_match = 0
|
||||
self.lockinfo = { }
|
||||
self.saw_revision = False
|
||||
|
||||
def define_tag(self, name, revision):
|
||||
MatchingSink.define_tag(self, name, revision)
|
||||
|
@ -213,10 +221,17 @@ class InfoSink(MatchingSink):
|
|||
self.entry.absent = 1
|
||||
raise rcsparse.RCSStopParser
|
||||
|
||||
def parse_completed(self):
|
||||
if not self.saw_revision:
|
||||
#self.entry.errors.append("No revisions exist on %s" % (view_tag or "MAIN"))
|
||||
self.entry.absent = 1
|
||||
|
||||
def set_locker(self, rev, locker):
|
||||
self.lockinfo[rev] = locker
|
||||
|
||||
def define_revision(self, revision, date, author, state, branches, next):
|
||||
self.saw_revision = True
|
||||
|
||||
if self.perfect_match:
|
||||
return
|
||||
|
||||
|
@ -224,14 +239,18 @@ class InfoSink(MatchingSink):
|
|||
rev = Revision(revision, date, author, state == "dead")
|
||||
rev.lockinfo = self.lockinfo.get(revision)
|
||||
|
||||
# perfect match if revision number matches tag number or if revision is on
|
||||
# trunk and tag points to trunk. imperfect match if tag refers to a branch
|
||||
# and this revision is the highest revision so far found on that branch
|
||||
# perfect match if revision number matches tag number or if
|
||||
# revision is on trunk and tag points to trunk. imperfect match
|
||||
# if tag refers to a branch and either a) this revision is the
|
||||
# highest revision so far found on that branch, or b) this
|
||||
# revision is the branchpoint.
|
||||
perfect = ((rev.number == tag.number) or
|
||||
(not tag.number and len(rev.number) == 2))
|
||||
if perfect or (tag.is_branch and tag.number == rev.number[:-1] and
|
||||
(not self.matching_rev or
|
||||
rev.number > self.matching_rev.number)):
|
||||
if perfect or (tag.is_branch and \
|
||||
((tag.number == rev.number[:-1] and
|
||||
(not self.matching_rev or
|
||||
rev.number > self.matching_rev.number)) or
|
||||
(rev.number == tag.number[:-1]))):
|
||||
self.matching_rev = rev
|
||||
self.perfect_match = perfect
|
||||
|
||||
|
@ -287,18 +306,18 @@ class TreeSink(rcsparse.Sink):
|
|||
deled = 0
|
||||
if self.head != revision:
|
||||
changed = 1
|
||||
lines = string.split(text, '\n')
|
||||
lines = text.split('\n')
|
||||
idx = 0
|
||||
while idx < len(lines):
|
||||
command = lines[idx]
|
||||
dmatch = self.d_command.match(command)
|
||||
idx = idx + 1
|
||||
if dmatch:
|
||||
deled = deled + string.atoi(dmatch.group(2))
|
||||
deled = deled + int(dmatch.group(2))
|
||||
else:
|
||||
amatch = self.a_command.match(command)
|
||||
if amatch:
|
||||
count = string.atoi(amatch.group(2))
|
||||
count = int(amatch.group(2))
|
||||
added = added + count
|
||||
idx = idx + count
|
||||
elif command:
|
||||
|
@ -314,12 +333,12 @@ class StreamText:
|
|||
a_command = re.compile('^a(\d+)\\s(\\d+)')
|
||||
|
||||
def __init__(self, text):
|
||||
self.text = string.split(text, "\n")
|
||||
self.text = text.split('\n')
|
||||
|
||||
def command(self, cmd):
|
||||
adjust = 0
|
||||
add_lines_remaining = 0
|
||||
diffs = string.split(cmd, "\n")
|
||||
diffs = cmd.split('\n')
|
||||
if diffs[-1] == "":
|
||||
del diffs[-1]
|
||||
if len(diffs) == 0:
|
||||
|
@ -337,22 +356,22 @@ class StreamText:
|
|||
amatch = self.a_command.match(command)
|
||||
if dmatch:
|
||||
# "d" - Delete command
|
||||
start_line = string.atoi(dmatch.group(1))
|
||||
count = string.atoi(dmatch.group(2))
|
||||
start_line = int(dmatch.group(1))
|
||||
count = int(dmatch.group(2))
|
||||
begin = start_line + adjust - 1
|
||||
del self.text[begin:begin + count]
|
||||
adjust = adjust - count
|
||||
elif amatch:
|
||||
# "a" - Add command
|
||||
start_line = string.atoi(amatch.group(1))
|
||||
count = string.atoi(amatch.group(2))
|
||||
start_line = int(amatch.group(1))
|
||||
count = int(amatch.group(2))
|
||||
add_lines_remaining = count
|
||||
else:
|
||||
raise RuntimeError, 'Error parsing diff commands'
|
||||
|
||||
def secondnextdot(s, start):
|
||||
# find the position the second dot after the start index.
|
||||
return string.find(s, '.', string.find(s, '.', start) + 1)
|
||||
return s.find('.', s.find('.', start) + 1)
|
||||
|
||||
|
||||
class COSink(MatchingSink):
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2006 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -10,8 +10,17 @@
|
|||
#
|
||||
# -----------------------------------------------------------------------
|
||||
|
||||
"""This package provides parsing tools for RCS files."""
|
||||
"""This package provides parsing tools for RCS files.
|
||||
|
||||
To use this package, first create a subclass of Sink. This should
|
||||
declare all the callback methods you care about. Create an instance
|
||||
of your class, and open() the RCS file you want to read. Then call
|
||||
parse() to parse the file.
|
||||
"""
|
||||
|
||||
# Make the "Sink" class and the various exception classes visible in this
|
||||
# scope. That way, applications never need to import any of the
|
||||
# sub-packages.
|
||||
from common import *
|
||||
|
||||
try:
|
||||
|
@ -23,4 +32,13 @@ except ImportError:
|
|||
from default import Parser
|
||||
|
||||
def parse(file, sink):
|
||||
"""Parse an RCS file.
|
||||
|
||||
Parameters: FILE is the file object to parse. (I.e. an object of the
|
||||
built-in Python type "file", usually created using Python's built-in
|
||||
"open()" function). It should be opened in binary mode.
|
||||
SINK is an instance of (some subclass of) Sink. It's methods will be
|
||||
called as the file is parsed; see the definition of Sink for the
|
||||
details.
|
||||
"""
|
||||
return Parser().parse(file, sink)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2007 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -16,52 +16,199 @@ import calendar
|
|||
import string
|
||||
|
||||
class Sink:
|
||||
"""Interface to be implemented by clients. The RCS parser calls this as
|
||||
it parses the RCS file.
|
||||
|
||||
All these methods have stub implementations that do nothing, so you only
|
||||
have to override the callbacks that you care about.
|
||||
"""
|
||||
def set_head_revision(self, revision):
|
||||
"""Reports the head revision for this RCS file.
|
||||
|
||||
This is the value of the 'head' header in the admin section of the RCS
|
||||
file. This function can only be called before admin_completed().
|
||||
|
||||
Parameter: REVISION is a string containing a revision number. This is
|
||||
an actual revision number, not a branch number.
|
||||
"""
|
||||
pass
|
||||
|
||||
def set_principal_branch(self, branch_name):
|
||||
"""Reports the principal branch for this RCS file. This is only called
|
||||
if the principal branch is not trunk.
|
||||
|
||||
This is the value of the 'branch' header in the admin section of the RCS
|
||||
file. This function can only be called before admin_completed().
|
||||
|
||||
Parameter: BRANCH_NAME is a string containing a branch number. If this
|
||||
function is called, the parameter is typically "1.1.1", indicating the
|
||||
vendor branch.
|
||||
"""
|
||||
pass
|
||||
|
||||
def set_access(self, accessors):
|
||||
"""Reports the access control list for this RCS file. This function is
|
||||
only called if the ACL is set. If this function is not called then
|
||||
there is no ACL and all users are allowed access.
|
||||
|
||||
This is the value of the 'access' header in the admin section of the RCS
|
||||
file. This function can only be called before admin_completed().
|
||||
|
||||
Parameter: ACCESSORS is a list of strings. Each string is a username.
|
||||
The user is allowed access if and only if their username is in the list,
|
||||
OR the user owns the RCS file on disk, OR the user is root.
|
||||
|
||||
Note that CVS typically doesn't use this field.
|
||||
"""
|
||||
pass
|
||||
|
||||
def define_tag(self, name, revision):
|
||||
"""Reports a tag or branch definition. This function will be called
|
||||
once for each tag or branch.
|
||||
|
||||
This is taken from the 'symbols' header in the admin section of the RCS
|
||||
file. This function can only be called before admin_completed().
|
||||
|
||||
Parameters: NAME is a string containing the tag or branch name.
|
||||
REVISION is a string containing a revision number. This may be
|
||||
an actual revision number (for a tag) or a branch number.
|
||||
|
||||
The revision number consists of a number of decimal components separated
|
||||
by dots. There are three common forms. If there are an odd number of
|
||||
components, it's a branch. Otherwise, if the next-to-last component is
|
||||
zero, it's a branch (and the next-to-last component is an artifact of
|
||||
CVS and should not be shown to the user). Otherwise, it's a tag.
|
||||
|
||||
This function is called in the order that the tags appear in the RCS
|
||||
file header. For CVS, this appears to be in reverse chronological
|
||||
order of tag/branch creation.
|
||||
"""
|
||||
pass
|
||||
|
||||
def set_locker(self, revision, locker):
|
||||
"""Reports a lock on this RCS file. This function will be called once
|
||||
for each lock.
|
||||
|
||||
This is taken from the 'locks' header in the admin section of the RCS
|
||||
file. This function can only be called before admin_completed().
|
||||
|
||||
Parameters: REVISION is a string containing a revision number. This is
|
||||
an actual revision number, not a branch number.
|
||||
LOCKER is a string containing a username.
|
||||
"""
|
||||
pass
|
||||
|
||||
def set_locking(self, mode):
|
||||
"""Used to signal locking mode.
|
||||
"""Signals strict locking mode. This function will be called if and
|
||||
only if the RCS file is in strict locking mode.
|
||||
|
||||
Called with mode argument 'strict' if strict locking
|
||||
Not called when no locking used."""
|
||||
This is taken from the 'strict' header in the admin section of the RCS
|
||||
file. This function can only be called before admin_completed().
|
||||
|
||||
Parameters: MODE is always the string 'strict'.
|
||||
"""
|
||||
pass
|
||||
|
||||
def set_comment(self, comment):
|
||||
"""Reports the comment for this RCS file.
|
||||
|
||||
This is the value of the 'comment' header in the admin section of the
|
||||
RCS file. This function can only be called before admin_completed().
|
||||
|
||||
Parameter: COMMENT is a string containing the comment. This may be
|
||||
multi-line.
|
||||
|
||||
This field does not seem to be used by CVS.
|
||||
"""
|
||||
pass
|
||||
|
||||
def set_expansion(self, mode):
|
||||
"""Reports the keyword expansion mode for this RCS file.
|
||||
|
||||
This is the value of the 'expand' header in the admin section of the
|
||||
RCS file. This function can only be called before admin_completed().
|
||||
|
||||
Parameter: MODE is a string containing the keyword expansion mode.
|
||||
Possible values include 'o' and 'b', amongst others.
|
||||
"""
|
||||
pass
|
||||
|
||||
def admin_completed(self):
|
||||
"""Reports that the initial RCS header has been parsed. This function is
|
||||
called exactly once.
|
||||
"""
|
||||
pass
|
||||
|
||||
def define_revision(self, revision, timestamp, author, state,
|
||||
branches, next):
|
||||
"""Reports metadata about a single revision.
|
||||
|
||||
This function is called for each revision. It is called later than
|
||||
admin_completed() and earlier than tree_completed().
|
||||
|
||||
Parameter: REVISION is a revision number, as a string. This is an
|
||||
actual revision number, not a branch number.
|
||||
TIMESTAMP is the date and time that the revision was created, as an
|
||||
integer number of seconds since the epoch. (I.e. "UNIX time" format).
|
||||
AUTHOR is the author name, as a string.
|
||||
STATE is the state of the revision, as a string. Common values are
|
||||
"Exp" and "dead".
|
||||
BRANCHES is a list of strings, with each string being an actual
|
||||
revision number (not a branch number). For each branch which is based
|
||||
on this revision and has commits, the revision number of the first
|
||||
branch commit is listed here.
|
||||
NEXT is either None or a string representing an actual revision number
|
||||
(not a branch number).
|
||||
|
||||
When on trunk, NEXT points to what humans might consider to be the
|
||||
'previous' revision number. For example, 1.3's NEXT is 1.2.
|
||||
However, on a branch, NEXT really does point to what humans would
|
||||
consider to be the 'next' revision number. For example, 1.1.2.1's
|
||||
NEXT would be 1.1.2.2.
|
||||
In other words, NEXT always means "where to find the next deltatext
|
||||
that you need this revision to retrieve".
|
||||
"""
|
||||
pass
|
||||
|
||||
def tree_completed(self):
|
||||
"""Reports that the RCS revision tree has been parsed. This function is
|
||||
called exactly once. This function will be called later than
|
||||
admin_completed().
|
||||
"""
|
||||
pass
|
||||
|
||||
def set_description(self, description):
|
||||
"""Reports the description from the RCS file. This is set using the
|
||||
"-m" flag to "cvs add". However, many CVS users don't use that option,
|
||||
so this is often empty.
|
||||
|
||||
This function is called once, after tree_completed().
|
||||
|
||||
Parameter: DESCRIPTION is a string containing the description. This may
|
||||
be multi-line.
|
||||
"""
|
||||
pass
|
||||
|
||||
def set_revision_info(self, revision, log, text):
|
||||
"""Reports the log message and contents of a CVS revision.
|
||||
|
||||
This function is called for each revision. It is called later than
|
||||
set_description().
|
||||
|
||||
Parameters: REVISION is a string containing the actual revision number.
|
||||
LOG is a string containing the log message. This may be multi-line.
|
||||
TEXT is the contents of the file in this revision, either as full-text or
|
||||
as a diff. This is usually multi-line, and often quite large and/or
|
||||
binary.
|
||||
"""
|
||||
pass
|
||||
|
||||
def parse_completed(self):
|
||||
"""Reports that parsing an RCS file is complete.
|
||||
|
||||
This function is called once. After it is called, no more calls will be
|
||||
made via this interface.
|
||||
"""
|
||||
pass
|
||||
|
||||
|
||||
|
@ -194,7 +341,8 @@ class _Parser:
|
|||
else:
|
||||
# Chew up "newphrase"
|
||||
# warn("Unexpected RCS token: $token\n")
|
||||
pass
|
||||
while self.ts.get() != ';':
|
||||
pass
|
||||
else:
|
||||
if f is None:
|
||||
self.ts.unget(token)
|
||||
|
@ -208,7 +356,7 @@ class _Parser:
|
|||
date = self.ts.get()
|
||||
self.ts.match(';')
|
||||
|
||||
# Convert date into timestamp
|
||||
# Convert date into standard UNIX time format (seconds since epoch)
|
||||
date_fields = string.split(date, '.')
|
||||
# According to rcsfile(5): the year "contains just the last two
|
||||
# digits of the year for years from 1900 through 1999, and all the
|
||||
|
@ -218,8 +366,11 @@ class _Parser:
|
|||
date_fields = map(string.atoi, date_fields)
|
||||
EPOCH = 1970
|
||||
if date_fields[0] < EPOCH:
|
||||
raise ValueError, 'invalid year'
|
||||
timestamp = calendar.timegm(tuple(date_fields) + (0, 0, 0,))
|
||||
raise ValueError, 'invalid year for revision %s' % (revision,)
|
||||
try:
|
||||
timestamp = calendar.timegm(tuple(date_fields) + (0, 0, 0,))
|
||||
except ValueError, e:
|
||||
raise ValueError, 'invalid date for revision %s: %s' % (revision, e,)
|
||||
|
||||
# Parse author
|
||||
### NOTE: authors containing whitespace are violations of the
|
||||
|
@ -255,6 +406,7 @@ class _Parser:
|
|||
# group 15;
|
||||
# permissions 644;
|
||||
# hardlinks @configure.in@;
|
||||
# commitid mLiHw3bulRjnTDGr;
|
||||
# this is "newphrase" in RCSFILE(5). we just want to skip over these.
|
||||
while 1:
|
||||
token = self.ts.get()
|
||||
|
@ -298,6 +450,15 @@ class _Parser:
|
|||
self.sink.set_revision_info(revision, log, text)
|
||||
|
||||
def parse(self, file, sink):
|
||||
"""Parse an RCS file.
|
||||
|
||||
Parameters: FILE is the file object to parse. (I.e. an object of the
|
||||
built-in Python type "file", usually created using Python's built-in
|
||||
"open()" function).
|
||||
SINK is an instance of (some subclass of) Sink. It's methods will be
|
||||
called as the file is parsed; see the definition of Sink for the
|
||||
details.
|
||||
"""
|
||||
self.ts = self.stream_class(file)
|
||||
self.sink = sink
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2006 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2007 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -19,7 +19,11 @@ import string
|
|||
import common
|
||||
|
||||
class _TokenStream:
|
||||
token_term = string.whitespace + ';:'
|
||||
token_term = string.whitespace + ";:"
|
||||
try:
|
||||
token_term = frozenset(token_term)
|
||||
except NameError:
|
||||
pass
|
||||
|
||||
# the algorithm is about the same speed for any CHUNK_SIZE chosen.
|
||||
# grab a good-sized chunk, but not too large to overwhelm memory.
|
||||
|
@ -44,15 +48,17 @@ class _TokenStream:
|
|||
# out more complex solutions.
|
||||
|
||||
buf = self.buf
|
||||
lbuf = len(buf)
|
||||
idx = self.idx
|
||||
|
||||
while 1:
|
||||
if idx == len(buf):
|
||||
if idx == lbuf:
|
||||
buf = self.rcsfile.read(self.CHUNK_SIZE)
|
||||
if buf == '':
|
||||
# signal EOF by returning None as the token
|
||||
del self.buf # so we fail if get() is called again
|
||||
return None
|
||||
lbuf = len(buf)
|
||||
idx = 0
|
||||
|
||||
if buf[idx] not in string.whitespace:
|
||||
|
@ -60,7 +66,7 @@ class _TokenStream:
|
|||
|
||||
idx = idx + 1
|
||||
|
||||
if buf[idx] == ';' or buf[idx] == ':':
|
||||
if buf[idx] in ';:':
|
||||
self.buf = buf
|
||||
self.idx = idx + 1
|
||||
return buf[idx]
|
||||
|
@ -70,17 +76,18 @@ class _TokenStream:
|
|||
token = ''
|
||||
while 1:
|
||||
# find token characters in the current buffer
|
||||
while end < len(buf) and buf[end] not in self.token_term:
|
||||
while end < lbuf and buf[end] not in self.token_term:
|
||||
end = end + 1
|
||||
token = token + buf[idx:end]
|
||||
|
||||
if end < len(buf):
|
||||
if end < lbuf:
|
||||
# we stopped before the end, so we have a full token
|
||||
idx = end
|
||||
break
|
||||
|
||||
# we stopped at the end of the buffer, so we may have a partial token
|
||||
buf = self.rcsfile.read(self.CHUNK_SIZE)
|
||||
lbuf = len(buf)
|
||||
idx = end = 0
|
||||
|
||||
self.buf = buf
|
||||
|
@ -94,22 +101,24 @@ class _TokenStream:
|
|||
chunks = [ ]
|
||||
|
||||
while 1:
|
||||
if idx == len(buf):
|
||||
if idx == lbuf:
|
||||
idx = 0
|
||||
buf = self.rcsfile.read(self.CHUNK_SIZE)
|
||||
if buf == '':
|
||||
raise RuntimeError, 'EOF'
|
||||
lbuf = len(buf)
|
||||
i = string.find(buf, '@', idx)
|
||||
if i == -1:
|
||||
chunks.append(buf[idx:])
|
||||
idx = len(buf)
|
||||
idx = lbuf
|
||||
continue
|
||||
if i == len(buf) - 1:
|
||||
if i == lbuf - 1:
|
||||
chunks.append(buf[idx:i])
|
||||
idx = 0
|
||||
buf = '@' + self.rcsfile.read(self.CHUNK_SIZE)
|
||||
if buf == '@':
|
||||
raise RuntimeError, 'EOF'
|
||||
lbuf = len(buf)
|
||||
continue
|
||||
if buf[i + 1] == '@':
|
||||
chunks.append(buf[idx:i+1])
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2007 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2008 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -15,17 +15,50 @@
|
|||
import os
|
||||
import os.path
|
||||
import re
|
||||
import urllib
|
||||
|
||||
_re_url = re.compile('^(http|https|file|svn|svn\+[^:]+)://')
|
||||
|
||||
def canonicalize_rootpath(rootpath):
|
||||
def _canonicalize_path(path):
|
||||
import svn.core
|
||||
try:
|
||||
import svn.core
|
||||
return svn.core.svn_path_canonicalize(rootpath)
|
||||
except:
|
||||
if re.search(_re_url, rootpath):
|
||||
return rootpath[-1] == '/' and rootpath[:-1] or rootpath
|
||||
return os.path.normpath(rootpath)
|
||||
return svn.core.svn_path_canonicalize(path)
|
||||
except AttributeError: # svn_path_canonicalize() appeared in 1.4.0 bindings
|
||||
# There's so much more that we *could* do here, but if we're
|
||||
# here at all its because there's a really old Subversion in
|
||||
# place, and those older Subversion versions cared quite a bit
|
||||
# less about the specifics of path canonicalization.
|
||||
if re.search(_re_url, path):
|
||||
return path.rstrip('/')
|
||||
else:
|
||||
return os.path.normpath(path)
|
||||
|
||||
|
||||
def canonicalize_rootpath(rootpath):
|
||||
# Try to canonicalize the rootpath using Subversion semantics.
|
||||
rootpath = _canonicalize_path(rootpath)
|
||||
|
||||
# ViewVC's support for local repositories is more complete and more
|
||||
# performant than its support for remote ones, so if we're on a
|
||||
# Unix-y system and we have a file:/// URL, convert it to a local
|
||||
# path instead.
|
||||
if os.name == 'posix':
|
||||
rootpath_lower = rootpath.lower()
|
||||
if rootpath_lower in ['file://localhost',
|
||||
'file://localhost/',
|
||||
'file://',
|
||||
'file:///'
|
||||
]:
|
||||
return '/'
|
||||
if rootpath_lower.startswith('file://localhost/'):
|
||||
rootpath = os.path.normpath(urllib.unquote(rootpath[16:]))
|
||||
elif rootpath_lower.startswith('file:///'):
|
||||
rootpath = os.path.normpath(urllib.unquote(rootpath[7:]))
|
||||
|
||||
# Ensure that we have an absolute path (or URL), and return.
|
||||
if not re.search(_re_url, rootpath):
|
||||
assert os.path.isabs(rootpath)
|
||||
return rootpath
|
||||
|
||||
|
||||
def expand_root_parent(parent_path):
|
||||
|
@ -35,6 +68,7 @@ def expand_root_parent(parent_path):
|
|||
else:
|
||||
# Any subdirectories of PARENT_PATH which themselves have a child
|
||||
# "format" are returned as roots.
|
||||
assert os.path.isabs(parent_path)
|
||||
subpaths = os.listdir(parent_path)
|
||||
for rootname in subpaths:
|
||||
rootpath = os.path.join(parent_path, rootname)
|
||||
|
@ -43,6 +77,20 @@ def expand_root_parent(parent_path):
|
|||
return roots
|
||||
|
||||
|
||||
def find_root_in_parent(parent_path, rootname):
|
||||
"""Search PARENT_PATH for a root named ROOTNAME, returning the
|
||||
canonicalized ROOTPATH of the root if found; return None if no such
|
||||
root is found."""
|
||||
|
||||
if not re.search(_re_url, parent_path):
|
||||
assert os.path.isabs(parent_path)
|
||||
rootpath = os.path.join(parent_path, rootname)
|
||||
format_path = os.path.join(rootpath, "format")
|
||||
if os.path.exists(format_path):
|
||||
return canonicalize_rootpath(rootpath)
|
||||
return None
|
||||
|
||||
|
||||
def SubversionRepository(name, rootpath, authorizer, utilities, config_dir):
|
||||
rootpath = canonicalize_rootpath(rootpath)
|
||||
if re.search(_re_url, rootpath):
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2008 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -15,13 +15,14 @@
|
|||
import vclib
|
||||
import sys
|
||||
import os
|
||||
import string
|
||||
import re
|
||||
import tempfile
|
||||
import popen2
|
||||
import time
|
||||
import urllib
|
||||
from svn_repos import Revision, SVNChangedPath, _datestr_to_date, _compare_paths, _path_parts, _cleanup_path, _rev2optrev
|
||||
from svn_repos import Revision, SVNChangedPath, _datestr_to_date, \
|
||||
_compare_paths, _path_parts, _cleanup_path, \
|
||||
_rev2optrev, _fix_subversion_exception, \
|
||||
_split_revprops, _canonicalize_path
|
||||
from svn import core, delta, client, wc, ra
|
||||
|
||||
|
||||
|
@ -52,13 +53,71 @@ def get_directory_props(ra_session, path, rev):
|
|||
props = ra.svn_ra_get_dir(ra_session, path, rev)
|
||||
return props
|
||||
|
||||
def client_log(url, start_rev, end_rev, log_limit, include_changes,
|
||||
cross_copies, cb_func, ctx):
|
||||
include_changes = include_changes and 1 or 0
|
||||
cross_copies = cross_copies and 1 or 0
|
||||
try:
|
||||
client.svn_client_log4([url], start_rev, start_rev, end_rev,
|
||||
log_limit, include_changes, not cross_copies,
|
||||
0, None, cb_func, ctx)
|
||||
except AttributeError:
|
||||
# Wrap old svn_log_message_receiver_t interface with a
|
||||
# svn_log_entry_t one.
|
||||
def cb_convert(paths, revision, author, date, message, pool):
|
||||
class svn_log_entry_t:
|
||||
pass
|
||||
log_entry = svn_log_entry_t()
|
||||
log_entry.changed_paths = paths
|
||||
log_entry.revision = revision
|
||||
log_entry.revprops = { core.SVN_PROP_REVISION_LOG : message,
|
||||
core.SVN_PROP_REVISION_AUTHOR : author,
|
||||
core.SVN_PROP_REVISION_DATE : date,
|
||||
}
|
||||
cb_func(log_entry, pool)
|
||||
client.svn_client_log2([url], start_rev, end_rev, log_limit,
|
||||
include_changes, not cross_copies, cb_convert, ctx)
|
||||
|
||||
|
||||
def setup_client_ctx(config_dir):
|
||||
# Ensure that the configuration directory exists.
|
||||
core.svn_config_ensure(config_dir)
|
||||
|
||||
# Fetch the configuration (and 'config' bit thereof).
|
||||
cfg = core.svn_config_get_config(config_dir)
|
||||
config = cfg.get(core.SVN_CONFIG_CATEGORY_CONFIG)
|
||||
|
||||
# Here's the compat-sensitive part: try to use
|
||||
# svn_cmdline_create_auth_baton(), and fall back to making our own
|
||||
# if that fails.
|
||||
try:
|
||||
auth_baton = core.svn_cmdline_create_auth_baton(1, None, None, config_dir,
|
||||
1, 1, config, None)
|
||||
except AttributeError:
|
||||
auth_baton = core.svn_auth_open([
|
||||
client.svn_client_get_simple_provider(),
|
||||
client.svn_client_get_username_provider(),
|
||||
client.svn_client_get_ssl_server_trust_file_provider(),
|
||||
client.svn_client_get_ssl_client_cert_file_provider(),
|
||||
client.svn_client_get_ssl_client_cert_pw_file_provider(),
|
||||
])
|
||||
if config_dir is not None:
|
||||
core.svn_auth_set_parameter(auth_baton,
|
||||
core.SVN_AUTH_PARAM_CONFIG_DIR,
|
||||
config_dir)
|
||||
|
||||
# Create, setup, and return the client context baton.
|
||||
ctx = client.svn_client_create_context()
|
||||
ctx.config = cfg
|
||||
ctx.auth_baton = auth_baton
|
||||
return ctx
|
||||
|
||||
### END COMPATABILITY CODE ###
|
||||
|
||||
|
||||
class LogCollector:
|
||||
### TODO: Make this thing authz-aware
|
||||
|
||||
def __init__(self, path, show_all_logs, lockinfo):
|
||||
def __init__(self, path, show_all_logs, lockinfo, access_check_func):
|
||||
# This class uses leading slashes for paths internally
|
||||
if not path:
|
||||
self.path = '/'
|
||||
|
@ -67,8 +126,16 @@ class LogCollector:
|
|||
self.logs = []
|
||||
self.show_all_logs = show_all_logs
|
||||
self.lockinfo = lockinfo
|
||||
self.access_check_func = access_check_func
|
||||
self.done = False
|
||||
|
||||
def add_log(self, log_entry, pool):
|
||||
if self.done:
|
||||
return
|
||||
paths = log_entry.changed_paths
|
||||
revision = log_entry.revision
|
||||
msg, author, date, revprops = _split_revprops(log_entry.revprops)
|
||||
|
||||
def add_log(self, paths, revision, author, date, message, pool):
|
||||
# Changed paths have leading slashes
|
||||
changed_paths = paths.keys()
|
||||
changed_paths.sort(lambda a, b: _compare_paths(a, b))
|
||||
|
@ -82,19 +149,23 @@ class LogCollector:
|
|||
if changed_path != self.path:
|
||||
# If a parent of our path was copied, our "next previous"
|
||||
# (huh?) path will exist elsewhere (under the copy source).
|
||||
if (string.rfind(self.path, changed_path) == 0) and \
|
||||
if (self.path.rfind(changed_path) == 0) and \
|
||||
self.path[len(changed_path)] == '/':
|
||||
change = paths[changed_path]
|
||||
if change.copyfrom_path:
|
||||
this_path = change.copyfrom_path + self.path[len(changed_path):]
|
||||
if self.show_all_logs or this_path:
|
||||
entry = Revision(revision, _datestr_to_date(date), author, message, None,
|
||||
self.lockinfo, self.path[1:], None, None)
|
||||
self.logs.append(entry)
|
||||
if self.access_check_func is None \
|
||||
or self.access_check_func(self.path[1:], revision):
|
||||
entry = Revision(revision, date, author, msg, None, self.lockinfo,
|
||||
self.path[1:], None, None)
|
||||
self.logs.append(entry)
|
||||
else:
|
||||
self.done = True
|
||||
if this_path:
|
||||
self.path = this_path
|
||||
|
||||
def temp_checkout(svnrepos, path, rev):
|
||||
def cat_to_tempfile(svnrepos, path, rev):
|
||||
"""Check out file revision to temporary file"""
|
||||
temp = tempfile.mktemp()
|
||||
stream = core.svn_stream_from_aprfile(temp)
|
||||
|
@ -155,21 +226,8 @@ class RemoteSubversionRepository(vclib.Repository):
|
|||
|
||||
def open(self):
|
||||
# Setup the client context baton, complete with non-prompting authstuffs.
|
||||
# TODO: svn_cmdline_setup_auth_baton() is mo' better (when available)
|
||||
core.svn_config_ensure(self.config_dir)
|
||||
self.ctx = client.svn_client_ctx_t()
|
||||
self.ctx.auth_baton = core.svn_auth_open([
|
||||
client.svn_client_get_simple_provider(),
|
||||
client.svn_client_get_username_provider(),
|
||||
client.svn_client_get_ssl_server_trust_file_provider(),
|
||||
client.svn_client_get_ssl_client_cert_file_provider(),
|
||||
client.svn_client_get_ssl_client_cert_pw_file_provider(),
|
||||
])
|
||||
self.ctx.config = core.svn_config_get_config(self.config_dir)
|
||||
if self.config_dir is not None:
|
||||
core.svn_auth_set_parameter(self.ctx.auth_baton,
|
||||
core.SVN_AUTH_PARAM_CONFIG_DIR,
|
||||
self.config_dir)
|
||||
self.ctx = setup_client_ctx(self.config_dir)
|
||||
|
||||
ra_callbacks = ra.svn_ra_callbacks_t()
|
||||
ra_callbacks.auth_baton = self.ctx.auth_baton
|
||||
self.ra_session = ra.svn_ra_open(self.rootpath, ra_callbacks, None,
|
||||
|
@ -177,6 +235,10 @@ class RemoteSubversionRepository(vclib.Repository):
|
|||
self.youngest = ra.svn_ra_get_latest_revnum(self.ra_session)
|
||||
self._dirent_cache = { }
|
||||
self._revinfo_cache = { }
|
||||
|
||||
# See if a universal read access determination can be made.
|
||||
if self.auth and self.auth.check_universal_access(self.name) == 1:
|
||||
self.auth = None
|
||||
|
||||
def rootname(self):
|
||||
return self.name
|
||||
|
@ -211,25 +273,23 @@ class RemoteSubversionRepository(vclib.Repository):
|
|||
raise vclib.ItemNotFound(path_parts)
|
||||
return pathtype
|
||||
|
||||
def openfile(self, path_parts, rev):
|
||||
def openfile(self, path_parts, rev, options):
|
||||
path = self._getpath(path_parts)
|
||||
if self.itemtype(path_parts, rev) != vclib.FILE: # does auth-check
|
||||
raise vclib.Error("Path '%s' is not a file." % path)
|
||||
rev = self._getrev(rev)
|
||||
url = self._geturl(path)
|
||||
tmp_file = tempfile.mktemp()
|
||||
stream = core.svn_stream_from_aprfile(tmp_file)
|
||||
### rev here should be the last history revision of the URL
|
||||
client.svn_client_cat(core.Stream(stream), url, _rev2optrev(rev), self.ctx)
|
||||
core.svn_stream_close(stream)
|
||||
return SelfCleanFP(tmp_file), self._get_last_history_rev(path_parts, rev)
|
||||
fp = SelfCleanFP(cat_to_tempfile(self, path, rev))
|
||||
lh_rev, c_rev = self._get_last_history_rev(path_parts, rev)
|
||||
return fp, lh_rev
|
||||
|
||||
def listdir(self, path_parts, rev, options):
|
||||
path = self._getpath(path_parts)
|
||||
if self.itemtype(path_parts, rev) != vclib.DIR: # does auth-check
|
||||
raise vclib.Error("Path '%s' is not a directory." % path)
|
||||
rev = self._getrev(rev)
|
||||
entries = [ ]
|
||||
entries = []
|
||||
dirents, locks = self._get_dirents(path, rev)
|
||||
for name in dirents.keys():
|
||||
entry = dirents[name]
|
||||
|
@ -237,8 +297,9 @@ class RemoteSubversionRepository(vclib.Repository):
|
|||
kind = vclib.DIR
|
||||
elif entry.kind == core.svn_node_file:
|
||||
kind = vclib.FILE
|
||||
if vclib.check_path_access(self, path_parts + [name], kind, rev):
|
||||
entries.append(vclib.DirEntry(name, kind))
|
||||
else:
|
||||
kind = None
|
||||
entries.append(vclib.DirEntry(name, kind))
|
||||
return entries
|
||||
|
||||
def dirlogs(self, path_parts, rev, entries, options):
|
||||
|
@ -249,12 +310,14 @@ class RemoteSubversionRepository(vclib.Repository):
|
|||
dirents, locks = self._get_dirents(path, rev)
|
||||
for entry in entries:
|
||||
entry_path_parts = path_parts + [entry.name]
|
||||
if not vclib.check_path_access(self, entry_path_parts, entry.kind, rev):
|
||||
dirent = dirents.get(entry.name, None)
|
||||
# dirents is authz-sanitized, so ensure the entry is found therein.
|
||||
if dirent is None:
|
||||
continue
|
||||
dirent = dirents[entry.name]
|
||||
entry.date, entry.author, entry.log, changes = \
|
||||
self.revinfo(dirent.created_rev)
|
||||
entry.rev = dirent.created_rev
|
||||
# Get authz-sanitized revision metadata.
|
||||
entry.date, entry.author, entry.log, revprops, changes = \
|
||||
self._revinfo(dirent.created_rev)
|
||||
entry.rev = str(dirent.created_rev)
|
||||
entry.size = dirent.size
|
||||
entry.lockinfo = None
|
||||
if locks.has_key(entry.name):
|
||||
|
@ -267,29 +330,51 @@ class RemoteSubversionRepository(vclib.Repository):
|
|||
rev = self._getrev(rev)
|
||||
url = self._geturl(path)
|
||||
|
||||
# Use ls3 to fetch the lock status for this item.
|
||||
lockinfo = None
|
||||
basename = path_parts and path_parts[-1] or ""
|
||||
dirents, locks = list_directory(url, _rev2optrev(rev),
|
||||
_rev2optrev(rev), 0, self.ctx)
|
||||
if locks.has_key(basename):
|
||||
lockinfo = locks[basename].owner
|
||||
# If this is a file, fetch the lock status and size (as of REV)
|
||||
# for this item.
|
||||
lockinfo = size_in_rev = None
|
||||
if path_type == vclib.FILE:
|
||||
basename = path_parts[-1]
|
||||
list_url = self._geturl(self._getpath(path_parts[:-1]))
|
||||
dirents, locks = list_directory(list_url, _rev2optrev(rev),
|
||||
_rev2optrev(rev), 0, self.ctx)
|
||||
if locks.has_key(basename):
|
||||
lockinfo = locks[basename].owner
|
||||
if dirents.has_key(basename):
|
||||
size_in_rev = dirents[basename].size
|
||||
|
||||
# Special handling for the 'svn_latest_log' scenario.
|
||||
### FIXME: Don't like this hack. We should just introduce
|
||||
### something more direct in the vclib API.
|
||||
if options.get('svn_latest_log', 0):
|
||||
dir_lh_rev, dir_c_rev = self._get_last_history_rev(path_parts, rev)
|
||||
date, author, log, revprops, changes = self._revinfo(dir_lh_rev)
|
||||
return [vclib.Revision(dir_lh_rev, str(dir_lh_rev), date, author,
|
||||
None, log, size_in_rev, lockinfo)]
|
||||
|
||||
def _access_checker(check_path, check_rev):
|
||||
return vclib.check_path_access(self, _path_parts(check_path),
|
||||
path_type, check_rev)
|
||||
|
||||
# It's okay if we're told to not show all logs on a file -- all
|
||||
# the revisions should match correctly anyway.
|
||||
lc = LogCollector(path, options.get('svn_show_all_dir_logs', 0), lockinfo)
|
||||
lc = LogCollector(path, options.get('svn_show_all_dir_logs', 0),
|
||||
lockinfo, _access_checker)
|
||||
|
||||
cross_copies = options.get('svn_cross_copies', 0)
|
||||
log_limit = 0
|
||||
if limit:
|
||||
log_limit = first + limit
|
||||
client.svn_client_log2([url], _rev2optrev(rev), _rev2optrev(1),
|
||||
log_limit, 1, not cross_copies,
|
||||
lc.add_log, self.ctx)
|
||||
client_log(url, _rev2optrev(rev), _rev2optrev(1), log_limit, 1,
|
||||
cross_copies, lc.add_log, self.ctx)
|
||||
revs = lc.logs
|
||||
revs.sort()
|
||||
prev = None
|
||||
for rev in revs:
|
||||
# Swap out revision info with stuff from the cache (which is
|
||||
# authz-sanitized).
|
||||
rev.date, rev.author, rev.log, revprops, changes \
|
||||
= self._revinfo(rev.number)
|
||||
rev.prev = prev
|
||||
prev = rev
|
||||
revs.reverse()
|
||||
|
@ -309,13 +394,25 @@ class RemoteSubversionRepository(vclib.Repository):
|
|||
_rev2optrev(rev), 0, self.ctx)
|
||||
return pairs and pairs[0][1] or {}
|
||||
|
||||
def annotate(self, path_parts, rev):
|
||||
def annotate(self, path_parts, rev, include_text=False):
|
||||
path = self._getpath(path_parts)
|
||||
if self.itemtype(path_parts, rev) != vclib.FILE: # does auth-check
|
||||
raise vclib.Error("Path '%s' is not a file." % path)
|
||||
rev = self._getrev(rev)
|
||||
url = self._geturl(path)
|
||||
|
||||
# Examine logs for the file to determine the oldest revision we are
|
||||
# permitted to see.
|
||||
log_options = {
|
||||
'svn_cross_copies' : 1,
|
||||
'svn_show_all_dir_logs' : 1,
|
||||
}
|
||||
revs = self.itemlog(path_parts, rev, vclib.SORTBY_REV, 0, 0, log_options)
|
||||
oldest_rev = revs[-1].number
|
||||
|
||||
# Now calculate the annotation data. Note that we'll not
|
||||
# inherently trust the provided author and date, because authz
|
||||
# rules might necessitate that we strip that information out.
|
||||
blame_data = []
|
||||
|
||||
def _blame_cb(line_no, revision, author, date,
|
||||
|
@ -323,62 +420,96 @@ class RemoteSubversionRepository(vclib.Repository):
|
|||
prev_rev = None
|
||||
if revision > 1:
|
||||
prev_rev = revision - 1
|
||||
blame_data.append(vclib.Annotation(line, line_no+1, revision, prev_rev,
|
||||
author, None))
|
||||
|
||||
client.svn_client_blame(url, _rev2optrev(1), _rev2optrev(rev),
|
||||
_blame_cb, self.ctx)
|
||||
|
||||
# If we have an invalid revision, clear the date and author
|
||||
# values. Otherwise, if we have authz filtering to do, use the
|
||||
# revinfo cache to do so.
|
||||
if revision < 0:
|
||||
date = author = None
|
||||
elif self.auth:
|
||||
date, author, msg, revprops, changes = self._revinfo(revision)
|
||||
|
||||
# Strip text if the caller doesn't want it.
|
||||
if not include_text:
|
||||
line = None
|
||||
blame_data.append(vclib.Annotation(line, line_no + 1, revision, prev_rev,
|
||||
author, date))
|
||||
|
||||
client.blame2(url, _rev2optrev(rev), _rev2optrev(oldest_rev),
|
||||
_rev2optrev(rev), _blame_cb, self.ctx)
|
||||
return blame_data, rev
|
||||
|
||||
def revinfo(self, rev):
|
||||
rev = self._getrev(rev)
|
||||
cached_info = self._revinfo_cache.get(rev)
|
||||
if not cached_info:
|
||||
cached_info = self._revinfo_raw(rev)
|
||||
self._revinfo_cache[rev] = cached_info
|
||||
return cached_info[0], cached_info[1], cached_info[2], cached_info[3]
|
||||
return self._revinfo(rev, 1)
|
||||
|
||||
def rawdiff(self, path_parts1, rev1, path_parts2, rev2, type, options={}):
|
||||
p1 = self._getpath(path_parts1)
|
||||
p2 = self._getpath(path_parts2)
|
||||
r1 = self._getrev(rev1)
|
||||
r2 = self._getrev(rev2)
|
||||
if not vclib.check_path_access(self, path_parts1, vclib.FILE, rev1):
|
||||
raise vclib.ItemNotFound(path_parts1)
|
||||
if not vclib.check_path_access(self, path_parts2, vclib.FILE, rev2):
|
||||
raise vclib.ItemNotFound(path_parts2)
|
||||
|
||||
if path_parts1 is not None:
|
||||
p1 = self._getpath(path_parts1)
|
||||
r1 = self._getrev(rev1)
|
||||
if not vclib.check_path_access(self, path_parts1, vclib.FILE, rev1):
|
||||
raise vclib.ItemNotFound(path_parts1)
|
||||
else:
|
||||
p1 = None
|
||||
|
||||
if path_parts2 is not None:
|
||||
if not p1:
|
||||
raise vclib.ItemNotFound(parh_parts2)
|
||||
p2 = self._getpath(path_parts2)
|
||||
r2 = self._getrev(rev2)
|
||||
if not vclib.check_path_access(self, path_parts2, vclib.FILE, rev2):
|
||||
raise vclib.ItemNotFound(path_parts2)
|
||||
else:
|
||||
p2 = None
|
||||
|
||||
args = vclib._diff_args(type, options)
|
||||
|
||||
def _date_from_rev(rev):
|
||||
date, author, msg, changes = self.revinfo(rev)
|
||||
date, author, msg, revprops, changes = self._revinfo(rev)
|
||||
return date
|
||||
|
||||
|
||||
try:
|
||||
temp1 = temp_checkout(self, p1, r1)
|
||||
temp2 = temp_checkout(self, p2, r2)
|
||||
info1 = p1, _date_from_rev(r1), r1
|
||||
info2 = p2, _date_from_rev(r2), r2
|
||||
if p1:
|
||||
temp1 = cat_to_tempfile(self, p1, r1)
|
||||
else:
|
||||
temp1 = '/dev/null'
|
||||
if p2:
|
||||
temp2 = cat_to_tempfile(self, p2, r2)
|
||||
else:
|
||||
temp2 = '/dev/null'
|
||||
return vclib._diff_fp(temp1, temp2, info1, info2, self.diff_cmd, args)
|
||||
except core.SubversionException, e:
|
||||
if e.apr_err == vclib.svn.core.SVN_ERR_FS_NOT_FOUND:
|
||||
_fix_subversion_exception(e)
|
||||
if e.apr_err == core.SVN_ERR_FS_NOT_FOUND:
|
||||
raise vclib.InvalidRevision
|
||||
raise
|
||||
|
||||
def isexecutable(self, path_parts, rev):
|
||||
props = self.itemprops(path_parts, rev) # does authz-check
|
||||
return props.has_key(core.SVN_PROP_EXECUTABLE)
|
||||
|
||||
def filesize(self, path_parts, rev):
|
||||
path = self._getpath(path_parts)
|
||||
if self.itemtype(path_parts, rev) != vclib.FILE: # does auth-check
|
||||
raise vclib.Error("Path '%s' is not a file." % path)
|
||||
rev = self._getrev(rev)
|
||||
dirents, locks = self._get_dirents(self._getpath(path_parts[:-1]), rev)
|
||||
dirent = dirents.get(path_parts[-1], None)
|
||||
return dirent.size
|
||||
|
||||
def _getpath(self, path_parts):
|
||||
return string.join(path_parts, '/')
|
||||
return '/'.join(path_parts)
|
||||
|
||||
def _getrev(self, rev):
|
||||
if rev is None or rev == 'HEAD':
|
||||
return self.youngest
|
||||
try:
|
||||
if type(rev) == type(''):
|
||||
while rev[0] == 'r':
|
||||
rev = rev[1:]
|
||||
rev = int(rev)
|
||||
except ValueError:
|
||||
except:
|
||||
raise vclib.InvalidRevision(rev)
|
||||
if (rev < 0) or (rev > self.youngest):
|
||||
raise vclib.InvalidRevision(rev)
|
||||
|
@ -387,58 +518,139 @@ class RemoteSubversionRepository(vclib.Repository):
|
|||
def _geturl(self, path=None):
|
||||
if not path:
|
||||
return self.rootpath
|
||||
return self.rootpath + '/' + urllib.quote(path, "/*~")
|
||||
path = self.rootpath + '/' + urllib.quote(path)
|
||||
return _canonicalize_path(path)
|
||||
|
||||
def _get_dirents(self, path, rev):
|
||||
"""Return a 2-type of dirents and locks, possibly reading/writing
|
||||
from a local cache of that information."""
|
||||
from a local cache of that information. This functions performs
|
||||
authz checks, stripping out unreadable dirents."""
|
||||
|
||||
dir_url = self._geturl(path)
|
||||
path_parts = _path_parts(path)
|
||||
if path:
|
||||
key = str(rev) + '/' + path
|
||||
else:
|
||||
key = str(rev)
|
||||
|
||||
# Ensure that the cache gets filled...
|
||||
dirents_locks = self._dirent_cache.get(key)
|
||||
if not dirents_locks:
|
||||
dirents, locks = list_directory(dir_url, _rev2optrev(rev),
|
||||
_rev2optrev(rev), 0, self.ctx)
|
||||
tmp_dirents, locks = list_directory(dir_url, _rev2optrev(rev),
|
||||
_rev2optrev(rev), 0, self.ctx)
|
||||
dirents = {}
|
||||
for name, dirent in tmp_dirents.items():
|
||||
dirent_parts = path_parts + [name]
|
||||
kind = dirent.kind
|
||||
if (kind == core.svn_node_dir or kind == core.svn_node_file) \
|
||||
and vclib.check_path_access(self, dirent_parts,
|
||||
kind == core.svn_node_dir \
|
||||
and vclib.DIR or vclib.FILE, rev):
|
||||
lh_rev, c_rev = self._get_last_history_rev(dirent_parts, rev)
|
||||
dirent.created_rev = lh_rev
|
||||
dirents[name] = dirent
|
||||
dirents_locks = [dirents, locks]
|
||||
self._dirent_cache[key] = dirents_locks
|
||||
|
||||
# ...then return the goodies from the cache.
|
||||
return dirents_locks[0], dirents_locks[1]
|
||||
|
||||
def _get_last_history_rev(self, path_parts, rev):
|
||||
"""Return the a 2-tuple which contains:
|
||||
- the last interesting revision equal to or older than REV in
|
||||
the history of PATH_PARTS.
|
||||
- the created_rev of of PATH_PARTS as of REV."""
|
||||
|
||||
path = self._getpath(path_parts)
|
||||
url = self._geturl(self._getpath(path_parts))
|
||||
optrev = _rev2optrev(rev)
|
||||
|
||||
# Get the last-changed-rev.
|
||||
revisions = []
|
||||
def _info_cb(path, info, pool, retval=revisions):
|
||||
revisions.append(info.last_changed_rev)
|
||||
client.svn_client_info(url, optrev, optrev, _info_cb, 0, self.ctx)
|
||||
return revisions[0]
|
||||
|
||||
def _revinfo_raw(self, rev):
|
||||
# return 5-tuple (date, author, message, changes)
|
||||
optrev = _rev2optrev(rev)
|
||||
revs = []
|
||||
last_changed_rev = revisions[0]
|
||||
|
||||
def _log_cb(changed_paths, revision, author,
|
||||
datestr, message, pool, retval=revs):
|
||||
date = _datestr_to_date(datestr)
|
||||
# Now, this object might not have been directly edited since the
|
||||
# last-changed-rev, but it might have been the child of a copy.
|
||||
# To determine this, we'll run a potentially no-op log between
|
||||
# LAST_CHANGED_REV and REV.
|
||||
lc = LogCollector(path, 1, None, None)
|
||||
client_log(url, optrev, _rev2optrev(last_changed_rev), 1, 1, 0,
|
||||
lc.add_log, self.ctx)
|
||||
revs = lc.logs
|
||||
if revs:
|
||||
revs.sort()
|
||||
return revs[0].number, last_changed_rev
|
||||
else:
|
||||
return last_changed_rev, last_changed_rev
|
||||
|
||||
def _revinfo_fetch(self, rev, include_changed_paths=0):
|
||||
need_changes = include_changed_paths or self.auth
|
||||
revs = []
|
||||
|
||||
def _log_cb(log_entry, pool, retval=revs):
|
||||
# If Subversion happens to call us more than once, we choose not
|
||||
# to care.
|
||||
if retval:
|
||||
return
|
||||
|
||||
revision = log_entry.revision
|
||||
msg, author, date, revprops = _split_revprops(log_entry.revprops)
|
||||
action_map = { 'D' : vclib.DELETED,
|
||||
'A' : vclib.ADDED,
|
||||
'R' : vclib.REPLACED,
|
||||
'M' : vclib.MODIFIED,
|
||||
}
|
||||
paths = (changed_paths or {}).keys()
|
||||
|
||||
# Easy out: if we won't use the changed-path info, just return a
|
||||
# changes-less tuple.
|
||||
if not need_changes:
|
||||
return revs.append([date, author, msg, revprops, None])
|
||||
|
||||
# Subversion 1.5 and earlier didn't offer the 'changed_paths2'
|
||||
# hash, and in Subversion 1.6, it's offered but broken.
|
||||
try:
|
||||
changed_paths = log_entry.changed_paths2
|
||||
paths = (changed_paths or {}).keys()
|
||||
except:
|
||||
changed_paths = log_entry.changed_paths
|
||||
paths = (changed_paths or {}).keys()
|
||||
paths.sort(lambda a, b: _compare_paths(a, b))
|
||||
|
||||
# If we get this far, our caller needs changed-paths, or we need
|
||||
# them for authz-related sanitization.
|
||||
changes = []
|
||||
found_readable = found_unreadable = 0
|
||||
for path in paths:
|
||||
pathtype = None
|
||||
change = changed_paths[path]
|
||||
|
||||
# svn_log_changed_path_t (which we might get instead of the
|
||||
# svn_log_changed_path2_t we'd prefer) doesn't have the
|
||||
# 'node_kind' member.
|
||||
pathtype = None
|
||||
if hasattr(change, 'node_kind'):
|
||||
if change.node_kind == core.svn_node_dir:
|
||||
pathtype = vclib.DIR
|
||||
elif change.node_kind == core.svn_node_file:
|
||||
pathtype = vclib.FILE
|
||||
|
||||
# svn_log_changed_path2_t only has the 'text_modified' and
|
||||
# 'props_modified' bits in Subversion 1.7 and beyond. And
|
||||
# svn_log_changed_path_t is without.
|
||||
text_modified = props_modified = 0
|
||||
if hasattr(change, 'text_modified'):
|
||||
if change.text_modified == core.svn_tristate_true:
|
||||
text_modified = 1
|
||||
if hasattr(change, 'props_modified'):
|
||||
if change.props_modified == core.svn_tristate_true:
|
||||
props_modified = 1
|
||||
|
||||
# Wrong, diddily wrong wrong wrong. Can you say,
|
||||
# "Manufacturing data left and right because it hurts to
|
||||
# figure out the right stuff?"
|
||||
action = action_map.get(change.action, vclib.MODIFIED)
|
||||
### Wrong, diddily wrong wrong wrong. Can you say,
|
||||
### "Manufacturing data left and right because it hurts to
|
||||
### figure out the right stuff?"
|
||||
if change.copyfrom_path and change.copyfrom_rev:
|
||||
is_copy = 1
|
||||
base_path = change.copyfrom_path
|
||||
|
@ -451,31 +663,61 @@ class RemoteSubversionRepository(vclib.Repository):
|
|||
base_path = path
|
||||
base_rev = revision - 1
|
||||
|
||||
### Check authz rules (we lie about the path type)
|
||||
# Check authz rules (sadly, we have to lie about the path type)
|
||||
parts = _path_parts(path)
|
||||
if vclib.check_path_access(self, parts, vclib.FILE, revision):
|
||||
if is_copy and base_path and (base_path != path):
|
||||
parts = _path_parts(base_path)
|
||||
if vclib.check_path_access(self, parts, vclib.FILE, base_rev):
|
||||
if not vclib.check_path_access(self, parts, vclib.FILE, base_rev):
|
||||
is_copy = 0
|
||||
base_path = None
|
||||
base_rev = None
|
||||
found_unreadable = 1
|
||||
changes.append(SVNChangedPath(path, revision, pathtype, base_path,
|
||||
base_rev, action, is_copy, 0, 0))
|
||||
base_rev, action, is_copy,
|
||||
text_modified, props_modified))
|
||||
found_readable = 1
|
||||
else:
|
||||
found_unreadable = 1
|
||||
|
||||
# If our caller doesn't want changed-path stuff, and we have
|
||||
# the info we need to make an authz determination already,
|
||||
# quit this loop and get on with it.
|
||||
if (not include_changed_paths) and found_unreadable and found_readable:
|
||||
break
|
||||
|
||||
# Filter unreadable information.
|
||||
if found_unreadable:
|
||||
message = None
|
||||
msg = None
|
||||
if not found_readable:
|
||||
author = None
|
||||
date = None
|
||||
revs.append([date, author, message, changes])
|
||||
|
||||
client.svn_client_log([self.rootpath], optrev, optrev,
|
||||
1, 0, _log_cb, self.ctx)
|
||||
return revs[0][0], revs[0][1], revs[0][2], revs[0][3]
|
||||
# Drop unrequested changes.
|
||||
if not include_changed_paths:
|
||||
changes = None
|
||||
|
||||
# Add this revision information to the "return" array.
|
||||
retval.append([date, author, msg, revprops, changes])
|
||||
|
||||
optrev = _rev2optrev(rev)
|
||||
client_log(self.rootpath, optrev, optrev, 1, need_changes, 0,
|
||||
_log_cb, self.ctx)
|
||||
return tuple(revs[0])
|
||||
|
||||
def _revinfo(self, rev, include_changed_paths=0):
|
||||
"""Internal-use, cache-friendly revision information harvester."""
|
||||
|
||||
# Consult the revinfo cache first. If we don't have cached info,
|
||||
# or our caller wants changed paths and we don't have those for
|
||||
# this revision, go do the real work.
|
||||
rev = self._getrev(rev)
|
||||
cached_info = self._revinfo_cache.get(rev)
|
||||
if not cached_info \
|
||||
or (include_changed_paths and cached_info[4] is None):
|
||||
cached_info = self._revinfo_fetch(rev, include_changed_paths)
|
||||
self._revinfo_cache[rev] = cached_info
|
||||
return cached_info
|
||||
|
||||
##--- custom --##
|
||||
|
||||
|
@ -486,6 +728,7 @@ class RemoteSubversionRepository(vclib.Repository):
|
|||
try:
|
||||
results = ra.get_locations(self.ra_session, path, rev, [old_rev])
|
||||
except core.SubversionException, e:
|
||||
_fix_subversion_exception(e)
|
||||
if e.apr_err == core.SVN_ERR_FS_NOT_FOUND:
|
||||
raise vclib.ItemNotFound(path)
|
||||
raise
|
||||
|
@ -493,23 +736,16 @@ class RemoteSubversionRepository(vclib.Repository):
|
|||
old_path = results[old_rev]
|
||||
except KeyError:
|
||||
raise vclib.ItemNotFound(path)
|
||||
|
||||
return _cleanup_path(old_path)
|
||||
old_path = _cleanup_path(old_path)
|
||||
old_path_parts = _path_parts(old_path)
|
||||
# Check access (lying about path types)
|
||||
if not vclib.check_path_access(self, old_path_parts, vclib.FILE, old_rev):
|
||||
raise vclib.ItemNotFound(path)
|
||||
return old_path
|
||||
|
||||
def created_rev(self, path, rev):
|
||||
# NOTE: We can't use svn_client_propget here because the
|
||||
# interfaces in that layer strip out the properties not meant for
|
||||
# human consumption (such as svn:entry:committed-rev, which we are
|
||||
# using here to get the created revision of PATH@REV).
|
||||
kind = ra.svn_ra_check_path(self.ra_session, path, rev)
|
||||
if kind == core.svn_node_none:
|
||||
raise vclib.ItemNotFound(_path_parts(path))
|
||||
elif kind == core.svn_node_dir:
|
||||
props = get_directory_props(self.ra_session, path, rev)
|
||||
elif kind == core.svn_node_file:
|
||||
fetched_rev, props = ra.svn_ra_get_file(self.ra_session, path, rev, None)
|
||||
return int(props.get(core.SVN_PROP_ENTRY_COMMITTED_REV,
|
||||
SVN_INVALID_REVNUM))
|
||||
lh_rev, c_rev = self._get_last_history_rev(_path_parts(path), rev)
|
||||
return lh_rev
|
||||
|
||||
def last_rev(self, path, peg_revision, limit_revision=None):
|
||||
"""Given PATH, known to exist in PEG_REVISION, find the youngest
|
||||
|
@ -544,3 +780,33 @@ class RemoteSubversionRepository(vclib.Repository):
|
|||
else:
|
||||
peg_revision = mid
|
||||
return peg_revision, path
|
||||
|
||||
def get_symlink_target(self, path_parts, rev):
|
||||
"""Return the target of the symbolic link versioned at PATH_PARTS
|
||||
in REV, or None if that object is not a symlink."""
|
||||
|
||||
path = self._getpath(path_parts)
|
||||
path_type = self.itemtype(path_parts, rev) # does auth-check
|
||||
rev = self._getrev(rev)
|
||||
url = self._geturl(path)
|
||||
|
||||
# Symlinks must be files with the svn:special property set on them
|
||||
# and with file contents which read "link SOME_PATH".
|
||||
if path_type != vclib.FILE:
|
||||
return None
|
||||
pairs = client.svn_client_proplist2(url, _rev2optrev(rev),
|
||||
_rev2optrev(rev), 0, self.ctx)
|
||||
props = pairs and pairs[0][1] or {}
|
||||
if not props.has_key(core.SVN_PROP_SPECIAL):
|
||||
return None
|
||||
pathspec = ''
|
||||
### FIXME: We're being a touch sloppy here, first by grabbing the
|
||||
### whole file and then by checking only the first line
|
||||
### of it.
|
||||
fp = SelfCleanFP(cat_to_tempfile(self, path, rev))
|
||||
pathspec = fp.readline()
|
||||
fp.close()
|
||||
if pathspec[:5] != 'link ':
|
||||
return None
|
||||
return pathspec[5:]
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2008 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -15,35 +15,52 @@
|
|||
import vclib
|
||||
import os
|
||||
import os.path
|
||||
import stat
|
||||
import string
|
||||
import cStringIO
|
||||
import signal
|
||||
import shutil
|
||||
import time
|
||||
import tempfile
|
||||
import popen
|
||||
import re
|
||||
from svn import fs, repos, core, client, delta
|
||||
import urllib
|
||||
from svn import fs, repos, core, client, delta, diff
|
||||
|
||||
|
||||
### Require Subversion 1.3.1 or better.
|
||||
if (core.SVN_VER_MAJOR, core.SVN_VER_MINOR, core.SVN_VER_PATCH) < (1, 3, 1):
|
||||
raise Exception, "Version requirement not met (needs 1.3.1 or better)"
|
||||
|
||||
|
||||
|
||||
### Pre-1.5 Subversion doesn't have SVN_ERR_CEASE_INVOCATION
|
||||
try:
|
||||
_SVN_ERR_CEASE_INVOCATION = core.SVN_ERR_CEASE_INVOCATION
|
||||
except:
|
||||
_SVN_ERR_CEASE_INVOCATION = core.SVN_ERR_CANCELLED
|
||||
|
||||
### Pre-1.5 SubversionException's might not have the .msg and .apr_err members
|
||||
def _fix_subversion_exception(e):
|
||||
if not hasattr(e, 'apr_err'):
|
||||
e.apr_err = e[1]
|
||||
if not hasattr(e, 'message'):
|
||||
e.message = e[0]
|
||||
|
||||
### Pre-1.4 Subversion doesn't have svn_path_canonicalize()
|
||||
def _canonicalize_path(path):
|
||||
try:
|
||||
return core.svn_path_canonicalize(path)
|
||||
except AttributeError:
|
||||
return path
|
||||
|
||||
def _allow_all(root, path, pool):
|
||||
"""Generic authz_read_func that permits access to all paths"""
|
||||
return 1
|
||||
|
||||
|
||||
def _path_parts(path):
|
||||
return filter(None, string.split(path, '/'))
|
||||
return filter(None, path.split('/'))
|
||||
|
||||
|
||||
def _cleanup_path(path):
|
||||
"""Return a cleaned-up Subversion filesystem path"""
|
||||
return string.join(_path_parts(path), '/')
|
||||
return '/'.join(_path_parts(path))
|
||||
|
||||
|
||||
def _fs_path_join(base, relative):
|
||||
|
@ -97,11 +114,37 @@ def _rev2optrev(rev):
|
|||
|
||||
def _rootpath2url(rootpath, path):
|
||||
rootpath = os.path.abspath(rootpath)
|
||||
if rootpath and rootpath[0] != '/':
|
||||
rootpath = '/' + rootpath
|
||||
drive, rootpath = os.path.splitdrive(rootpath)
|
||||
if os.sep != '/':
|
||||
rootpath = string.replace(rootpath, os.sep, '/')
|
||||
return 'file://' + string.join([rootpath, path], "/")
|
||||
rootpath = rootpath.replace(os.sep, '/')
|
||||
rootpath = urllib.quote(rootpath)
|
||||
path = urllib.quote(path)
|
||||
if drive:
|
||||
url = 'file:///' + drive + rootpath + '/' + path
|
||||
else:
|
||||
url = 'file://' + rootpath + '/' + path
|
||||
return _canonicalize_path(url)
|
||||
|
||||
|
||||
# Given a dictionary REVPROPS of revision properties, pull special
|
||||
# ones out of them and return a 4-tuple containing the log message,
|
||||
# the author, the date (converted from the date string property), and
|
||||
# a dictionary of any/all other revprops.
|
||||
def _split_revprops(revprops):
|
||||
if not revprops:
|
||||
return None, None, None, {}
|
||||
special_props = []
|
||||
for prop in core.SVN_PROP_REVISION_LOG, \
|
||||
core.SVN_PROP_REVISION_AUTHOR, \
|
||||
core.SVN_PROP_REVISION_DATE:
|
||||
if revprops.has_key(prop):
|
||||
special_props.append(revprops[prop])
|
||||
del(revprops[prop])
|
||||
else:
|
||||
special_props.append(None)
|
||||
msg, author, datestr = tuple(special_props)
|
||||
date = _datestr_to_date(datestr)
|
||||
return msg, author, date, revprops
|
||||
|
||||
|
||||
def _datestr_to_date(datestr):
|
||||
|
@ -154,7 +197,7 @@ class NodeHistory:
|
|||
test_path = path
|
||||
found = 0
|
||||
while 1:
|
||||
off = string.rfind(test_path, '/')
|
||||
off = test_path.rfind('/')
|
||||
if off < 0:
|
||||
break
|
||||
test_path = test_path[0:off]
|
||||
|
@ -167,60 +210,11 @@ class NodeHistory:
|
|||
return
|
||||
self.histories.append([revision, _cleanup_path(path)])
|
||||
if self.limit and len(self.histories) == self.limit:
|
||||
raise core.SubversionException("", core.SVN_ERR_CEASE_INVOCATION)
|
||||
raise core.SubversionException("", _SVN_ERR_CEASE_INVOCATION)
|
||||
|
||||
def __getitem__(self, idx):
|
||||
return self.histories[idx]
|
||||
|
||||
|
||||
def _get_history(svnrepos, path, rev, path_type, limit=0, options={}):
|
||||
rev_paths = []
|
||||
fsroot = svnrepos._getroot(rev)
|
||||
show_all_logs = options.get('svn_show_all_dir_logs', 0)
|
||||
if not show_all_logs:
|
||||
# See if the path is a file or directory.
|
||||
kind = fs.check_path(fsroot, path)
|
||||
if kind is core.svn_node_file:
|
||||
show_all_logs = 1
|
||||
|
||||
# Instantiate a NodeHistory collector object, and use it to collect
|
||||
# history items for PATH@REV.
|
||||
history = NodeHistory(svnrepos.fs_ptr, show_all_logs, limit)
|
||||
try:
|
||||
repos.svn_repos_history(svnrepos.fs_ptr, path, history.add_history,
|
||||
1, rev, options.get('svn_cross_copies', 0))
|
||||
except core.SubversionException, e:
|
||||
if e.apr_err != core.SVN_ERR_CEASE_INVOCATION:
|
||||
raise
|
||||
|
||||
# Now, iterate over those history items, checking for changes of
|
||||
# location, pruning as necessitated by authz rules.
|
||||
for hist_rev, hist_path in history:
|
||||
path_parts = _path_parts(hist_path)
|
||||
if not vclib.check_path_access(svnrepos, path_parts, path_type, hist_rev):
|
||||
break
|
||||
rev_paths.append([hist_rev, hist_path])
|
||||
return rev_paths
|
||||
|
||||
|
||||
def _log_helper(svnrepos, path, rev, lockinfo):
|
||||
rev_root = fs.revision_root(svnrepos.fs_ptr, rev)
|
||||
|
||||
# Was this path@rev the target of a copy?
|
||||
copyfrom_rev, copyfrom_path = fs.copied_from(rev_root, path)
|
||||
|
||||
# Assemble our LogEntry
|
||||
date, author, msg, changes = svnrepos.revinfo(rev)
|
||||
if fs.is_file(rev_root, path):
|
||||
size = fs.file_length(rev_root, path)
|
||||
else:
|
||||
size = None
|
||||
entry = Revision(rev, date, author, msg, size, lockinfo, path,
|
||||
copyfrom_path and _cleanup_path(copyfrom_path),
|
||||
copyfrom_rev)
|
||||
return entry
|
||||
|
||||
|
||||
def _get_last_history_rev(fsroot, path):
|
||||
history = fs.node_history(fsroot, path)
|
||||
history = fs.history_prev(history, 0)
|
||||
|
@ -299,21 +293,23 @@ class FileContentsPipe:
|
|||
|
||||
|
||||
class BlameSource:
|
||||
def __init__(self, local_url, rev, first_rev):
|
||||
def __init__(self, local_url, rev, first_rev, include_text, config_dir):
|
||||
self.idx = -1
|
||||
self.first_rev = first_rev
|
||||
self.blame_data = []
|
||||
self.include_text = include_text
|
||||
|
||||
ctx = client.ctx_t()
|
||||
core.svn_config_ensure(None)
|
||||
ctx.config = core.svn_config_get_config(None)
|
||||
ctx = client.svn_client_create_context()
|
||||
core.svn_config_ensure(config_dir)
|
||||
ctx.config = core.svn_config_get_config(config_dir)
|
||||
ctx.auth_baton = core.svn_auth_open([])
|
||||
try:
|
||||
### TODO: Is this use of FIRST_REV always what we want? Should we
|
||||
### pass 1 here instead and do filtering later?
|
||||
client.blame2(local_url, _rev2optrev(rev), _rev2optrev(first_rev),
|
||||
_rev2optrev(rev), self._blame_cb, ctx)
|
||||
client.blame3(local_url, _rev2optrev(rev), _rev2optrev(first_rev),
|
||||
_rev2optrev(rev), diff.svn_diff_file_options_t(), True, self._blame_cb, ctx)
|
||||
except core.SubversionException, e:
|
||||
_fix_subversion_exception(e)
|
||||
if e.apr_err == core.SVN_ERR_CLIENT_IS_BINARY_FILE:
|
||||
raise vclib.NonTextualFileContents
|
||||
raise
|
||||
|
@ -322,6 +318,8 @@ class BlameSource:
|
|||
prev_rev = None
|
||||
if rev > self.first_rev:
|
||||
prev_rev = rev - 1
|
||||
if not self.include_text:
|
||||
text = None
|
||||
self.blame_data.append(vclib.Annotation(text, line_no + 1, rev,
|
||||
prev_rev, author, None))
|
||||
|
||||
|
@ -358,31 +356,14 @@ class LocalSubversionRepository(vclib.Repository):
|
|||
self.rootpath = rootpath
|
||||
self.name = name
|
||||
self.auth = authorizer
|
||||
self.svn_client_path = utilities.svn or 'svn'
|
||||
self.diff_cmd = utilities.diff or 'diff'
|
||||
self.config_dir = config_dir
|
||||
self.config_dir = config_dir or None
|
||||
|
||||
# See if this repository is even viewable, authz-wise.
|
||||
if not vclib.check_root_access(self):
|
||||
raise vclib.ReposNotFound(name)
|
||||
|
||||
def open(self):
|
||||
# Register a handler for SIGTERM so we can have a chance to
|
||||
# cleanup. If ViewVC takes too long to start generating CGI
|
||||
# output, Apache will grow impatient and SIGTERM it. While we
|
||||
# don't mind getting told to bail, we want to gracefully close the
|
||||
# repository before we bail.
|
||||
def _sigterm_handler(signum, frame, self=self):
|
||||
sys.exit(-1)
|
||||
try:
|
||||
signal.signal(signal.SIGTERM, _sigterm_handler)
|
||||
except ValueError:
|
||||
# This is probably "ValueError: signal only works in main
|
||||
# thread", which will get thrown by the likes of mod_python
|
||||
# when trying to install a signal handler from a thread that
|
||||
# isn't the main one. We'll just not care.
|
||||
pass
|
||||
|
||||
# Open the repository and init some other variables.
|
||||
self.repos = repos.svn_repos_open(self.rootpath)
|
||||
self.fs_ptr = repos.svn_repos_fs(self.repos)
|
||||
|
@ -390,6 +371,10 @@ class LocalSubversionRepository(vclib.Repository):
|
|||
self._fsroots = {}
|
||||
self._revinfo_cache = {}
|
||||
|
||||
# See if a universal read access determination can be made.
|
||||
if self.auth and self.auth.check_universal_access(self.name) == 1:
|
||||
self.auth = None
|
||||
|
||||
def rootname(self):
|
||||
return self.name
|
||||
|
||||
|
@ -405,19 +390,14 @@ class LocalSubversionRepository(vclib.Repository):
|
|||
def itemtype(self, path_parts, rev):
|
||||
rev = self._getrev(rev)
|
||||
basepath = self._getpath(path_parts)
|
||||
kind = fs.check_path(self._getroot(rev), basepath)
|
||||
pathtype = None
|
||||
if kind == core.svn_node_dir:
|
||||
pathtype = vclib.DIR
|
||||
elif kind == core.svn_node_file:
|
||||
pathtype = vclib.FILE
|
||||
else:
|
||||
pathtype = self._gettype(basepath, rev)
|
||||
if pathtype is None:
|
||||
raise vclib.ItemNotFound(path_parts)
|
||||
if not vclib.check_path_access(self, path_parts, pathtype, rev):
|
||||
raise vclib.ItemNotFound(path_parts)
|
||||
return pathtype
|
||||
|
||||
def openfile(self, path_parts, rev):
|
||||
def openfile(self, path_parts, rev, options):
|
||||
path = self._getpath(path_parts)
|
||||
if self.itemtype(path_parts, rev) != vclib.FILE: # does auth-check
|
||||
raise vclib.Error("Path '%s' is not a file." % path)
|
||||
|
@ -456,7 +436,7 @@ class LocalSubversionRepository(vclib.Repository):
|
|||
continue
|
||||
path = self._getpath(entry_path_parts)
|
||||
entry_rev = _get_last_history_rev(fsroot, path)
|
||||
date, author, msg, changes = self.revinfo(entry_rev)
|
||||
date, author, msg, revprops, changes = self._revinfo(entry_rev)
|
||||
entry.rev = str(entry_rev)
|
||||
entry.date = date
|
||||
entry.author = author
|
||||
|
@ -505,20 +485,19 @@ class LocalSubversionRepository(vclib.Repository):
|
|||
# 'limit' parameter here as numeric cut-off for the depth of our
|
||||
# history search.
|
||||
if options.get('svn_latest_log', 0):
|
||||
revision = _log_helper(self, path, rev, lockinfo)
|
||||
revision = self._log_helper(path, rev, lockinfo)
|
||||
if revision:
|
||||
revision.prev = None
|
||||
revs.append(revision)
|
||||
else:
|
||||
history = _get_history(self, path, rev, path_type,
|
||||
first + limit, options)
|
||||
history = self._get_history(path, rev, path_type, first + limit, options)
|
||||
if len(history) < first:
|
||||
history = []
|
||||
if limit:
|
||||
history = history[first:first+limit]
|
||||
|
||||
for hist_rev, hist_path in history:
|
||||
revision = _log_helper(self, hist_path, hist_rev, lockinfo)
|
||||
revision = self._log_helper(hist_path, hist_rev, lockinfo)
|
||||
if revision:
|
||||
# If we have unreadable copyfrom data, obscure it.
|
||||
if revision.copy_path is not None:
|
||||
|
@ -539,155 +518,333 @@ class LocalSubversionRepository(vclib.Repository):
|
|||
fsroot = self._getroot(rev)
|
||||
return fs.node_proplist(fsroot, path)
|
||||
|
||||
def annotate(self, path_parts, rev):
|
||||
def annotate(self, path_parts, rev, include_text=False):
|
||||
path = self._getpath(path_parts)
|
||||
path_type = self.itemtype(path_parts, rev) # does auth-check
|
||||
if path_type != vclib.FILE:
|
||||
raise vclib.Error("Path '%s' is not a file." % path)
|
||||
rev = self._getrev(rev)
|
||||
fsroot = self._getroot(rev)
|
||||
history = _get_history(self, path, rev, path_type, 0,
|
||||
{'svn_cross_copies': 1})
|
||||
history = self._get_history(path, rev, path_type, 0,
|
||||
{'svn_cross_copies': 1})
|
||||
youngest_rev, youngest_path = history[0]
|
||||
oldest_rev, oldest_path = history[-1]
|
||||
source = BlameSource(_rootpath2url(self.rootpath, path),
|
||||
youngest_rev, oldest_rev)
|
||||
source = BlameSource(_rootpath2url(self.rootpath, path), youngest_rev,
|
||||
oldest_rev, include_text, self.config_dir)
|
||||
return source, youngest_rev
|
||||
|
||||
def _revinfo_raw(self, rev):
|
||||
fsroot = self._getroot(rev)
|
||||
|
||||
# Get the changes for the revision
|
||||
editor = repos.ChangeCollector(self.fs_ptr, fsroot)
|
||||
e_ptr, e_baton = delta.make_editor(editor)
|
||||
repos.svn_repos_replay(fsroot, e_ptr, e_baton)
|
||||
changes = editor.get_changes()
|
||||
changedpaths = {}
|
||||
|
||||
# Now get the revision property info. Would use
|
||||
# editor.get_root_props(), but something is broken there...
|
||||
revprops = fs.revision_proplist(self.fs_ptr, rev)
|
||||
msg = revprops.get(core.SVN_PROP_REVISION_LOG)
|
||||
author = revprops.get(core.SVN_PROP_REVISION_AUTHOR)
|
||||
datestr = revprops.get(core.SVN_PROP_REVISION_DATE)
|
||||
|
||||
# Copy the Subversion changes into a new hash, converting them into
|
||||
# ChangedPath objects.
|
||||
found_readable = found_unreadable = 0
|
||||
for path in changes.keys():
|
||||
change = changes[path]
|
||||
if change.path:
|
||||
change.path = _cleanup_path(change.path)
|
||||
if change.base_path:
|
||||
change.base_path = _cleanup_path(change.base_path)
|
||||
is_copy = 0
|
||||
if not hasattr(change, 'action'): # new to subversion 1.4.0
|
||||
action = vclib.MODIFIED
|
||||
if not change.path:
|
||||
action = vclib.DELETED
|
||||
elif change.added:
|
||||
action = vclib.ADDED
|
||||
replace_check_path = path
|
||||
if change.base_path and change.base_rev:
|
||||
replace_check_path = change.base_path
|
||||
if changedpaths.has_key(replace_check_path) \
|
||||
and changedpaths[replace_check_path].action == vclib.DELETED:
|
||||
action = vclib.REPLACED
|
||||
else:
|
||||
if change.action == repos.CHANGE_ACTION_ADD:
|
||||
action = vclib.ADDED
|
||||
elif change.action == repos.CHANGE_ACTION_DELETE:
|
||||
action = vclib.DELETED
|
||||
elif change.action == repos.CHANGE_ACTION_REPLACE:
|
||||
action = vclib.REPLACED
|
||||
else:
|
||||
action = vclib.MODIFIED
|
||||
if (action == vclib.ADDED or action == vclib.REPLACED) \
|
||||
and change.base_path \
|
||||
and change.base_rev:
|
||||
is_copy = 1
|
||||
if change.item_kind == core.svn_node_dir:
|
||||
pathtype = vclib.DIR
|
||||
elif change.item_kind == core.svn_node_file:
|
||||
pathtype = vclib.FILE
|
||||
else:
|
||||
pathtype = None
|
||||
|
||||
parts = _path_parts(path)
|
||||
if vclib.check_path_access(self, parts, pathtype, rev):
|
||||
if is_copy and change.base_path and (change.base_path != path):
|
||||
parts = _path_parts(change.base_path)
|
||||
if not vclib.check_path_access(self, parts, pathtype, change.base_rev):
|
||||
is_copy = 0
|
||||
change.base_path = None
|
||||
change.base_rev = None
|
||||
changedpaths[path] = SVNChangedPath(path, rev, pathtype,
|
||||
change.base_path,
|
||||
change.base_rev, action,
|
||||
is_copy, change.text_changed,
|
||||
change.prop_changes)
|
||||
found_readable = 1
|
||||
else:
|
||||
found_unreadable = 1
|
||||
|
||||
# Return our tuple, auth-filtered: date, author, msg, changes
|
||||
if found_unreadable:
|
||||
msg = None
|
||||
if not found_readable:
|
||||
author = None
|
||||
datestr = None
|
||||
|
||||
date = _datestr_to_date(datestr)
|
||||
return date, author, msg, changedpaths.values()
|
||||
|
||||
def revinfo(self, rev):
|
||||
rev = self._getrev(rev)
|
||||
cached_info = self._revinfo_cache.get(rev)
|
||||
if not cached_info:
|
||||
cached_info = self._revinfo_raw(rev)
|
||||
self._revinfo_cache[rev] = cached_info
|
||||
return cached_info[0], cached_info[1], cached_info[2], cached_info[3]
|
||||
return self._revinfo(rev, 1)
|
||||
|
||||
def rawdiff(self, path_parts1, rev1, path_parts2, rev2, type, options={}):
|
||||
p1 = self._getpath(path_parts1)
|
||||
p2 = self._getpath(path_parts2)
|
||||
r1 = self._getrev(rev1)
|
||||
r2 = self._getrev(rev2)
|
||||
if not vclib.check_path_access(self, path_parts1, vclib.FILE, rev1):
|
||||
raise vclib.ItemNotFound(path_parts1)
|
||||
if not vclib.check_path_access(self, path_parts2, vclib.FILE, rev2):
|
||||
raise vclib.ItemNotFound(path_parts2)
|
||||
|
||||
if path_parts1:
|
||||
p1 = self._getpath(path_parts1)
|
||||
r1 = self._getrev(rev1)
|
||||
if not vclib.check_path_access(self, path_parts1, vclib.FILE, rev1):
|
||||
raise vclib.ItemNotFound(path_parts1)
|
||||
else:
|
||||
p1 = None
|
||||
|
||||
if path_parts2:
|
||||
p2 = self._getpath(path_parts2)
|
||||
r2 = self._getrev(rev2)
|
||||
if not vclib.check_path_access(self, path_parts2, vclib.FILE, rev2):
|
||||
raise vclib.ItemNotFound(path_parts2)
|
||||
else:
|
||||
if not p1:
|
||||
raise vclib.ItemNotFound(path_parts2)
|
||||
p2 = None
|
||||
|
||||
args = vclib._diff_args(type, options)
|
||||
|
||||
def _date_from_rev(rev):
|
||||
date, author, msg, changes = self.revinfo(rev)
|
||||
date, author, msg, revprops, changes = self._revinfo(rev)
|
||||
return date
|
||||
|
||||
try:
|
||||
temp1 = temp_checkout(self, p1, r1)
|
||||
temp2 = temp_checkout(self, p2, r2)
|
||||
info1 = p1, _date_from_rev(r1), r1
|
||||
info2 = p2, _date_from_rev(r2), r2
|
||||
if p1:
|
||||
temp1 = temp_checkout(self, p1, r1)
|
||||
info1 = p1, _date_from_rev(r1), r1
|
||||
else:
|
||||
temp1 = '/dev/null'
|
||||
info1 = '/dev/null', _date_from_rev(rev1), rev1
|
||||
if p2:
|
||||
temp2 = temp_checkout(self, p2, r2)
|
||||
info2 = p2, _date_from_rev(r2), r2
|
||||
else:
|
||||
temp2 = '/dev/null'
|
||||
info2 = '/dev/null', _date_from_rev(rev2), rev2
|
||||
return vclib._diff_fp(temp1, temp2, info1, info2, self.diff_cmd, args)
|
||||
except core.SubversionException, e:
|
||||
_fix_subversion_exception(e)
|
||||
if e.apr_err == core.SVN_ERR_FS_NOT_FOUND:
|
||||
raise vclib.InvalidRevision
|
||||
raise
|
||||
if e.apr_err != _SVN_ERR_CEASE_INVOCATION:
|
||||
raise
|
||||
|
||||
def isexecutable(self, path_parts, rev):
|
||||
props = self.itemprops(path_parts, rev) # does authz-check
|
||||
return props.has_key(core.SVN_PROP_EXECUTABLE)
|
||||
|
||||
def filesize(self, path_parts, rev):
|
||||
path = self._getpath(path_parts)
|
||||
if self.itemtype(path_parts, rev) != vclib.FILE: # does auth-check
|
||||
raise vclib.Error("Path '%s' is not a file." % path)
|
||||
fsroot = self._getroot(self._getrev(rev))
|
||||
return fs.file_length(fsroot, path)
|
||||
|
||||
##--- helpers ---##
|
||||
|
||||
def _revinfo(self, rev, include_changed_paths=0):
|
||||
"""Internal-use, cache-friendly revision information harvester."""
|
||||
|
||||
def _get_changed_paths(fsroot):
|
||||
"""Return a 3-tuple: found_readable, found_unreadable, changed_paths."""
|
||||
editor = repos.ChangeCollector(self.fs_ptr, fsroot)
|
||||
e_ptr, e_baton = delta.make_editor(editor)
|
||||
repos.svn_repos_replay(fsroot, e_ptr, e_baton)
|
||||
changedpaths = {}
|
||||
changes = editor.get_changes()
|
||||
|
||||
# Copy the Subversion changes into a new hash, checking
|
||||
# authorization and converting them into ChangedPath objects.
|
||||
found_readable = found_unreadable = 0
|
||||
for path in changes.keys():
|
||||
change = changes[path]
|
||||
if change.path:
|
||||
change.path = _cleanup_path(change.path)
|
||||
if change.base_path:
|
||||
change.base_path = _cleanup_path(change.base_path)
|
||||
is_copy = 0
|
||||
if not hasattr(change, 'action'): # new to subversion 1.4.0
|
||||
action = vclib.MODIFIED
|
||||
if not change.path:
|
||||
action = vclib.DELETED
|
||||
elif change.added:
|
||||
action = vclib.ADDED
|
||||
replace_check_path = path
|
||||
if change.base_path and change.base_rev:
|
||||
replace_check_path = change.base_path
|
||||
if changedpaths.has_key(replace_check_path) \
|
||||
and changedpaths[replace_check_path].action == vclib.DELETED:
|
||||
action = vclib.REPLACED
|
||||
else:
|
||||
if change.action == repos.CHANGE_ACTION_ADD:
|
||||
action = vclib.ADDED
|
||||
elif change.action == repos.CHANGE_ACTION_DELETE:
|
||||
action = vclib.DELETED
|
||||
elif change.action == repos.CHANGE_ACTION_REPLACE:
|
||||
action = vclib.REPLACED
|
||||
else:
|
||||
action = vclib.MODIFIED
|
||||
if (action == vclib.ADDED or action == vclib.REPLACED) \
|
||||
and change.base_path \
|
||||
and change.base_rev:
|
||||
is_copy = 1
|
||||
if change.item_kind == core.svn_node_dir:
|
||||
pathtype = vclib.DIR
|
||||
elif change.item_kind == core.svn_node_file:
|
||||
pathtype = vclib.FILE
|
||||
else:
|
||||
pathtype = None
|
||||
|
||||
parts = _path_parts(path)
|
||||
if vclib.check_path_access(self, parts, pathtype, rev):
|
||||
if is_copy and change.base_path and (change.base_path != path):
|
||||
parts = _path_parts(change.base_path)
|
||||
if not vclib.check_path_access(self, parts, pathtype,
|
||||
change.base_rev):
|
||||
is_copy = 0
|
||||
change.base_path = None
|
||||
change.base_rev = None
|
||||
found_unreadable = 1
|
||||
changedpaths[path] = SVNChangedPath(path, rev, pathtype,
|
||||
change.base_path,
|
||||
change.base_rev, action,
|
||||
is_copy, change.text_changed,
|
||||
change.prop_changes)
|
||||
found_readable = 1
|
||||
else:
|
||||
found_unreadable = 1
|
||||
return found_readable, found_unreadable, changedpaths.values()
|
||||
|
||||
def _get_change_copyinfo(fsroot, path, change):
|
||||
# If we know the copyfrom info, return it...
|
||||
if hasattr(change, 'copyfrom_known') and change.copyfrom_known:
|
||||
copyfrom_path = change.copyfrom_path
|
||||
copyfrom_rev = change.copyfrom_rev
|
||||
# ...otherwise, if this change could be a copy (that is, it
|
||||
# contains an add action), query the copyfrom info ...
|
||||
elif (change.change_kind == fs.path_change_add or
|
||||
change.change_kind == fs.path_change_replace):
|
||||
copyfrom_rev, copyfrom_path = fs.copied_from(fsroot, path)
|
||||
# ...else, there's no copyfrom info.
|
||||
else:
|
||||
copyfrom_rev = core.SVN_INVALID_REVNUM
|
||||
copyfrom_path = None
|
||||
return copyfrom_path, copyfrom_rev
|
||||
|
||||
def _simple_auth_check(fsroot):
|
||||
"""Return a 2-tuple: found_readable, found_unreadable."""
|
||||
found_unreadable = found_readable = 0
|
||||
if hasattr(fs, 'paths_changed2'):
|
||||
changes = fs.paths_changed2(fsroot)
|
||||
else:
|
||||
changes = fs.paths_changed(fsroot)
|
||||
paths = changes.keys()
|
||||
for path in paths:
|
||||
change = changes[path]
|
||||
pathtype = None
|
||||
if hasattr(change, 'node_kind'):
|
||||
if change.node_kind == core.svn_node_file:
|
||||
pathtype = vclib.FILE
|
||||
elif change.node_kind == core.svn_node_dir:
|
||||
pathtype = vclib.DIR
|
||||
parts = _path_parts(path)
|
||||
if pathtype is None:
|
||||
# Figure out the pathtype so we can query the authz subsystem.
|
||||
if change.change_kind == fs.path_change_delete:
|
||||
# Deletions are annoying, because they might be underneath
|
||||
# copies (make their previous location non-trivial).
|
||||
prev_parts = parts
|
||||
prev_rev = rev - 1
|
||||
parent_parts = parts[:-1]
|
||||
while parent_parts:
|
||||
parent_path = '/' + self._getpath(parent_parts)
|
||||
parent_change = changes.get(parent_path)
|
||||
if not (parent_change and \
|
||||
(parent_change.change_kind == fs.path_change_add or
|
||||
parent_change.change_kind == fs.path_change_replace)):
|
||||
del(parent_parts[-1])
|
||||
continue
|
||||
copyfrom_path, copyfrom_rev = \
|
||||
_get_change_copyinfo(fsroot, parent_path, parent_change)
|
||||
if copyfrom_path:
|
||||
prev_rev = copyfrom_rev
|
||||
prev_parts = _path_parts(copyfrom_path) + \
|
||||
parts[len(parent_parts):]
|
||||
break
|
||||
del(parent_parts[-1])
|
||||
pathtype = self._gettype(self._getpath(prev_parts), prev_rev)
|
||||
else:
|
||||
pathtype = self._gettype(self._getpath(parts), rev)
|
||||
if vclib.check_path_access(self, parts, pathtype, rev):
|
||||
found_readable = 1
|
||||
copyfrom_path, copyfrom_rev = \
|
||||
_get_change_copyinfo(fsroot, path, change)
|
||||
if copyfrom_path and copyfrom_path != path:
|
||||
parts = _path_parts(copyfrom_path)
|
||||
if not vclib.check_path_access(self, parts, pathtype,
|
||||
copyfrom_rev):
|
||||
found_unreadable = 1
|
||||
else:
|
||||
found_unreadable = 1
|
||||
if found_readable and found_unreadable:
|
||||
break
|
||||
return found_readable, found_unreadable
|
||||
|
||||
def _revinfo_helper(rev, include_changed_paths):
|
||||
# Get the revision property info. (Would use
|
||||
# editor.get_root_props(), but something is broken there...)
|
||||
revprops = fs.revision_proplist(self.fs_ptr, rev)
|
||||
msg, author, date, revprops = _split_revprops(revprops)
|
||||
|
||||
# Optimization: If our caller doesn't care about the changed
|
||||
# paths, and we don't need them to do authz determinations, let's
|
||||
# get outta here.
|
||||
if self.auth is None and not include_changed_paths:
|
||||
return date, author, msg, revprops, None
|
||||
|
||||
# If we get here, then we either need the changed paths because we
|
||||
# were asked for them, or we need them to do authorization checks.
|
||||
#
|
||||
# If we only need them for authorization checks, though, we
|
||||
# won't bother generating fully populated ChangedPath items (the
|
||||
# cost is too great).
|
||||
fsroot = self._getroot(rev)
|
||||
if include_changed_paths:
|
||||
found_readable, found_unreadable, changedpaths = \
|
||||
_get_changed_paths(fsroot)
|
||||
else:
|
||||
changedpaths = None
|
||||
found_readable, found_unreadable = _simple_auth_check(fsroot)
|
||||
|
||||
# Filter our metadata where necessary, and return the requested data.
|
||||
if found_unreadable:
|
||||
msg = None
|
||||
if not found_readable:
|
||||
author = None
|
||||
date = None
|
||||
return date, author, msg, revprops, changedpaths
|
||||
|
||||
# Consult the revinfo cache first. If we don't have cached info,
|
||||
# or our caller wants changed paths and we don't have those for
|
||||
# this revision, go do the real work.
|
||||
rev = self._getrev(rev)
|
||||
cached_info = self._revinfo_cache.get(rev)
|
||||
if not cached_info \
|
||||
or (include_changed_paths and cached_info[4] is None):
|
||||
cached_info = _revinfo_helper(rev, include_changed_paths)
|
||||
self._revinfo_cache[rev] = cached_info
|
||||
return tuple(cached_info)
|
||||
|
||||
def _log_helper(self, path, rev, lockinfo):
|
||||
rev_root = fs.revision_root(self.fs_ptr, rev)
|
||||
copyfrom_rev, copyfrom_path = fs.copied_from(rev_root, path)
|
||||
date, author, msg, revprops, changes = self._revinfo(rev)
|
||||
if fs.is_file(rev_root, path):
|
||||
size = fs.file_length(rev_root, path)
|
||||
else:
|
||||
size = None
|
||||
return Revision(rev, date, author, msg, size, lockinfo, path,
|
||||
copyfrom_path and _cleanup_path(copyfrom_path),
|
||||
copyfrom_rev)
|
||||
|
||||
def _get_history(self, path, rev, path_type, limit=0, options={}):
|
||||
if self.youngest == 0:
|
||||
return []
|
||||
|
||||
rev_paths = []
|
||||
fsroot = self._getroot(rev)
|
||||
show_all_logs = options.get('svn_show_all_dir_logs', 0)
|
||||
if not show_all_logs:
|
||||
# See if the path is a file or directory.
|
||||
kind = fs.check_path(fsroot, path)
|
||||
if kind is core.svn_node_file:
|
||||
show_all_logs = 1
|
||||
|
||||
# Instantiate a NodeHistory collector object, and use it to collect
|
||||
# history items for PATH@REV.
|
||||
history = NodeHistory(self.fs_ptr, show_all_logs, limit)
|
||||
try:
|
||||
repos.svn_repos_history(self.fs_ptr, path, history.add_history,
|
||||
1, rev, options.get('svn_cross_copies', 0))
|
||||
except core.SubversionException, e:
|
||||
_fix_subversion_exception(e)
|
||||
if e.apr_err != _SVN_ERR_CEASE_INVOCATION:
|
||||
raise
|
||||
|
||||
# Now, iterate over those history items, checking for changes of
|
||||
# location, pruning as necessitated by authz rules.
|
||||
for hist_rev, hist_path in history:
|
||||
path_parts = _path_parts(hist_path)
|
||||
if not vclib.check_path_access(self, path_parts, path_type, hist_rev):
|
||||
break
|
||||
rev_paths.append([hist_rev, hist_path])
|
||||
return rev_paths
|
||||
|
||||
def _getpath(self, path_parts):
|
||||
return string.join(path_parts, '/')
|
||||
return '/'.join(path_parts)
|
||||
|
||||
def _getrev(self, rev):
|
||||
if rev is None or rev == 'HEAD':
|
||||
return self.youngest
|
||||
try:
|
||||
if type(rev) == type(''):
|
||||
while rev[0] == 'r':
|
||||
rev = rev[1:]
|
||||
rev = int(rev)
|
||||
except ValueError:
|
||||
except:
|
||||
raise vclib.InvalidRevision(rev)
|
||||
if (rev < 0) or (rev > self.youngest):
|
||||
raise vclib.InvalidRevision(rev)
|
||||
|
@ -700,7 +857,20 @@ class LocalSubversionRepository(vclib.Repository):
|
|||
r = self._fsroots[rev] = fs.revision_root(self.fs_ptr, rev)
|
||||
return r
|
||||
|
||||
##--- custom --##
|
||||
def _gettype(self, path, rev):
|
||||
# Similar to itemtype(), but without the authz check. Returns
|
||||
# None for missing paths.
|
||||
try:
|
||||
kind = fs.check_path(self._getroot(rev), path)
|
||||
except:
|
||||
return None
|
||||
if kind == core.svn_node_dir:
|
||||
return vclib.DIR
|
||||
if kind == core.svn_node_file:
|
||||
return vclib.FILE
|
||||
return None
|
||||
|
||||
##--- custom ---##
|
||||
|
||||
def get_youngest_revision(self):
|
||||
return self.youngest
|
||||
|
@ -710,6 +880,7 @@ class LocalSubversionRepository(vclib.Repository):
|
|||
results = repos.svn_repos_trace_node_locations(self.fs_ptr, path,
|
||||
rev, [old_rev], _allow_all)
|
||||
except core.SubversionException, e:
|
||||
_fix_subversion_exception(e)
|
||||
if e.apr_err == core.SVN_ERR_FS_NOT_FOUND:
|
||||
raise vclib.ItemNotFound(path)
|
||||
raise
|
||||
|
@ -749,7 +920,7 @@ class LocalSubversionRepository(vclib.Repository):
|
|||
while history:
|
||||
path, peg_revision = fs.history_location(history)
|
||||
if peg_revision <= limit_revision:
|
||||
return max(peg_revision, limit_revision), _cleanup_path(path)
|
||||
return peg_revision, _cleanup_path(path)
|
||||
history = fs.history_prev(history, 1)
|
||||
return peg_revision, _cleanup_path(path)
|
||||
else:
|
||||
|
@ -759,6 +930,7 @@ class LocalSubversionRepository(vclib.Repository):
|
|||
try:
|
||||
mid_id = fs.node_id(self._getroot(mid), path)
|
||||
except core.SubversionException, e:
|
||||
_fix_subversion_exception(e)
|
||||
if e.apr_err == core.SVN_ERR_FS_NOT_FOUND:
|
||||
cmp = -1
|
||||
else:
|
||||
|
@ -776,3 +948,32 @@ class LocalSubversionRepository(vclib.Repository):
|
|||
return peg_revision, path
|
||||
finally:
|
||||
pass
|
||||
|
||||
def get_symlink_target(self, path_parts, rev):
|
||||
"""Return the target of the symbolic link versioned at PATH_PARTS
|
||||
in REV, or None if that object is not a symlink."""
|
||||
|
||||
path = self._getpath(path_parts)
|
||||
rev = self._getrev(rev)
|
||||
path_type = self.itemtype(path_parts, rev) # does auth-check
|
||||
fsroot = self._getroot(rev)
|
||||
|
||||
# Symlinks must be files with the svn:special property set on them
|
||||
# and with file contents which read "link SOME_PATH".
|
||||
if path_type != vclib.FILE:
|
||||
return None
|
||||
props = fs.node_proplist(fsroot, path)
|
||||
if not props.has_key(core.SVN_PROP_SPECIAL):
|
||||
return None
|
||||
pathspec = ''
|
||||
### FIXME: We're being a touch sloppy here, only checking the first line
|
||||
### of the file.
|
||||
stream = fs.file_contents(fsroot, path)
|
||||
try:
|
||||
pathspec, eof = core.svn_stream_readline(stream, '\n')
|
||||
finally:
|
||||
core.svn_stream_close(stream)
|
||||
if pathspec[:5] != 'link ':
|
||||
return None
|
||||
return pathspec[5:]
|
||||
|
||||
|
|
3027
lib/viewvc.py
3027
lib/viewvc.py
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,75 @@
|
|||
#!/usr/bin/python
|
||||
|
||||
import mimetypes
|
||||
import magic
|
||||
|
||||
have_chardet = 0
|
||||
try:
|
||||
import chardet
|
||||
have_chardet = 1
|
||||
except: pass
|
||||
|
||||
class ContentMagic:
|
||||
|
||||
def __init__(self, encodings):
|
||||
self.encodings = encodings.split(':')
|
||||
self.mime_magic = None
|
||||
self.errors = []
|
||||
# Try to load magic
|
||||
self.mime_magic = magic.open(magic.MAGIC_MIME_TYPE)
|
||||
self.mime_magic.load()
|
||||
|
||||
# returns MIME type
|
||||
def guess_mime(self, mime, filename, tempfile):
|
||||
if mime == 'application/octet-stream':
|
||||
mime = ''
|
||||
if not mime and filename:
|
||||
mime = mimetypes.guess_type(filename)[0]
|
||||
if not mime and tempfile and self.mime_magic:
|
||||
if type(tempfile) == type(''):
|
||||
mime = self.mime_magic.file(tempfile)
|
||||
else:
|
||||
c = tempfile.read(4096)
|
||||
mime = self.mime_magic.buffer(c)
|
||||
return mime
|
||||
|
||||
# returns (utf8_content, charset)
|
||||
def guess_charset(self, content):
|
||||
# Try UTF-8
|
||||
charset = 'utf-8'
|
||||
try: content = content.decode('utf-8')
|
||||
except: charset = None
|
||||
if charset is None and have_chardet and len(content) > 64:
|
||||
# Try to guess with chardet
|
||||
try:
|
||||
# Only detect on first 256KB if content is longer
|
||||
if len(content) > 256*1024:
|
||||
charset = chardet.detect(content[0:256*1024])
|
||||
else:
|
||||
charset = chardet.detect(content)
|
||||
if charset and charset['encoding']:
|
||||
charset = charset['encoding']
|
||||
if charset == 'MacCyrillic':
|
||||
# Silly MacCyr, try cp1251
|
||||
try:
|
||||
content = content.decode('windows-1251')
|
||||
charset = 'windows-1251'
|
||||
except: content = content.decode(charset)
|
||||
else:
|
||||
content = content.decode(charset)
|
||||
except: charset = None
|
||||
# Then try to guess primitively
|
||||
if charset is None:
|
||||
for charset in self.encodings:
|
||||
try:
|
||||
content = content.decode(charset)
|
||||
break
|
||||
except: charset = None
|
||||
return (content, charset)
|
||||
|
||||
# guess and encode return value into UTF-8
|
||||
def utf8(self, content):
|
||||
(uni, charset) = self.guess_charset(content)
|
||||
if charset:
|
||||
return uni.encode('utf-8')
|
||||
return content
|
|
@ -1,6 +1,6 @@
|
|||
# -*-python-*-
|
||||
#
|
||||
# Copyright (C) 1999-2007 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
||||
|
@ -14,7 +14,7 @@
|
|||
#
|
||||
# -----------------------------------------------------------------------
|
||||
|
||||
import os, sys, traceback, string, thread
|
||||
import os, sys, traceback, thread
|
||||
try:
|
||||
import win32api
|
||||
except ImportError, e:
|
||||
|
@ -40,9 +40,9 @@ def CommandLine(command, args):
|
|||
"""Convert an executable path and a sequence of arguments into a command
|
||||
line that can be passed to CreateProcess"""
|
||||
|
||||
cmd = "\"" + string.replace(command, "\"", "\"\"") + "\""
|
||||
cmd = "\"" + command.replace("\"", "\"\"") + "\""
|
||||
for arg in args:
|
||||
cmd = cmd + " \"" + string.replace(arg, "\"", "\"\"") + "\""
|
||||
cmd = cmd + " \"" + arg.replace("\"", "\"\"") + "\""
|
||||
return cmd
|
||||
|
||||
def CreateProcess(cmd, hStdInput, hStdOutput, hStdError):
|
||||
|
@ -109,13 +109,13 @@ def CreatePipe(readInheritable, writeInheritable):
|
|||
|
||||
def File2FileObject(pipe, mode):
|
||||
"""Make a C stdio file object out of a win32 file handle"""
|
||||
if string.find(mode, 'r') >= 0:
|
||||
if mode.find('r') >= 0:
|
||||
wmode = os.O_RDONLY
|
||||
elif string.find(mode, 'w') >= 0:
|
||||
elif mode.find('w') >= 0:
|
||||
wmode = os.O_WRONLY
|
||||
if string.find(mode, 'b') >= 0:
|
||||
if mode.find('b') >= 0:
|
||||
wmode = wmode | os.O_BINARY
|
||||
if string.find(mode, 't') >= 0:
|
||||
if mode.find('t') >= 0:
|
||||
wmode = wmode | os.O_TEXT
|
||||
return os.fdopen(msvcrt.open_osfhandle(pipe.Detach(),wmode),mode)
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
# Copyright (C) 1999-2006 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
# Copyright (C) 1999-2007 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
# Copyright (C) 1999-2006 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
# Copyright (C) 1999-2006 The ViewCVS Group. All Rights Reserved.
|
||||
# Copyright (C) 1999-2013 The ViewCVS Group. All Rights Reserved.
|
||||
#
|
||||
# By using this file, you agree to the terms and conditions set forth in
|
||||
# the LICENSE.html file which can be found at the top level of the ViewVC
|
|
@ -1,9 +1,42 @@
|
|||
RELEASE MANAGEMENT
|
||||
RELEASE MANAGEMENT
|
||||
|
||||
ViewVC rolls releases from release branches associate with each minor
|
||||
version of the software. For example, the 1.1.0 is rolled from the
|
||||
1.1.x branch. The same is true for the 1.1.1, 1.1.2, ... releases.
|
||||
|
||||
|
||||
A. Creating Release Branches
|
||||
============================
|
||||
|
||||
Primary ViewVC development occurs on the trunk, with bugfixes and
|
||||
compatible features being backported to release branches as
|
||||
appropriate. When, however, the need arises to create a new release
|
||||
branch, here's the process (M, N, X, and Y below represent integral
|
||||
major, minor, and patch version numbers, and are not literal):
|
||||
|
||||
1. Create the release branch as a copy of the trunk@HEAD (the
|
||||
lower-case "x" in the branch name is literal):
|
||||
|
||||
svn cp -m "Branch for X.Y release stabilization." . ^/branches/X.Y.x
|
||||
|
||||
2. On the trunk, update the following files to reflect the new
|
||||
version which trunk will be progressing towards:
|
||||
|
||||
CHANGES: Add stub section for new release.
|
||||
INSTALL: Update example configuration.
|
||||
lib/viewvc.py: Update "__version__" value.
|
||||
docs/upgrading-howto.html: Add stub section for new release.
|
||||
docs/template-authoring-guide.html: Update to reflect new release.
|
||||
docs/release-notes/M.N.0.html: Add a new stub file.
|
||||
|
||||
Commit these changes:
|
||||
|
||||
svn ci -m "Trunk is now progressing toward version M.N."
|
||||
|
||||
|
||||
B. Publishing Releases
|
||||
======================
|
||||
|
||||
There is a script, `tools/make-release', which creates a release
|
||||
directory and the various archive files that we distribute. All other
|
||||
steps required to get a ViewVC release out of the door require manual
|
||||
|
@ -13,21 +46,24 @@ follows:
|
|||
Checkout a working copy of the release branch for the release you
|
||||
intend to roll, and in that working copy, perform the following steps
|
||||
(X, Y, and Z below represent integral major, minor, and patch version
|
||||
numbers, and not literal):
|
||||
numbers, and are not literal):
|
||||
|
||||
1. Review any open bug reports:
|
||||
|
||||
http://viewvc.tigris.org/servlets/ProjectIssues
|
||||
|
||||
2. Add a new subsection to the file 'docs/upgrading.html' describing
|
||||
all user visible changes for users of previous releases of ViewVC.
|
||||
Commit any modifications. NOTE: This step should not be necessary
|
||||
for patch releases.
|
||||
2. Ensure that the file 'docs/upgrading.html' describes all user
|
||||
visible changes for users of previous releases of ViewVC. (Any
|
||||
changes here should be made on the trunk and backported to the
|
||||
branch.) NOTE: This step should not be necessary for patch
|
||||
releases.
|
||||
|
||||
3. Verify that copyright years are correct in both the license-1.html
|
||||
file and the source code.
|
||||
|
||||
4. Update and commit the 'CHANGES' file.
|
||||
4. Update and commit the 'CHANGES' file, using any available crystal
|
||||
balls or other forward-looking devices to take a stab at the
|
||||
release date.
|
||||
|
||||
5. Test, test, test! There is no automatic testsuite available. So
|
||||
just run with permuting different `viewvc.conf' settings... and
|
||||
|
@ -38,50 +74,86 @@ numbers, and not literal):
|
|||
should exactly reflect what you wish to distribute and dub "the
|
||||
release".
|
||||
|
||||
7. Edit the file 'lib/viewvc.py' and remove the "-dev" suffix from
|
||||
7. Update your release branch working copy to HEAD.
|
||||
|
||||
svn up
|
||||
|
||||
8. Edit the file 'lib/viewvc.py' and remove the "-dev" suffix from
|
||||
__version__. The remainder should be of the form "X.Y.Z", where X,
|
||||
Y, and Z are positive integers. Do NOT commit this change.
|
||||
Y, and Z are positive integers.
|
||||
|
||||
8. Update your working copy to HEAD, and tag the release:
|
||||
*** Do NOT commit this change. ***
|
||||
|
||||
svn update
|
||||
svn cp -m "Tag the X.Y.Z final release." . \
|
||||
http://viewvc.tigris.org/svn/viewvc/tags/X.Y.Z
|
||||
9. "Peg" the contributed templates externals definition to the
|
||||
current HEAD revision:
|
||||
|
||||
9. Go into an empty directory and run the 'make-release' script:
|
||||
svn pedit svn:externals .
|
||||
|
||||
(squeeze "-rBASE_REV", where BASE_REV is the current HEAD revision
|
||||
number, between 'templates-contrib' and the target URL).
|
||||
|
||||
tools/make-release viewvc-X.Y.Z X.Y.Z
|
||||
*** Do NOT commit this change. ***
|
||||
|
||||
10. Verify the archive files:
|
||||
10. Tag the release:
|
||||
|
||||
svn cp -m "Tag the X.Y.Z final release." . ^/tags/X.Y.Z
|
||||
|
||||
This will create a copy of the release branch, plus your local
|
||||
modifications to the svn:externals property and lib/viewvc.py
|
||||
file, to the tag location.
|
||||
|
||||
11. Revert the changes in your working copy.
|
||||
|
||||
svn revert -R .
|
||||
|
||||
12. Go into an empty directory and run the 'make-release' script:
|
||||
|
||||
tools/make-release viewvc-X.Y.Z tags/X.Y.Z
|
||||
|
||||
13. Verify the archive files:
|
||||
|
||||
- do they have a LICENSE.html file?
|
||||
- do they have necessary include documentation?
|
||||
- do they *not* have unnecessary stuff?
|
||||
- do they install and work correctly?
|
||||
|
||||
11. Upload the created archive files (tar.gz and zip) into the Files
|
||||
14. Upload the created archive files (tar.gz and zip) into the Files
|
||||
and Documents section of the Tigris.org project, and modify the
|
||||
CHECKSUMS document there accordingly. Also, drop a copy of the
|
||||
archive files into the root directory of the viewvc.org website
|
||||
(unversioned).
|
||||
CHECKSUMS document there accordingly:
|
||||
|
||||
12. On trunk, update the websites (both the viewvc.org/ and www/ ones)
|
||||
to refer to the new release files, and copy the CHANGES for the
|
||||
new release into trunk's CHANGES file.
|
||||
http://viewvc.tigris.org/servlets/ProjectDocumentList?folderID=6004
|
||||
|
||||
13. Edit the file 'lib/viewvc.py' again, re-adding the "-dev" suffix
|
||||
and incrementing the patch number assigned to the __version__
|
||||
variable, and add a new empty block in the branch's CHANGES file,
|
||||
and commit:
|
||||
Also, drop a copy of the archive files into the root directory of
|
||||
the viewvc.org website (unversioned).
|
||||
|
||||
15. Update the Tigris.org website (^/trunk/www/index.html) to refer to
|
||||
the new release files and commit.
|
||||
|
||||
svn ci -m "Bump latest advertised release."
|
||||
|
||||
16. Back on the release branch, edit the file 'lib/viewvc.py' again,
|
||||
incrementing the patch number assigned to the __version__
|
||||
variable. Add a new empty block in the branch's CHANGES file.
|
||||
Commit your changes:
|
||||
|
||||
svn ci -m "Begin a new release cycle."
|
||||
|
||||
14. Edit the Issue Tracker configuration options, adding a new Version
|
||||
17. Edit the Issue Tracker configuration options, adding a new Version
|
||||
for the just-released one, and a new Milestone for the next patch
|
||||
(and possibly, minor or major) release. (For the Milestone sort
|
||||
key, use a packed integer XXYYZZ: 1.0.3 == 10003, 2.11.4 == 21104.)
|
||||
|
||||
15. Write an announcement explaining all the cool new features and
|
||||
post it to the announce@ list, to the project's News area, and to
|
||||
other places interested in this sort of stuff, such as Freshmeat
|
||||
(http://www.freshmeat.net).
|
||||
http://viewvc.tigris.org/issues/editversions.cgi?component=viewvc&action=add
|
||||
http://viewvc.tigris.org/issues/editmilestones.cgi?component=viewvc&action=add
|
||||
|
||||
18. Send to the announce@ list a message explaining all the cool new
|
||||
features.
|
||||
|
||||
http://viewvc.tigris.org/ds/viewForumSummary.do?dsForumId=4253
|
||||
|
||||
19. Post a new release notification at Freecode.
|
||||
|
||||
https://freecode.com/projects/viewvc/releases/new
|
||||
|
||||
20. Merge CHANGES for this release into the CHANGES file for newer
|
||||
release lines and commit.
|
||||
|
|
|
@ -0,0 +1,107 @@
|
|||
-*- text -*-
|
||||
|
||||
This document carries some design thoughts regarding the solution of
|
||||
Issue #439[1] ("allow svn repositories to reside in web-navigable
|
||||
subdirectories")
|
||||
|
||||
[1] http://viewvc.tigris.org/issues/show_bug.cgi?id=439
|
||||
|
||||
|
||||
INTRODUCTION
|
||||
============
|
||||
|
||||
Many folks have expressed the desire that ViewVC expose its configured
|
||||
roots at more or less arbitrary virtual paths below the ViewVC root
|
||||
URL. An example might explain this better.
|
||||
|
||||
Say you have a ViewVC instance configured with roots like so:
|
||||
|
||||
# path vc
|
||||
# ------------ ---
|
||||
root_parents = /var/cvs/old : cvs,
|
||||
/var/svn/dev : svn,
|
||||
/var/svn/qa : svn,
|
||||
|
||||
and say that each of these root parents has a few roots whose names
|
||||
begin with the basenames of the parent directory ("dev-tools" lives in
|
||||
"/var/svn/dev", "old-docs" lives in "/var/cvs/old", etc.)
|
||||
|
||||
Today, ViewVC will display all those roots in the "root listing" view
|
||||
as if they are siblings:
|
||||
|
||||
old-docs/
|
||||
old-src/
|
||||
dev-build/
|
||||
dev-libs/
|
||||
dev-tools/
|
||||
qa-scripts/
|
||||
qa-utils/
|
||||
|
||||
In other words, any heirarchy which might exist in the on-disk
|
||||
locations of the roots, or (in the Subversion case) in the
|
||||
version-control system itself, is flattened.
|
||||
|
||||
But sometimes you might want to preserve -- or even introduce -- some
|
||||
heirarchy in those roots, exposed to the users. For example, you
|
||||
might wish that instead of a single "root listing" view, ViewVC
|
||||
instead presented users with a navigable tree constructed from paths
|
||||
configured by the admin. For example, imagine if each root_parent
|
||||
item also carried an "exposure path" bit of configuration:
|
||||
|
||||
# path vc exposure-path
|
||||
# ------------ --- -------------
|
||||
root_parents = /var/cvs/old : cvs : old,
|
||||
/var/svn/dev : svn : current/dev,
|
||||
/var/svn/qa : svn : current/qa,
|
||||
|
||||
A visit to ViewVC's root URL would then show:
|
||||
|
||||
old/
|
||||
current/
|
||||
|
||||
Clicking into "old/", you'd see:
|
||||
|
||||
old-docs/
|
||||
old-src/
|
||||
|
||||
Alternatively, clicking into "current/" would show:
|
||||
|
||||
dev/
|
||||
qa/
|
||||
|
||||
...and so on.
|
||||
|
||||
In fact, you'd have a virtual heirarchy like so:
|
||||
|
||||
/
|
||||
old/
|
||||
old-docs/ => CVS root at /var/cvs/old/docs
|
||||
old-src/ => CVS root at /var/cvs/old/src
|
||||
current/
|
||||
dev/
|
||||
dev-build/ => SVN root at /var/svn/dev/dev-build
|
||||
dev-libs/ => SVN root at /var/svn/dev/dev-libs
|
||||
dev-tools/ => SVN root at /var/svn/dev/dev-tools
|
||||
qa/
|
||||
qa-scripts/ => SVN root at /var/svn/qa/qa-scripts
|
||||
qa-utils/ => SVN root at /var/svn/qa/qa-utils
|
||||
|
||||
|
||||
CHALLENGES
|
||||
==========
|
||||
|
||||
* Merely tacking on a new "exposure path" item in the definition of
|
||||
the root_parents, cvs_roots, and svn_roots seems clunky. It also
|
||||
limits the the granularity of control: you couldn't assign
|
||||
different locations to the various roots that live within a single
|
||||
root parent path. Finally, the current code is banking on there
|
||||
being only a single colon (:) separator (since those might legally
|
||||
appear in Windows on-disk paths). That might create a bit of a
|
||||
compatibility annoyance.
|
||||
|
||||
* What do you do about root_as_url_component=0? I guess this feature
|
||||
is just simply unavailable in that case.
|
||||
|
||||
* Do you continue to allow cvs_roots and svn_roots members to specify
|
||||
a root name, or does the root name concept go away entirely in light
|
||||
of the new exposure path concept?
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue