# # # delete "i18n.h" # # delete "m4/xgettextflag.m4" # # delete "mkstemp.hh" # # delete "package_full_revision.h" # # delete "package_revision.h" # # patch "Makefile.am" # from [f73bbb82e9278ee9bc66eb42e445542d900a8ae0] # to [7c9525e222269c6d2954593056ef43c6135d8703] # # patch "adler32.hh" # from [8d6d6a08448d05eec4c12e4ec3285b6945da6d70] # to [a1669df544fd3ccc233417b87b7bfaa447e63071] # # patch "annotate.hh" # from [7b6a52deeb9922ad942ad150e5149b52b49f4581] # to [1084654578762318227a750310ef3f143d894b12] # # patch "app_state.hh" # from [d57aab1728315fb169a43e88ad7b213487b9e295] # to [222d30fb282520d59946e1d4cb3e19846cc9e7fd] # # patch "asciik.cc" # from [0829616d7ee850f5f9a4babc0c8ddb22fc458354] # to [cf946f9a14ad309615704bc960255c50e12b636a] # # patch "asciik.hh" # from [a7e9e877e516ed5f3140b4ba786bba789e000878] # to [592aa966af256f50be9784bfd01c543f54d3447b] # # patch "audit-includes" # from [1779cfc4a2dd88c53d5f48692cc88bdcb838b160] # to [f7e39d48e8637517540e8aa6a3ba17e9ea115cae] # # patch "automate.cc" # from [84e58a92e4188b5b4159348a49c51f1f94fe6d6f] # to [e61d4525484552eb8eac7a56cc1270ab921e79a7] # # patch "base.hh" # from [434649b6ff55a860d707807f78598ba068fa4da2] # to [94d6fc3f52f45d06406072978a3dcfcb4b8b0612] # # patch "basic_io.cc" # from [42424cd28bea6ad3df841d4dfaa15811d8d0a32f] # to [95ae5bc17a2c7140bfe13691036591b8975bcf41] # # patch "basic_io.hh" # from [641229e66202063897f00c2ac6b33d6a7786c5d8] # to [df6d95570895d30d6143bbce4d31dd93687b0fd1] # # patch "botan_pipe_cache.hh" # from [105f9431f4633819be88d758ccff8281ce7bd6fa] # to [90361c58d131861f55560dcad3793ee756a50c7b] # # patch "cert.hh" # from [3fa5adb025361516fac47866927c4f193337af8e] # to [e19095fd325166c38bcfcfb378f84f6dbbdf60e3] # # patch "char_classifiers.hh" # from [203fa7aa9d0438bd11e88279fe2d2d67a0715991] # to [380ead182576526e2343bd873b19114770015979] # # patch "charset.hh" # from [fd5cac7b2f6866b0deee4843c6906617660926ab] # to [0cb9234e49ef5ade2ed2a04e9c7f7f0fbcdf6a4a] # # patch "cleanup.hh" # from [c0af521b7aa0719eb3ca0d886af60d813ea6e3f5] # to [34bc7dde900a7f6d91534821886f91d1f9409409] # # patch "cmd.cc" # from [b7bdef6d3e370a8647789c59a2de7b190c49205a] # to [d05a3e8b9fff0b10340e90eb50a4cfcae5f7e1ca] # # patch "cmd.hh" # from [0a877d515c8b959a010de89e5f7db7f6fabce05f] # to [24e116cf72a52ef0340a410faf79da7270570727] # # patch "cmd_merging.cc" # from [71f2dae2ca58490e8db2a81c22a777decfc75ded] # to [d87f80673f250737ffde253dcb1884da98c03f4b] # # patch "cmd_netsync.cc" # from [ccffd713e9f1139b29b9726fb5de936b2683a265] # to [6fe2e56d33f4c4e6566bb4c993ae0ec3871a8365] # # patch "commands.cc" # from [2aabcae7ae24cd69dda86ecaabbf810c23c3d80c] # to [36e4666430055a87eb0d71e709e21ac623489d90] # # patch "commands.hh" # from [0b39910ab77fbb722c4a0fada49f07a7e8c3cb21] # to [31506ab303271d2cde7f9070476439e2027c7480] # # patch "configure.ac" # from [83643deaab65b2216a8021d1c7c74ac202692860] # to [526a9af13ac143ef35c8579548280a71dc4eebdb] # # patch "constants.hh" # from [f74e771b8c51ca5bdd37c0dd383471794d6427b4] # to [6dfe4845835786d6579cd86635f76096a30169ad] # # patch "cset.hh" # from [98c7724f0e0ef0da85d9c0f4a8efe1e12dffcdb0] # to [5a205be4ade4d652ad3a689a13f8a3fb86767d0d] # # patch "cycle_detector.hh" # from [f84cdc9a8ffd6333c739ddfba03a709295126e31] # to [f77b04f6c75c70dbb8e99265aa3d36d0f2f244af] # # patch "database.hh" # from [982dc2304b3e729f1f1b228f19769117b2015be1] # to [3e4156e4f98fab98d384a0b3449c55dde501409e] # # patch "diff_output.cc" # from [c41e41988dd3283841bf171f494280ba9b5066e2] # to [746af1eeaa7fee943bf1264dc88ddd6e218c7866] # # patch "diff_output.hh" # from [21d1cd2af12202cb14359483c7f85724f373786b] # to [9125ccd0d0fa725782c9910b5f34e844048d2da8] # # patch "enumerator.hh" # from [77463e904b18c2dbef84a776c6706f28be489ee9] # to [3c5c2ee377c33482e5442e9d59e8fdeb6facf182] # # patch "epoch.hh" # from [41f84eceeebe1a75b49fc172119cb005f9b74589] # to [d5de5eeb6ae26fefda8a89d452492b9faaa32e0c] # # patch "file_io.hh" # from [c5adaa89ea74db1d489c53a4ca3f60398beb848a] # to [653187d3891d5bdcfa979c55e48163ed451951b0] # # patch "globish.cc" # from [457d8817b4b0541646c134406e3f537897dfad74] # to [338d0214a12f6adaf4bda966e495fefb91e3a054] # # patch "globish.hh" # from [696c65bcf44f9a427e54d85b810bc8bfcfdfd1a0] # to [864db1e5341486754cbb90b73eca6e4e0886f1d6] # # patch "graph.cc" # from [262f4c91912223b9b33361736f46bd49c242069a] # to [0e4930c4797e6f2b6c163b12e28a8d3876bedbec] # # patch "graph.hh" # from [7322b6a5901450c65e3c965028e8fe7069294049] # to [ab4c40bcdcde42949481cbc0e3c29ba66ab07a9c] # # patch "hash_map.hh" # from [233406037b70b2cf47538d743409ca45a126978d] # to [10db5cb434769d726d1f354c7ac19c8d102152b9] # # patch "hmac.cc" # from [7a9e2c99be224785b6563622ad08675ebb29ca6b] # to [210b2af20b968d079d6de149d4b15d5c86422d50] # # patch "hmac.hh" # from [441e7ef06ac15ebc11bf66ba5e53aa4b5d8ed35e] # to [0020d6ab642d66824a18260e160a05b45c13be7b] # # patch "hybrid_map.hh" # from [f0b044a619da06baacc4163f492c124f372886db] # to [2baeadbc3fdfacec78d0a600da59151d6496ee4a] # # patch "inodeprint.hh" # from [ef0ced7b3dc4f2efee24c9a57102c1c4f1f09801] # to [7def309187f69a62288c27063692f9f85d4cb848] # # patch "interner.hh" # from [79c7a7122d6bda80842c63fd6b56c0113a2274a8] # to [c300647e6937a8a68f33fbbcd647e6fd9455a87f] # # patch "key_store.cc" # from [133bf327bebd83b73820217c7d92cd12f9153464] # to [8da2c21fdfb618f80c4e2296f587256da80e572a] # # patch "key_store.hh" # from [6f3cac249a46421122b889945156357dfe0f57bf] # to [cd49166162ff03e5c0bd7539e4fad65c6260ae7f] # # patch "keys.hh" # from [e56b05f2449eebda62d3ae309354cd2103969623] # to [16ad63cbcd8fa67104f45e3765f587aed9a7f1f4] # # patch "lcs.cc" # from [9028826c5eecfb13b76bd9068276a29fdcfdc34e] # to [f910a6d0679cc8ca110c9ee3d69e864ea5d63343] # # patch "lcs.hh" # from [5f95696df0fc81dae682ad3a0e4bad7db2085dea] # to [11373d3b6fa6c8deba61b60e657d3b084d53400c] # # patch "legacy.hh" # from [546d699913ccb3cafedf6dff50520ef38a5d6139] # to [6758cc428dda77af648e712d572e0b6c764146b4] # # patch "lexical_cast.hh" # from [5c433b309da53278749b284173e71306e732ca72] # to [fe70361a7da25ed93b4b46b266220fcfa29bf5c3] # # patch "lru_writeback_cache.hh" # from [55fb7845cd2c2f91fac2510a1492362fcb73d95a] # to [d659c6cf2b06fb3ec5324e50c1448571a8676712] # # patch "lua-testsuite.lua" # from [60452657c3ea7dd8fd21e69928e739c666f90837] # to [e28a4e630a460bcca1a2d9023a2a898c1e77670a] # # patch "lua.cc" # from [c441838b543ce387a6267815bfbd298b3205edbf] # to [753de9935cdaaf02658cf8f7b38d318563f145e9] # # patch "lua.hh" # from [75ff1e98f4674697157c8846b21d24b4245d084f] # to [91180f986cbe192aa5d1fd9fd0146a1150b789cc] # # patch "lua_hooks.cc" # from [de82039ec490be9bbf93a10ee7da613b0397657c] # to [69a6fc1c56a61871e90cf7a0c397e5b15a74051e] # # patch "lua_hooks.hh" # from [95a7446409bedb4594e26a46a643da2ae7ce462a] # to [bd3e476d9506f29a4efd2751ea2b1fe3fff03617] # # patch "luaext_globish.cc" # from [3593ef67e795b1a0edcc9273a7d01ec90ba924e0] # to [470ed3d2b5443f902335346ae5d4afc4f0ef8ffa] # # patch "luaext_guess_binary.cc" # from [6a44123a75956d5b4dc393fe82fda582bbc75a6b] # to [2bc668e174bf62b58c47a9bbba758362d12639d9] # # patch "luaext_mkstemp.cc" # from [397937a9ccedd28e68af5728e093bb2e3edc671a] # to [5170df290e82446908b2aee9704d1e905df0d03c] # # patch "luaext_parse_basic_io.cc" # from [2506b458aea07c761714450dbc3127b6bdd61c7c] # to [995b37d3cc3eb58a3c6be6db06e38f997ba6845e] # # patch "luaext_platform.cc" # from [fb98e039fbc2367e62e58faa4c5d1d309bc87d9f] # to [16f1628b90d20a981fcf134de97bea86f89660f7] # # patch "m4/boost.m4" # from [f8acc6b6b0859c9ffc31e5e7a37502bc8345176c] # to [90da17aab421082f379f262e9a76cbd772755a2d] # # patch "m4/inaddrnone.m4" # from [52ce7862f2d1bbb566c2a97c0483439284fba51b] # to [25adf5ed7ee5ef9b9656ec93057b8a034beadb39] # # patch "m4/library.m4" # from [3455f28dcfb1dc60fd61229a471d885fd12ecdfe] # to [1e10ad58fec9442d9e593a2d056f3e7e1f3f33f8] # # patch "m4/mtn-gettext.m4" # from [5302bc5b6157c5f51110753755847e322ebe044d] # to [499e1ab86a32d7fdc3b367e9219870b2b4d8ef8a] # # patch "m4/netxx.m4" # from [ced01d921bec3fcc597022d7bc33428899cb9ad6] # to [c273b63b4c52e26cc9cc9fafd1690bf554cf5d3d] # # patch "m4/numeric_vocab.m4" # from [5276a2eacf683db1a894edae1d0053a6fe9a506c] # to [ba2358bd856f2755a9857de56784fb99f6d0b336] # # patch "m4/stlporthashmap.m4" # from [076a81ff0bcc1dbde3063b0ba592755ba775ad78] # to [076e4ed9f4673ef214d667a410e421f8e40046f9] # # patch "m4/syncwithstdio.m4" # from [b640642083693cb93252e4b36b614cc6137e506a] # to [b4b592abcaaa6f661cb904eb606f9ca7800f30c8] # # patch "m4/tempstatconst.m4" # from [3308c6d6e531b6c6006783d044a30dd097b51c0d] # to [7738d43c8a0984a6258ecd64f8b44d650f20e2d6] # # patch "m4/typeof.m4" # from [e8cbaca79b7dfa1a2883609e8fa59cc783feef0c] # to [7803b50641603ae60ebd2b61bfcbce47ba130274] # # patch "merge_3way.cc" # from [19276380b5c046f910583ffbd86b77bc8f584320] # to [569fce0fc1a72f06b9a7266b69ea4b3e12e70432] # # patch "merge_conflict.cc" # from [a7606edae350ba90e0071e11ac1bab5f7ac85558] # to [b9162a1e2c3929ca16501bdfad57522f4616195a] # # patch "merge_content.cc" # from [678fec71c1a640e4c91ac0c601fccda6d90a358f] # to [06f264a5ff0b3b6360efdb930d91f0a1f0b5af76] # # patch "merge_content.hh" # from [b696d83e6c528c5896a3beaeabfaee877ff3ed37] # to [c3dc50ac9bad4488b4583c84551f3c6302763a64] # # patch "merge_roster.cc" # from [d49c1f097a8944d42887bf8d7385e32979c77335] # to [11dbe612fdb5f76eb10de88b07057c6f7e98b9dc] # # patch "merge_roster.hh" # from [8306856b153df6d6d927be60453d5a74f3fc4788] # to [33e71d22ef810554cfc133c69c5e65ee37031e9f] # # patch "merkle_tree.hh" # from [f8559915480b7fdf77424a8664b27df4f868843a] # to [7ae6a892d28c901e06986c03c90b54a9acf5102d] # # patch "migration.hh" # from [fa3fa48452af3ae8a04b67672d56ab687c79e116] # to [a69a8f22bc9fad780e35cd11c2594425de198f49] # # patch "mkstemp.cc" # from [22bb6303b6a7f3f2394490a6dab856f74b9de069] # to [450d3f028d322b58cde8e1369ebe78061faecc20] # # patch "monotone.cc" # from [d8084957ee90b91e4f55f224775ee2656c91e878] # to [4c3b7c12860268b0b01e39faeab5f95cbbe300b8] # # patch "mt_version.cc" # from [36443b123dbb3ebcba952fd46540efc64c022330] # to [e73c0a25e76ba110976a4a0b94f39f5295c1dd75] # # patch "mt_version.hh" # from [0b4b309b696507036d823d955c517731768f2924] # to [369db9625091082898262e4aba0268d740fdf732] # # patch "mtn-sanity.cc" # from [fdd728e6175f5df8721e21cee035832501d2072f] # to [d6b11b878814b0a40a4dd0ae4e0f666566a1d8aa] # # patch "mtn-sanity.hh" # from [b59ba9e27f19fff9944a7f8e8a363bb3ecbad1a0] # to [4703095d226cf4f77a1d5ac4c1142963f193bcad] # # patch "netcmd.hh" # from [4c4322e0f4dafdddee2e239daf0adfa6f6439883] # to [9fd97280633714008862a4a261403461d335fed5] # # patch "netio.hh" # from [60010c88056bdc63b4730146d293f5ed6ea6e015] # to [34259951595744b5948e66a2b7e00a2de34e2877] # # patch "netsync.cc" # from [64e1b397594ff5f6e0f4f2680ba66ce6fe9ffd97] # to [ecd3ca4123c4fdeaad74b808975209224fda1c00] # # patch "netxx_pipe.hh" # from [5ef141781ad2d0cae7e89725f5ac2a24c41dc3fd] # to [a94beacf372f3012d6294088d7363ca06f214fc7] # # patch "numeric_vocab.hh" # from [7bcabd35993b2dd6be4ee0d0c87c8384d684e4fb] # to [857d25e240304dd485efc94ada24a1774eaf78d2] # # patch "option.cc" # from [9d72465dc3f8c0031532fb3d54d19203266ec4db] # to [97d9423e3b676464b075d7309e045bcd8391c9fb] # # patch "option.hh" # from [322a377f8548a2e84a5fba54671042785d134d4e] # to [e0dfcbf481d579f5602aea5203f49bd4836d715f] # # patch "options.cc" # from [4ed21148936a06b55250339de690f8eff5d8f0b7] # to [7a2689cbb0597dced4933dce0464157c52cbefe1] # # patch "options.hh" # from [902b5dbb47ef7dc707ebce9e531eab4515dd71bc] # to [8af2d2fa88a70d3f8cec1331fb8e5823adc74849] # # patch "options_list.hh" # from [7b7947d1f69b84b0639593b5534f4ace6075691e] # to [49add23d26b58781c71b9de4e3a2258e1fc5866c] # # patch "origin_type.hh" # from [0d9f9f4e1e169b15eaa5c5081cd8059ad6d9a429] # to [0e329b2b10d081f52a8346044a6522a9fdc68552] # # patch "outdated_indicator.cc" # from [1d3ec59ddbb2339b573c1a316b52ba659b2242b5] # to [ba676108726aaf7eba3b7e7e357165696e15a599] # # patch "outdated_indicator.hh" # from [25f60524f7478a08a9de6fdc90ae395cdf185b51] # to [8f8a6bd36595e3c846be40ad59f550983a00f2a0] # # patch "packet.hh" # from [57a749c4a9ef6e4de431d4ad2bdf00ce6e702398] # to [c2de8fab34088703def8bdd9d33ef544bc68e585] # # patch "parallel_iter.hh" # from [7f91744f6a12f274696bfa8bde1cb968691f2611] # to [4901d0d1b3daece3f0b292c4343de8634814522e] # # patch "paths.cc" # from [f85b26f7c5a535d259b4f65d75335619d9e20972] # to [30a2058671b87385d855d97cd20705f91870b777] # # patch "paths.hh" # from [bc8dc8fb4bd0f32aec0a93fe34df74d47384938a] # to [cbd3ac7810f4fd8c528bcb5f87549d9d0e358d0a] # # patch "platform-wrapped.hh" # from [9b6adf61ff8908b94f5f6059b9f071fc39e0d5d8] # to [52b85ed314d2f3dd0aef3619809d0abf9a900659] # # patch "platform.hh" # from [c50e7babf7716b238c7b8074f5339bfcaab67fff] # to [88ead5a98aeec122e00284198ad381d67cd2b75c] # # patch "project.cc" # from [7614711c10af1c725062f1570b2a6f4834439197] # to [86618b33d4154fb81225a6fb34480ebf63c1d220] # # patch "project.hh" # from [fa2e22f7fbea8b83797aa7c855baa3940d001d39] # to [2ae5e78f9d9aaa989ff53b50565960a39cb9f1b2] # # patch "randomfile.hh" # from [6cb73ec10f057f704eb11fffe93795882109e54c] # to [7494c47918a029148554462f981058525623a590] # # patch "randomizer.hh" # from [490f09880887f76baf40a00ead66f13cb107078c] # to [136779fca474229e2f6d735caf1afec0acd2b100] # # patch "rcs_file.hh" # from [fa865ade41a0d7f42cc2969d1ad170093b71917a] # to [23731152c2a5ac9eb8b6573eec50cd00a8522f54] # # patch "rcs_import.hh" # from [4d945c0abf3da05913328433420a83cf240173a3] # to [4bd96c41b141f2506a955380933c29904985aa88] # # patch "refiner.hh" # from [ec6282db69b98f2c748d00536c281680275b31ec] # to [76a2230251b87e779d7a938ae9e6982fe69ab105] # # patch "restrictions.hh" # from [a733872f76708daa50374e273a6ef3a5909e4ef3] # to [1e0d83de80fd4e610d69d59bd3eba76704a25cd9] # # patch "rev_height.hh" # from [6b528fe9d4944ba8758676e320e658ae945eeed9] # to [ed34c24a20b18966c380ec8e58b4b8667fb1b7c3] # # patch "revision.hh" # from [a9037068bbbb814b1043de6f0b55eed977d3b82e] # to [75bac531320de250cc7d0660762c3b01e04147dd] # # patch "roster.cc" # from [12f996cf49a33446ecd7b6aba1d7812242c4ace9] # to [bfae685e1a37e6fe09184d44e82e307e633fdaa5] # # patch "roster.hh" # from [b4257701116cab6db535932efe5893ffb042396f] # to [cff9707c9498e8f3fd61ad45b80473cc4444ce06] # # patch "roster_delta.hh" # from [bfa92f4bb32c3c2f6d6cfcb56c453bdbbe1fecea] # to [8a78d49fa1d7b16ef457cf04367e97d052d1afcb] # # patch "roster_tests.hh" # from [cee3c68e3a02ab972c4ff031946154342ef88b22] # to [71c596a21bd5878e1588f6f580019e26deb6b634] # # patch "safe_map.hh" # from [f07247d537c7872cbddd5a085b0f5ada242f0f5b] # to [72cfed654bd458c527b1abef1a691ab3f9ebfb4b] # # patch "sanity.hh" # from [ce0c494f5f8a1c27bc93386dfe46d8f65ee18f6b] # to [c0f57fa10025bd057f6d0992483d5de05f075ea1] # # patch "schema.sql" # from [dc3656ef5ebccb830fef27df2fdf2d482eda5bff] # to [b933498af43c8221933f2afaa6b2b9c6a527c6e0] # # patch "selectors.hh" # from [7a2e92f0e1c1a1b05fc3c0c00ea2dc2b9059ebe2] # to [43c5060c6c0d55fe8e57e8f07e1a71dc0d99bbc6] # # patch "simplestring_xform.cc" # from [506008109458c58abc016f9546384db4ed61650e] # to [9f72024cbeb2a7df393faae3e8b13b392fcd9300] # # patch "simplestring_xform.hh" # from [d732cfc308a8910807ad9350ba6d7c293219ab18] # to [5a6e7a65e2564f2a01321844a1ff6d98e6f58646] # # patch "std_hooks.lua" # from [4416ae18e8a820e013fc08d1019443fe3eb67d4c] # to [47f92f3269c99464106e72b9f3839027c3eacce1] # # patch "string_queue.hh" # from [d2184fccefabdb4ac69d5616bf13fc21ada15408] # to [5053a58d5e02d505c19a02b2101dc5876d5bfbaa] # # patch "tester-plaf.hh" # from [e9e164562a9022398b417351dab5a8662237ff15] # to [7492ac48c14abb8f61f57175fb31a78666bee01d] # # patch "tester-tests/cleanup-1/__driver__.lua" # from [146d477bf5223d9963adc2f0fcaf47916f5326e6] # to [a4ec393e0de28565938fbd353c8b3f7dbe0444ac] # # patch "tester-tests/cleanup-2/__driver__.lua" # from [652dbe860039c60ddc896417c02508f4d7488ff9] # to [4a9e5b8b5c0002e6c42502fb020969653981e499] # # patch "tester-tests/isolated-1/__driver__.lua" # from [e617f484d767b12ba5b160f0e47b2ef381668eb9] # to [a5f58c9e8310c48c73c26b8fd62fe1c91ed50463] # # patch "tester-tests/isolated-2/__driver__.lua" # from [aa6bd61b18da39a7114da0a676821473c6733b8c] # to [d8ebd6ac783e3d626200af77064894fd7e4d7d70] # # patch "tester-tests/remove-unwriteable/__driver__.lua" # from [b6d27451748345a7920bbaec2f092cac04ec6260] # to [38a996b7a32d72fb1be00caf1b9c0b945870c9f9] # # patch "tester-testsuite.lua" # from [befdacc2d9be5065780fd668bd242e01ed25d793] # to [d7c9755ba1838680e15f237a00de1b50ca01693c] # # patch "tester.cc" # from [dc4d5a9a16ee58d9b9f625affad3642fe69f9185] # to [9944326468bd2eb1ac21d19d103372d236f4dc1a] # # patch "testlib.lua" # from [ebf6812c6bf774e2bdd3ba494090d0418357408d] # to [dd8669557a3a4bf9933897e29a615cbedc42cf38] # # patch "tests/inventory_hooks.lua" # from [a16591bdd459974f0186eb84ce3050c932a0f885] # to [9697410bd122c502981cbc601330b5eafb6c1582] # # patch "tests/min_hooks.lua" # from [d90ff30d41f1c9c73ea72ea50222370d07e1d575] # to [6dc8f710c41ddcf939ca5fef4ca2fab0ce4d3a81] # # patch "tests/test_hooks.lua" # from [268c94edd77cf0af6d976b87870787f11d4d7716] # to [2352f60b89c450fbfd3df9a419d9ab7828d55244] # # patch "transforms.hh" # from [9be76fde6f1634f9606101c7028f0051b39fa918] # to [301029c9284881c127a16fc610a8c22eb670cdde] # # patch "txt2c.cc" # from [22ef07ab43c37b4d954cb171203cbe4aa3a267f6] # to [77e55cb6174483c2e253052793a5fc15e43535d2] # # patch "ui.hh" # from [1a9728da7d53a52ac0b4dfb7f2728045081973f6] # to [9a3acd06bf677e16f092cfd96c414a27cefe1c30] # # patch "unit-tests/basic_io.cc" # from [538770889b3e70342026027977a9c35ef3bf4bcb] # to [cd2c7d4a6ca0b182f8ee5622efa594d42e78b6b0] # # patch "unit-tests/commands.cc" # from [d5a24210a23b5ba2efb29dacbbf28c88b17fc70c] # to [e7be707b4b2c607eface60478e5a0d66f054d3d7] # # patch "unit-tests/globish.cc" # from [16645f0f37122cc2534d83dfd32bb38368d0e9e8] # to [d025d9c8472782f0ca2ee251348281a219837504] # # patch "unit-tests/graph.cc" # from [c03ea24f2bbe86e0034a0be7ed668b2891da145c] # to [6445249524fa296bd687166581fb8e46ef3494e6] # # patch "unit-tests/merge_3way.cc" # from [c3a2f75290711c12829e59e5b26fd1e5bf657595] # to [f643b8c4672cd8c99a8d1d7a51320358d6f64cc4] # # patch "unit-tests/merge_roster.cc" # from [8e60819d5307c992f84f41b295c07900cd6addb0] # to [5c08ece22eaf194dd5145b436bf3408b870fba88] # # patch "unit-tests/mkstemp.cc" # from [a4272b124940a7e051422e38b85d6a71e0f57222] # to [c31495717409818a9665a969b04780050717cc3d] # # patch "unit-tests/option.cc" # from [81d914901386f286e56b93bdd1fbfda1ad98aa35] # to [66567ef27006f59ae54eb64b348bc20f621148cb] # # patch "unit-tests/outdated_indicator.cc" # from [7763f324495b4930c469b97f92c9f83a24d51c0b] # to [1168e2453894c0fbeb1f1aedbff4583fc1250b7d] # # patch "unit-tests/paths.cc" # from [7465bbf45840f38209712842ee79c6642bcc9482] # to [f443111b016125fb2b00af638586853a68369ad9] # # patch "unit-tests/roster.cc" # from [26f278e0c4f1db6a2d06480acc20b97039c5f4c9] # to [77681ef65ff98bcaf591865acdd228d2f00dd2fa] # # patch "unit-tests/sha1.cc" # from [dcaf3439d0f7ca6a95746b258b0bee1dbb376044] # to [295bf7885357b428837a74656553c1f0e78ab2c3] # # patch "unit-tests/simplestring_xform.cc" # from [03649bf0eb4f9ab5f50594b5ac9a915456e49f11] # to [ce5669547d1c501aae6e7619c37cde5fd25358cc] # # patch "unit-tests/string_queue.cc" # from [c2e3a25ff75876791bd5b70dde967796ecec07b3] # to [c647f97658e6abd5e15cc1a82cffffcb8decf0db] # # patch "unit-testsuite.lua" # from [44f7e7d6c8a081bda84298b9984dbdf7d39f6797] # to [a8fd12b4d50135121bf3e9be6247bd0fbf0ade58] # # patch "unit_tests.hh" # from [6b954b0c842e44cd5e8f3caf92fc9ee7354fd888] # to [75efe28df99e01acc70527cb90b922f0bf2f7a09] # # patch "unix/cputime.cc" # from [2a024eb642dfbedba1197dc0658977d09b57f8c9] # to [e1347423e9c01e5187c9dcd6df7c3fc45a862b8e] # # patch "unix/fs.cc" # from [6a14757e5551b259f87054adbd53173e25ce9bc4] # to [b5909760f49692cdd13ea1aa76a0323e07b95b92] # # patch "unix/get_system_flavour.cc" # from [c2b5a4b599251b363f308aa884cfaeb4eb237e61] # to [87943eef2597712166a26308313fb6a40feca0a0] # # patch "unix/inodeprint.cc" # from [0d38c64a84cc6aa60ef42a2cef10257972eec035] # to [41011634c6a155cf7c9f3fe5053e08c577c918ee] # # patch "unix/main.cc" # from [bc6e80dc6a77ec1fbc620920cf490d10135a9d74] # to [1a4910550eee2b11ff4bc99bec1f9de0d44da81e] # # patch "unix/make_io_binary.cc" # from [9ab5faa9b8759d7f91fb6c676fdc445b6fad3b00] # to [269723498e7fab1e60549c89e0a595231d897a2d] # # patch "unix/os_strerror.cc" # from [83f07b118dc8d51dcf9d07044b8b7183f14e7b55] # to [ae83ca96d06155e367f9e70e1772d85f3d10c84c] # # patch "unix/process.cc" # from [feac2afcdb6084a21b68c6ff72dafc9e914a4127] # to [99af2840bfac311181ff2d0ee5360288494a1cb4] # # patch "unix/read_password.cc" # from [781410699fe1a5325ae2efca87fc3871c6647a44] # to [013c10f388eb58d2dcdc53277c77c12908f81eba] # # patch "unix/terminal.cc" # from [83a585e971202a39e648085ab9e7d3302cb9848a] # to [10809407b581afe8d412fb187e2e40f2e4c8d8ba] # # patch "unix/tester-check-net.cc" # from [89fdb78ff4c9cd7fe4a60bca1afdf5fbf00b5bbd] # to [952588905c0e3878d260b6afb27cddfd0490ec33] # # patch "unix/tester-plaf.cc" # from [bcbcd37f68b536f66b86b22af6ea82ef7a1d5111] # to [033e1c858b94b338b8ed4f476855413379274bd9] # # patch "update.hh" # from [ba78cd61383ee268f56bc37682a490bfac7ee9bb] # to [f94e1d2140acab803e81fe736f9ecc9f607ef22a] # # patch "uri.hh" # from [f47e00a95933cc7b73d3023993100072625d8fef] # to [4ee1882809ef881390a703fb31e2a41a3258c70c] # # patch "util/mtnopt.in" # from [a9aff1396ce99d1a46cf805c857bad739dcad613] # to [f35d29ef8d033798552ca96e218ce5db2d443353] # # patch "vector.hh" # from [6c7d7e9c1f2c26a95d0d51fbbe7db9982e4309c2] # to [2f921a6478315b7b3e7be38f25bed16380d97b72] # # patch "vocab.hh" # from [2bd325ccd8f3e2af59352517f3570991d60ce29e] # to [6ccbe5b9ab2907f2cf15072d68c4369e3862b137] # # patch "vocab_cast.hh" # from [bd143db00172c1dff56eace0fa2c82e7299bacce] # to [9710931398c21cebf7b008e4982e5cfc2f2b6614] # # patch "vocab_hash.hh" # from [7fd5a04439ab35f212daaad1b673f6dea894ae25] # to [4a55fd719ba7113624e1f16086298e65ec288930] # # patch "vocab_macros.hh" # from [6c97f3c4c3b4ac6766ac0c42ffd802168d72a582] # to [8c97fbf646367acb3d62c4101b28b0d69538fa3d] # # patch "win32/cputime.cc" # from [1039e1fabada328afce0aeb6abd903a5a6a05576] # to [bc75990945d1cb48772541f39a580e3f3308d9cd] # # patch "win32/fs.cc" # from [16b42480fad9d8f471dae8b84db11ab3479d726f] # to [14806bf816131ecf8e940f5ba2f386f258f85ac8] # # patch "win32/get_system_flavour.cc" # from [9a3d6b976c35c20ffe50e1fb6e723efe4006a1fd] # to [60cdbd9a9c7a6373952674ab39e70b2c76f99a41] # # patch "win32/inodeprint.cc" # from [187f90f531d8c05d1000cccccc826b0f7542b9b8] # to [a08322b9d96e7784d12aa866927558457a0838fd] # # patch "win32/main.cc" # from [5a71222d0355a0c8f699b69e3e13e95ee52ca872] # to [c54eb01fae6a969180812791cba859e738e17476] # # patch "win32/make_io_binary.cc" # from [184845c1a84f925fca74cf69c1853af811ebacf2] # to [569e5331194822075b1fa1b458313d7ee05e9be3] # # patch "win32/os_strerror.cc" # from [5753db7a97adb234f801c2cc3b2512f19bb31b8b] # to [6675788dc2b4b2b6dc15e54ba58a5c8994de9876] # # patch "win32/process.cc" # from [34244703491fe7f3a5d7271d3f4e1eadf3398f2a] # to [b04ad9cc13ce045696222da5b9796bc39397cc5d] # # patch "win32/read_password.cc" # from [24f94f0c5768283f77dd11b5cb4eff5a2885f965] # to [f664b01c8d5a5346934284107ee552f2ab139dc9] # # patch "win32/terminal.cc" # from [f695bcc3b73c50c76b63e0cfc30e3fb7bf2d9876] # to [1db5ba145a2e414e13d95c880c97a186efde869e] # # patch "win32/tester-check-net.cc" # from [5a33162d303659f396e377380ce64015ac0ee79b] # to [1fb16b6a801951299889667d726a96894ec77121] # # patch "win32/tester-plaf.cc" # from [3515a1b8a6a7fa2a45dbaddb933239fef3c18823] # to [4cae66ca767106b916ed327199590446f1cc0cc7] # # patch "work.hh" # from [06639353bb835eb913d2287cc35a2f96fe69230a] # to [48bdba225cedd327acdfd13db63226e76df1ecec] # # patch "xdelta.hh" # from [e2926cc2e87c1962303f9f11cbd588f08e4e2341] # to [59ad94776aa99040452c7f678b9c642ccbb29ec0] # ============================================================ --- Makefile.am f73bbb82e9278ee9bc66eb42e445542d900a8ae0 +++ Makefile.am 7c9525e222269c6d2954593056ef43c6135d8703 @@ -1,6 +1,17 @@ -AUTOMAKE_OPTIONS=subdir-objects -Wno-portability -ACLOCAL_AMFLAGS = -I m4 +# Copyright (C) 2003 Graydon Hoare +# +# This program is made available under the GNU GPL version 2.0 or +# greater. See the accompanying file COPYING for details. +# +# This program is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. +# Makefile for monotone + +AUTOMAKE_OPTIONS = subdir-objects -Wno-portability +ACLOCAL_AMFLAGS = -I m4 + CMD_SOURCES = \ cmd.hh cmd.cc cmd_netsync.cc cmd_list.cc cmd_packet.cc \ cmd_key_cert.cc cmd_merging.cc cmd_db.cc cmd_diff_log.cc \ @@ -19,7 +30,7 @@ LUAEXT_SOURCES = \ interner.hh hash_map.hh vocab_hash.hh \ luaext_mkstemp.cc luaext_parse_basic_io.cc \ luaext_guess_binary.cc luaext_platform.cc luaext_globish.cc \ - lua.cc lua.hh mkstemp.cc mkstemp.hh file_io.cc file_io.hh \ + lua.cc lua.hh mkstemp.cc file_io.cc file_io.hh \ globish.cc globish.hh basic_io.cc basic_io.hh \ char_classifiers.hh @@ -83,11 +94,10 @@ MOST_SOURCES = \ cleanup.hh unit_tests.hh \ cycle_detector.hh randomfile.hh adler32.hh \ netio.hh gettext.h \ - package_revision.cc package_revision.h \ - package_full_revision.cc package_full_revision.h \ + package_revision.cc package_full_revision.cc \ option.cc option.hh options.cc options.hh options_list.hh \ specialized_lexical_cast.cc lexical_cast.hh \ - i18n.h parallel_iter.hh safe_map.hh pch.hh current_exception.hh + parallel_iter.hh safe_map.hh pch.hh current_exception.hh NETXX_SOURCES = \ netxx/accept.cxx netxx/accept.h netxx/address.cxx \ ============================================================ --- adler32.hh 8d6d6a08448d05eec4c12e4ec3285b6945da6d70 +++ adler32.hh a1669df544fd3ccc233417b87b7bfaa447e63071 @@ -1,6 +1,3 @@ -#ifndef __ADLER32_HH__ -#define __ADLER32_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __ADLER32_HH__ +#define __ADLER32_HH__ + // this is a pseudo-adler32. it does not use a prime modulus. it is not // entirely clear that this matters; it is what rsync and xdelta both do // and it seems to work. ============================================================ --- annotate.hh 7b6a52deeb9922ad942ad150e5149b52b49f4581 +++ annotate.hh 1084654578762318227a750310ef3f143d894b12 @@ -1,6 +1,3 @@ -#ifndef __ANNOTATE_HH__ -#define __ANNOTATE_HH__ - // Copyright (C) 2005 Emile Snyder // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __ANNOTATE_HH__ +#define __ANNOTATE_HH__ + #include "vocab.hh" #include "rev_types.hh" ============================================================ --- app_state.hh d57aab1728315fb169a43e88ad7b213487b9e295 +++ app_state.hh 222d30fb282520d59946e1d4cb3e19846cc9e7fd @@ -1,6 +1,3 @@ -#ifndef __APP_STATE_HH__ -#define __APP_STATE_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __APP_STATE_HH__ +#define __APP_STATE_HH__ + #include #include ============================================================ --- asciik.cc 0829616d7ee850f5f9a4babc0c8ddb22fc458354 +++ asciik.cc cf946f9a14ad309615704bc960255c50e12b636a @@ -1,6 +1,6 @@ // Copyright (C) 2006 Nathaniel Smith -// Copyright (C) 2007 Lapo Luchini -// Copyright (C) 2007 Gabriele Dini Ciacci +// 2007 Lapo Luchini +// 2007 Gabriele Dini Ciacci // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- asciik.hh a7e9e877e516ed5f3140b4ba786bba789e000878 +++ asciik.hh 592aa966af256f50be9784bfd01c543f54d3447b @@ -1,3 +1,12 @@ +// Copyright (C) 2007 Lapo Luchini +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #ifndef __ASCIIK_HH__ #define __ASCIIK_HH__ ============================================================ --- audit-includes 1779cfc4a2dd88c53d5f48692cc88bdcb838b160 +++ audit-includes f7e39d48e8637517540e8aa6a3ba17e9ea115cae @@ -1,5 +1,15 @@ #! /bin/sh +# Copyright (C) 2007 Zack Weinberg +# +# This program is made available under the GNU GPL version 2.0 or +# greater. See the accompanying file COPYING for details. +# +# This program is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. +# Check all C++ source files to make sure they obey the header file rules. + egrep -H "$(printf '^[ \t]*#[ \t]*include\\>')" "$@" | sed -e "$(printf 's/:[ \t]*#[ \t]*include[ \t]*[<\"]/ /')" -e 's/[>"]$//' | { @@ -8,6 +18,7 @@ egrep -H "$(printf '^[ \t]*#[ \t]*includ late_base_hh="" shouldnt_base_hh="" shouldnt_config_h="" + shouldnt_gettext_h="" shouldnt_string="" shouldnt_iosfwd="" found_base_hh=f @@ -44,6 +55,10 @@ egrep -H "$(printf '^[ \t]*#[ \t]*includ if [ "$file" != "base.hh" ] then shouldnt_config_h="$shouldnt_config_h $file" fi;; + (gettext.h) + if [ "$file" != "base.hh" ] + then shouldnt_gettext_h="$shouldnt_gettext_h $file" + fi;; (string) if [ "$file" != "base.hh" ] then shouldnt_string="$shouldnt_string $file" @@ -80,6 +95,11 @@ egrep -H "$(printf '^[ \t]*#[ \t]*includ echo "$shouldnt_config_h" | tr -s ' ' | fmt | sed 's/^/ /' status=1 fi + if [ -n "$shouldnt_gettext_h" ]; then + echo "*** Unwanted #include \"gettext.h\":" + echo "$shouldnt_gettext_h" | tr -s ' ' | fmt | sed 's/^/ /' + status=1 + fi if [ -n "$shouldnt_string" ]; then echo "*** Unwanted #include :" echo "$shouldnt_string" | tr -s ' ' | fmt | sed 's/^/ /' ============================================================ --- automate.cc 84e58a92e4188b5b4159348a49c51f1f94fe6d6f +++ automate.cc e61d4525484552eb8eac7a56cc1270ab921e79a7 @@ -1,5 +1,5 @@ -// Copyright (C) 2004, 2007 Nathaniel Smith -// Copyright (C) 2007 - 2008 Stephen Leake +// Copyright (C) 2004 Nathaniel Smith +// 2007 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- base.hh 434649b6ff55a860d707807f78598ba068fa4da2 +++ base.hh 94d6fc3f52f45d06406072978a3dcfcb4b8b0612 @@ -1,6 +1,3 @@ -#ifndef __BASE_HH__ -#define __BASE_HH__ - // Copyright (C) 2007 Zack Weinberg // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __BASE_HH__ +#define __BASE_HH__ + // This file contains a small number of inclusions and declarations that // should be visible to the entire program. Include it first. @@ -61,6 +61,13 @@ template <> void dump(std::string const #define sqlite3_prepare_v2 sqlite3_prepare #endif +// i18n goo + +#include "gettext.h" + +#define _(str) gettext(str) +#define N_(str) gettext_noop(str) + #endif // __BASE_HH__ // Local Variables: ============================================================ --- basic_io.cc 42424cd28bea6ad3df841d4dfaa15811d8d0a32f +++ basic_io.cc 95ae5bc17a2c7140bfe13691036591b8975bcf41 @@ -1,5 +1,5 @@ -// Copyright (C) 2008 Stephen Leake // Copyright (C) 2004 Graydon Hoare +// 2008 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- basic_io.hh 641229e66202063897f00c2ac6b33d6a7786c5d8 +++ basic_io.hh df6d95570895d30d6143bbce4d31dd93687b0fd1 @@ -1,8 +1,5 @@ -#ifndef __BASIC_IO_HH__ -#define __BASIC_IO_HH__ - -// Copyright (C) 2008 Stephen Leake // Copyright (C) 2004 Graydon Hoare +// 2008 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. @@ -11,6 +8,8 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __BASIC_IO_HH__ +#define __BASIC_IO_HH__ #include "vector.hh" #include ============================================================ --- botan_pipe_cache.hh 105f9431f4633819be88d758ccff8281ce7bd6fa +++ botan_pipe_cache.hh 90361c58d131861f55560dcad3793ee756a50c7b @@ -1,6 +1,3 @@ -#ifndef __BOTAN_PIPE_CACHE_HH__ -#define __BOTAN_PIPE_CACHE_HH__ - // Copyright (C) 2008 Zack Weinberg // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __BOTAN_PIPE_CACHE_HH__ +#define __BOTAN_PIPE_CACHE_HH__ + #include #include ============================================================ --- cert.hh 3fa5adb025361516fac47866927c4f193337af8e +++ cert.hh e19095fd325166c38bcfcfb378f84f6dbbdf60e3 @@ -1,6 +1,3 @@ -#ifndef __CERT_HH__ -#define __CERT_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __CERT_HH__ +#define __CERT_HH__ + #include #include #include "vector.hh" ============================================================ --- char_classifiers.hh 203fa7aa9d0438bd11e88279fe2d2d67a0715991 +++ char_classifiers.hh 380ead182576526e2343bd873b19114770015979 @@ -1,6 +1,3 @@ -#ifndef __CHAR_CLASSIFIERS_HH__ -#define __CHAR_CLASSIFIERS_HH__ - // Copyright (C) 2004 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __CHAR_CLASSIFIERS_HH__ +#define __CHAR_CLASSIFIERS_HH__ + // We don't use the standard C macros because their results // may depend on the global locale, and we don't use the standard C++ // ctype facet (in classic() mode, of course) because, well, ============================================================ --- charset.hh fd5cac7b2f6866b0deee4843c6906617660926ab +++ charset.hh 0cb9234e49ef5ade2ed2a04e9c7f7f0fbcdf6a4a @@ -1,6 +1,3 @@ -#ifndef __CHARSET_HH__ -#define __CHARSET_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __CHARSET_HH__ +#define __CHARSET_HH__ + #include "vocab.hh" // Charset conversions. ============================================================ --- cleanup.hh c0af521b7aa0719eb3ca0d886af60d813ea6e3f5 +++ cleanup.hh 34bc7dde900a7f6d91534821886f91d1f9409409 @@ -1,6 +1,3 @@ -#ifndef __CLEANUP_HH__ -#define __CLEANUP_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __CLEANUP_HH__ +#define __CLEANUP_HH__ + // This is a little "auto-cleanup" container, used to ensure things // from our helper C libraries are deallocated when we leave a scope. ============================================================ --- cmd.cc b7bdef6d3e370a8647789c59a2de7b190c49205a +++ cmd.cc d05a3e8b9fff0b10340e90eb50a4cfcae5f7e1ca @@ -1,5 +1,5 @@ // Copyright (C) 2002 Graydon Hoare -// Copyright (C) 2007 Julio M. Merino Vidal +// 2007 Julio M. Merino Vidal // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- cmd.hh 0a877d515c8b959a010de89e5f7db7f6fabce05f +++ cmd.hh 24e116cf72a52ef0340a410faf79da7270570727 @@ -1,6 +1,3 @@ -#ifndef __CMD_HH__ -#define __CMD_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __CMD_HH__ +#define __CMD_HH__ + #include #include ============================================================ --- cmd_merging.cc 71f2dae2ca58490e8db2a81c22a777decfc75ded +++ cmd_merging.cc d87f80673f250737ffde253dcb1884da98c03f4b @@ -1,5 +1,5 @@ -// Copyright (C) 2008 Stephen Leake // Copyright (C) 2002 Graydon Hoare +// 2008 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- cmd_netsync.cc ccffd713e9f1139b29b9726fb5de936b2683a265 +++ cmd_netsync.cc 6fe2e56d33f4c4e6566bb4c993ae0ec3871a8365 @@ -1,3 +1,13 @@ +// Copyright (C) 2002 Graydon Hoare +// 2006 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #include "base.hh" #include "cmd.hh" ============================================================ --- commands.cc 2aabcae7ae24cd69dda86ecaabbf810c23c3d80c +++ commands.cc 36e4666430055a87eb0d71e709e21ac623489d90 @@ -1,5 +1,5 @@ // Copyright (C) 2002 Graydon Hoare -// Copyright (C) 2007 Julio M. Merino Vidal +// 2007 Julio M. Merino Vidal // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- commands.hh 0b39910ab77fbb722c4a0fada49f07a7e8c3cb21 +++ commands.hh 31506ab303271d2cde7f9070476439e2027c7480 @@ -1,6 +1,3 @@ -#ifndef __COMMANDS_HH__ -#define __COMMANDS_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __COMMANDS_HH__ +#define __COMMANDS_HH__ + #include "vector.hh" #include "options.hh" class app_state; ============================================================ --- configure.ac 83643deaab65b2216a8021d1c7c74ac202692860 +++ configure.ac 526a9af13ac143ef35c8579548280a71dc4eebdb @@ -1,4 +1,12 @@ -# -*- Autoconf -*- +# Copyright (C) 2003 Graydon Hoare +# +# This program is made available under the GNU GPL version 2.0 or +# greater. See the accompanying file COPYING for details. +# +# This program is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. + # Process this file with autoconf to produce a configure script. AC_PREREQ(2.58) ============================================================ --- constants.hh f74e771b8c51ca5bdd37c0dd383471794d6427b4 +++ constants.hh 6dfe4845835786d6579cd86635f76096a30169ad @@ -1,6 +1,3 @@ -#ifndef __CONSTANTS_HH__ -#define __CONSTANTS_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __CONSTANTS_HH__ +#define __CONSTANTS_HH__ + #include #include #include "numeric_vocab.hh" ============================================================ --- cset.hh 98c7724f0e0ef0da85d9c0f4a8efe1e12dffcdb0 +++ cset.hh 5a205be4ade4d652ad3a689a13f8a3fb86767d0d @@ -1,6 +1,3 @@ -#ifndef __CSET_HH__ -#define __CSET_HH__ - // Copyright (C) 2005 Nathaniel Smith // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __CSET_HH__ +#define __CSET_HH__ + #include #include "paths.hh" #include "rev_types.hh" ============================================================ --- cycle_detector.hh f84cdc9a8ffd6333c739ddfba03a709295126e31 +++ cycle_detector.hh f77b04f6c75c70dbb8e99265aa3d36d0f2f244af @@ -1,6 +1,3 @@ -#ifndef __CYCLE_DETECTOR_HH__ -#define __CYCLE_DETECTOR_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __CYCLE_DETECTOR_HH__ +#define __CYCLE_DETECTOR_HH__ + #include "vector.hh" #include #include ============================================================ --- database.hh 982dc2304b3e729f1f1b228f19769117b2015be1 +++ database.hh 3e4156e4f98fab98d384a0b3449c55dde501409e @@ -1,6 +1,3 @@ -#ifndef __DATABASE_HH__ -#define __DATABASE_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __DATABASE_HH__ +#define __DATABASE_HH__ + #include "vector.hh" #include #include ============================================================ --- diff_output.cc c41e41988dd3283841bf171f494280ba9b5066e2 +++ diff_output.cc 746af1eeaa7fee943bf1264dc88ddd6e218c7866 @@ -1,5 +1,5 @@ -// Copyright (C) 2008 Stephen Leake // Copyright (C) 2002 Graydon Hoare +// 2008 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- diff_output.hh 21d1cd2af12202cb14359483c7f85724f373786b +++ diff_output.hh 9125ccd0d0fa725782c9910b5f34e844048d2da8 @@ -1,8 +1,5 @@ -#ifndef __DIFF_PATCH_HH__ -#define __DIFF_PATCH_HH__ - -// Copyright (C) 2008 Stephen Leake // Copyright (C) 2002 Graydon Hoare +// 2008 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. @@ -11,6 +8,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __DIFF_PATCH_HH__ +#define __DIFF_PATCH_HH__ + // this file is to contain some stripped down, in-process implementations // of GNU-diffutils-like things (diff, diff3, maybe patch..) ============================================================ --- enumerator.hh 77463e904b18c2dbef84a776c6706f28be489ee9 +++ enumerator.hh 3c5c2ee377c33482e5442e9d59e8fdeb6facf182 @@ -1,6 +1,3 @@ -#ifndef __ENUMERATOR_H__ -#define __ENUMERATOR_H__ - // Copyright (C) 2005 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __ENUMERATOR_H__ +#define __ENUMERATOR_H__ + #include #include #include ============================================================ --- epoch.hh 41f84eceeebe1a75b49fc172119cb005f9b74589 +++ epoch.hh d5de5eeb6ae26fefda8a89d452492b9faaa32e0c @@ -1,6 +1,3 @@ -#ifndef __EPOCH_HH__ -#define __EPOCH_HH__ - // Copyright (C) 2005 Nathaniel Smith // // This program is made available under the GNU GPL version 2.0 or @@ -10,8 +7,10 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. -#include "vocab.hh" +#ifndef __EPOCH_HH__ +#define __EPOCH_HH__ +#include "vocab.hh" // epochs are pairs (branch name, random data) ============================================================ --- file_io.hh c5adaa89ea74db1d489c53a4ca3f60398beb848a +++ file_io.hh 653187d3891d5bdcfa979c55e48163ed451951b0 @@ -1,6 +1,3 @@ -#ifndef __FILE_IO_H__ -#define __FILE_IO_H__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,9 +7,11 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __FILE_IO_H__ +#define __FILE_IO_H__ + #include "vocab.hh" #include "paths.hh" -#include "sanity.hh" #include "platform-wrapped.hh" #include "vector.hh" @@ -47,10 +46,12 @@ bool directory_empty(any_path const & pa // returns true if there is a directory at 'path' with no files or sub-directories bool directory_empty(any_path const & path); - // returns true if the string content is binary according to monotone heuristic bool guess_binary(std::string const & s); +// creates and returns the name of a temporary file +bool monotone_mkstemp(std::string & tmpl); + void mkdir_p(any_path const & path); void make_dir_for(any_path const & p); ============================================================ --- globish.cc 457d8817b4b0541646c134406e3f537897dfad74 +++ globish.cc 338d0214a12f6adaf4bda966e495fefb91e3a054 @@ -1,5 +1,5 @@ // Copyright (C) 2005 Nathaniel Smith -// Copyright (C) 2007 Zack Weinberg +// 2007 Zack Weinberg // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- globish.hh 696c65bcf44f9a427e54d85b810bc8bfcfdfd1a0 +++ globish.hh 864db1e5341486754cbb90b73eca6e4e0886f1d6 @@ -1,6 +1,3 @@ -#ifndef __GLOBISH_HH__ -#define __GLOBISH_HH__ - // Copyright (C) 2005 Nathaniel Smith // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __GLOBISH_HH__ +#define __GLOBISH_HH__ + // a sort of glob-like pattern matcher, for use in specifying branch // collections for netsync. it is important that it not be too expensive to // match (as opposed to common regex engines, which can be exponential on ============================================================ --- graph.cc 262f4c91912223b9b33361736f46bd49c242069a +++ graph.cc 0e4930c4797e6f2b6c163b12e28a8d3876bedbec @@ -1,3 +1,12 @@ +// Copyright (C) 2006 Nathaniel Smith +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #include "base.hh" #include #include ============================================================ --- graph.hh 7322b6a5901450c65e3c965028e8fe7069294049 +++ graph.hh ab4c40bcdcde42949481cbc0e3c29ba66ab07a9c @@ -1,6 +1,3 @@ -#ifndef __GRAPH__HH__ -#define __GRAPH__HH__ - // Copyright (C) 2006 Nathaniel Smith // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __GRAPH__HH__ +#define __GRAPH__HH__ + // This file contains generic graph algorithms. They are split out from any // particular concrete graph (e.g., the revision graph, the delta storage // graphs) to easy re-use, and to make them easier to test on their own. We ============================================================ --- hash_map.hh 233406037b70b2cf47538d743409ca45a126978d +++ hash_map.hh 10db5cb434769d726d1f354c7ac19c8d102152b9 @@ -1,7 +1,15 @@ +// Copyright (C) 2005 Patrick Mauritz +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #ifndef __HASHMAP_HH #define __HASHMAP_HH - #include namespace hashmap { ============================================================ --- hmac.cc 7a9e2c99be224785b6563622ad08675ebb29ca6b +++ hmac.cc 210b2af20b968d079d6de149d4b15d5c86422d50 @@ -1,3 +1,12 @@ +// Copyright (C) 2005 Matt Johnston +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #include "base.hh" #include ============================================================ --- hmac.hh 441e7ef06ac15ebc11bf66ba5e53aa4b5d8ed35e +++ hmac.hh 0020d6ab642d66824a18260e160a05b45c13be7b @@ -1,7 +1,15 @@ +// Copyright (C) 2005 Matt Johnston +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #ifndef __HMAC_HH__ #define __HMAC_HH__ - #include #include "vocab.hh" @@ -28,9 +36,6 @@ private: std::string chain_val; }; - - - #endif // __HMAC_HH__ // Local Variables: ============================================================ --- hybrid_map.hh f0b044a619da06baacc4163f492c124f372886db +++ hybrid_map.hh 2baeadbc3fdfacec78d0a600da59151d6496ee4a @@ -1,7 +1,4 @@ -#ifndef __HYBRID_MAP_HH__ -#define __HYBRID_MAP_HH__ - -// Copyright 2007 Timothy Brownawell +// Copyright (C) 2007 Timothy Brownawell // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __HYBRID_MAP_HH__ +#define __HYBRID_MAP_HH__ + #include "sanity.hh" #include "hash_map.hh" #include ============================================================ --- inodeprint.hh ef0ced7b3dc4f2efee24c9a57102c1c4f1f09801 +++ inodeprint.hh 7def309187f69a62288c27063692f9f85d4cb848 @@ -1,6 +1,3 @@ -#ifndef __INODEPRINT_HH__ -#define __INODEPRINT_HH__ - // Copyright (C) 2005 Nathaniel Smith // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __INODEPRINT_HH__ +#define __INODEPRINT_HH__ + #include #include "vocab.hh" #include "quick_alloc.hh" ============================================================ --- interner.hh 79c7a7122d6bda80842c63fd6b56c0113a2274a8 +++ interner.hh c300647e6937a8a68f33fbbcd647e6fd9455a87f @@ -1,6 +1,3 @@ -#ifndef __INTERNER_HH__ -#define __INTERNER_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __INTERNER_HH__ +#define __INTERNER_HH__ + #include "vector.hh" #include "hash_map.hh" #include "sanity.hh" ============================================================ --- key_store.cc 133bf327bebd83b73820217c7d92cd12f9153464 +++ key_store.cc 8da2c21fdfb618f80c4e2296f587256da80e572a @@ -1,3 +1,12 @@ +// Copyright (C) 2005 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #include "base.hh" #include ============================================================ --- key_store.hh 6f3cac249a46421122b889945156357dfe0f57bf +++ key_store.hh cd49166162ff03e5c0bd7539e4fad65c6260ae7f @@ -1,3 +1,12 @@ +// Copyright (C) 2005 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #ifndef __KEY_STORE_H__ #define __KEY_STORE_H__ ============================================================ --- keys.hh e56b05f2449eebda62d3ae309354cd2103969623 +++ keys.hh 16ad63cbcd8fa67104f45e3765f587aed9a7f1f4 @@ -1,6 +1,3 @@ -#ifndef __KEYS_HH__ -#define __KEYS_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __KEYS_HH__ +#define __KEYS_HH__ + #include "vocab.hh" struct options; ============================================================ --- lcs.cc 9028826c5eecfb13b76bd9068276a29fdcfdc34e +++ lcs.cc f910a6d0679cc8ca110c9ee3d69e864ea5d63343 @@ -1,6 +1,13 @@ -/* +// Copyright (C) 2003 Graydon Hoare +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. - this is a pretty direct translation (with only vague understanding, +/* this is a pretty direct translation (with only vague understanding, unfortunately) of aubrey jaffer's most recent O(NP) edit-script calculation algorithm, which performs quite a bit better than myers, manber and miller's O(NP) simple edit *distance* algorithm. this one @@ -8,11 +15,8 @@ the following is jaffer's copyright and license statement. it probably still has some legal relevance here, as this is a highly derivative - work. if not, the portions of this file which are "mine" (if any exist) - are subject to copyright (C) 2003 graydon hoare, licensed to the public - under the GPL v2+. see the file COPYING for details. if you want to see - more of the original file jaffer's work came from, see the SLIB - repository on savannah.nongnu.org, his website at + work. if you want to see more of the original file jaffer's work came + from, see the SLIB repository on savannah.nongnu.org, his website at http://www.swiss.ai.mit.edu/~jaffer/, or look in the journal of computational biology. apparantly it's submitted for publication there too. ============================================================ --- lcs.hh 5f95696df0fc81dae682ad3a0e4bad7db2085dea +++ lcs.hh 11373d3b6fa6c8deba61b60e657d3b084d53400c @@ -1,6 +1,3 @@ -#ifndef __LCS_HH__ -#define __LCS_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __LCS_HH__ +#define __LCS_HH__ + #include #include "vector.hh" #include "quick_alloc.hh" ============================================================ --- legacy.hh 546d699913ccb3cafedf6dff50520ef38a5d6139 +++ legacy.hh 6758cc428dda77af648e712d572e0b6c764146b4 @@ -1,6 +1,3 @@ -#ifndef __LEGACY_HH__ -#define __LEGACY_HH__ - // Copyright (C) 2005 Nathaniel Smith // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __LEGACY_HH__ +#define __LEGACY_HH__ + // old code needed for reading legacy data (so we can then convert it) #include ============================================================ --- lexical_cast.hh 5c433b309da53278749b284173e71306e732ca72 +++ lexical_cast.hh fe70361a7da25ed93b4b46b266220fcfa29bf5c3 @@ -1,6 +1,3 @@ -#ifndef __LEXICAL_CAST_HH__ -#define __LEXICAL_CAST_HH__ - // Copyright (C) 2007 Timothy Brownawell // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,8 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __LEXICAL_CAST_HH__ +#define __LEXICAL_CAST_HH__ #include ============================================================ --- lru_writeback_cache.hh 55fb7845cd2c2f91fac2510a1492362fcb73d95a +++ lru_writeback_cache.hh d659c6cf2b06fb3ec5324e50c1448571a8676712 @@ -1,12 +1,16 @@ -/*************************************************************************** - * Originally copyright (C) 2004 by Patrick Audley * - * address@hidden * - * * - * Revised and copyright (C) 2006 by Nathaniel Smith * - * for the monotone project. * - * * - ***************************************************************************/ +// Copyright (C) 2004 Patrick Audley +// 2006 Nathaniel Smith +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. +#ifndef __LRU_WRITEBACK_CACHE_HH__ +#define __LRU_WRITEBACK_CACHE_HH__ + #include #include @@ -271,6 +275,7 @@ private: } }; +#endif // __LRU_WRITEBACK_CACHE_HH__ // Local Variables: // mode: C++ ============================================================ --- lua-testsuite.lua 60452657c3ea7dd8fd21e69928e739c666f90837 +++ lua-testsuite.lua e28a4e630a460bcca1a2d9023a2a898c1e77670a @@ -1,4 +1,11 @@ -#!./tester +-- Copyright (C) 2006 Timothy Brownawell +-- +-- This program is made available under the GNU GPL version 2.0 or +-- greater. See the accompanying file COPYING for details. +-- +-- This program is distributed WITHOUT ANY WARRANTY; without even the +-- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +-- PURPOSE. monotone_path = nil no_network_tests = false ============================================================ --- lua.cc c441838b543ce387a6267815bfbd298b3205edbf +++ lua.cc 753de9935cdaaf02658cf8f7b38d318563f145e9 @@ -1,5 +1,12 @@ +// Copyright (C) 2003 Graydon Hoare +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. - #include "base.hh" #include "lua.hh" ============================================================ --- lua.hh 75ff1e98f4674697157c8846b21d24b4245d084f +++ lua.hh 91180f986cbe192aa5d1fd9fd0146a1150b789cc @@ -1,3 +1,12 @@ +// Copyright (C) 2003 Graydon Hoare +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #ifndef __LUA_HH__ #define __LUA_HH__ ============================================================ --- lua_hooks.cc de82039ec490be9bbf93a10ee7da613b0397657c +++ lua_hooks.cc 69a6fc1c56a61871e90cf7a0c397e5b15a74051e @@ -1,5 +1,5 @@ -// Copyright (C) 2008 Stephen Leake // Copyright (C) 2002 Graydon Hoare +// 2008 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- lua_hooks.hh 95a7446409bedb4594e26a46a643da2ae7ce462a +++ lua_hooks.hh bd3e476d9506f29a4efd2751ea2b1fe3fff03617 @@ -1,8 +1,5 @@ -#ifndef __LUA_HOOKS_HH__ -#define __LUA_HOOKS_HH__ - -// Copyright (C) 2008 Stephen Leake // Copyright (C) 2002 Graydon Hoare +// 2008 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. @@ -11,6 +8,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __LUA_HOOKS_HH__ +#define __LUA_HOOKS_HH__ + // this file defines a typed C++ interface to the various hooks // we expose to the user as lua functions or variables ============================================================ --- luaext_globish.cc 3593ef67e795b1a0edcc9273a7d01ec90ba924e0 +++ luaext_globish.cc 470ed3d2b5443f902335346ae5d4afc4f0ef8ffa @@ -1,3 +1,12 @@ +// Copyright (C) 2006 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #include "base.hh" #include "lua.hh" #include "globish.hh" ============================================================ --- luaext_guess_binary.cc 6a44123a75956d5b4dc393fe82fda582bbc75a6b +++ luaext_guess_binary.cc 2bc668e174bf62b58c47a9bbba758362d12639d9 @@ -1,3 +1,11 @@ +// Copyright (C) 2006 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #include "base.hh" #include "lua.hh" ============================================================ --- luaext_mkstemp.cc 397937a9ccedd28e68af5728e093bb2e3edc671a +++ luaext_mkstemp.cc 5170df290e82446908b2aee9704d1e905df0d03c @@ -1,7 +1,15 @@ +// Copyright (C) 2006 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #include "base.hh" #include "lua.hh" -#include "mkstemp.hh" +#include "file_io.hh" #include #include ============================================================ --- luaext_parse_basic_io.cc 2506b458aea07c761714450dbc3127b6bdd61c7c +++ luaext_parse_basic_io.cc 995b37d3cc3eb58a3c6be6db06e38f997ba6845e @@ -1,3 +1,11 @@ +// Copyright (C) 2006 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #include "base.hh" #include "lua.hh" ============================================================ --- luaext_platform.cc fb98e039fbc2367e62e58faa4c5d1d309bc87d9f +++ luaext_platform.cc 16f1628b90d20a981fcf134de97bea86f89660f7 @@ -1,3 +1,12 @@ +// Copyright (C) 2006 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #include "base.hh" #include "lua.hh" ============================================================ --- m4/boost.m4 f8acc6b6b0859c9ffc31e5e7a37502bc8345176c +++ m4/boost.m4 90da17aab421082f379f262e9a76cbd772755a2d @@ -1,4 +1,11 @@ -dnl Grab-bag of checks related to boost. +# Copyright (C) 2006 Zack Weinberg +# +# This program is made available under the GNU GPL version 2.0 or +# greater. See the accompanying file COPYING for details. +# +# This program is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. # Check for suitably new version of boost. AC_DEFUN([BOOST_VERSION_CHECK], ============================================================ --- m4/inaddrnone.m4 52ce7862f2d1bbb566c2a97c0483439284fba51b +++ m4/inaddrnone.m4 25adf5ed7ee5ef9b9656ec93057b8a034beadb39 @@ -1,3 +1,12 @@ +# Copyright (C) 2003 Patrick Mauritz +# +# This program is made available under the GNU GPL version 2.0 or +# greater. See the accompanying file COPYING for details. +# +# This program is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. + AC_DEFUN([AC_HAVE_INADDR_NONE], [AC_CACHE_CHECK([whether INADDR_NONE is defined], ac_cv_have_inaddr_none, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ ============================================================ --- m4/library.m4 3455f28dcfb1dc60fd61229a471d885fd12ecdfe +++ m4/library.m4 1e10ad58fec9442d9e593a2d056f3e7e1f3f33f8 @@ -1,3 +1,12 @@ +# Copyright (C) 2008 Zack Weinberg +# +# This program is made available under the GNU GPL version 2.0 or +# greater. See the accompanying file COPYING for details. +# +# This program is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. + # Encapsulation of all the logic required to probe for monotone's # dependent libraries. ============================================================ --- m4/mtn-gettext.m4 5302bc5b6157c5f51110753755847e322ebe044d +++ m4/mtn-gettext.m4 499e1ab86a32d7fdc3b367e9219870b2b4d8ef8a @@ -1,3 +1,12 @@ +# Copyright (C) 2009 Zack Weinberg +# +# This program is made available under the GNU GPL version 2.0 or +# greater. See the accompanying file COPYING for details. +# +# This program is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. + # This is a custom set of probe macros for xgettext and the gettext # library (either in libc or as -lintl [-liconv]). The differences # from the standard version are as follows: ============================================================ --- m4/netxx.m4 ced01d921bec3fcc597022d7bc33428899cb9ad6 +++ m4/netxx.m4 c273b63b4c52e26cc9cc9fafd1690bf554cf5d3d @@ -1,3 +1,12 @@ +# Copyright (C) 2003 Graydon Hoare +# +# This program is made available under the GNU GPL version 2.0 or +# greater. See the accompanying file COPYING for details. +# +# This program is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. + # checks done primarily for the benefit of netxx # Check for IPv6. Let the user enable or disable it manually using a ============================================================ --- m4/numeric_vocab.m4 5276a2eacf683db1a894edae1d0053a6fe9a506c +++ m4/numeric_vocab.m4 ba2358bd856f2755a9857de56784fb99f6d0b336 @@ -1,4 +1,5 @@ dnl Copyright (C) 2007 Zack Weinberg +dnl dnl This program is made available under the GNU GPL version 2.0 or dnl greater. See the accompanying file COPYING for details. dnl ============================================================ --- m4/stlporthashmap.m4 076a81ff0bcc1dbde3063b0ba592755ba775ad78 +++ m4/stlporthashmap.m4 076e4ed9f4673ef214d667a410e421f8e40046f9 @@ -1,6 +1,6 @@ dnl dnl @synopsis AC_CXX_STLPORT_HASHMAP dnl -dnl tests for the presence of the gcc hashmap stl extension +dnl tests for the presence of the stlport hash_map extension dnl dnl @author Patrick Mauritz dnl @version 2005-07-18 ============================================================ --- m4/syncwithstdio.m4 b640642083693cb93252e4b36b614cc6137e506a +++ m4/syncwithstdio.m4 b4b592abcaaa6f661cb904eb606f9ca7800f30c8 @@ -1,3 +1,12 @@ +# Copyright (C) 2006 Zack Weinberg +# +# This program is made available under the GNU GPL version 2.0 or +# greater. See the accompanying file COPYING for details. +# +# This program is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. + # Check whether sync_with_stdio(false) run on C++ streams works correctly. # It causes strange problems (EOF returned too early) on some versions of # MinGW and OS X. The first test is for the MinGW issue, the second for ============================================================ --- m4/tempstatconst.m4 3308c6d6e531b6c6006783d044a30dd097b51c0d +++ m4/tempstatconst.m4 7738d43c8a0984a6258ecd64f8b44d650f20e2d6 @@ -1,3 +1,12 @@ +# Copyright (C) 2003 Graydon Hoare +# +# This program is made available under the GNU GPL version 2.0 or +# greater. See the accompanying file COPYING for details. +# +# This program is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. + # check for the obnoxious gcc 4.1.[01] template static data bug # (see http://gcc.gnu.org/PR28016) AC_DEFUN([AC_CXX_TEMPLATE_STATIC_CONST_BUG], ============================================================ --- m4/typeof.m4 e8cbaca79b7dfa1a2883609e8fa59cc783feef0c +++ m4/typeof.m4 7803b50641603ae60ebd2b61bfcbce47ba130274 @@ -1,6 +1,6 @@ -dnl @synopsis AC_CXX_GNUCXX_HASHMAP +dnl @synopsis AC_CXX_TYPEOF dnl -dnl tests for the presence of the gcc hashmap stl extension +dnl tests for the presence of the gcc typeof() extension dnl dnl @author Patrick Mauritz dnl @version 2005-08-15 ============================================================ --- merge_3way.cc 19276380b5c046f910583ffbd86b77bc8f584320 +++ merge_3way.cc 569fce0fc1a72f06b9a7266b69ea4b3e12e70432 @@ -1,5 +1,5 @@ -// Copyright (C) 2008 Stephen Leake // Copyright (C) 2002 Graydon Hoare +// 2008 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- merge_conflict.cc a7606edae350ba90e0071e11ac1bab5f7ac85558 +++ merge_conflict.cc b9162a1e2c3929ca16501bdfad57522f4616195a @@ -1,5 +1,5 @@ -// Copyright (C) 2008 Stephen Leake // Copyright (C) 2005 Nathaniel Smith +// 2008 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- merge_content.cc 678fec71c1a640e4c91ac0c601fccda6d90a358f +++ merge_content.cc 06f264a5ff0b3b6360efdb930d91f0a1f0b5af76 @@ -1,5 +1,5 @@ -// Copyright (C) 2008 Stephen Leake // Copyright (C) 2008 Nathaniel Smith +// 2008 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- merge_content.hh b696d83e6c528c5896a3beaeabfaee877ff3ed37 +++ merge_content.hh c3dc50ac9bad4488b4583c84551f3c6302763a64 @@ -1,8 +1,5 @@ -#ifndef __MERGE_HH__ -#define __MERGE_HH__ - -// Copyright (C) 2008 Stephen Leake // Copyright (C) 2005 Nathaniel Smith +// 2008 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. @@ -11,6 +8,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __MERGE_HH__ +#define __MERGE_HH__ + #include "vocab.hh" #include "rev_types.hh" ============================================================ --- merge_roster.cc d49c1f097a8944d42887bf8d7385e32979c77335 +++ merge_roster.cc 11dbe612fdb5f76eb10de88b07057c6f7e98b9dc @@ -1,5 +1,5 @@ // Copyright (C) 2008 Stephen Leake -// Copyright (C) 2005 Nathaniel Smith +// 2005 Nathaniel Smith // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- merge_roster.hh 8306856b153df6d6d927be60453d5a74f3fc4788 +++ merge_roster.hh 33e71d22ef810554cfc133c69c5e65ee37031e9f @@ -1,8 +1,5 @@ -#ifndef __ROSTER_MERGE_HH__ -#define __ROSTER_MERGE_HH__ - -// Copyright (C) 2008 Stephen Leake // Copyright (C) 2005 Nathaniel Smith +// 2008 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. @@ -11,6 +8,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __ROSTER_MERGE_HH__ +#define __ROSTER_MERGE_HH__ + #include #include "rev_types.hh" ============================================================ --- merkle_tree.hh f8559915480b7fdf77424a8664b27df4f868843a +++ merkle_tree.hh 7ae6a892d28c901e06986c03c90b54a9acf5102d @@ -1,6 +1,3 @@ -#ifndef __MERKLE_TREE_HH__ -#define __MERKLE_TREE_HH__ - // Copyright (C) 2004 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __MERKLE_TREE_HH__ +#define __MERKLE_TREE_HH__ + #include #include ============================================================ --- migration.hh fa3fa48452af3ae8a04b67672d56ab687c79e116 +++ migration.hh a69a8f22bc9fad780e35cd11c2594425de198f49 @@ -1,6 +1,3 @@ -#ifndef __MIGRATION__ -#define __MIGRATION__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,8 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __MIGRATION_HH__ +#define __MIGRATION_HH__ // this file knows how to migrate schema databases. the general strategy is // to hash each schema we ever use, and make a list of the SQL commands ============================================================ --- mkstemp.cc 22bb6303b6a7f3f2394490a6dab856f74b9de069 +++ mkstemp.cc 450d3f028d322b58cde8e1369ebe78061faecc20 @@ -1,10 +1,16 @@ -// this file is partially cribbed from gfileutils.c in glib, which is -// copyright (c) 2000 Red Hat. It was released as LGPL version 2.0 or -// greater, so I have copied some of its text into this file and am -// relicensing my derivative work (this file): -// copyright (C) 2004 graydon hoare, as LGPL version 2.0 or greater also. -// revised, copyright (C) 2009 zack weinberg +// Copyright (C) 2000 Red Hat, Inc. +// 2004 Graydon Hoare +// 2009 Zack Weinberg // +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + +// this code was originally based on part of gfileutils.cc in glib. +// // this is a portable implementation of mkstemp, which is not available on // all systems and not always correctly implemented even when available. // @@ -44,7 +50,7 @@ // and it can be extremely poor quality (RANDU, anyone?) #include "base.hh" -#include "mkstemp.hh" +#include "file_io.hh" #include "numeric_vocab.hh" #include ============================================================ --- monotone.cc d8084957ee90b91e4f55f224775ee2656c91e878 +++ monotone.cc 4c3b7c12860268b0b01e39faeab5f95cbbe300b8 @@ -19,7 +19,6 @@ #include #include -#include "i18n.h" #include "app_state.hh" #include "botan_pipe_cache.hh" #include "commands.hh" @@ -34,7 +33,6 @@ #include "platform.hh" #include "work.hh" - using std::cout; using std::cerr; using std::string; ============================================================ --- mt_version.cc 36443b123dbb3ebcba952fd46540efc64c022330 +++ mt_version.cc e73c0a25e76ba110976a4a0b94f39f5295c1dd75 @@ -28,8 +28,6 @@ #include "lua.hh" #include "platform.hh" #include "mt_version.hh" -#include "package_revision.h" -#include "package_full_revision.h" #include "sanity.hh" using std::cout; ============================================================ --- mt_version.hh 0b4b309b696507036d823d955c517731768f2924 +++ mt_version.hh 369db9625091082898262e4aba0268d740fdf732 @@ -1,6 +1,3 @@ -#ifndef __MT_VERSION_HH__ -#define __MT_VERSION_HH__ - // Copyright (C) 2004 Nathaniel Smith // // This program is made available under the GNU GPL version 2.0 or @@ -10,12 +7,17 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __MT_VERSION_HH__ +#define __MT_VERSION_HH__ void get_version(std::string & out); void print_version(); void get_full_version(std::string & out); void print_full_version(); +extern char const package_revision_constant[]; +extern char const package_full_revision_constant[]; + #endif // Local Variables: ============================================================ --- mtn-sanity.cc fdd728e6175f5df8721e21cee035832501d2072f +++ mtn-sanity.cc d6b11b878814b0a40a4dd0ae4e0f666566a1d8aa @@ -1,3 +1,12 @@ +// Copyright (C) 2006 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #include "base.hh" #include "mtn-sanity.hh" #include "ui.hh" ============================================================ --- mtn-sanity.hh b59ba9e27f19fff9944a7f8e8a363bb3ecbad1a0 +++ mtn-sanity.hh 4703095d226cf4f77a1d5ac4c1142963f193bcad @@ -1,3 +1,12 @@ +// Copyright (C) 2006 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #ifndef __MTN_SANITY_HH__ #define __MTN_SANITY_HH__ ============================================================ --- netcmd.hh 4c4322e0f4dafdddee2e239daf0adfa6f6439883 +++ netcmd.hh 9fd97280633714008862a4a261403461d335fed5 @@ -1,6 +1,3 @@ -#ifndef __NETCMD_HH__ -#define __NETCMD_HH__ - // Copyright (C) 2004 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __NETCMD_HH__ +#define __NETCMD_HH__ + #include "vector.hh" #include #include ============================================================ --- netio.hh 60010c88056bdc63b4730146d293f5ed6ea6e015 +++ netio.hh 34259951595744b5948e66a2b7e00a2de34e2877 @@ -1,6 +1,3 @@ -#ifndef __NETIO_HH__ -#define __NETIO_HH__ - // Copyright (C) 2004 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __NETIO_HH__ +#define __NETIO_HH__ + // all network i/o decoding and encoding in netcmd and merkle is done using // the primitives in this header. it has to be very correct. ============================================================ --- netsync.cc 64e1b397594ff5f6e0f4f2680ba66ce6fe9ffd97 +++ netsync.cc ecd3ca4123c4fdeaad74b808975209224fda1c00 @@ -1,5 +1,5 @@ -// Copyright (C) 2008 Stephen Leake // Copyright (C) 2004 Graydon Hoare +// 2008 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- netxx_pipe.hh 5ef141781ad2d0cae7e89725f5ac2a24c41dc3fd +++ netxx_pipe.hh a94beacf372f3012d6294088d7363ca06f214fc7 @@ -1,6 +1,3 @@ -#ifndef __NETXX_PIPE_HH__ -#define __NETXX_PIPE_HH__ - // Copyright (C) 2005 Christof Petig // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __NETXX_PIPE_HH__ +#define __NETXX_PIPE_HH__ + #include "vector.hh" #include #include ============================================================ --- numeric_vocab.hh 7bcabd35993b2dd6be4ee0d0c87c8384d684e4fb +++ numeric_vocab.hh 857d25e240304dd485efc94ada24a1774eaf78d2 @@ -1,6 +1,3 @@ -#ifndef __NUMERIC_VOCAB__ -#define __NUMERIC_VOCAB__ - // Copyright (C) 2004 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __NUMERIC_VOCAB__ +#define __NUMERIC_VOCAB__ + #include #include // Some architectures need this for CHAR_BIT // The lack of this was reported as bug #19984 ============================================================ --- option.cc 9d72465dc3f8c0031532fb3d54d19203266ec4db +++ option.cc 97d9423e3b676464b075d7309e045bcd8391c9fb @@ -1,5 +1,11 @@ -// Copyright 2006 Timothy Brownawell -// This is made available under the GNU GPL v2 or later. +// Copyright (C) 2006 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #include "base.hh" #include "file_io.hh" ============================================================ --- option.hh 322a377f8548a2e84a5fba54671042785d134d4e +++ option.hh e0dfcbf481d579f5602aea5203f49bd4836d715f @@ -1,5 +1,11 @@ -// Copyright 2006 Timothy Brownawell -// This is made available under the GNU GPL v2 or later. +// Copyright (C) 2006 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #ifndef __OPTION_HH__ #define __OPTION_HH__ ============================================================ --- options.cc 4ed21148936a06b55250339de690f8eff5d8f0b7 +++ options.cc 7a2689cbb0597dced4933dce0464157c52cbefe1 @@ -1,5 +1,11 @@ -// Copyright 2006 Timothy Brownawell -// This is made available under the GNU GPL v2 or later. +// Copyright (C) 2006 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #include "base.hh" #include ============================================================ --- options.hh 902b5dbb47ef7dc707ebce9e531eab4515dd71bc +++ options.hh 8af2d2fa88a70d3f8cec1331fb8e5823adc74849 @@ -1,5 +1,11 @@ -// Copyright 2006 Timothy Brownawell -// This is made available under the GNU GPL v2 or later. +// Copyright (C) 2006 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #ifndef __OPTIONS_HH__ #define __OPTIONS_HH__ ============================================================ --- options_list.hh 7b7947d1f69b84b0639593b5534f4ace6075691e +++ options_list.hh 49add23d26b58781c71b9de4e3a2258e1fc5866c @@ -1,6 +1,12 @@ -// Copyright 2008 Stephen Leake -// Copyright 2006 Timothy Brownawell -// This is made available under the GNU GPL v2 or later. +// Copyright (C) 2006 Timothy Brownawell +// 2008 Stephen Leake +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. /* * This is a list of all options that monotone can take, what variables ============================================================ --- origin_type.hh 0d9f9f4e1e169b15eaa5c5081cd8059ad6d9a429 +++ origin_type.hh 0e329b2b10d081f52a8346044a6522a9fdc68552 @@ -1,3 +1,12 @@ +// Copyright (C) 2009 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #ifndef __ORIGIN_TYPE_HH__ #define __ORIGIN_TYPE_HH__ ============================================================ --- outdated_indicator.cc 1d3ec59ddbb2339b573c1a316b52ba659b2242b5 +++ outdated_indicator.cc ba676108726aaf7eba3b7e7e357165696e15a599 @@ -1,5 +1,11 @@ -// 2007 Timothy Brownawell -// GNU GPL V2 or later +// Copyright (C) 2007 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #include "base.hh" #include "outdated_indicator.hh" ============================================================ --- outdated_indicator.hh 25f60524f7478a08a9de6fdc90ae395cdf185b51 +++ outdated_indicator.hh 8f8a6bd36595e3c846be40ad59f550983a00f2a0 @@ -1,9 +1,15 @@ +// Copyright (C) 2007 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #ifndef __OUTDATED_NOTIFIER_HH__ #define __OUTDATED_NOTIFIER_HH__ -// 2007 Timothy Brownawell -// GNU GPL V2 or later - // Allow clients to find out when something changes. // The 'something' has an outdated_indicator_factory, // and calls note_change() when changes are made. ============================================================ --- packet.hh 57a749c4a9ef6e4de431d4ad2bdf00ce6e702398 +++ packet.hh c2de8fab34088703def8bdd9d33ef544bc68e585 @@ -1,6 +1,3 @@ -#ifndef __PACKET_HH__ -#define __PACKET_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __PACKET_HH__ +#define __PACKET_HH__ + #include "vocab.hh" struct cert; ============================================================ --- parallel_iter.hh 7f91744f6a12f274696bfa8bde1cb968691f2611 +++ parallel_iter.hh 4901d0d1b3daece3f0b292c4343de8634814522e @@ -1,6 +1,3 @@ -#ifndef __PARALLEL_ITER_HH__ -#define __PARALLEL_ITER_HH__ - // Copyright (C) 2005 Nathaniel Smith // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __PARALLEL_ITER_HH__ +#define __PARALLEL_ITER_HH__ + // An ugly, but handy, little helper class for doing parallel iteration // over maps. // Usage: ============================================================ --- paths.cc f85b26f7c5a535d259b4f65d75335619d9e20972 +++ paths.cc 30a2058671b87385d855d97cd20705f91870b777 @@ -1,5 +1,5 @@ -// Copyright (C) 2008 Stephen Leake // Copyright (C) 2005 Nathaniel Smith +// 2008 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- paths.hh bc8dc8fb4bd0f32aec0a93fe34df74d47384938a +++ paths.hh cbd3ac7810f4fd8c528bcb5f87549d9d0e358d0a @@ -1,8 +1,5 @@ -#ifndef __PATHS_HH__ -#define __PATHS_HH__ - -// Copyright (C) 2008 Stephen Leake // Copyright (C) 2005 Nathaniel Smith +// 2008 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. @@ -11,6 +8,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __PATHS_HH__ +#define __PATHS_HH__ + // safe, portable, fast, simple path handling -- in that order. // but they all count. // ============================================================ --- platform-wrapped.hh 9b6adf61ff8908b94f5f6059b9f071fc39e0d5d8 +++ platform-wrapped.hh 52b85ed314d2f3dd0aef3619809d0abf9a900659 @@ -1,3 +1,12 @@ +// Copyright (C) 2006 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #ifndef __PLATFORM_WRAPPED_HH__ #define __PLATFORM_WRAPPED_HH__ ============================================================ --- platform.hh c50e7babf7716b238c7b8074f5339bfcaab67fff +++ platform.hh 88ead5a98aeec122e00284198ad381d67cd2b75c @@ -1,6 +1,3 @@ -#ifndef __PLATFORM_HH__ -#define __PLATFORM_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __PLATFORM_HH__ +#define __PLATFORM_HH__ + // this describes functions to be found, alternatively, in win32/* or unix/* // directories. ============================================================ --- project.cc 7614711c10af1c725062f1570b2a6f4834439197 +++ project.cc 86618b33d4154fb81225a6fb34480ebf63c1d220 @@ -1,5 +1,11 @@ -// 2007 Timothy Brownawell -// GNU GPL V2 or later +// Copyright (C) 2007 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #include "base.hh" #include "vector.hh" ============================================================ --- project.hh fa2e22f7fbea8b83797aa7c855baa3940d001d39 +++ project.hh 2ae5e78f9d9aaa989ff53b50565960a39cb9f1b2 @@ -1,5 +1,11 @@ -// 2007 Timothy Brownawell -// GNU GPL V2 or later +// Copyright (C) 2007 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #ifndef __PROJECT_HH__ #define __PROJECT_HH__ ============================================================ --- randomfile.hh 6cb73ec10f057f704eb11fffe93795882109e54c +++ randomfile.hh 7494c47918a029148554462f981058525623a590 @@ -1,6 +1,3 @@ -#ifndef __RANDOMFILE_HH__ -#define __RANDOMFILE_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __RANDOMFILE_HH__ +#define __RANDOMFILE_HH__ + #include "vector.hh" #include "lexical_cast.hh" ============================================================ --- randomizer.hh 490f09880887f76baf40a00ead66f13cb107078c +++ randomizer.hh 136779fca474229e2f6d735caf1afec0acd2b100 @@ -1,6 +1,3 @@ -#ifndef __RANDOMIZER_HH__ -#define __RANDOMIZER_HH__ - // Copyright (C) 2006 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __RANDOMIZER_HH__ +#define __RANDOMIZER_HH__ + // This is just a set of utility methods built on top of boost::random. // // Our purpose is to create a global randomization utility for unit ============================================================ --- rcs_file.hh fa865ade41a0d7f42cc2969d1ad170093b71917a +++ rcs_file.hh 23731152c2a5ac9eb8b6573eec50cd00a8522f54 @@ -1,6 +1,3 @@ -#ifndef __RCS_FILE_HH__ -#define __RCS_FILE_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __RCS_FILE_HH__ +#define __RCS_FILE_HH__ + #include "vector.hh" #include #include ============================================================ --- rcs_import.hh 4d945c0abf3da05913328433420a83cf240173a3 +++ rcs_import.hh 4bd96c41b141f2506a955380933c29904985aa88 @@ -1,6 +1,3 @@ -#ifndef __RCS_IMPORT_HH__ -#define __RCS_IMPORT_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __RCS_IMPORT_HH__ +#define __RCS_IMPORT_HH__ + class system_path; class database; class key_store; ============================================================ --- refiner.hh ec6282db69b98f2c748d00536c281680275b31ec +++ refiner.hh 76a2230251b87e779d7a938ae9e6982fe69ab105 @@ -1,6 +1,3 @@ -#ifndef __REFINER_HH__ -#define __REFINER_HH__ - // Copyright (C) 2005 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __REFINER_HH__ +#define __REFINER_HH__ + #include #include "vocab.hh" ============================================================ --- restrictions.hh a733872f76708daa50374e273a6ef3a5909e4ef3 +++ restrictions.hh 1e0d83de80fd4e610d69d59bd3eba76704a25cd9 @@ -1,6 +1,3 @@ -#ifndef __RESTRICTIONS_HH__ -#define __RESTRICTIONS_HH__ - // Copyright (C) 2005 Derek Scherger // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __RESTRICTIONS_HH__ +#define __RESTRICTIONS_HH__ + // the following commands accept file arguments and --exclude and --depth // options used to define a restriction on the files that will be processed: // ============================================================ --- rev_height.hh 6b528fe9d4944ba8758676e320e658ae945eeed9 +++ rev_height.hh ed34c24a20b18966c380ec8e58b4b8667fb1b7c3 @@ -1,6 +1,3 @@ -#ifndef __REV_HEIGHT_HH_ -#define __REV_HEIGHT_HH_ - // Copyright (C) 2006 Thomas Moschny // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __REV_HEIGHT_HH_ +#define __REV_HEIGHT_HH_ + #include "numeric_vocab.hh" class rev_height ============================================================ --- revision.hh a9037068bbbb814b1043de6f0b55eed977d3b82e +++ revision.hh 75bac531320de250cc7d0660762c3b01e04147dd @@ -1,6 +1,3 @@ -#ifndef __REVISION_HH__ -#define __REVISION_HH__ - // Copyright (C) 2004 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __REVISION_HH__ +#define __REVISION_HH__ + #include #include "vector.hh" #include "rev_types.hh" ============================================================ --- roster.cc 12f996cf49a33446ecd7b6aba1d7812242c4ace9 +++ roster.cc bfae685e1a37e6fe09184d44e82e307e633fdaa5 @@ -1,5 +1,5 @@ -// Copyright (C) 2008 Stephen Leake // Copyright (C) 2005 Nathaniel Smith +// 2008 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- roster.hh b4257701116cab6db535932efe5893ffb042396f +++ roster.hh cff9707c9498e8f3fd61ad45b80473cc4444ce06 @@ -1,8 +1,5 @@ -#ifndef __ROSTER_HH__ -#define __ROSTER_HH__ - -// Copyright (C) 2008 Stephen Leake // Copyright (C) 2005 Nathaniel Smith +// 2008 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. @@ -11,6 +8,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __ROSTER_HH__ +#define __ROSTER_HH__ + #include "hybrid_map.hh" #include "paths.hh" #include "rev_types.hh" ============================================================ --- roster_delta.hh bfa92f4bb32c3c2f6d6cfcb56c453bdbbe1fecea +++ roster_delta.hh 8a78d49fa1d7b16ef457cf04367e97d052d1afcb @@ -1,5 +1,3 @@ -#ifndef __ROSTER_DELTA_HH__ - // Copyright (C) 2006 Nathaniel Smith // // This program is made available under the GNU GPL version 2.0 or @@ -9,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __ROSTER_DELTA_HH__ +#define __ROSTER_DELTA_HH__ + // This file contains "diff"/"patch" code that operates directly on rosters // (with their associated markings). ============================================================ --- roster_tests.hh cee3c68e3a02ab972c4ff031946154342ef88b22 +++ roster_tests.hh 71c596a21bd5878e1588f6f580019e26deb6b634 @@ -1,8 +1,5 @@ -#ifndef __ROSTER_TESTS_HH__ -#define __ROSTER_TESTS_HH__ - -// Copyright (C) 2008 Stephen Leake // Copyright (C) 2005 Nathaniel Smith +// 2008 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. @@ -11,6 +8,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __ROSTER_TESTS_HH__ +#define __ROSTER_TESTS_HH__ + // Interfaces among roster.cc, merge_roster.cc, and roster_delta.cc // used exclusively for testing. ============================================================ --- safe_map.hh f07247d537c7872cbddd5a085b0f5ada242f0f5b +++ safe_map.hh 72cfed654bd458c527b1abef1a691ab3f9ebfb4b @@ -1,6 +1,3 @@ -#ifndef __SAFE_MAP_HH__ -#define __SAFE_MAP_HH__ - // Copyright (C) 2005 Nathaniel Smith // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __SAFE_MAP_HH__ +#define __SAFE_MAP_HH__ + // some helpers to safely use maps #include "sanity.hh" ============================================================ --- sanity.hh ce0c494f5f8a1c27bc93386dfe46d8f65ee18f6b +++ sanity.hh c0f57fa10025bd057f6d0992483d5de05f075ea1 @@ -1,6 +1,3 @@ -#ifndef __SANITY_HH__ -#define __SANITY_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,13 +7,15 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __SANITY_HH__ +#define __SANITY_HH__ + #include #include #include #include "boost/current_function.hpp" -#include "i18n.h" #include "numeric_vocab.hh" #include "origin_type.hh" @@ -483,6 +482,8 @@ dump(T const & t, char const *var, #define DUMP(foo) dump(foo, #foo, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION) +extern void localize_monotone(); + #endif // __SANITY_HH__ // Local Variables: ============================================================ --- schema.sql dc3656ef5ebccb830fef27df2fdf2d482eda5bff +++ schema.sql b933498af43c8221933f2afaa6b2b9c6a527c6e0 @@ -1,3 +1,11 @@ +-- Copyright (C) 2002 Graydon Hoare +-- +-- This program is made available under the GNU GPL version 2.0 or +-- greater. See the accompanying file COPYING for details. +-- +-- This program is distributed WITHOUT ANY WARRANTY; without even the +-- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +-- PURPOSE. -- schema for the sql database. this file is converted into -- a string constant, as the symbol: @@ -7,12 +15,6 @@ -- and emitted as schema.h at compile time. it is used by -- database.cc when initializing a fresh sqlite db. - --- copyright (C) 2002, 2003, 2004 graydon hoare --- all rights reserved. --- licensed to the public under the terms of the GNU GPL 2.1+ --- see the file COPYING for details - PRAGMA page_size=8192; -- Transactions avoid syncing for each action, db init gets faster. ============================================================ --- selectors.hh 7a2e92f0e1c1a1b05fc3c0c00ea2dc2b9059ebe2 +++ selectors.hh 43c5060c6c0d55fe8e57e8f07e1a71dc0d99bbc6 @@ -1,6 +1,3 @@ -#ifndef __SELECTORS_HH__ -#define __SELECTORS_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __SELECTORS_HH__ +#define __SELECTORS_HH__ + #include "vocab.hh" #include ============================================================ --- simplestring_xform.cc 506008109458c58abc016f9546384db4ed61650e +++ simplestring_xform.cc 9f72024cbeb2a7df393faae3e8b13b392fcd9300 @@ -1,3 +1,12 @@ +// Copyright (C) 2006 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #include "base.hh" #include "simplestring_xform.hh" #include "sanity.hh" ============================================================ --- simplestring_xform.hh d732cfc308a8910807ad9350ba6d7c293219ab18 +++ simplestring_xform.hh 5a6e7a65e2564f2a01321844a1ff6d98e6f58646 @@ -1,3 +1,12 @@ +// Copyright (C) 2006 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #ifndef __SIMPLESTRING_XFORM_HH__ #define __SIMPLESTRING_XFORM_HH__ ============================================================ --- std_hooks.lua 4416ae18e8a820e013fc08d1019443fe3eb67d4c +++ std_hooks.lua 47f92f3269c99464106e72b9f3839027c3eacce1 @@ -1,3 +1,11 @@ +-- Copyright (C) 2003 Graydon Hoare +-- +-- This program is made available under the GNU GPL version 2.0 or +-- greater. See the accompanying file COPYING for details. +-- +-- This program is distributed WITHOUT ANY WARRANTY; without even the +-- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +-- PURPOSE. -- this is the standard set of lua hooks for monotone; -- user-provided files can override it or add to it. ============================================================ --- string_queue.hh d2184fccefabdb4ac69d5616bf13fc21ada15408 +++ string_queue.hh 5053a58d5e02d505c19a02b2101dc5876d5bfbaa @@ -1,6 +1,3 @@ -#ifndef __STRING_QUEUE_HH__ -#define __STRING_QUEUE_HH__ - // Copyright (C) 2005 Eric Anderson // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __STRING_QUEUE_HH__ +#define __STRING_QUEUE_HH__ + #include #include ============================================================ --- tester-plaf.hh e9e164562a9022398b417351dab5a8662237ff15 +++ tester-plaf.hh 7492ac48c14abb8f61f57175fb31a78666bee01d @@ -1,6 +1,3 @@ -#ifndef __TESTER_PLAF_HH__ -#define __TESTER_PLAF_HH__ - // Copyright (C) 2007 Zack Weinberg // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __TESTER_PLAF_HH__ +#define __TESTER_PLAF_HH__ + // this describes functions to be found, alternatively, in win32/* or unix/* // directories and used only by the tester. ============================================================ --- tester-tests/cleanup-1/__driver__.lua 146d477bf5223d9963adc2f0fcaf47916f5326e6 +++ tester-tests/cleanup-1/__driver__.lua a4ec393e0de28565938fbd353c8b3f7dbe0444ac @@ -1,3 +1,12 @@ +-- Copyright (C) 2006 Timothy Brownawell +-- +-- This program is made available under the GNU GPL version 2.0 or +-- greater. See the accompanying file COPYING for details. +-- +-- This program is distributed WITHOUT ANY WARRANTY; without even the +-- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +-- PURPOSE. + -- no state whatsoever is inherited across tests -- (see cleanup-2 for the other half of this test) ============================================================ --- tester-tests/cleanup-2/__driver__.lua 652dbe860039c60ddc896417c02508f4d7488ff9 +++ tester-tests/cleanup-2/__driver__.lua 4a9e5b8b5c0002e6c42502fb020969653981e499 @@ -1,3 +1,12 @@ +-- Copyright (C) 2006 Timothy Brownawell +-- +-- This program is made available under the GNU GPL version 2.0 or +-- greater. See the accompanying file COPYING for details. +-- +-- This program is distributed WITHOUT ANY WARRANTY; without even the +-- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +-- PURPOSE. + -- the variables set by cleanup-1 should not have survived to this point check(t_ran == nil) check(cleanup_ran == nil) ============================================================ --- tester-tests/isolated-1/__driver__.lua e617f484d767b12ba5b160f0e47b2ef381668eb9 +++ tester-tests/isolated-1/__driver__.lua a5f58c9e8310c48c73c26b8fd62fe1c91ed50463 @@ -1,3 +1,11 @@ +-- Copyright (C) 2006 Timothy Brownawell +-- +-- This program is made available under the GNU GPL version 2.0 or +-- greater. See the accompanying file COPYING for details. +-- +-- This program is distributed WITHOUT ANY WARRANTY; without even the +-- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +-- PURPOSE. -- functions can be redefined foo = "bar" ============================================================ --- tester-tests/isolated-2/__driver__.lua aa6bd61b18da39a7114da0a676821473c6733b8c +++ tester-tests/isolated-2/__driver__.lua d8ebd6ac783e3d626200af77064894fd7e4d7d70 @@ -1,3 +1,11 @@ +-- Copyright (C) 2006 Timothy Brownawell +-- +-- This program is made available under the GNU GPL version 2.0 or +-- greater. See the accompanying file COPYING for details. +-- +-- This program is distributed WITHOUT ANY WARRANTY; without even the +-- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +-- PURPOSE. -- part 2: ...check that those globals have been reset check(foo == nil) ============================================================ --- tester-tests/remove-unwriteable/__driver__.lua b6d27451748345a7920bbaec2f092cac04ec6260 +++ tester-tests/remove-unwriteable/__driver__.lua 38a996b7a32d72fb1be00caf1b9c0b945870c9f9 @@ -1,3 +1,11 @@ +-- Copyright (C) 2006 Timothy Brownawell +-- +-- This program is made available under the GNU GPL version 2.0 or +-- greater. See the accompanying file COPYING for details. +-- +-- This program is distributed WITHOUT ANY WARRANTY; without even the +-- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +-- PURPOSE. skip_if(not existsonpath("chmod")) ============================================================ --- tester-testsuite.lua befdacc2d9be5065780fd668bd242e01ed25d793 +++ tester-testsuite.lua d7c9755ba1838680e15f237a00de1b50ca01693c @@ -1,2 +1,11 @@ +-- Copyright (C) 2006 Timothy Brownawell +-- +-- This program is made available under the GNU GPL version 2.0 or +-- greater. See the accompanying file COPYING for details. +-- +-- This program is distributed WITHOUT ANY WARRANTY; without even the +-- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +-- PURPOSE. + -- we have very little to do here; just declare the directory of tests. testdir = srcdir.."/tester-tests" ============================================================ --- tester.cc dc4d5a9a16ee58d9b9f625affad3642fe69f9185 +++ tester.cc 9944326468bd2eb1ac21d19d103372d236f4dc1a @@ -1,3 +1,12 @@ +// Copyright (C) 2006 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #include "base.hh" #include #include "botan_pipe_cache.hh" ============================================================ --- testlib.lua ebf6812c6bf774e2bdd3ba494090d0418357408d +++ testlib.lua dd8669557a3a4bf9933897e29a615cbedc42cf38 @@ -1,3 +1,12 @@ +-- Copyright (C) 2006 Timothy Brownawell +-- +-- This program is made available under the GNU GPL version 2.0 or +-- greater. See the accompanying file COPYING for details. +-- +-- This program is distributed WITHOUT ANY WARRANTY; without even the +-- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +-- PURPOSE. + -- misc global values -- where the main testsuite file is srcdir = get_source_dir() ============================================================ --- tests/inventory_hooks.lua a16591bdd459974f0186eb84ce3050c932a0f885 +++ tests/inventory_hooks.lua 9697410bd122c502981cbc601330b5eafb6c1582 @@ -1,3 +1,12 @@ +-- Copyright (C) 2006 Timothy Brownawell +-- +-- This program is made available under the GNU GPL version 2.0 or +-- greater. See the accompanying file COPYING for details. +-- +-- This program is distributed WITHOUT ANY WARRANTY; without even the +-- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +-- PURPOSE. + function ignore_file(name) if (string.find(name, "%~$")) then return true end return false ============================================================ --- tests/min_hooks.lua d90ff30d41f1c9c73ea72ea50222370d07e1d575 +++ tests/min_hooks.lua 6dc8f710c41ddcf939ca5fef4ca2fab0ce4d3a81 @@ -1,3 +1,11 @@ +-- Copyright (C) 2006 Timothy Brownawell +-- +-- This program is made available under the GNU GPL version 2.0 or +-- greater. See the accompanying file COPYING for details. +-- +-- This program is distributed WITHOUT ANY WARRANTY; without even the +-- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +-- PURPOSE. function get_passphrase(keyid) return keyid ============================================================ --- tests/test_hooks.lua 268c94edd77cf0af6d976b87870787f11d4d7716 +++ tests/test_hooks.lua 2352f60b89c450fbfd3df9a419d9ab7828d55244 @@ -1,3 +1,11 @@ +-- Copyright (C) 2006 Timothy Brownawell +-- +-- This program is made available under the GNU GPL version 2.0 or +-- greater. See the accompanying file COPYING for details. +-- +-- This program is distributed WITHOUT ANY WARRANTY; without even the +-- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +-- PURPOSE. -- this is the "testing" set of lua hooks for monotone -- it's intended to support self-tests, not for use in ============================================================ --- transforms.hh 9be76fde6f1634f9606101c7028f0051b39fa918 +++ transforms.hh 301029c9284881c127a16fc610a8c22eb670cdde @@ -1,6 +1,3 @@ -#ifndef __TRANSFORMS_HH__ -#define __TRANSFORMS_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __TRANSFORMS_HH__ +#define __TRANSFORMS_HH__ + #include "vocab.hh" // this file contans various sorts of string transformations. each ============================================================ --- txt2c.cc 22ef07ab43c37b4d954cb171203cbe4aa3a267f6 +++ txt2c.cc 77e55cb6174483c2e253052793a5fc15e43535d2 @@ -1,3 +1,12 @@ +// Copyright (C) 2003 Tom Tromey +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #include #include #include ============================================================ --- ui.hh 1a9728da7d53a52ac0b4dfb7f2728045081973f6 +++ ui.hh 9a3acd06bf677e16f092cfd96c414a27cefe1c30 @@ -1,6 +1,3 @@ -#ifndef __UI_HH__ -#define __UI_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __UI_HH__ +#define __UI_HH__ + // this file contains a couple utilities to deal with the user // interface. the global user_interface object 'ui' owns cerr, so // no writing to it directly! ============================================================ --- unit-tests/basic_io.cc 538770889b3e70342026027977a9c35ef3bf4bcb +++ unit-tests/basic_io.cc cd2c7d4a6ca0b182f8ee5622efa594d42e78b6b0 @@ -1,5 +1,5 @@ -// Copyright (C) 2008 Stephen Leake // Copyright (C) 2004 Graydon Hoare +// 2008 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- unit-tests/commands.cc d5a24210a23b5ba2efb29dacbbf28c88b17fc70c +++ unit-tests/commands.cc e7be707b4b2c607eface60478e5a0d66f054d3d7 @@ -1,5 +1,5 @@ // Copyright (C) 2002 Graydon Hoare -// Copyright (C) 2007 Julio M. Merino Vidal +// 2007 Julio M. Merino Vidal // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- unit-tests/globish.cc 16645f0f37122cc2534d83dfd32bb38368d0e9e8 +++ unit-tests/globish.cc d025d9c8472782f0ca2ee251348281a219837504 @@ -1,5 +1,5 @@ // Copyright (C) 2005 Nathaniel Smith -// Copyright (C) 2007 Zack Weinberg +// 2007 Zack Weinberg // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- unit-tests/graph.cc c03ea24f2bbe86e0034a0be7ed668b2891da145c +++ unit-tests/graph.cc 6445249524fa296bd687166581fb8e46ef3494e6 @@ -1,3 +1,12 @@ +// Copyright (C) 2006 Nathaniel Smith +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #include "base.hh" #include "unit_tests.hh" #include "graph.hh" ============================================================ --- unit-tests/merge_3way.cc c3a2f75290711c12829e59e5b26fd1e5bf657595 +++ unit-tests/merge_3way.cc f643b8c4672cd8c99a8d1d7a51320358d6f64cc4 @@ -1,5 +1,5 @@ -// Copyright (C) 2008 Stephen Leake // Copyright (C) 2002 Graydon Hoare +// 2008 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- unit-tests/merge_roster.cc 8e60819d5307c992f84f41b295c07900cd6addb0 +++ unit-tests/merge_roster.cc 5c08ece22eaf194dd5145b436bf3408b870fba88 @@ -1,5 +1,5 @@ -// Copyright (C) 2008 Stephen Leake // Copyright (C) 2005 Nathaniel Smith +// 2008 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- unit-tests/mkstemp.cc a4272b124940a7e051422e38b85d6a71e0f57222 +++ unit-tests/mkstemp.cc c31495717409818a9665a969b04780050717cc3d @@ -9,7 +9,7 @@ #include "base.hh" #include "unit_tests.hh" -#include "mkstemp.hh" +#include "file_io.hh" #include "sanity.hh" #include ============================================================ --- unit-tests/option.cc 81d914901386f286e56b93bdd1fbfda1ad98aa35 +++ unit-tests/option.cc 66567ef27006f59ae54eb64b348bc20f621148cb @@ -1,5 +1,11 @@ -// Copyright 2006 Timothy Brownawell -// This is made available under the GNU GPL v2 or later. +// Copyright (C) 2006 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #include "base.hh" #include "unit_tests.hh" ============================================================ --- unit-tests/outdated_indicator.cc 7763f324495b4930c469b97f92c9f83a24d51c0b +++ unit-tests/outdated_indicator.cc 1168e2453894c0fbeb1f1aedbff4583fc1250b7d @@ -1,5 +1,11 @@ -// 2007 Timothy Brownawell -// GNU GPL V2 or later +// Copyright (C) 2007 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #include "base.hh" #include "unit_tests.hh" ============================================================ --- unit-tests/paths.cc 7465bbf45840f38209712842ee79c6642bcc9482 +++ unit-tests/paths.cc f443111b016125fb2b00af638586853a68369ad9 @@ -1,5 +1,5 @@ -// Copyright (C) 2008 Stephen Leake // Copyright (C) 2005 Nathaniel Smith +// 2008 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- unit-tests/roster.cc 26f278e0c4f1db6a2d06480acc20b97039c5f4c9 +++ unit-tests/roster.cc 77681ef65ff98bcaf591865acdd228d2f00dd2fa @@ -1,5 +1,5 @@ -// Copyright (C) 2008 Stephen Leake // Copyright (C) 2005 Nathaniel Smith +// 2008 Stephen Leake // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- unit-tests/sha1.cc dcaf3439d0f7ca6a95746b258b0bee1dbb376044 +++ unit-tests/sha1.cc 295bf7885357b428837a74656553c1f0e78ab2c3 @@ -1,5 +1,5 @@ // Copyright (C) 2005 Kaushik Veeraraghavan -// Copyright (C) 2009 Zack Weinberg +// 2009 Zack Weinberg // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- unit-tests/simplestring_xform.cc 03649bf0eb4f9ab5f50594b5ac9a915456e49f11 +++ unit-tests/simplestring_xform.cc ce5669547d1c501aae6e7619c37cde5fd25358cc @@ -1,3 +1,12 @@ +// Copyright (C) 2006 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #include "base.hh" #include "unit_tests.hh" #include "simplestring_xform.hh" ============================================================ --- unit-tests/string_queue.cc c2e3a25ff75876791bd5b70dde967796ecec07b3 +++ unit-tests/string_queue.cc c647f97658e6abd5e15cc1a82cffffcb8decf0db @@ -1,3 +1,12 @@ +// Copyright (C) 2005 Eric Anderson +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + // unit tests for string_queue #include "base.hh" ============================================================ --- unit-testsuite.lua 44f7e7d6c8a081bda84298b9984dbdf7d39f6797 +++ unit-testsuite.lua a8fd12b4d50135121bf3e9be6247bd0fbf0ade58 @@ -1,3 +1,12 @@ +-- Copyright (C) 2007 Zack Weinberg +-- +-- This program is made available under the GNU GPL version 2.0 or +-- greater. See the accompanying file COPYING for details. +-- +-- This program is distributed WITHOUT ANY WARRANTY; without even the +-- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +-- PURPOSE. + -- This test suite is special; it synthesizes all its __driver__.lua -- files on the fly. Each one runs the 'unit_tests' binary over just -- one of the test cases it can run. ============================================================ --- unit_tests.hh 6b954b0c842e44cd5e8f3caf92fc9ee7354fd888 +++ unit_tests.hh 75efe28df99e01acc70527cb90b922f0bf2f7a09 @@ -1,6 +1,3 @@ -#ifndef __UNIT_TESTS__ -#define __UNIT_TESTS__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __UNIT_TESTS__ +#define __UNIT_TESTS__ + #include // Log a success/failure message, and set the test state to 'fail' if needed ============================================================ --- unix/cputime.cc 2a024eb642dfbedba1197dc0658977d09b57f8c9 +++ unix/cputime.cc e1347423e9c01e5187c9dcd6df7c3fc45a862b8e @@ -1,7 +1,11 @@ -// copyright (C) 2006 Nathaniel Smith -// all rights reserved. -// licensed to the public under the terms of the GNU GPL (>= 2) -// see the file COPYING for details +// Copyright (C) 2006 Nathaniel Smith +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #include "base.hh" #include ============================================================ --- unix/fs.cc 6a14757e5551b259f87054adbd53173e25ce9bc4 +++ unix/fs.cc b5909760f49692cdd13ea1aa76a0323e07b95b92 @@ -1,9 +1,12 @@ -// copyright (C) 2005 nathaniel smith -// all rights reserved. -// licensed to the public under the terms of the GNU GPL (>= 2) -// see the file COPYING for details +// Copyright (C) 2005 nathaniel smith +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. - #ifndef _FILE_OFFSET_BITS #define _FILE_OFFSET_BITS 64 #endif ============================================================ --- unix/get_system_flavour.cc c2b5a4b599251b363f308aa884cfaeb4eb237e61 +++ unix/get_system_flavour.cc 87943eef2597712166a26308313fb6a40feca0a0 @@ -1,7 +1,11 @@ -// copyright (C) 2004 graydon hoare -// all rights reserved. -// licensed to the public under the terms of the GNU GPL (>= 2) -// see the file COPYING for details +// Copyright (C) 2004 graydon hoare +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #include "base.hh" #include ============================================================ --- unix/inodeprint.cc 0d38c64a84cc6aa60ef42a2cef10257972eec035 +++ unix/inodeprint.cc 41011634c6a155cf7c9f3fe5053e08c577c918ee @@ -1,7 +1,11 @@ -// copyright (C) 2005 nathaniel smith -// all rights reserved. -// licensed to the public under the terms of the GNU GPL (>= 2) -// see the file COPYING for details +// Copyright (C) 2005 nathaniel smith +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #include "base.hh" #include ============================================================ --- unix/main.cc bc6e80dc6a77ec1fbc620920cf490d10135a9d74 +++ unix/main.cc 1a4910550eee2b11ff4bc99bec1f9de0d44da81e @@ -1,6 +1,4 @@ -// Copyright (C) 2006 Zack Weinberg -// Based on code by Graydon Hoare and contributors -// Originally derived from execution_monitor.cpp, a part of boost. +// Copyright (C) 2006 Zack Weinberg // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- unix/make_io_binary.cc 9ab5faa9b8759d7f91fb6c676fdc445b6fad3b00 +++ unix/make_io_binary.cc 269723498e7fab1e60549c89e0a595231d897a2d @@ -1,3 +1,12 @@ +// Copyright (C) 2006 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + // I/O is always binary on sane platforms... void make_io_binary() { ============================================================ --- unix/os_strerror.cc 83f07b118dc8d51dcf9d07044b8b7183f14e7b55 +++ unix/os_strerror.cc ae83ca96d06155e367f9e70e1772d85f3d10c84c @@ -1,7 +1,11 @@ -// Copyright (C) 2006 Matthew Gregan -// all rights reserved. -// licensed to the public under the terms of the GNU GPL (>= 2) -// see the file COPYING for details +// Copyright (C) 2006 Matthew Gregan +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #include "base.hh" #include ============================================================ --- unix/process.cc feac2afcdb6084a21b68c6ff72dafc9e914a4127 +++ unix/process.cc 99af2840bfac311181ff2d0ee5360288494a1cb4 @@ -1,7 +1,11 @@ -// copyright (C) 2005 Jon Bright -// all rights reserved. -// licensed to the public under the terms of the GNU GPL (>= 2) -// see the file COPYING for details +// Copyright (C) 2005 Jon Bright +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #include "base.hh" #include ============================================================ --- unix/read_password.cc 781410699fe1a5325ae2efca87fc3871c6647a44 +++ unix/read_password.cc 013c10f388eb58d2dcdc53277c77c12908f81eba @@ -1,7 +1,11 @@ -/* read_password.c: retrieve the password - * Nico Schottelius (address@hidden) - * 13-May-2004 - */ +// Copyright (C) 2004 Nico Schottelius +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #include "base.hh" #include ============================================================ --- unix/terminal.cc 83a585e971202a39e648085ab9e7d3302cb9848a +++ unix/terminal.cc 10809407b581afe8d412fb187e2e40f2e4c8d8ba @@ -1,8 +1,12 @@ -// copyright (C) 2005 derek scherger -// copyright (C) 2005 nathaniel smith -// all rights reserved. -// licensed to the public under the terms of the GNU GPL (>= 2) -// see the file COPYING for details +// Copyright (C) 2005 Derek Scherger +// Nathaniel Smith +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #include "base.hh" #include @@ -10,7 +14,6 @@ #include #include - #include "platform.hh" bool have_smart_terminal() ============================================================ --- unix/tester-check-net.cc 89fdb78ff4c9cd7fe4a60bca1afdf5fbf00b5bbd +++ unix/tester-check-net.cc 952588905c0e3878d260b6afb27cddfd0490ec33 @@ -1,12 +1,12 @@ -/* Copyright (C) 2008 Zack Weinberg +// Copyright (C) 2008 Zack Weinberg +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. - This program is made available under the GNU GPL version 2.0 or - greater. See the accompanying file COPYING for details. - - This program is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. */ - /* The test suite runs this program to decide whether or not to include network tests. It determines whether it is possible to create a listening socket on a randomly chosen port on the loopback interface, ============================================================ --- unix/tester-plaf.cc bcbcd37f68b536f66b86b22af6ea82ef7a1d5111 +++ unix/tester-plaf.cc 033e1c858b94b338b8ed4f476855413379274bd9 @@ -1,3 +1,13 @@ +// Copyright (C) 2006 Timothy Brownawell +// 2007 Zack Weinberg +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + // Tester-specific platform interface glue, Unix version. #include "base.hh" ============================================================ --- update.hh ba78cd61383ee268f56bc37682a490bfac7ee9bb +++ update.hh f94e1d2140acab803e81fe736f9ecc9f607ef22a @@ -1,6 +1,3 @@ -#ifndef __UPDATE_HH__ -#define __UPDATE_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __UPDATE_HH__ +#define __UPDATE_HH__ + #include #include "vocab.hh" ============================================================ --- uri.hh f47e00a95933cc7b73d3023993100072625d8fef +++ uri.hh 4ee1882809ef881390a703fb31e2a41a3258c70c @@ -1,6 +1,3 @@ -#ifndef __URI_HH__ -#define __URI_HH__ - // Copyright (C) 2006 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __URI_HH__ +#define __URI_HH__ + #include "sanity.hh" struct uri ============================================================ --- util/mtnopt.in a9aff1396ce99d1a46cf805c857bad739dcad613 +++ util/mtnopt.in f35d29ef8d033798552ca96e218ce5db2d443353 @@ -1,4 +1,12 @@ #! /bin/sh +# Copyright (C) 2008 Richard Levitte +# +# This program is made available under the GNU GPL version 2.0 or +# greater. See the accompanying file COPYING for details. +# +# This program is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. mtn_dir=./_MTN mtn_keys= ============================================================ --- vector.hh 6c7d7e9c1f2c26a95d0d51fbbe7db9982e4309c2 +++ vector.hh 2f921a6478315b7b3e7be38f25bed16380d97b72 @@ -1,6 +1,3 @@ -#ifndef __VECTOR_HH__ -#define __VECTOR_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __VECTOR_HH__ +#define __VECTOR_HH__ + // we're interested in trapping index overflows early and precisely, // because they usually represent *very significant* logic errors. we use // an inline template function because the idx(...) needs to be used as an ============================================================ --- vocab.hh 2bd325ccd8f3e2af59352517f3570991d60ce29e +++ vocab.hh 6ccbe5b9ab2907f2cf15072d68c4369e3862b137 @@ -1,6 +1,3 @@ -#ifndef __VOCAB_HH__ -#define __VOCAB_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __VOCAB_HH__ +#define __VOCAB_HH__ + #include #include "sanity.hh" ============================================================ --- vocab_cast.hh bd143db00172c1dff56eace0fa2c82e7299bacce +++ vocab_cast.hh 9710931398c21cebf7b008e4982e5cfc2f2b6614 @@ -1,3 +1,12 @@ +// Copyright (C) 2007 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #ifndef __VOCAB_CAST_HH #define __VOCAB_CAST_HH ============================================================ --- vocab_hash.hh 7fd5a04439ab35f212daaad1b673f6dea894ae25 +++ vocab_hash.hh 4a55fd719ba7113624e1f16086298e65ec288930 @@ -1,7 +1,4 @@ -#ifndef __VOCAB_HASH_HH__ -#define __VOCAB_HASH_HH__ - -// Copyright 2007 Timothy Brownawell +// Copyright (C) 2007 Timothy Brownawell // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __VOCAB_HASH_HH__ +#define __VOCAB_HASH_HH__ + #include "vocab.hh" #include "hash_map.hh" ============================================================ --- vocab_macros.hh 6c97f3c4c3b4ac6766ac0c42ffd802168d72a582 +++ vocab_macros.hh 8c97fbf646367acb3d62c4101b28b0d69538fa3d @@ -1,3 +1,11 @@ +// Copyright (C) 2002 Graydon Hoare +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. //HH ============================================================ --- win32/cputime.cc 1039e1fabada328afce0aeb6abd903a5a6a05576 +++ win32/cputime.cc bc75990945d1cb48772541f39a580e3f3308d9cd @@ -1,7 +1,11 @@ -// copyright (C) 2006 Nathaniel Smith -// all rights reserved. -// licensed to the public under the terms of the GNU GPL (>= 2) -// see the file COPYING for details +// Copyright (C) 2006 Nathaniel Smith +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #include "base.hh" #include ============================================================ --- win32/fs.cc 16b42480fad9d8f471dae8b84db11ab3479d726f +++ win32/fs.cc 14806bf816131ecf8e940f5ba2f386f258f85ac8 @@ -1,9 +1,12 @@ -// copyright (C) 2005 nathaniel smith -// all rights reserved. -// licensed to the public under the terms of the GNU GPL (>= 2) -// see the file COPYING for details +// Copyright (C) 2005 nathaniel smith +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. - #define WIN32_LEAN_AND_MEAN #include "base.hh" #include ============================================================ --- win32/get_system_flavour.cc 9a3d6b976c35c20ffe50e1fb6e723efe4006a1fd +++ win32/get_system_flavour.cc 60cdbd9a9c7a6373952674ab39e70b2c76f99a41 @@ -1,11 +1,16 @@ -// copyright (C) 2004 graydon hoare -// all rights reserved. -// licensed to the public under the terms of the GNU GPL (>= 2) -// see the file COPYING for details +// Copyright (C) 2004 graydon hoare +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #include "base.hh" #include "sanity.hh" +#define WIN32_LEAN_AND_MEAN #include struct table_entry ============================================================ --- win32/inodeprint.cc 187f90f531d8c05d1000cccccc826b0f7542b9b8 +++ win32/inodeprint.cc a08322b9d96e7784d12aa866927558457a0838fd @@ -1,8 +1,13 @@ -// copyright (C) 2005 nathaniel smith -// all rights reserved. -// licensed to the public under the terms of the GNU GPL (>= 2) -// see the file COPYING for details +// Copyright (C) 2005 nathaniel smith +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. +#define WIN32_LEAN_AND_MEAN #include "base.hh" #include #include ============================================================ --- win32/main.cc 5a71222d0355a0c8f699b69e3e13e95ee52ca872 +++ win32/main.cc c54eb01fae6a969180812791cba859e738e17476 @@ -1,6 +1,4 @@ -// Copyright (C) 2006 Zack Weinberg -// Based on code by Graydon Hoare and contributors -// Originally derived from execution_monitor.cpp, a part of boost. +// Copyright (C) 2006 Zack Weinberg // // This program is made available under the GNU GPL version 2.0 or // greater. See the accompanying file COPYING for details. ============================================================ --- win32/make_io_binary.cc 184845c1a84f925fca74cf69c1853af811ebacf2 +++ win32/make_io_binary.cc 569e5331194822075b1fa1b458313d7ee05e9be3 @@ -1,3 +1,12 @@ +// Copyright (C) 2006 Timothy Brownawell +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + #define WIN32_LEAN_AND_MEAN #include "base.hh" #include ============================================================ --- win32/os_strerror.cc 5753db7a97adb234f801c2cc3b2512f19bb31b8b +++ win32/os_strerror.cc 6675788dc2b4b2b6dc15e54ba58a5c8994de9876 @@ -1,7 +1,11 @@ // Copyright (C) 2006 Matthew Gregan -// all rights reserved. -// licensed to the public under the terms of the GNU GPL (>= 2) -// see the file COPYING for details +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #define WIN32_LEAN_AND_MEAN #include "base.hh" ============================================================ --- win32/process.cc 34244703491fe7f3a5d7271d3f4e1eadf3398f2a +++ win32/process.cc b04ad9cc13ce045696222da5b9796bc39397cc5d @@ -1,7 +1,11 @@ -// copyright (C) 2005 Jon Bright -// all rights reserved. -// licensed to the public under the terms of the GNU GPL (>= 2) -// see the file COPYING for details +// Copyright (C) 2005 Jon Bright +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #include "base.hh" #include ============================================================ --- win32/read_password.cc 24f94f0c5768283f77dd11b5cb4eff5a2885f965 +++ win32/read_password.cc f664b01c8d5a5346934284107ee552f2ab139dc9 @@ -1,7 +1,11 @@ -/* read_password.c: retrieve the password - * Nico Schottelius (address@hidden) - * 13-May-2004 - */ +// Copyright (C) 2004 Nico Schottelius +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #include "base.hh" #include ============================================================ --- win32/terminal.cc f695bcc3b73c50c76b63e0cfc30e3fb7bf2d9876 +++ win32/terminal.cc 1db5ba145a2e414e13d95c880c97a186efde869e @@ -1,14 +1,17 @@ -// copyright (C) 2005 derek scherger -// copyright (C) 2005 nathaniel smith -// all rights reserved. -// licensed to the public under the terms of the GNU GPL (>= 2) -// see the file COPYING for details +// Copyright (C) 2005 Derek Scherger +// Nathaniel Smith +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. #include "base.hh" #include #include - #include "platform.hh" bool have_smart_terminal() ============================================================ --- win32/tester-check-net.cc 5a33162d303659f396e377380ce64015ac0ee79b +++ win32/tester-check-net.cc 1fb16b6a801951299889667d726a96894ec77121 @@ -1,3 +1,12 @@ +// Copyright (C) 2008 Zack Weinberg +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + /* Stub - needs implementing. See lua-testsuite.lua (very end) for rationale, and unix/tester-check-net.cc for behavior to emulate. */ int main(void) ============================================================ --- win32/tester-plaf.cc 3515a1b8a6a7fa2a45dbaddb933239fef3c18823 +++ win32/tester-plaf.cc 4cae66ca767106b916ed327199590446f1cc0cc7 @@ -1,3 +1,13 @@ +// Copyright (C) 2006 Timothy Brownawell +// 2007 Zack Weinberg +// +// This program is made available under the GNU GPL version 2.0 or +// greater. See the accompanying file COPYING for details. +// +// This program is distributed WITHOUT ANY WARRANTY; without even the +// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. + // Tester-specific platform interface glue, Windows version. #define WIN32_LEAN_AND_MEAN // we don't need the GUI interfaces ============================================================ --- work.hh 06639353bb835eb913d2287cc35a2f96fe69230a +++ work.hh 48bdba225cedd327acdfd13db63226e76df1ecec @@ -1,6 +1,3 @@ -#ifndef __WORK_HH__ -#define __WORK_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __WORK_HH__ +#define __WORK_HH__ + #include #include "paths.hh" #include "rev_types.hh" ============================================================ --- xdelta.hh e2926cc2e87c1962303f9f11cbd588f08e4e2341 +++ xdelta.hh 59ad94776aa99040452c7f678b9c642ccbb29ec0 @@ -1,6 +1,3 @@ -#ifndef __XDELTA_HH__ -#define __XDELTA_HH__ - // Copyright (C) 2002 Graydon Hoare // // This program is made available under the GNU GPL version 2.0 or @@ -10,6 +7,9 @@ // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. +#ifndef __XDELTA_HH__ +#define __XDELTA_HH__ + #include #include "vocab.hh"