# # # delete "indent_script" # # patch "Makefile.am" # from [bb8be649399cfa08806ca51af094bbf7c57d5210] # to [f73bbb82e9278ee9bc66eb42e445542d900a8ae0] # # patch "adler32.hh" # from [7d209e5bfab115bd173679fc129799a44be15931] # to [8d6d6a08448d05eec4c12e4ec3285b6945da6d70] # # patch "ancestry.cc" # from [a8362c21538ff7576166507a9b87fd4ebde69a00] # to [e13c59e3ab4f4aae398a06e0eeffe2c39d7c0e81] # # patch "annotate.cc" # from [ef7795111567f501c8bf2ed9f470d4cc430c3b44] # to [09b9fdcfd43d6ea5867e9a5b77e94dd39defbf9a] # # patch "annotate.hh" # from [1ffd0ce10fb46ba3d995e3ae5fbc1638d7462896] # to [7b6a52deeb9922ad942ad150e5149b52b49f4581] # # patch "app_state.hh" # from [0a75c1c70e25952174396fbd693ab6b00567ca7d] # to [d57aab1728315fb169a43e88ad7b213487b9e295] # # patch "asciik.cc" # from [6732fae4fe007723502d95a935c7ca4c065e45a5] # to [0829616d7ee850f5f9a4babc0c8ddb22fc458354] # # patch "asciik.hh" # from [80f43a7385027a74cc27728be8da0bc81bab85ba] # to [a7e9e877e516ed5f3140b4ba786bba789e000878] # # patch "base.hh" # from [a62d857c95d9bc18efcbf5636de75762b6ff02fe] # to [434649b6ff55a860d707807f78598ba068fa4da2] # # patch "basic_io.hh" # from [c1f0e7760a1316c80a511016d8449e9903924b38] # to [641229e66202063897f00c2ac6b33d6a7786c5d8] # # patch "botan_pipe_cache.hh" # from [21898f46e28b96c8471b488237b4f716f8389bda] # to [105f9431f4633819be88d758ccff8281ce7bd6fa] # # patch "cert.cc" # from [7b6d6fe8c2cf22a420422e7699b812c2ee6ef3d6] # to [b3dcf32e9aef5757a17afc8ec113a41cb428b861] # # patch "cert.hh" # from [1d875af6765958035c4c44bc51ac57f0fdb458a1] # to [3fa5adb025361516fac47866927c4f193337af8e] # # patch "char_classifiers.hh" # from [7dece6ad2d6a9520ababb31f6a9f84b7edb60444] # to [203fa7aa9d0438bd11e88279fe2d2d67a0715991] # # patch "charset.hh" # from [3cff551326cf06e612a8ca969e5eef07fe904802] # to [fd5cac7b2f6866b0deee4843c6906617660926ab] # # patch "cleanup.hh" # from [010b36cdbbabb9548e3df6d03f4a6a6be9563707] # to [c0af521b7aa0719eb3ca0d886af60d813ea6e3f5] # # patch "cmd.cc" # from [1cfec6b4c6f2737366730df48bbe1b4f65beb5b6] # to [b7bdef6d3e370a8647789c59a2de7b190c49205a] # # patch "cmd.hh" # from [b1068b8f8f0fe3b691a0a2b5624527d37adc4e48] # to [0a877d515c8b959a010de89e5f7db7f6fabce05f] # # patch "cmd_conflicts.cc" # from [29cf4482ddd3d446052d3767588c9caf0a656cdf] # to [47726f1fef74e5141dfb6678e07778d4c08fc15b] # # patch "cmd_diff_log.cc" # from [022198a63c53dc5a47f0d1824fb5eeed6c155f80] # to [caf5335a9a55a96e92391a998d953b4ddae1b92a] # # patch "cmd_files.cc" # from [a052e282223aa32471545d4dbbd84f267f546271] # to [b50cf2dcd44c507747371c64b7ed16d6263c13c2] # # patch "cmd_key_cert.cc" # from [992b4e94b38c2ed75c0da7f2d50a70f90b7cd453] # to [a6a341676c5f588f994d9a2e1743c91dcdd2ad4b] # # patch "cmd_othervcs.cc" # from [ca6b6d84259d7758b81cd9209d996979a757f4c5] # to [ffef05703295b5f6ae6b5860cb83a7a960b74b03] # # patch "cmd_packet.cc" # from [3afccc60c3efa1335909f87f598ce4e843071b11] # to [e661fbb33bf6182af21cbd7d7f83a56cf63b3656] # # patch "commands.hh" # from [18235ed79ea9bf22f0a6957e6bb7d2486b824db7] # to [0b39910ab77fbb722c4a0fada49f07a7e8c3cb21] # # patch "constants.hh" # from [d0a7820dda371e19f30b83adcd1d6c5027ebfcd8] # to [f74e771b8c51ca5bdd37c0dd383471794d6427b4] # # patch "cset.hh" # from [5120df6bd9c521f03437fc04e5f02ed7dc610b97] # to [98c7724f0e0ef0da85d9c0f4a8efe1e12dffcdb0] # # patch "current_exception.hh" # from [3b0be7b7f888fc02ef96db80b17b0fae2c9c83bd] # to [4cdea3209b8fbd10ba6ea4b71db8930dda3b4d08] # # patch "cycle_detector.hh" # from [c8ee3bc84304bebe227f3fe2c3e43910cf8fbcbd] # to [f84cdc9a8ffd6333c739ddfba03a709295126e31] # # patch "database.hh" # from [3669851b2d94c471f26ec67fa38ee392e141d826] # to [982dc2304b3e729f1f1b228f19769117b2015be1] # # patch "database_check.cc" # from [252ae203301bfc31df26045a1afb7ce466ae57ee] # to [748c15e077685e9ab0783151323ee94150cabaa4] # # patch "diff_output.hh" # from [399f633945756b8ca315ee658d632243e357226f] # to [21d1cd2af12202cb14359483c7f85724f373786b] # # patch "do-editor-vars.sh" # from [34672877afa9dd656c51d24412f08a10e14105e3] # to [c9502a84ed9c574b45031e23d8b502e71c63092d] # # patch "enumerator.cc" # from [e3eff2b537853694535346e0d47489832eefccf7] # to [89890d88770c8a1cffbfc36fe1f4b8471fc06477] # # patch "enumerator.hh" # from [a6ad0d155400b0f3ce46331dd029780fb90546e9] # to [77463e904b18c2dbef84a776c6706f28be489ee9] # # patch "epoch.hh" # from [9d4366878bee862bbdf1f04b107e780e1225a340] # to [41f84eceeebe1a75b49fc172119cb005f9b74589] # # patch "file_io.cc" # from [1dd0f7e6aab013780c2f902515a73becae6804cf] # to [34e9c1581a7c336b0406c2601ac7cee5012723c7] # # patch "file_io.hh" # from [e477a87af2f1d3326d5f07f9c9ed6ab322809fe6] # to [c5adaa89ea74db1d489c53a4ca3f60398beb848a] # # patch "globish.cc" # from [0e1c02f1ea8a2a3ed93c40628f139357bcfe9e78] # to [457d8817b4b0541646c134406e3f537897dfad74] # # patch "globish.hh" # from [52afd9b82e2cf0a8b2e61ee60d0e6afa12ce6f13] # to [696c65bcf44f9a427e54d85b810bc8bfcfdfd1a0] # # patch "graph.cc" # from [9a5011b6865d7b3690db35284e17e81e08f62846] # to [262f4c91912223b9b33361736f46bd49c242069a] # # patch "graph.hh" # from [1defcf53b76fc0b894e124883802e7f04a3d9c3e] # to [7322b6a5901450c65e3c965028e8fe7069294049] # # patch "gzip.cc" # from [94366b8142864e7304bb05627761c8b9bf85ae69] # to [1beb2f35dc50dc33134175f8e77b8cf487a0d945] # # patch "gzip.hh" # from [391f70c2e4678fcc34ce5bbcd848335f94de882f] # to [d8ba99ba959d68614258509a06a1c52d1ba7f023] # # patch "hash_map.hh" # from [1354e46d7ae2f17c40f5262c7b7be6666d197d64] # to [233406037b70b2cf47538d743409ca45a126978d] # # patch "hmac.cc" # from [0e9e11fc7f8143da251aa6523a65a35d59da7961] # to [7a9e2c99be224785b6563622ad08675ebb29ca6b] # # patch "hmac.hh" # from [df0392000b74ac3553d40c39d851e4144eda1aef] # to [441e7ef06ac15ebc11bf66ba5e53aa4b5d8ed35e] # # patch "hybrid_map.hh" # from [c0b815591a24a6442550a32afdd54bebc8524784] # to [f0b044a619da06baacc4163f492c124f372886db] # # patch "inodeprint.cc" # from [9f2497b52396a2caec4699b13bdaff55525a204c] # to [aa6821e0691244214d92f7a911daf130daf52f6d] # # patch "inodeprint.hh" # from [b3e2f2e96752e05f794cc8b23eed82bdc7a5de86] # to [ef0ced7b3dc4f2efee24c9a57102c1c4f1f09801] # # patch "interner.hh" # from [149f63e6eb3f1b29d26d017d5e94d8482327afd6] # to [79c7a7122d6bda80842c63fd6b56c0113a2274a8] # # patch "key_store.cc" # from [36d3755fc7c95b38d90420321b9bfa8b8d08983a] # to [133bf327bebd83b73820217c7d92cd12f9153464] # # patch "key_store.hh" # from [a529bde9cd5162d259f18a889d95c29397e1bad7] # to [6f3cac249a46421122b889945156357dfe0f57bf] # # patch "keys.cc" # from [1528a27ad3ac8a35b53954213b61ed8fbef90a28] # to [bcd0aee2b93c4e03b4eea9e2f227a106bc970664] # # patch "keys.hh" # from [665e7f1f1dd80336bb3d961522da79aac4c2fe89] # to [e56b05f2449eebda62d3ae309354cd2103969623] # # patch "lazy_rng.hh" # from [1f39ec488a4ff5c0566404f56284708d32f5a190] # to [82afe6e95ed601b9ff81877bd94fde5da715097e] # # patch "lcs.cc" # from [d8c5af8949518e9da3c0fa6a5d34c2acb47dec9a] # to [9028826c5eecfb13b76bd9068276a29fdcfdc34e] # # patch "lcs.hh" # from [3b862f707ecadc59ea9204714fb2068bf8fec66c] # to [5f95696df0fc81dae682ad3a0e4bad7db2085dea] # # patch "legacy.hh" # from [456f497a51f5e635b688fe4bf4374a35b6194461] # to [546d699913ccb3cafedf6dff50520ef38a5d6139] # # patch "lru_writeback_cache.hh" # from [fa05b036a2b82fe0b799c27168a75feee26e7692] # to [55fb7845cd2c2f91fac2510a1492362fcb73d95a] # # patch "lua.hh" # from [703cd58553a76947f52cf6b065e2bccd70790381] # to [75ff1e98f4674697157c8846b21d24b4245d084f] # # patch "lua_hooks.hh" # from [a6e3f6663c7786973278429c995f9dbb888455d4] # to [95a7446409bedb4594e26a46a643da2ae7ce462a] # # patch "luaext_globish.cc" # from [6770e40f83df0cc18c22b98d1bed2ba3d22b0203] # to [3593ef67e795b1a0edcc9273a7d01ec90ba924e0] # # patch "luaext_guess_binary.cc" # from [0140e574ffd1864f8c767cfb06ed2ea11f4cac44] # to [6a44123a75956d5b4dc393fe82fda582bbc75a6b] # # patch "luaext_mkstemp.cc" # from [fe5ba3069520fca7cf68ef6e25e1add747282b4d] # to [397937a9ccedd28e68af5728e093bb2e3edc671a] # # patch "luaext_parse_basic_io.cc" # from [3fd2a04d39c43d006344b3ad96111fa00b7f24f5] # to [2506b458aea07c761714450dbc3127b6bdd61c7c] # # patch "luaext_platform.cc" # from [381925fa00804791bba4d2b88817e242b1d756ab] # to [fb98e039fbc2367e62e58faa4c5d1d309bc87d9f] # # patch "merge_conflict.cc" # from [f00c522c0099d0141849d64a7311d546e61c7008] # to [a7606edae350ba90e0071e11ac1bab5f7ac85558] # # patch "merge_content.hh" # from [a4003604503ede3dc6a72b7daeaa326f5931f6f4] # to [b696d83e6c528c5896a3beaeabfaee877ff3ed37] # # patch "merge_roster.hh" # from [5bb429497a38b162b753014738c602b582c2fbbe] # to [8306856b153df6d6d927be60453d5a74f3fc4788] # # patch "merkle_tree.cc" # from [86d53a37da3ee3e4f36cfc5cfc65b33fa0b8d986] # to [681a6488e15edc8495664d188928fe122caa8bb0] # # patch "merkle_tree.hh" # from [451dc43a85454c689e15636f4387c7dcee2b4428] # to [f8559915480b7fdf77424a8664b27df4f868843a] # # patch "migrate_ancestry.cc" # from [d24eba186d24fdba6d66cca44fdc455a5af3795c] # to [1d8b2629b8e66f43b01088a868f64390f6a7f4bb] # # patch "migrate_schema.cc" # from [863fb9096d12b31c6193c90373313227e13b4320] # to [ffd51091a60a67132b1fd88514fd50d04f0e17f8] # # patch "migrate_work.cc" # from [b0e7ef6fdc52db96cf7567c5cfb4ae007ba40ef0] # to [21dbcf76b5fa84b60c02577da6c589887c0cc5ba] # # patch "migration.hh" # from [d6e6181cc84d400d949dbf1dc5d6e8aea15baf74] # to [fa3fa48452af3ae8a04b67672d56ab687c79e116] # # patch "mkstemp.hh" # from [368bf10bb8da79f070c54f3e8484efeacbf24e4f] # to [95bcdd6a2319549c3e950fbdb1d29ef09a404e82] # # patch "mt_version.cc" # from [8389644e15bf83ea03708a60f4b6158f73848fcf] # to [36443b123dbb3ebcba952fd46540efc64c022330] # # patch "mt_version.hh" # from [0637d55ddff99fd51dab3e0214a1abd8df0d2668] # to [0b4b309b696507036d823d955c517731768f2924] # # patch "mtn-sanity.cc" # from [2b00557214de222db5c0a3642f3cc37d862f8d11] # to [fdd728e6175f5df8721e21cee035832501d2072f] # # patch "mtn-sanity.hh" # from [6efc93a1a859ac94800cdb4c0565383006a5d59d] # to [b59ba9e27f19fff9944a7f8e8a363bb3ecbad1a0] # # patch "netcmd.cc" # from [b6a32a1abc1b292dd7f2f6621f27d90714a217e5] # to [64d6c56e6b3de68bd2e3cf34c3530b5fb14b54d5] # # patch "netcmd.hh" # from [10527907b0ef2b48afc16182cc998211ba879d08] # to [4c4322e0f4dafdddee2e239daf0adfa6f6439883] # # patch "netio.hh" # from [68bc41e1df3d57e7a74eb5cf6249b68d29412f3d] # to [60010c88056bdc63b4730146d293f5ed6ea6e015] # # patch "netsync.cc" # from [550bd33295edd35c99ac6befbe6f93da9cca8639] # to [64e1b397594ff5f6e0f4f2680ba66ce6fe9ffd97] # # patch "netxx_pipe.cc" # from [e97af13ca9326232fa0869cb0b513025b876fdf6] # to [6b6ed53222f1bcb7033a0dce1d691635d6c06a53] # # patch "netxx_pipe.hh" # from [873bc7d111d59db057cba5ea5f9ce31ad7608e1f] # to [5ef141781ad2d0cae7e89725f5ac2a24c41dc3fd] # # patch "numeric_vocab.hh" # from [fdd9138b8fc70374bd96e20e41294d374a48170d] # to [7bcabd35993b2dd6be4ee0d0c87c8384d684e4fb] # # patch "option.cc" # from [014c3780136d90b4f6370a2494a4b8246b0be837] # to [9d72465dc3f8c0031532fb3d54d19203266ec4db] # # patch "option.hh" # from [65d3756b0f12e7741a308536a0d51cee021189c1] # to [322a377f8548a2e84a5fba54671042785d134d4e] # # patch "options.cc" # from [e89af04e97c53b86bbfff144e567a6bfd7535357] # to [4ed21148936a06b55250339de690f8eff5d8f0b7] # # patch "options.hh" # from [c3d069fcf7845b6e8cf8a2819d73e98c69aaee8b] # to [902b5dbb47ef7dc707ebce9e531eab4515dd71bc] # # patch "options_list.hh" # from [67023185e0e775e535d178143ddad30bd6b2f298] # to [7b7947d1f69b84b0639593b5534f4ace6075691e] # # patch "origin_type.hh" # from [54082f23fb5a6cb64e725fe44df7b06517224222] # to [0d9f9f4e1e169b15eaa5c5081cd8059ad6d9a429] # # patch "outdated_indicator.cc" # from [d023ea9df38c3281c7456270293e9c8eea569891] # to [1d3ec59ddbb2339b573c1a316b52ba659b2242b5] # # patch "outdated_indicator.hh" # from [75b823c58d06ac45f84d198ccf90dcabbc23a985] # to [25f60524f7478a08a9de6fdc90ae395cdf185b51] # # patch "packet.cc" # from [23dd3dd24d74f8aab78028365261af6788aba601] # to [d0dc9d47397f902117459c3d82bd34f100e75d76] # # patch "packet.hh" # from [883e5e7c88e8dfeb148a279d970c6c4020d086bc] # to [57a749c4a9ef6e4de431d4ad2bdf00ce6e702398] # # patch "parallel_iter.hh" # from [2ee45ae23e10ab433da7101315ad4ea52435f706] # to [7f91744f6a12f274696bfa8bde1cb968691f2611] # # patch "paths.hh" # from [6702f74f0462d64c773191e55be0983fabb393e3] # to [bc8dc8fb4bd0f32aec0a93fe34df74d47384938a] # # patch "pch.hh" # from [6dff430a4635cb308fd7b0c76333c8bbc7f167ab] # to [4831fa5a656735b98e48a8e34cb3377526f87bab] # # patch "platform-wrapped.hh" # from [70c1cf6a373352fa802cf407d354cf2caad92754] # to [9b6adf61ff8908b94f5f6059b9f071fc39e0d5d8] # # patch "platform.hh" # from [7b09b4e28d7c7379e6336a3fa8d76cf937d3ac1f] # to [c50e7babf7716b238c7b8074f5339bfcaab67fff] # # patch "project.cc" # from [c33b13a28918d13f35351966e7e34b627ca990ef] # to [7614711c10af1c725062f1570b2a6f4834439197] # # patch "project.hh" # from [f67968192cfc5e513d2281f384c29b76eefdd5e7] # to [fa2e22f7fbea8b83797aa7c855baa3940d001d39] # # patch "quick_alloc.hh" # from [ed41c0b93c8433b8f4060f6ad7834c6dccbaf44b] # to [be5bfaafed2068e24f9d87b40909ad1d26963056] # # patch "randomfile.hh" # from [86995b5fde62b718b35ef8b1231036734a5b950b] # to [6cb73ec10f057f704eb11fffe93795882109e54c] # # patch "randomizer.cc" # from [481e038efea222577cb47f22c3bb3614d7d7d9d5] # to [95de956e48cd3b479e5949c45e9f9781c34aa119] # # patch "randomizer.hh" # from [c4b81193a356206d33540e2c6c9f47d5cb511f13] # to [490f09880887f76baf40a00ead66f13cb107078c] # # patch "rcs_file.cc" # from [ed67c5671b3697e609331ad14f952cfffde85d1f] # to [885b3fbe7b6cfed78816f0e57cd71d44616213c6] # # patch "rcs_file.hh" # from [4f97971ca41a02c642818bf4a6dda13010bbe28f] # to [fa865ade41a0d7f42cc2969d1ad170093b71917a] # # patch "rcs_import.hh" # from [a8e67b44e7960ed7ef21eb46abac7d658ce03689] # to [4d945c0abf3da05913328433420a83cf240173a3] # # patch "refiner.hh" # from [9a8c4cec8421bdd8f8f56106c21dda20ab17d2bf] # to [ec6282db69b98f2c748d00536c281680275b31ec] # # patch "restrictions.hh" # from [d5fea25c76c985979abc5e827fde4e6e8cb98e7c] # to [a733872f76708daa50374e273a6ef3a5909e4ef3] # # patch "rev_height.cc" # from [2634076bced1edfbdadc9467ab7448266daeb72f] # to [f5cd9938feb73ae1b69b0628b9300d222395e28e] # # patch "rev_types.hh" # from [af3c5cf58a78153d7b6a515a25dd4d6d584b851f] # to [81c80844a9083de00a1da7297528ae91737bcfbc] # # patch "revision.cc" # from [33289a2160f89ef17357550e6b7374aef57ca00b] # to [e646c35dae34ea0399ec89c3a86fff6088415efd] # # patch "revision.hh" # from [5be0a6d495ccb2c974f93ac54a45c5ef5a5a4e3a] # to [a9037068bbbb814b1043de6f0b55eed977d3b82e] # # patch "roster.hh" # from [90a95971b06f5586a5bd9c76dc701c643280bf87] # to [b4257701116cab6db535932efe5893ffb042396f] # # patch "roster_delta.cc" # from [f21967cc9f37298083c2a384d167e325e2fa197d] # to [26aa90ed85b6cbdb57c1c77e97d3a0ef305e55dd] # # patch "roster_delta.hh" # from [1cbd73f46a1aa4864ae5b172b67662e8088b810d] # to [bfa92f4bb32c3c2f6d6cfcb56c453bdbbe1fecea] # # patch "roster_tests.hh" # from [2a7c9e87be949541081a52fe18aa732a544397d6] # to [cee3c68e3a02ab972c4ff031946154342ef88b22] # # patch "safe_map.hh" # from [fd5389bf0c1a28081f39a4d5df9b0011c641e208] # to [f07247d537c7872cbddd5a085b0f5ada242f0f5b] # # patch "sanity.cc" # from [40cbfb6afc3df127fbf6c109e0e7aa4075ad2df2] # to [ca4bd80fa83a478d324ec37adb6468b9a884401d] # # patch "sanity.hh" # from [a59baca5da8a73b4c38778ca73a3497409f02ce9] # to [ce0c494f5f8a1c27bc93386dfe46d8f65ee18f6b] # # patch "selectors.cc" # from [c719f6e62002a6940ad8e49f2db7989427f4fb64] # to [0379e566dbf2b7deaf7f209218f5d4cd0d148517] # # patch "selectors.hh" # from [19cc6377e9afbf63e494d7bcfde3eb4754d2b510] # to [7a2e92f0e1c1a1b05fc3c0c00ea2dc2b9059ebe2] # # patch "sha1.cc" # from [52cd7b95bf6ac52cd9020624ec7e4a3bb998d038] # to [a662852697928ff72315d3d9f435305ddc9bb376] # # patch "simplestring_xform.cc" # from [be8b49996d330de5d23552cf2c8fcb38d5b8ddc2] # to [506008109458c58abc016f9546384db4ed61650e] # # patch "simplestring_xform.hh" # from [0f62eaf3d669fa38fde3351bc29f166f7555c924] # to [d732cfc308a8910807ad9350ba6d7c293219ab18] # # patch "ssh_agent.cc" # from [5a9bd4037c3249449c0b7bdee7b3df795cba7581] # to [a9b3a1f2f41e7381007069ee96f76bef97aecac5] # # patch "ssh_agent.hh" # from [c9b7efaf4b0f2c137336046b0ebe3ccff7ad5076] # to [c3293f416dcb980dd2cede7108612c92e4bc3d68] # # patch "string_queue.hh" # from [1326b1642a49c87e22c5dc727ea019c502213ca0] # to [d2184fccefabdb4ac69d5616bf13fc21ada15408] # # patch "tester-plaf.hh" # from [b6b7ad97e517261fdb37d05064e5f1365197f529] # to [e9e164562a9022398b417351dab5a8662237ff15] # # patch "transforms.hh" # from [b2fdb8c0ed6409e99fac04d55e765d38c23158fd] # to [9be76fde6f1634f9606101c7028f0051b39fa918] # # patch "txt2c.cc" # from [810cb63bef54dd15ec21812c34032343b73c668c] # to [22ef07ab43c37b4d954cb171203cbe4aa3a267f6] # # patch "ui.cc" # from [617c42e7a6cc179979544fc0db59383a8f8ffafc] # to [62f1f7056425bf6bbd3beb02ee742eee4fd58adb] # # patch "ui.hh" # from [698164ee671be4906fe4c8ee03a3b8fd001de5d6] # to [1a9728da7d53a52ac0b4dfb7f2728045081973f6] # # patch "unit-tests/basic_io.cc" # from [d9722a5d70813f6ca1aa92e1c04a135c8a4f3a80] # to [538770889b3e70342026027977a9c35ef3bf4bcb] # # patch "unit-tests/charset.cc" # from [91077286a68892e8664e4516ebf87d304941a51f] # to [33530ee817a25d4941d236f4af919957931445ca] # # patch "unit-tests/commands.cc" # from [e0f918182b56e04dd75854cd9e3fe57a402328f0] # to [d5a24210a23b5ba2efb29dacbbf28c88b17fc70c] # # patch "unit-tests/cset.cc" # from [7d16409c51ab9dd2599eeac49e43cbc456a6c7d3] # to [28a06dc65c661141c07a93b69533c42d352a3586] # # patch "unit-tests/dates.cc" # from [4b41c972bd9629ccdddb28ec2cff917f97ac0a7a] # to [af8a777e15c6cccc98f7c006dfe4d84ffd5636ba] # # patch "unit-tests/globish.cc" # from [d2db751fddfa0d0bc0d0df2f735ae7304bcbf151] # to [16645f0f37122cc2534d83dfd32bb38368d0e9e8] # # patch "unit-tests/graph.cc" # from [9d1dad603ecf364e8a0154ef418f04ef5ea3973c] # to [c03ea24f2bbe86e0034a0be7ed668b2891da145c] # # patch "unit-tests/merge_3way.cc" # from [7f56ea3d267d93bfcdfaf39ddc2839e712aba755] # to [c3a2f75290711c12829e59e5b26fd1e5bf657595] # # patch "unit-tests/merge_roster.cc" # from [e83b6301720c6db5bb09c65bccb48ca5ac6f2a5e] # to [8e60819d5307c992f84f41b295c07900cd6addb0] # # patch "unit-tests/netcmd.cc" # from [4ac3c2dd1580efa5134f750c2f1454e99e908863] # to [6f32770480ff18eb89f5131cd4da26572e8e203e] # # patch "unit-tests/netxx_pipe.cc" # from [181510dab2c0c141d7575f035f6dadd91ac1560f] # to [8079a37e6515c9447167cfc70edcee6a89899aff] # # patch "unit-tests/option.cc" # from [a98ee374f118b6153162b465728e7244f00853a1] # to [81d914901386f286e56b93bdd1fbfda1ad98aa35] # # patch "unit-tests/outdated_indicator.cc" # from [dc593bf8294eaaf05595b0b18bcb6136cb1f4610] # to [7763f324495b4930c469b97f92c9f83a24d51c0b] # # patch "unit-tests/packet.cc" # from [99c63c53f2b82b88f6dafb9839056dbe69ea74f8] # to [0886a71bcaacbe45af4109ca95108d28af7dd842] # # patch "unit-tests/paths.cc" # from [294a3b564606d0e3237d3392906832a66c83c904] # to [7465bbf45840f38209712842ee79c6642bcc9482] # # patch "unit-tests/refiner.cc" # from [212627343ce39518d16392092da2103880b063fb] # to [8aec2b41ff7d6f7ac1ee5cb8d701fca0edfab9c6] # # patch "unit-tests/restrictions.cc" # from [90ac7ff1a2560b3f65a6aeea2efa8a3ffc0f3a46] # to [c7f6ce107a7c5599ed0dac7ecfff2b9f0268f0b3] # # patch "unit-tests/rev_height.cc" # from [449562e54a13e606ac164c46658893b972977f4f] # to [c4badb69187cd720c1ba87c32ff5fbd5a0ff0a39] # # patch "unit-tests/revision.cc" # from [22d5e143205c9909fadb6f4c5a627e432a01412d] # to [d79f05dc96e7ec2e63c699d1022593789278715d] # # patch "unit-tests/roster.cc" # from [4bb7cf5442f7f16b20a470e605b0a919119d0196] # to [26f278e0c4f1db6a2d06480acc20b97039c5f4c9] # # patch "unit-tests/sha1.cc" # from [ac4543c655de43bdffc5ddaba3c511b1dcc53a74] # to [dcaf3439d0f7ca6a95746b258b0bee1dbb376044] # # patch "unit-tests/simplestring_xform.cc" # from [2b998292cf315420f3254869124275cf1bb964db] # to [03649bf0eb4f9ab5f50594b5ac9a915456e49f11] # # patch "unit-tests/string_queue.cc" # from [ab5a11313c3ed142a83b135a38d1417114b8064b] # to [c2e3a25ff75876791bd5b70dde967796ecec07b3] # # patch "unit-tests/transforms.cc" # from [eebedcadbd8f1cc21fdeb5c2bb566dc26ea89f7f] # to [73b208da2aa37fa7b9c84324782d10adf7424cce] # # patch "unit-tests/uri.cc" # from [83484f081b8a03e0316df7d4d4082830bf72768b] # to [be871d7b14f2fd2c066b4759ae43abc2f2d08912] # # patch "unit-tests/vocab.cc" # from [1d7d9a06fd70fb9d013a53e87cbad73baa274792] # to [bfb299c88dd2b2988aaf1c6d9a110e62896597f4] # # patch "unit-tests/xdelta.cc" # from [429356c79bac3c54426db6286bff3bfb4e5b8a83] # to [a0183bed5c69963c3a39531792657ba3b97b763b] # # patch "unit_tester.cc" # from [8734397c969f332c57e2e2e246502c072bb2103e] # to [ee385ca238b903be23ddbaeef78d2ee78f474e8b] # # patch "unit_tests.hh" # from [48d2f3e88792009a1f883da4e7d7926b802fd016] # to [6b954b0c842e44cd5e8f3caf92fc9ee7354fd888] # # patch "unix/fs.cc" # from [dceea237ff47043805e967acb5040ce3170de2d8] # to [6a14757e5551b259f87054adbd53173e25ce9bc4] # # patch "unix/get_system_flavour.cc" # from [97543576570865c331d16d5ffe11cdc118624530] # to [c2b5a4b599251b363f308aa884cfaeb4eb237e61] # # patch "unix/process.cc" # from [43c3fe5e6a4f465e35e9b3c55859f8e6f6f1e1f0] # to [feac2afcdb6084a21b68c6ff72dafc9e914a4127] # # patch "unix/read_password.cc" # from [fc7956632728a871f4de6f547171ac397d1b8489] # to [781410699fe1a5325ae2efca87fc3871c6647a44] # # patch "unix/ssh_agent_platform.cc" # from [271c9bebfa66789128441aa1452f30d5fa962c8a] # to [ca283542525ff3050ab2b3a657137fb3c5ed5d9b] # # patch "unix/ssh_agent_platform.hh" # from [fdf540a64a48b22b9b7941feb7850b879f353eac] # to [80bc92de73e40e1906c156e49f8927fa9483e2d8] # # patch "unix/tester-check-net.cc" # from [093f6aa88a8aafd110387c0f9df09afc1c44185d] # to [89fdb78ff4c9cd7fe4a60bca1afdf5fbf00b5bbd] # # patch "unix/tester-plaf.cc" # from [839e25268631815a9c6a3a8864a4b9d5dc4a78a1] # to [bcbcd37f68b536f66b86b22af6ea82ef7a1d5111] # # patch "update.cc" # from [04ca1a313bbd21e3fb4654074b36a791246052af] # to [7a3e42759fc4ce4b4ef3693b7dcca4cf7f477c12] # # patch "update.hh" # from [182e0764bd0c84327c2b1f073fc3eaf3642ad4d2] # to [ba78cd61383ee268f56bc37682a490bfac7ee9bb] # # patch "uri.cc" # from [fcf41abf3ae0212694c7db6eab281e707f3a345e] # to [1c57c3a5fa0f0899e60e71b2b79caea4d1c3596d] # # patch "uri.hh" # from [cf5fd067baa8047fb5400ae462aad5840361fa71] # to [f47e00a95933cc7b73d3023993100072625d8fef] # # patch "vector.hh" # from [978075c1e0d5965855106d5e6a4f82518fdde041] # to [6c7d7e9c1f2c26a95d0d51fbbe7db9982e4309c2] # # patch "vocab.hh" # from [8519acc2d76a0ae326f0935adcea296391d2d750] # to [2bd325ccd8f3e2af59352517f3570991d60ce29e] # # patch "vocab_cast.hh" # from [d6cdeb15c439fcb834d27482e480741c4cf608da] # to [bd143db00172c1dff56eace0fa2c82e7299bacce] # # patch "vocab_hash.hh" # from [9d01d5332e1d652f00fc962841a5610a6e59a287] # to [7fd5a04439ab35f212daaad1b673f6dea894ae25] # # patch "vocab_macros.hh" # from [db691c053cae7fa496c004608fe39f576fd6fa7e] # to [6c97f3c4c3b4ac6766ac0c42ffd802168d72a582] # # patch "vocab_terms.hh" # from [8b4bb85bf082eb78e3c2b22ce78081c70f06eeed] # to [28341d787d1cbaba84a00ab5b176939b0a81e05e] # # patch "win32/fs.cc" # from [9dee8425649922f9cf98200c8d79c3a0b01f8290] # to [16b42480fad9d8f471dae8b84db11ab3479d726f] # # patch "win32/get_system_flavour.cc" # from [df4829cf15d2a0ec0c4a63c60f9cef2b15496168] # to [9a3d6b976c35c20ffe50e1fb6e723efe4006a1fd] # # patch "win32/main.cc" # from [2f73d3121a41dd868d41f71fd87e40a8979c560b] # to [5a71222d0355a0c8f699b69e3e13e95ee52ca872] # # patch "win32/process.cc" # from [097e18737531f5b702b62c55a7b98899bab4f7ac] # to [34244703491fe7f3a5d7271d3f4e1eadf3398f2a] # # patch "win32/read_password.cc" # from [8b6380a4788c7ce6b75c2497abc159e466c37d36] # to [24f94f0c5768283f77dd11b5cb4eff5a2885f965] # # patch "win32/ssh_agent_platform.cc" # from [0c9cfe97c961efffa7b19b1fda41252722bdd64c] # to [e06f146740f518ca444678d266b982d234ae061b] # # patch "win32/ssh_agent_platform.hh" # from [d331366b5dde642fb849cdf0b2016803563c0eed] # to [5b62f5f8d1e4158a47839d3b0005531d4d5a3c83] # # patch "win32/tester-check-net.cc" # from [898174e2fc36137c9e27823ad89633df94c46066] # to [5a33162d303659f396e377380ce64015ac0ee79b] # # patch "work.hh" # from [a9f41416559c2d0f44c43aa75b8cf49f2ddc0e05] # to [06639353bb835eb913d2287cc35a2f96fe69230a] # # patch "xdelta.cc" # from [1e3f4949b1b62015a6453efb5a4f7bcb1c9bf5c7] # to [5094e62fb1c7881a0b8da6331f2fc7488a342146] # # patch "xdelta.hh" # from [f8be14aa8c299a8b1bb241c4eafabcb34fff20f6] # to [e2926cc2e87c1962303f9f11cbd588f08e4e2341] # ============================================================ --- Makefile.am bb8be649399cfa08806ca51af094bbf7c57d5210 +++ Makefile.am f73bbb82e9278ee9bc66eb42e445542d900a8ae0 @@ -293,7 +293,7 @@ EXTRA_DIST = \ info_TEXINFOS = monotone.texi EXTRA_DIST = \ HACKING INSTALL README.changesets README.visualc8 UPGRADE \ - audit-includes do-editor-vars.sh doxygen.cfg indent_script \ + audit-includes do-editor-vars.sh doxygen.cfg \ $(wildcard $(srcdir)/m4/*.m4) monotone.spec monotone.html \ texinfo.css schema.sql unix/README util/mtnopt.in win32/README \ win32/monotone.iss win32/modpath.iss win32/monotone.bmp \ ============================================================ --- adler32.hh 7d209e5bfab115bd173679fc129799a44be15931 +++ adler32.hh 8d6d6a08448d05eec4c12e4ec3285b6945da6d70 @@ -49,15 +49,15 @@ adler32 // monotone only uses the adler32 in order to do a rolling window over // the data for the purpose of finding matches in xdelta.cc // Optimize for this case avoiding a lot of unneeded masking. - inline void replace_with(u8 const * ch, std::string::size_type count) + inline void replace_with(u8 const * ch, std::string::size_type count) { I(count < 255); s1 = 1; s2 = 0; len = count; - // Can't overflow in this case as (for s1) 255*255 < 0xffff, + // Can't overflow in this case as (for s1) 255*255 < 0xffff, // and (for s2) (maxs1 = 255*255)*255 < 0xffff_ffff - while (count--) + while (count--) { u32 c = widen(*(ch++)); s1 += c; @@ -77,6 +77,8 @@ adler32 } }; +#endif // __ADLER32_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -84,5 +86,3 @@ adler32 // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __ADLER32_HH__ ============================================================ --- ancestry.cc a8362c21538ff7576166507a9b87fd4ebde69a00 +++ ancestry.cc e13c59e3ab4f4aae398a06e0eeffe2c39d7c0e81 @@ -240,7 +240,7 @@ toposort(database & db, map work; for (set::const_iterator i = revisions.begin(); - i != revisions.end(); ++i) + i != revisions.end(); ++i) { rev_height height; db.get_rev_height(*i, height); @@ -248,7 +248,7 @@ toposort(database & db, } sorted.clear(); - + for (map::const_iterator i = work.begin(); i != work.end(); ++i) { @@ -305,10 +305,10 @@ erase_ancestors_and_failures(database & { // Load up the ancestry graph multimap inverse_graph; - + if (candidates.empty()) return; - + if (inverse_graph_cache_ptr == NULL) inverse_graph_cache_ptr = &inverse_graph; if (inverse_graph_cache_ptr->empty()) @@ -490,8 +490,8 @@ make_roster_for_merge(revision_t const & // can be unit tested. (See comments in that file for further explanation.) static void make_roster_for_merge(revision_t const & rev, revision_id const & new_rid, - roster_t & new_roster, marking_map & new_markings, - database & db, node_id_source & nis) + roster_t & new_roster, marking_map & new_markings, + database & db, node_id_source & nis) { edge_map::const_iterator i = rev.edges.begin(); revision_id const & left_rid = edge_old_revision(i); @@ -507,16 +507,16 @@ make_roster_for_merge(revision_t const & set left_uncommon_ancestors, right_uncommon_ancestors; db.get_uncommon_ancestors(left_rid, right_rid, - left_uncommon_ancestors, - right_uncommon_ancestors); + left_uncommon_ancestors, + right_uncommon_ancestors); make_roster_for_merge(left_rid, *left_cached.first, *left_cached.second, - left_cs, left_uncommon_ancestors, - right_rid, *right_cached.first, *right_cached.second, - right_cs, right_uncommon_ancestors, - new_rid, - new_roster, new_markings, - nis); + left_cs, left_uncommon_ancestors, + right_rid, *right_cached.first, *right_cached.second, + right_cs, right_uncommon_ancestors, + new_rid, + new_roster, new_markings, + nis); } static void ============================================================ --- annotate.cc ef7795111567f501c8bf2ed9f470d4cc430c3b44 +++ annotate.cc 09b9fdcfd43d6ea5867e9a5b77e94dd39defbf9a @@ -263,7 +263,7 @@ annotate_context::evaluate(revision_id r // L(FL("evaluate setting annotations[%d] -> %s, since " // "touched_lines contained %d, copied_lines didn't and " // "annotations[%d] was nullid\n") % *i % rev % *i % *i); - + annotations[*i] = rev; annotated_lines_completed++; } @@ -717,7 +717,7 @@ do_annotate_node(database & db, I(!(work_unit.revision == parent_revision)); file_id file_in_parent; - + work_units::index::type::iterator lmn = work_units.get().find(parent_revision); @@ -741,7 +741,7 @@ do_annotate_node(database & db, added_in_parent_count++; continue; } - + // the node was live in the parent, so this represents a delta. shared_ptr parent_lineage; @@ -781,11 +781,11 @@ do_annotate_node(database & db, } else parent_marked = true; - + // if it's marked, we need to look at its parents instead. if (parent_marked) db.get_revision_parents(parent_revision, parents_interesting_ancestors); - + rev_height parent_height; db.get_rev_height(parent_revision, parent_height); annotate_node_work newunit(work_unit.annotations, @@ -803,7 +803,7 @@ do_annotate_node(database & db, // already a pending node, so we just have to merge the lineage. L(FL("merging lineage from node %s to parent %s") % work_unit.revision % parent_revision); - + lmn->lineage->merge(*parent_lineage, work_unit.annotations); } } @@ -841,19 +841,19 @@ do_annotate (project_t & project, file_t && *(rids_interesting_ancestors.begin()) == rid); if (rid_marked) project.db.get_revision_parents(rid, rids_interesting_ancestors); - + annotate_node_work workunit(acp, lineage, rid, file_node->self, height, rids_interesting_ancestors, file_node->content, rid_marked); work_units.insert(workunit); } - + while (!(work_units.empty() || acp->is_complete())) { // get the work unit for the revision with the greatest height work_units::iterator w = work_units.begin(); I(w != work_units.end()); - + // do_annotate_node() might insert new work units into work_units, and // thus might invalidate the iterator annotate_node_work work = *w; ============================================================ --- annotate.hh 1ffd0ce10fb46ba3d995e3ae5fbc1638d7462896 +++ annotate.hh 7b6a52deeb9922ad942ad150e5149b52b49f4581 @@ -19,6 +19,8 @@ do_annotate(project_t & project, file_t do_annotate(project_t & project, file_t file_node, revision_id rid, bool just_revs); +#endif // defined __ANNOTATE_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -26,5 +28,3 @@ do_annotate(project_t & project, file_t // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // defined __ANNOTATE_HH__ ============================================================ --- app_state.hh 0a75c1c70e25952174396fbd693ab6b00567ca7d +++ app_state.hh d57aab1728315fb169a43e88ad7b213487b9e295 @@ -38,6 +38,8 @@ public: #endif }; +#endif // __APP_STATE_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -45,5 +47,3 @@ public: // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __APP_STATE_HH__ ============================================================ --- asciik.cc 6732fae4fe007723502d95a935c7ca4c065e45a5 +++ asciik.cc 0829616d7ee850f5f9a4babc0c8ddb22fc458354 @@ -399,3 +399,11 @@ CMD(asciik, "asciik", "", CMD_REF(debug) rev->inner().made_from)); } } + +// Local Variables: +// mode: C++ +// fill-column: 76 +// c-file-style: "gnu" +// indent-tabs-mode: nil +// End: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- asciik.hh 80f43a7385027a74cc27728be8da0bc81bab85ba +++ asciik.hh a7e9e877e516ed5f3140b4ba786bba789e000878 @@ -36,3 +36,11 @@ private: }; #endif + +// Local Variables: +// mode: C++ +// fill-column: 76 +// c-file-style: "gnu" +// indent-tabs-mode: nil +// End: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- base.hh a62d857c95d9bc18efcbf5636de75762b6ff02fe +++ base.hh 434649b6ff55a860d707807f78598ba068fa4da2 @@ -61,6 +61,8 @@ template <> void dump(std::string const #define sqlite3_prepare_v2 sqlite3_prepare #endif +#endif // __BASE_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -68,5 +70,3 @@ template <> void dump(std::string const // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- basic_io.hh c1f0e7760a1316c80a511016d8449e9903924b38 +++ basic_io.hh 641229e66202063897f00c2ac6b33d6a7786c5d8 @@ -64,11 +64,11 @@ namespace basic_io char c; input_source(std::string const & in, std::string const & nm) : line(1), col(1), in(in), curr(in.begin()), - name(nm), lookahead(0), c('\0') + name(nm), lookahead(0), c('\0') {} input_source(std::string const & in, std::string const & nm, origin::type w) : origin_aware(w), line(1), col(1), in(in), curr(in.begin()), - name(nm), lookahead(0), c('\0') + name(nm), lookahead(0), c('\0') {} inline void peek() @@ -76,9 +76,9 @@ namespace basic_io if (LIKELY(curr != in.end())) // we do want to distinguish between EOF and '\xff', // so we translate '\xff' to 255u - lookahead = widen(*curr); + lookahead = widen(*curr); else - lookahead = EOF; + lookahead = EOF; } inline void advance() @@ -140,64 +140,64 @@ namespace basic_io } if (is_alpha(in.lookahead)) - { - mark(); - while (is_alnum(in.lookahead) || in.lookahead == '_') - advance(); - store(val); - return basic_io::TOK_SYMBOL; - } + { + mark(); + while (is_alnum(in.lookahead) || in.lookahead == '_') + advance(); + store(val); + return basic_io::TOK_SYMBOL; + } else if (in.lookahead == '[') - { - in.advance(); - mark(); - while (static_cast(in.lookahead) != ']') - { - if (UNLIKELY(in.lookahead == EOF)) - in.err("input stream ended in hex string"); + { + in.advance(); + mark(); + while (static_cast(in.lookahead) != ']') + { + if (UNLIKELY(in.lookahead == EOF)) + in.err("input stream ended in hex string"); if (UNLIKELY(!is_xdigit(in.lookahead))) in.err("non-hex character in hex string"); advance(); - } + } - store(val); + store(val); - if (UNLIKELY(static_cast(in.lookahead) != ']')) - in.err("hex string did not end with ']'"); - in.advance(); + if (UNLIKELY(static_cast(in.lookahead) != ']')) + in.err("hex string did not end with ']'"); + in.advance(); - return basic_io::TOK_HEX; - } + return basic_io::TOK_HEX; + } else if (in.lookahead == '"') - { - in.advance(); - mark(); - while (static_cast(in.lookahead) != '"') - { - if (UNLIKELY(in.lookahead == EOF)) - in.err("input stream ended in string"); - if (UNLIKELY(static_cast(in.lookahead) == '\\')) - { - // Possible escape: we understand escaped quotes and - // escaped backslashes. Nothing else. If we // happen to - // hit an escape, we stop doing the mark/store // thing - // and switch to copying and appending per-character - // until the // end of the token. + { + in.advance(); + mark(); + while (static_cast(in.lookahead) != '"') + { + if (UNLIKELY(in.lookahead == EOF)) + in.err("input stream ended in string"); + if (UNLIKELY(static_cast(in.lookahead) == '\\')) + { + // Possible escape: we understand escaped quotes and + // escaped backslashes. Nothing else. If we // happen to + // hit an escape, we stop doing the mark/store // thing + // and switch to copying and appending per-character + // until the // end of the token. // So first, store what we have *before* the escape. store(val); // Then skip over the escape backslash. - in.advance(); + in.advance(); // Make sure it's an escape we recognize. - if (UNLIKELY(!(static_cast(in.lookahead) == '"' + if (UNLIKELY(!(static_cast(in.lookahead) == '"' || - static_cast(in.lookahead) == '\\'))) + static_cast(in.lookahead) == '\\'))) in.err("unrecognized character escape"); // Add the escaped character onto the accumulating token. - in.advance(); + in.advance(); val += in.c; // Now enter special slow loop for remainder. @@ -210,9 +210,9 @@ namespace basic_io // Skip over any further escape marker. in.advance(); if (UNLIKELY - (!(static_cast(in.lookahead) == '"' - || - static_cast(in.lookahead) == '\\'))) + (!(static_cast(in.lookahead) == '"' + || + static_cast(in.lookahead) == '\\'))) in.err("unrecognized character escape"); } in.advance(); @@ -224,20 +224,20 @@ namespace basic_io in.advance(); return basic_io::TOK_STRING; - } - advance(); - } + } + advance(); + } - store(val); + store(val); - if (UNLIKELY(static_cast(in.lookahead) != '"')) - in.err("string did not end with '\"'"); - in.advance(); + if (UNLIKELY(static_cast(in.lookahead) != '"')) + in.err("string did not end with '\"'"); + in.advance(); - return basic_io::TOK_STRING; - } + return basic_io::TOK_STRING; + } else - return basic_io::TOK_NONE; + return basic_io::TOK_NONE; } void err(std::string const & s); }; @@ -254,11 +254,11 @@ namespace basic_io void push_hex_pair(symbol const & k, hexenc const & v); void push_binary_pair(symbol const & k, id const & v); void push_binary_triple(symbol const & k, std::string const & n, - id const & v); + id const & v); void push_str_pair(symbol const & k, std::string const & v); void push_str_pair(symbol const & k, symbol const & v); void push_str_triple(symbol const & k, std::string const & n, - std::string const & v); + std::string const & v); void push_file_pair(symbol const & k, file_path const & v); void push_str_multi(symbol const & k, std::vector const & v); @@ -343,6 +343,8 @@ namespace basic_io } +#endif // __BASIC_IO_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -350,5 +352,3 @@ namespace basic_io // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __BASIC_IO_HH__ ============================================================ --- botan_pipe_cache.hh 21898f46e28b96c8471b488237b4f716f8389bda +++ botan_pipe_cache.hh 105f9431f4633819be88d758ccff8281ce7bd6fa @@ -80,6 +80,8 @@ inline cached_botan_pipe::cached_botan_p global_pipe_cleanup_object->to_be_destroyed = this; } +#endif // __BOTAN_PIPE_CACHE_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -87,5 +89,3 @@ inline cached_botan_pipe::cached_botan_p // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __BOTAN_PIPE_CACHE_HH__ ============================================================ --- cert.cc 7b6d6fe8c2cf22a420422e7699b812c2ee6ef3d6 +++ cert.cc b3dcf32e9aef5757a17afc8ec113a41cb428b861 @@ -116,7 +116,7 @@ erase_bogus_certs(database & db, // Sorry, this is a crazy data structure typedef tuple< manifest_id, cert_name, cert_value > trust_key; - typedef map< trust_key, + typedef map< trust_key, pair< shared_ptr< set >, it > > trust_map; trust_map trust; @@ -175,14 +175,14 @@ erase_bogus_certs(database & db, // sorry, this is a crazy data structure typedef tuple< revision_id, cert_name, cert_value > trust_key; - typedef map< trust_key, + typedef map< trust_key, pair< shared_ptr< set >, it > > trust_map; trust_map trust; for (it i = certs.begin(); i != certs.end(); ++i) { - trust_key key = trust_key(i->inner().ident, - i->inner().name, + trust_key key = trust_key(i->inner().ident, + i->inner().name, i->inner().value); trust_map::iterator j = trust.find(key); shared_ptr< set > s; ============================================================ --- cert.hh 1d875af6765958035c4c44bc51ac57f0fdb458a1 +++ cert.hh 3fa5adb025361516fac47866927c4f193337af8e @@ -147,6 +147,7 @@ cert_revision_testresult(database & db, revision_id const & m, std::string const & results); +#endif // __CERT_HH__ // Local Variables: // mode: C++ @@ -155,5 +156,3 @@ cert_revision_testresult(database & db, // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __CERT_HH__ ============================================================ --- char_classifiers.hh 7dece6ad2d6a9520ababb31f6a9f84b7edb60444 +++ char_classifiers.hh 203fa7aa9d0438bd11e88279fe2d2d67a0715991 @@ -71,6 +71,8 @@ inline char to_lower(char x) return is_upper(x) ? (x - 'A' + 'a') : x; } +#endif // __CHAR_CLASSIFIERS_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -78,5 +80,3 @@ inline char to_lower(char x) // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __CHAR_CLASSIFIERS_HH__ ============================================================ --- charset.hh 3cff551326cf06e612a8ca969e5eef07fe904802 +++ charset.hh fd5cac7b2f6866b0deee4843c6906617660926ab @@ -50,6 +50,8 @@ void externalize_var_domain(var_domain c void externalize_var_domain(var_domain const & d, utf8 & utf); void externalize_var_domain(var_domain const & d, external & ext); +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -57,5 +59,3 @@ void externalize_var_domain(var_domain c // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- cleanup.hh 010b36cdbbabb9548e3df6d03f4a6a6be9563707 +++ cleanup.hh c0af521b7aa0719eb3ca0d886af60d813ea6e3f5 @@ -35,6 +35,8 @@ struct cleanup_ptr { } }; +#endif // __CLEANUP_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -42,5 +44,3 @@ struct cleanup_ptr { // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __CLEANUP_HH__ ============================================================ --- cmd.cc 1cfec6b4c6f2737366730df48bbe1b4f65beb5b6 +++ cmd.cc b7bdef6d3e370a8647789c59a2de7b190c49205a @@ -303,7 +303,7 @@ namespace commands { std::string const & func_name) : command(primary_name, "", CMD_REF(user), false, false, params, abstract, desc, true, - options::options_type() | options::opts::none, true), + options::options_type() | options::opts::none, true), st(L_st), f_name(func_name) { // because user commands are inserted after the normal @@ -312,7 +312,7 @@ namespace commands { } void exec(app_state & app, command_id const & execid, - args_vector const & args) const + args_vector const & args) const { I(st); I(app.lua.check_lua_state(st)); @@ -324,8 +324,8 @@ namespace commands { ll.func(f_name); for (args_vector::const_iterator it = args.begin(); - it != args.end(); ++it) - ll.push_str((*it)()); + it != args.end(); ++it) + ll.push_str((*it)()); app.mtn_automate_allowed = true; @@ -334,8 +334,8 @@ namespace commands { app.mtn_automate_allowed = false; E(ll.ok(), origin::user, - F("Call to user command %s (lua command: %s) failed.") - % primary_name() % f_name); + F("Call to user command %s (lua command: %s) failed.") + % primary_name() % f_name); } }; } @@ -373,7 +373,7 @@ LUAEXT(register_command, ) // leak this - commands can't be removed anyway new commands::cmd_lua(cmd_name, cmd_params, cmd_abstract, cmd_desc, - LS, cmd_func); + LS, cmd_func); lua_pushboolean(LS, true); return 1; @@ -383,7 +383,7 @@ CMD_NO_WORKSPACE(help, "help", "", CMD_R // better file. CMD_NO_WORKSPACE(help, "help", "", CMD_REF(informative), - N_("command [ARGS...]"), + N_("command [ARGS...]"), N_("Displays help about commands and options"), "", options::opts::none) ============================================================ --- cmd.hh b1068b8f8f0fe3b691a0a2b5624527d37adc4e48 +++ cmd.hh 0a877d515c8b959a010de89e5f7db7f6fabce05f @@ -138,7 +138,7 @@ args_to_paths(args_vector const & args) { if (bookkeeping_path::external_string_is_bookkeeping_path(*i)) W(F("ignored bookkeeping path '%s'") % *i); - else + else paths.push_back(file_path_external(*i)); } // "it should not be the case that args were passed, but our paths set @@ -282,6 +282,8 @@ CMD_FWD_DECL(user); CMD_FWD_DECL(workspace); CMD_FWD_DECL(user); +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -289,5 +291,3 @@ CMD_FWD_DECL(user); // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- cmd_conflicts.cc 29cf4482ddd3d446052d3767588c9caf0a656cdf +++ cmd_conflicts.cc 47726f1fef74e5141dfb6678e07778d4c08fc15b @@ -431,4 +431,10 @@ CMD(clean, "clean", "", CMD_REF(conflict delete_dir_recursive(resolutions_dir); } -// end of file +// Local Variables: +// mode: C++ +// fill-column: 76 +// c-file-style: "gnu" +// indent-tabs-mode: nil +// End: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- cmd_diff_log.cc 022198a63c53dc5a47f0d1824fb5eeed6c155f80 +++ cmd_diff_log.cc caf5335a9a55a96e92391a998d953b4ddae1b92a @@ -392,9 +392,9 @@ prepare_diff(app_state & app, work.update_current_roster_from_filesystem(new_roster, mask); - make_restricted_roster(old_roster, new_roster, restricted_roster, + make_restricted_roster(old_roster, new_roster, restricted_roster, mask); - + make_cset(old_roster, restricted_roster, included); make_cset(restricted_roster, new_roster, excluded); @@ -419,9 +419,9 @@ prepare_diff(app_state & app, work.update_current_roster_from_filesystem(new_roster, mask); - make_restricted_roster(old_roster, new_roster, restricted_roster, + make_restricted_roster(old_roster, new_roster, restricted_roster, mask); - + make_cset(old_roster, restricted_roster, included); make_cset(restricted_roster, new_roster, excluded); @@ -465,10 +465,10 @@ prepare_diff(app_state & app, args_to_paths(app.opts.exclude_patterns), app.opts.depth, old_roster, new_roster); - - make_restricted_roster(old_roster, new_roster, restricted_roster, + + make_restricted_roster(old_roster, new_roster, restricted_roster, mask); - + make_cset(old_roster, restricted_roster, included); make_cset(restricted_roster, new_roster, excluded); @@ -715,7 +715,7 @@ CMD(log, "log", "", CMD_REF(informative) work.get_current_roster_shape(db, nis, new_roster); mask = node_restriction(args_to_paths(args), - args_to_paths(app.opts.exclude_patterns), + args_to_paths(app.opts.exclude_patterns), app.opts.depth, parents, new_roster, ignored_file(work)); } @@ -727,7 +727,7 @@ CMD(log, "log", "", CMD_REF(informative) db.get_roster(first_rid, roster); mask = node_restriction(args_to_paths(args), - args_to_paths(app.opts.exclude_patterns), + args_to_paths(app.opts.exclude_patterns), app.opts.depth, roster); } } ============================================================ --- cmd_files.cc a052e282223aa32471545d4dbbd84f267f546271 +++ cmd_files.cc b50cf2dcd44c507747371c64b7ed16d6263c13c2 @@ -60,7 +60,7 @@ CMD(fmerge, "fmerge", "", CMD_REF(debug) if (args.size() != 3) throw usage(execid); - file_id + file_id anc_id(decode_hexenc_as(idx(args, 0)(), origin::user)), left_id(decode_hexenc_as(idx(args, 1)(), origin::user)), right_id(decode_hexenc_as(idx(args, 2)(), origin::user)); @@ -104,7 +104,7 @@ CMD(fdiff, "fdiff", "", CMD_REF(debug), & src_name = idx(args, 0)(), & dst_name = idx(args, 1)(); - file_id + file_id src_id(decode_hexenc_as(idx(args, 2)(), origin::user)), dst_id(decode_hexenc_as(idx(args, 3)(), origin::user)); @@ -234,15 +234,15 @@ CMD_AUTOMATE(identify, N_("PATH"), { E(args.size() == 1, origin::user, F("wrong argument count")); - + utf8 path = idx(args, 0); - + E(path() != "-", origin::user, F("Cannot read from stdin")); - + data dat; read_data_for_command_line(path, dat); - + id ident; calculate_ident(dat, ident); output << ident << '\n'; @@ -275,7 +275,7 @@ dump_file(database & db, std::ostream & db.get_roster(rid, roster, marks); E(roster.has_node(fp), origin::user, F("no file '%s' found in revision '%s'") % fp % rid); - + node_t node = roster.get_node(fp); E((!null_node(node->self) && is_file_t(node)), origin::user, F("no file '%s' found in revision '%s'") % fp % rid); ============================================================ --- cmd_key_cert.cc 992b4e94b38c2ed75c0da7f2d50a70f90b7cd453 +++ cmd_key_cert.cc a6a341676c5f588f994d9a2e1743c91dcdd2ad4b @@ -188,7 +188,7 @@ CMD(cert, "cert", "", CMD_REF(key_and_ce guard.commit(); } -CMD(trusted, "trusted", "", CMD_REF(key_and_cert), +CMD(trusted, "trusted", "", CMD_REF(key_and_cert), N_("REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]"), N_("Tests whether a hypothetical certificate would be trusted"), N_("The current settings are used to run the test."), ============================================================ --- cmd_othervcs.cc ca6b6d84259d7758b81cd9209d996979a757f4c5 +++ cmd_othervcs.cc ffef05703295b5f6ae6b5860cb83a7a960b74b03 @@ -33,7 +33,7 @@ CMD(rcs_import, "rcs_import", "", CMD_RE } -CMD(cvs_import, "cvs_import", "", CMD_REF(rcs), N_("CVSROOT"), +CMD(cvs_import, "cvs_import", "", CMD_REF(rcs), N_("CVSROOT"), N_("Imports all versions in a CVS repository"), "", options::opts::branch) ============================================================ --- cmd_packet.cc 3afccc60c3efa1335909f87f598ce4e843071b11 +++ cmd_packet.cc e661fbb33bf6182af21cbd7d7f83a56cf63b3656 @@ -23,7 +23,7 @@ using std::vector; using std::istringstream; using std::vector; -CMD(pubkey, "pubkey", "", CMD_REF(packet_io), N_("ID"), +CMD(pubkey, "pubkey", "", CMD_REF(packet_io), N_("ID"), N_("Prints a public key packet"), "", options::opts::none) @@ -56,7 +56,7 @@ CMD(pubkey, "pubkey", "", CMD_REF(packet pw.consume_public_key(ident, key); } -CMD(privkey, "privkey", "", CMD_REF(packet_io), N_("ID"), +CMD(privkey, "privkey", "", CMD_REF(packet_io), N_("ID"), N_("Prints a private key packet"), "", options::opts::none) @@ -116,7 +116,7 @@ namespace db.put_revision(ident, dat); guard.commit(); } - + virtual void consume_revision_cert(cert const & t) { transaction_guard guard(db); @@ -131,7 +131,7 @@ namespace db.put_key(ident, k); guard.commit(); } - + virtual void consume_key_pair(rsa_keypair_id const & ident, keypair const & kp) { @@ -193,7 +193,7 @@ CMD(read, "read", "", CMD_REF(packet_io) } else { - for (args_vector::const_iterator i = args.begin(); + for (args_vector::const_iterator i = args.begin(); i != args.end(); ++i) { data dat; ============================================================ --- commands.hh 18235ed79ea9bf22f0a6957e6bb7d2486b824db7 +++ commands.hh 0b39910ab77fbb722c4a0fada49f07a7e8c3cb21 @@ -36,6 +36,8 @@ struct usage commands::command_id which; }; +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -43,5 +45,3 @@ struct usage // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- constants.hh d0a7820dda371e19f30b83adcd1d6c5027ebfcd8 +++ constants.hh f74e771b8c51ca5bdd37c0dd383471794d6427b4 @@ -174,6 +174,8 @@ namespace constants extern char const manual_merge_attribute[]; } +#endif // __CONSTANTS_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -181,5 +183,3 @@ namespace constants // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __CONSTANTS_HH__ ============================================================ --- cset.hh 5120df6bd9c521f03437fc04e5f02ed7dc610b97 +++ cset.hh 98c7724f0e0ef0da85d9c0f4a8efe1e12dffcdb0 @@ -118,6 +118,8 @@ dump(cset const & cs, std::string & out) template <> void dump(cset const & cs, std::string & out); +#endif // __CSET_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -125,5 +127,3 @@ dump(cset const & cs, std::string & out) // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __CSET_HH__ ============================================================ --- current_exception.hh 3b0be7b7f888fc02ef96db80b17b0fae2c9c83bd +++ current_exception.hh 4cdea3209b8fbd10ba6ea4b71db8930dda3b4d08 @@ -42,3 +42,11 @@ #endif #endif + +// Local Variables: +// mode: C++ +// fill-column: 76 +// c-file-style: "gnu" +// indent-tabs-mode: nil +// End: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- cycle_detector.hh c8ee3bc84304bebe227f3fe2c3e43910cf8fbcbd +++ cycle_detector.hh f84cdc9a8ffd6333c739ddfba03a709295126e31 @@ -89,6 +89,8 @@ struct cycle_detector } }; +#endif // __CYCLE_DETECTOR_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -96,5 +98,3 @@ struct cycle_detector // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __CYCLE_DETECTOR_HH__ ============================================================ --- database.hh 3669851b2d94c471f26ec67fa38ee392e141d826 +++ database.hh 982dc2304b3e729f1f1b228f19769117b2015be1 @@ -246,7 +246,7 @@ public: void delete_public_key(rsa_keypair_id const & pub_id); // Crypto operations - + void encrypt_rsa(rsa_keypair_id const & pub_id, std::string const & plaintext, rsa_oaep_sha_data & ciphertext); @@ -416,7 +416,7 @@ public: void put_rev_height(revision_id const & id, rev_height const & height); - + bool has_rev_height(rev_height const & height); void delete_existing_heights(); @@ -543,6 +543,8 @@ public: } }; +#endif // __DATABASE_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -550,5 +552,3 @@ public: // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __DATABASE_HH__ ============================================================ --- database_check.cc 252ae203301bfc31df26045a1afb7ce466ae57ee +++ database_check.cc 748c15e077685e9ab0783151323ee94150cabaa4 @@ -179,9 +179,9 @@ check_rosters_manifest(database & db, db.get_roster_ids(rosters); L(FL("checking %d rosters, manifest pass") % rosters.size()); - + ticker ticks(_("rosters"), "r", rosters.size()/70+1); - + for (set::const_iterator i = rosters.begin(); i != rosters.end(); ++i) { @@ -503,7 +503,7 @@ check_heights(database & db, revision_id null_id; heights.insert(null_id); } - + L(FL("checking %d heights") % heights.size()); set seen; @@ -514,7 +514,7 @@ check_heights(database & db, i != heights.end(); ++i) { L(FL("checking height for %s") % *i); - + rev_height h; try { @@ -573,7 +573,7 @@ check_heights_relation(database & db, L(FL("checking heights for edges %s -> %s") % p_id % c_id); - + rev_height parent, child; db.get_rev_height(p_id, parent); db.get_rev_height(c_id, child); ============================================================ --- diff_output.hh 399f633945756b8ca315ee658d632243e357226f +++ diff_output.hh 21d1cd2af12202cb14359483c7f85724f373786b @@ -26,6 +26,8 @@ void make_diff(std::string const & filen diff_type type, std::string const & pattern); +#endif // __DIFF_PATCH_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -33,5 +35,3 @@ void make_diff(std::string const & filen // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __DIFF_PATCH_HH__ ============================================================ --- do-editor-vars.sh 34672877afa9dd656c51d24412f08a10e14105e3 +++ do-editor-vars.sh c9502a84ed9c574b45031e23d8b502e71c63092d @@ -1,11 +1,10 @@ #!/bin/sh -for file in $(ls *cc *hh unix/*cc unix/*hh win32/*cc win32/*hh 2>/dev/null | sort); do +for file in *.cc *.hh */*.cc */*.hh; do if ! grep -q 'Local Variables' $file; then echo "Adding vars block to $file" cat <> $file - // Local Variables: // mode: C++ // fill-column: 76 @@ -13,7 +12,6 @@ for file in $(ls *cc *hh unix/*cc unix/* // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - EOF fi; done ============================================================ --- enumerator.cc e3eff2b537853694535346e0d47489832eefccf7 +++ enumerator.cc 89890d88770c8a1cffbfc36fe1f4b8471fc06477 @@ -45,7 +45,7 @@ revision_enumerator::get_revision_parent void revision_enumerator::get_revision_parents(revision_id const & child, - vector & parents) + vector & parents) { parents.clear(); typedef multimap::const_iterator ci; @@ -54,8 +54,8 @@ revision_enumerator::get_revision_parent { if (i->first == child) { - parents.push_back(i->second); - } + parents.push_back(i->second); + } } } @@ -166,7 +166,7 @@ revision_enumerator::note_cert(revision_ void revision_enumerator::note_cert(revision_id const & rid, - id const & cert_hash) + id const & cert_hash) { revision_certs.insert(make_pair(rid, cert_hash)); } @@ -174,7 +174,7 @@ revision_enumerator::get_revision_certs( void revision_enumerator::get_revision_certs(revision_id const & rid, - vector & hashes) + vector & hashes) { hashes.clear(); bool found_one = false; @@ -184,7 +184,7 @@ revision_enumerator::get_revision_certs( { found_one = true; if (i->first == rid) - hashes.push_back(i->second); + hashes.push_back(i->second); } if (!found_one) project.get_revision_cert_hashes(rid, hashes); @@ -217,9 +217,9 @@ revision_enumerator::step() pair range = graph.equal_range(r); for (ci i = range.first; i != range.second; ++i) { - // We push_front here rather than push_back in order - // to improve database cache performance. It avoids - // skipping back and forth beween parallel lineages. + // We push_front here rather than push_back in order + // to improve database cache performance. It avoids + // skipping back and forth beween parallel lineages. if (i->first == r) if (enumerated_nodes.find(i->first) == enumerated_nodes.end()) revs.push_front(i->second); ============================================================ --- enumerator.hh a6ad0d155400b0f3ce46331dd029780fb90546e9 +++ enumerator.hh 77463e904b18c2dbef84a776c6706f28be489ee9 @@ -67,19 +67,21 @@ revision_enumerator std::set & full_files, std::set > & del_files); void get_revision_certs(revision_id const & rid, - std::vector & certs); + std::vector & certs); public: revision_enumerator(project_t & project, enumerator_callbacks & cb); void get_revision_parents(revision_id const & rid, - std::vector & parents); + std::vector & parents); void note_cert(revision_id const & rid, id const & cert_hash); void step(); bool done(); }; +#endif // __ENUMERATOR_H__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -87,5 +89,3 @@ public: // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __ENUMERATOR_H__ ============================================================ --- epoch.hh 9d4366878bee862bbdf1f04b107e780e1225a340 +++ epoch.hh 41f84eceeebe1a75b49fc172119cb005f9b74589 @@ -22,6 +22,8 @@ void epoch_hash_code(branch_name const & void epoch_hash_code(branch_name const & branch, epoch_data const & epoch, epoch_id & eid); +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -29,5 +31,3 @@ void epoch_hash_code(branch_name const & // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- file_io.cc 1dd0f7e6aab013780c2f902515a73becae6804cf +++ file_io.cc 34e9c1581a7c336b0406c2601ac7cee5012723c7 @@ -490,7 +490,7 @@ walk_tree_recursive(file_path const & pa // describing _this_ directory pinned on the heap. Then our recursive // call itself made another recursive call, etc., causing a huge spike in // peak memory. By splitting the loop in half, we avoid this problem. - // + // // [1] http://lkml.org/lkml/2006/2/24/215 vector files, dirs; read_directory(path, files, dirs); ============================================================ --- file_io.hh e477a87af2f1d3326d5f07f9c9ed6ab322809fe6 +++ file_io.hh c5adaa89ea74db1d489c53a4ca3f60398beb848a @@ -123,6 +123,8 @@ void calculate_ident(file_path const & f void calculate_ident(file_path const & file, file_id & ident); +#endif // __FILE_IO_H__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -130,5 +132,3 @@ void calculate_ident(file_path const & f // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __FILE_IO_H__ ============================================================ --- globish.cc 0e1c02f1ea8a2a3ed93c40628f139357bcfe9e78 +++ globish.cc 457d8817b4b0541646c134406e3f537897dfad74 @@ -104,7 +104,7 @@ compile_charclass(string const & pat, st L(FL("expanding range from %X (%c) to %X (%c)") % (start+1) % (char)(start+1) % stop % (char)stop); - + for (unsigned int r = start + 1; r < stop; r++) in_class.push_back((char)r); } @@ -160,7 +160,7 @@ compile_frag(string const & pat, back_in E((widen(*p)) >= ' ', made_from, F("invalid pattern '%s': control character 0x%02x is not allowed") % pat % (widen(*p))); - + *to++ = *p; break; @@ -185,7 +185,7 @@ compile_frag(string const & pat, back_in case '?': *to++ = META_QUES; break; - + case '\\': p++; E(p != pat.end(), made_from, @@ -369,8 +369,8 @@ find_next_subpattern(string::const_itera I(false); } - + static bool do_match(string::const_iterator sb, string::const_iterator se, string::const_iterator p, string::const_iterator pe) @@ -493,7 +493,7 @@ do_match(string::const_iterator sb, stri if (do_match(s, srest, psub, pnext - 1) && do_match(srest, se, prest, pe)) return true; - + psub = pnext; } while (pnext < prest); @@ -507,7 +507,7 @@ bool globish::matches(string const & tar bool globish::matches(string const & target) const { bool result; - + // The empty pattern matches nothing. if (compiled_pattern.empty()) result = false; ============================================================ --- globish.hh 52afd9b82e2cf0a8b2e61ee60d0e6afa12ce6f13 +++ globish.hh 696c65bcf44f9a427e54d85b810bc8bfcfdfd1a0 @@ -84,6 +84,8 @@ private: }; +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -91,5 +93,3 @@ private: // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- graph.cc 9a5011b6865d7b3690db35284e17e81e08f62846 +++ graph.cc 262f4c91912223b9b33361736f46bd49c242069a @@ -143,7 +143,7 @@ void toposort_rev_ancestry(rev_ancestry_ { typedef multimap::const_iterator gi; typedef map::iterator pi; - + revisions.clear(); revisions.reserve(graph.size()); // determine the number of parents for each rev @@ -165,7 +165,7 @@ void toposort_rev_ancestry(rev_ancestry_ roots.pop_front(); if (!null_id(cur)) revisions.push_back(cur); - + std::pair bounds = graph.equal_range(cur); for(gi i = bounds.first; i != bounds.second; i++) @@ -225,11 +225,11 @@ get_uncommon_ancestors(revision_id const rg.get_height(b, h); b_frontier.insert(make_pair(h, b)); } - + hash_set a_seen, b_seen, common_seen; a_seen.insert(a); b_seen.insert(b); - + while (!a_frontier.empty() || !b_frontier.empty()) { // We take the leaf-most (ie highest) height entry from any frontier. @@ -278,7 +278,7 @@ get_uncommon_ancestors(revision_id const } else I(false); - } + } } ============================================================ --- graph.hh 1defcf53b76fc0b894e124883802e7f04a3d9c3e +++ graph.hh 7322b6a5901450c65e3c965028e8fe7069294049 @@ -51,9 +51,9 @@ get_uncommon_ancestors(revision_id const rev_graph const & hg, std::set & a_uncommon_ancs, std::set & b_uncommon_ancs); - + #endif // __GRAPH__HH__ @@ -64,4 +64,3 @@ get_uncommon_ancestors(revision_id const // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - ============================================================ --- gzip.cc 94366b8142864e7304bb05627761c8b9bf85ae69 +++ gzip.cc 1beb2f35dc50dc33134175f8e77b8cf487a0d945 @@ -368,7 +368,7 @@ void Gzip_Decompression::check_footer() throw Exception("Gzip_Decompression: Error finalizing decompression"); pipe.end_msg(); - + // 4 byte CRC32, and 4 byte length field SecureVector buf(4); SecureVector tmpbuf(4); @@ -419,3 +419,11 @@ void Gzip_Decompression::clear() } } + +// Local Variables: +// mode: C++ +// fill-column: 76 +// c-file-style: "gnu" +// indent-tabs-mode: nil +// End: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- gzip.hh 391f70c2e4678fcc34ce5bbcd848335f94de882f +++ gzip.hh d8ba99ba959d68614258509a06a1c52d1ba7f023 @@ -82,3 +82,11 @@ class Gzip_Decompression : public Filter } #endif + +// Local Variables: +// mode: C++ +// fill-column: 76 +// c-file-style: "gnu" +// indent-tabs-mode: nil +// End: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- hash_map.hh 1354e46d7ae2f17c40f5262c7b7be6666d197d64 +++ hash_map.hh 233406037b70b2cf47538d743409ca45a126978d @@ -114,7 +114,7 @@ namespace hashmap { equal_to<_Key> > {}; - + } #elif HAVE_STLPORT_HASHMAP @@ -187,7 +187,7 @@ namespace hashmap size_t operator( )(T const & s) const { - return h(s); + return h(s); } bool operator( )(T const & a, T const & b) const @@ -218,6 +218,8 @@ namespace hashmap #undef HASHMAP_PRESENT +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -225,5 +227,3 @@ namespace hashmap // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- hmac.cc 0e9e11fc7f8143da251aa6523a65a35d59da7961 +++ hmac.cc 7a9e2c99be224785b6563622ad08675ebb29ca6b @@ -1,4 +1,3 @@ - #include "base.hh" #include @@ -26,7 +25,7 @@ chained_hmac::set_key(netsync_session_ke if (active) { key = Botan::SymmetricKey(reinterpret_cast(session_key().data()), - session_key().size()); + session_key().size()); engine.reset(); engine.append(new Botan::MAC_Filter("HMAC(SHA-160)", key, constants::sha1_digest_length)); ============================================================ --- hmac.hh df0392000b74ac3553d40c39d851e4144eda1aef +++ hmac.hh 441e7ef06ac15ebc11bf66ba5e53aa4b5d8ed35e @@ -14,9 +14,9 @@ public: chained_hmac(netsync_session_key const & session_key, bool active); void set_key(netsync_session_key const & session_key); std::string process(std::string const & str, size_t pos = 0, - size_t n = std::string::npos); + size_t n = std::string::npos); std::string process(string_queue const & str, size_t pos = 0, - size_t n = std::string::npos); + size_t n = std::string::npos); size_t const hmac_length; bool is_active() { return active; } @@ -31,6 +31,8 @@ private: +#endif // __HMAC_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -38,6 +40,3 @@ private: // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __HMAC_HH__ - ============================================================ --- hybrid_map.hh c0b815591a24a6442550a32afdd54bebc8524784 +++ hybrid_map.hh f0b044a619da06baacc4163f492c124f372886db @@ -115,11 +115,11 @@ public: hybrid_map const * n; public: const_iterator(hybrid_map const * n, - typename omap::const_iterator const & i) + typename omap::const_iterator const & i) : ordered(true), valid(i != n->ordered.end()), o(i), n(n) {} const_iterator(hybrid_map const * n, - typename umap::const_iterator const & i) + typename umap::const_iterator const & i) : ordered(false), valid(i != n->unordered.end()), u(i), n(n) {} const_iterator(iterator const & i) @@ -246,3 +246,11 @@ public: #endif + +// Local Variables: +// mode: C++ +// fill-column: 76 +// c-file-style: "gnu" +// indent-tabs-mode: nil +// End: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- inodeprint.cc 9f2497b52396a2caec4699b13bdaff55525a204c +++ inodeprint.cc aa6821e0691244214d92f7a911daf130daf52f6d @@ -53,7 +53,7 @@ read_inodeprint_map(data const & dat, L(FL("inodeprints file format is wrong, skipping it")); return; } - + basic_io::input_source src(dat(), "inodeprint"); basic_io::tokenizer tok(src); basic_io::parser pa(tok); ============================================================ --- inodeprint.hh b3e2f2e96752e05f794cc8b23eed82bdc7a5de86 +++ inodeprint.hh ef0ced7b3dc4f2efee24c9a57102c1c4f1f09801 @@ -33,7 +33,7 @@ inline bool bool inodeprint_file(file_path const & file, hexenc & ip); inline bool -inodeprint_unchanged(inodeprint_map const & ipm, file_path const & path) +inodeprint_unchanged(inodeprint_map const & ipm, file_path const & path) { inodeprint_map::const_iterator old_ip = ipm.find(path); if (old_ip != ipm.end()) @@ -49,6 +49,8 @@ inodeprint_unchanged(inodeprint_map cons } +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -56,5 +58,3 @@ inodeprint_unchanged(inodeprint_map cons // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- interner.hh 149f63e6eb3f1b29d26d017d5e94d8482327afd6 +++ interner.hh 79c7a7122d6bda80842c63fd6b56c0113a2274a8 @@ -51,6 +51,8 @@ interner } }; +#endif // __INTERNER_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -58,5 +60,3 @@ interner // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __INTERNER_HH__ ============================================================ --- key_store.cc 36d3755fc7c95b38d90420321b9bfa8b8d08983a +++ key_store.cc 133bf327bebd83b73820217c7d92cd12f9153464 @@ -408,7 +408,7 @@ get_passphrase(utf8 & phrase, if (confirm_phrase) prompt2 = (F("confirm passphrase for key ID [%s]: ") % keyid).str(); - + try { for (;;) ============================================================ --- key_store.hh a529bde9cd5162d259f18a889d95c29397e1bad7 +++ key_store.hh 6f3cac249a46421122b889945156357dfe0f57bf @@ -102,6 +102,8 @@ public: rsa_pub_key const & pub); }; +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -109,5 +111,3 @@ public: // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- keys.cc 1528a27ad3ac8a35b53954213b61ed8fbef90a28 +++ keys.cc bcd0aee2b93c4e03b4eea9e2f227a106bc970664 @@ -85,7 +85,7 @@ get_user_key(options const & opts, lua_h // Ensure that the specified key actually exists. keypair priv_key; load_key_pair(keys, key, priv_key); - + if (db.database_specified()) { // If the database doesn't have this public key, add it now; otherwise ============================================================ --- keys.hh 665e7f1f1dd80336bb3d961522da79aac4c2fe89 +++ keys.hh e56b05f2449eebda62d3ae309354cd2103969623 @@ -25,7 +25,7 @@ void get_user_key(options const & opts, // N()'s out if there is no unique key for us to use void get_user_key(options const & opts, lua_hooks & lua, - database & db, key_store & keys, + database & db, key_store & keys, rsa_keypair_id & key); void cache_user_key(options const & opts, lua_hooks & lua, @@ -53,6 +53,8 @@ bool keys_match(rsa_keypair_id const & i rsa_keypair_id const & id2, rsa_pub_key const & key2); +#endif // __KEYS_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -60,5 +62,3 @@ bool keys_match(rsa_keypair_id const & i // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __KEYS_HH__ ============================================================ --- lazy_rng.hh 1f39ec488a4ff5c0566404f56284708d32f5a190 +++ lazy_rng.hh 82afe6e95ed601b9ff81877bd94fde5da715097e @@ -32,9 +32,17 @@ public: rng = Botan::RandomNumberGenerator::make_rng(); return *rng; - } + } }; #endif /* botan >= 1.7.7 */ #endif /* lazy_rng.hh */ + +// Local Variables: +// mode: C++ +// fill-column: 76 +// c-file-style: "gnu" +// indent-tabs-mode: nil +// End: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- lcs.cc d8c5af8949518e9da3c0fa6a5d34c2acb47dec9a +++ lcs.cc 9028826c5eecfb13b76bd9068276a29fdcfdc34e @@ -12,7 +12,7 @@ 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 + 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 3b862f707ecadc59ea9204714fb2068bf8fec66c +++ lcs.hh 5f95696df0fc81dae682ad3a0e4bad7db2085dea @@ -16,20 +16,22 @@ longest_common_subsequence(std::vector::const_iterator begin_a, - std::vector::const_iterator end_a, - std::vector::const_iterator begin_b, - std::vector::const_iterator end_b, - long p_lim, - std::back_insert_iterator< std::vector > lcs); + std::vector::const_iterator end_a, + std::vector::const_iterator begin_b, + std::vector::const_iterator end_b, + long p_lim, + std::back_insert_iterator< std::vector > lcs); void edit_script(std::vector::const_iterator begin_a, - std::vector::const_iterator end_a, - std::vector::const_iterator begin_b, - std::vector::const_iterator end_b, - long p_lim, - std::vector & edits_out); + std::vector::const_iterator end_a, + std::vector::const_iterator begin_b, + std::vector::const_iterator end_b, + long p_lim, + std::vector & edits_out); +#endif // __LCS_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -37,5 +39,3 @@ edit_script(std::vector: // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __LCS_HH__ ============================================================ --- legacy.hh 456f497a51f5e635b688fe4bf4374a35b6194461 +++ legacy.hh 546d699913ccb3cafedf6dff50520ef38a5d6139 @@ -55,6 +55,8 @@ namespace legacy } +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -62,5 +64,3 @@ namespace legacy // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- lru_writeback_cache.hh fa05b036a2b82fe0b799c27168a75feee26e7692 +++ lru_writeback_cache.hh 55fb7845cd2c2f91fac2510a1492362fcb73d95a @@ -70,13 +70,13 @@ private: std::set _dirty; /// Manager Manager _manager; - + /// Maximum abstract size of the cache unsigned long _max_size; - + /// Current abstract size of the cache unsigned long _curr_size; - + public: /** @brief Creates a cache that holds at most Size worth of elements. * @param Size maximum size of cache @@ -279,4 +279,3 @@ private: // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - ============================================================ --- lua.hh 703cd58553a76947f52cf6b065e2bccd70790381 +++ lua.hh 75ff1e98f4674697157c8846b21d24b4245d084f @@ -104,6 +104,8 @@ int luaext :: extfn_ ## NAME ## _ ## TAB } \ int luaext :: extfn_ ## NAME ## _ ## TABLE :: call(lua_State * LS) +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -111,5 +113,3 @@ int luaext :: extfn_ ## NAME ## _ ## TAB // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- lua_hooks.hh a6e3f6663c7786973278429c995f9dbb888455d4 +++ lua_hooks.hh 95a7446409bedb4594e26a46a643da2ae7ce462a @@ -189,6 +189,8 @@ public: bool hook_note_mtn_startup(args_vector const & args); }; +#endif // __LUA_HOOKS_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -196,5 +198,3 @@ public: // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __LUA_HOOKS_HH__ ============================================================ --- luaext_globish.cc 6770e40f83df0cc18c22b98d1bed2ba3d22b0203 +++ luaext_globish.cc 3593ef67e795b1a0edcc9273a7d01ec90ba924e0 @@ -30,4 +30,3 @@ LUAEXT(match, globish) // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - ============================================================ --- luaext_guess_binary.cc 0140e574ffd1864f8c767cfb06ed2ea11f4cac44 +++ luaext_guess_binary.cc 6a44123a75956d5b4dc393fe82fda582bbc75a6b @@ -37,7 +37,6 @@ LUAEXT(guess_binary_file_contents, ) return 1; } - // Local Variables: // mode: C++ // fill-column: 76 @@ -45,4 +44,3 @@ LUAEXT(guess_binary_file_contents, ) // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - ============================================================ --- luaext_mkstemp.cc fe5ba3069520fca7cf68ef6e25e1add747282b4d +++ luaext_mkstemp.cc 397937a9ccedd28e68af5728e093bb2e3edc671a @@ -21,8 +21,6 @@ LUAEXT(mkstemp, ) return 1; } - - // Local Variables: // mode: C++ // fill-column: 76 @@ -30,4 +28,3 @@ LUAEXT(mkstemp, ) // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - ============================================================ --- luaext_parse_basic_io.cc 3fd2a04d39c43d006344b3ad96111fa00b7f24f5 +++ luaext_parse_basic_io.cc 2506b458aea07c761714450dbc3127b6bdd61c7c @@ -69,7 +69,6 @@ LUAEXT(parse_basic_io, ) return 1; } - // Local Variables: // mode: C++ // fill-column: 76 @@ -77,4 +76,3 @@ LUAEXT(parse_basic_io, ) // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - ============================================================ --- luaext_platform.cc 381925fa00804791bba4d2b88817e242b1d756ab +++ luaext_platform.cc fb98e039fbc2367e62e58faa4c5d1d309bc87d9f @@ -1,4 +1,3 @@ - #include "base.hh" #include "lua.hh" @@ -84,7 +83,7 @@ LUAEXT(spawn_redirected, ) // There is a Lua FAQ entitled: // "Why does my library-created file segfault on :close() but work otherwise?" -#define topfile(LS) ((FILE **)luaL_checkudata(LS, 1, LUA_FILEHANDLE)) +#define topfile(LS) ((FILE **)luaL_checkudata(LS, 1, LUA_FILEHANDLE)) static int io_fclose (lua_State *LS) { FILE **p = topfile(LS); @@ -118,7 +117,7 @@ LUAEXT(spawn_pipe, ) return 0; for (i=0; i2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - ============================================================ --- merge_conflict.cc f00c522c0099d0141849d64a7311d546e61c7008 +++ merge_conflict.cc a7606edae350ba90e0071e11ac1bab5f7ac85558 @@ -2282,7 +2282,7 @@ resolve_duplicate_name_one_side(lua_hook case resolve_conflicts::content_internal: E(false, origin::user, - F("invalid resolution for duplicate_name %s") % name); + F("invalid resolution for duplicate_name %s") % name); break; default: @@ -2409,3 +2409,11 @@ roster_merge_result::resolve_file_conten file_content_conflicts.clear(); } + +// Local Variables: +// mode: C++ +// fill-column: 76 +// c-file-style: "gnu" +// indent-tabs-mode: nil +// End: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- merge_content.hh a4003604503ede3dc6a72b7daeaa326f5931f6f4 +++ merge_content.hh b696d83e6c528c5896a3beaeabfaee877ff3ed37 @@ -272,6 +272,8 @@ bool merge3(std::vector con std::vector & merged); +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -279,5 +281,3 @@ bool merge3(std::vector con // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- merge_roster.hh 5bb429497a38b162b753014738c602b582c2fbbe +++ merge_roster.hh 8306856b153df6d6d927be60453d5a74f3fc4788 @@ -290,6 +290,8 @@ parse_resolve_conflicts_opts (options co roster_merge_result & result, bool & resolutions_given); +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -297,5 +299,3 @@ parse_resolve_conflicts_opts (options co // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- merkle_tree.cc 86d53a37da3ee3e4f36cfc5cfc65b33fa0b8d986 +++ merkle_tree.cc 681a6488e15edc8495664d188928fe122caa8bb0 @@ -74,7 +74,7 @@ raw_sha1(string const & in) { Botan::SHA_160 hash; hash.update(reinterpret_cast(in.data()), - static_cast(in.size())); + static_cast(in.size())); char digest[constants::sha1_digest_length]; hash.final(reinterpret_cast(digest)); string out(digest, constants::sha1_digest_length); @@ -305,7 +305,7 @@ read_node(string const & inbuf, size_t & out.check_invariants(); if (hash != checkhash) throw bad_decode(F("mismatched node hash value %s, expected %s") - % id(checkhash, origin::internal) + % id(checkhash, origin::internal) % id(hash, origin::network)); } ============================================================ --- merkle_tree.hh 451dc43a85454c689e15636f4387c7dcee2b4428 +++ merkle_tree.hh f8559915480b7fdf77424a8664b27df4f868843a @@ -159,6 +159,8 @@ recalculate_merkle_codes(merkle_table & prefix const & pref, size_t level); +#endif // __MERKLE_TREE_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -166,5 +168,3 @@ recalculate_merkle_codes(merkle_table & // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __MERKLE_TREE_HH__ ============================================================ --- migrate_ancestry.cc d24eba186d24fdba6d66cca44fdc455a5af3795c +++ migrate_ancestry.cc 1d8b2629b8e66f43b01088a868f64390f6a7f4bb @@ -873,7 +873,7 @@ anc_graph::construct_revisions_from_ance L(FL("mapped node %d to revision %s") % child % new_rid); if (db.put_revision(new_rid, rev)) ++n_revs_out; - + // Mark this child as done, hooray! safe_insert(done, child); ============================================================ --- migrate_schema.cc 863fb9096d12b31c6193c90373313227e13b4320 +++ migrate_schema.cc ffd51091a60a67132b1fd88514fd50d04f0e17f8 @@ -87,7 +87,7 @@ assert_sqlite3_ok(sqlite3 * db) // older). case SQLITE_CORRUPT: case SQLITE_NOTADB: - auxiliary_message + auxiliary_message = _("(if this is a database last used by monotone 0.16 or older,\n" "you must follow a special procedure to make it usable again.\n" "see the file UPGRADE, in the distribution, for instructions.)"); @@ -353,7 +353,7 @@ char const migrate_merge_url_and_group[] "INSERT INTO posting_queue" " SELECT (url || '/' || groupname), content FROM tmp;" "DROP TABLE tmp;" - + // migrate the incoming_queue table "ALTER TABLE incoming_queue RENAME TO tmp;" "CREATE TABLE incoming_queue " @@ -388,7 +388,7 @@ char const migrate_merge_url_and_group[] "DROP TABLE tmp;" ; -char const migrate_add_hashes_and_merkle_trees[] = +char const migrate_add_hashes_and_merkle_trees[] = // add the column to manifest_certs "ALTER TABLE manifest_certs RENAME TO tmp;" "CREATE TABLE manifest_certs" @@ -503,7 +503,7 @@ char const migrate_to_epochs[] = " );" ; -char const migrate_to_vars[] = +char const migrate_to_vars[] = "CREATE TABLE db_vars\n" " ( domain not null, -- scope of application of a var\n" " name not null, -- var key\n" @@ -577,7 +577,7 @@ char const migrate_add_rosters[] = ; // I wish I had a form of ALTER TABLE COMMENT on sqlite3 -char const migrate_files_BLOB[] = +char const migrate_files_BLOB[] = // change the encoding of file(_delta)s "ALTER TABLE files RENAME TO tmp;" "CREATE TABLE files" @@ -635,8 +635,8 @@ char const migrate_add_heights[] = char const migrate_add_heights[] = "CREATE TABLE heights" - " ( revision not null, -- joins with revisions.id\n" - " height not null, -- complex height, array of big endian u32 integers\n" + " ( revision not null, -- joins with revisions.id\n" + " height not null, -- complex height, array of big endian u32 integers\n" " unique(revision, height)" " );" ; @@ -670,14 +670,14 @@ char const migrate_to_binary_hashes[] = // table completely. "ALTER TABLE revision_certs RENAME TO tmp;\n" "CREATE TABLE revision_certs" - " ( hash not null unique, -- hash of remaining fields separated by \":\"\n" - " id not null, -- joins with revisions.id\n" - " name not null, -- opaque string chosen by user\n" - " value not null, -- opaque blob\n" - " keypair not null, -- joins with public_keys.id\n" - " signature not null, -- RSA/SHA1 signature of \"address@hidden:val]\"\n" - " unique(name, value, id, keypair, signature)\n" - " );" + " ( hash not null unique, -- hash of remaining fields separated by \":\"\n" + " id not null, -- joins with revisions.id\n" + " name not null, -- opaque string chosen by user\n" + " value not null, -- opaque blob\n" + " keypair not null, -- joins with public_keys.id\n" + " signature not null, -- RSA/SHA1 signature of \"address@hidden:val]\"\n" + " unique(name, value, id, keypair, signature)\n" + " );" "INSERT INTO revision_certs SELECT unhex(hash), unhex(id), name, value, keypair, signature FROM tmp;" "DROP TABLE tmp;" "CREATE INDEX revision_certs__id ON revision_certs (id);" @@ -687,10 +687,10 @@ char const migrate_to_binary_hashes[] = // schema hash to upgrade to. "ALTER TABLE branch_epochs RENAME TO tmp;" "CREATE TABLE branch_epochs" - " ( hash not null unique, -- hash of remaining fields separated by \":\"\n" - " branch not null unique, -- joins with revision_certs.value\n" - " epoch not null -- random binary id\n" - " );" + " ( hash not null unique, -- hash of remaining fields separated by \":\"\n" + " branch not null unique, -- joins with revision_certs.value\n" + " epoch not null -- random binary id\n" + " );" "INSERT INTO branch_epochs SELECT unhex(hash), branch, unhex(epoch) FROM tmp;" "DROP TABLE tmp;" @@ -709,7 +709,7 @@ enum upgrade_regime upgrade_changesetify, upgrade_rosterify, upgrade_regen_caches, - upgrade_none, + upgrade_none, }; static void dump(enum upgrade_regime const & regime, string & out) @@ -991,11 +991,11 @@ check_sql_schema(sqlite3 * db, system_pa check_sql_schema(sqlite3 * db, system_path const & filename) { I(db != NULL); - + schema_mismatch_case cat = classify_schema(db); - + diagnose_unrecognized_schema(cat, filename); - + E(cat != SCHEMA_MIGRATION_NEEDED, origin::user, F("database %s is laid out according to an old schema\n" "try '%s db migrate' to upgrade\n" @@ -1015,7 +1015,7 @@ migrate_sql_schema(sqlite3 * db, key_sto I(db != NULL); upgrade_regime regime = upgrade_none; MM(regime); - + // Take an exclusive lock on the database before we try to read anything // from it. If we don't take this lock until the beginning of the // "migrating data" phase, two simultaneous "db migrate" processes could ============================================================ --- migrate_work.cc b0e7ef6fdc52db96cf7567c5cfb4ae007ba40ef0 +++ migrate_work.cc 21dbcf76b5fa84b60c02577da6c589887c0cc5ba @@ -143,7 +143,7 @@ workspace::check_ws_format() E(format <= current_workspace_format, origin::system, F("this version of monotone only understands workspace metadata\n" "in formats 0 through %d. your workspace is in format %d.\n" - "you need a newer version of monotone to use this workspace.") + "you need a newer version of monotone to use this workspace.") % current_workspace_format % format); } @@ -188,7 +188,7 @@ migrate_1_to_2() bookkeeping_path rev_path = bookkeeping_root / "revision"; data base_rev_data; MM(base_rev_data); - try + try { read_data(rev_path, base_rev_data); } @@ -201,7 +201,7 @@ migrate_1_to_2() origin::system)); MM(base_rid); - cset workcs; + cset workcs; MM(workcs); bookkeeping_path workcs_path = bookkeeping_root / "work"; bool delete_workcs = false; @@ -209,7 +209,7 @@ migrate_1_to_2() { delete_workcs = true; data workcs_data; MM(workcs_data); - try + try { read_data(workcs_path, workcs_data); } @@ -262,7 +262,7 @@ workspace::migrate_ws_format() write_ws_format(); break; - case current_workspace_format: + case current_workspace_format: P(F("this workspace is in the current format, " "no migration is necessary.")); break; @@ -273,7 +273,7 @@ workspace::migrate_ws_format() E(false, origin::system, F("this version of monotone only understands workspace metadata\n" "in formats 0 through %d. your workspace is in format %d.\n" - "you need a newer version of monotone to use this workspace.") + "you need a newer version of monotone to use this workspace.") % current_workspace_format % format); } } ============================================================ --- migration.hh d6e6181cc84d400d949dbf1dc5d6e8aea15baf74 +++ migration.hh fa3fa48452af3ae8a04b67672d56ab687c79e116 @@ -65,6 +65,8 @@ regenerate_caches(database & db); regenerate_caches(database & db); +#endif // __MIGRATION__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -72,5 +74,3 @@ regenerate_caches(database & db); // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __MIGRATION__ ============================================================ --- mkstemp.hh 368bf10bb8da79f070c54f3e8484efeacbf24e4f +++ mkstemp.hh 95bcdd6a2319549c3e950fbdb1d29ef09a404e82 @@ -5,6 +5,8 @@ monotone_mkstemp(std::string &tmpl); bool monotone_mkstemp(std::string &tmpl); +#endif // __MKSTEMP_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -12,5 +14,3 @@ monotone_mkstemp(std::string &tmpl); // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __MKSTEMP_HH__ ============================================================ --- mt_version.cc 8389644e15bf83ea03708a60f4b6158f73848fcf +++ mt_version.cc 36443b123dbb3ebcba952fd46540efc64c022330 @@ -68,16 +68,16 @@ get_full_version(string & out) "Botan version : %d.%d.%d (compiled against %d.%d.%d)\n" "Changes since base revision:\n" "%s") - % base_version % flavour - % BOOST_COMPILER - % BOOST_STDLIB - % BOOST_LIB_VERSION - % sqlite3_libversion() % SQLITE_VERSION - % LUA_VERSION - % pcre_version() % PCRE_MAJOR % PCRE_MINOR - % Botan::version_major() % Botan::version_minor() % Botan::version_patch() - % BOTAN_VERSION_MAJOR % BOTAN_VERSION_MINOR % BOTAN_VERSION_PATCH - % string(package_full_revision_constant)) + % base_version % flavour + % BOOST_COMPILER + % BOOST_STDLIB + % BOOST_LIB_VERSION + % sqlite3_libversion() % SQLITE_VERSION + % LUA_VERSION + % pcre_version() % PCRE_MAJOR % PCRE_MINOR + % Botan::version_major() % Botan::version_minor() % Botan::version_patch() + % BOTAN_VERSION_MAJOR % BOTAN_VERSION_MINOR % BOTAN_VERSION_PATCH + % string(package_full_revision_constant)) .str(); } ============================================================ --- mt_version.hh 0637d55ddff99fd51dab3e0214a1abd8df0d2668 +++ mt_version.hh 0b4b309b696507036d823d955c517731768f2924 @@ -16,6 +16,8 @@ void print_full_version(); void get_full_version(std::string & out); void print_full_version(); +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -23,5 +25,3 @@ void print_full_version(); // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- mtn-sanity.cc 2b00557214de222db5c0a3642f3cc37d862f8d11 +++ mtn-sanity.cc fdd728e6175f5df8721e21cee035832501d2072f @@ -50,7 +50,6 @@ mtn_sanity::inform_error(std::string con ui.inform(msg); } - // Local Variables: // mode: C++ // fill-column: 76 @@ -58,4 +57,3 @@ mtn_sanity::inform_error(std::string con // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - ============================================================ --- mtn-sanity.hh 6efc93a1a859ac94800cdb4c0565383006a5d59d +++ mtn-sanity.hh b59ba9e27f19fff9944a7f8e8a363bb3ecbad1a0 @@ -18,7 +18,6 @@ private: #endif - // Local Variables: // mode: C++ // fill-column: 76 @@ -26,4 +25,3 @@ private: // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - ============================================================ --- netcmd.cc b6a32a1abc1b292dd7f2f6621f27d90714a217e5 +++ netcmd.cc 64d6c56e6b3de68bd2e3cf34c3530b5fb14b54d5 @@ -164,8 +164,8 @@ netcmd::read(string_queue & inbuf, chain { // they might have given us bogus data cmd_digest = extract_substring(inbuf, pos, - constants::netsync_hmac_value_length_in_bytes, - "netcmd HMAC"); + constants::netsync_hmac_value_length_in_bytes, + "netcmd HMAC"); } inbuf.pop_front(pos); @@ -175,9 +175,9 @@ netcmd::read(string_queue & inbuf, chain && cmd_digest != digest) { throw bad_decode(F("bad HMAC checksum (got %s, wanted %s)\n" - "this suggests data was corrupted in transit") - % cmd_digest - % digest); + "this suggests data was corrupted in transit") + % cmd_digest + % digest); } return true; ============================================================ --- netcmd.hh 10527907b0ef2b48afc16182cc998211ba879d08 +++ netcmd.hh 4c4322e0f4dafdddee2e239daf0adfa6f6439883 @@ -101,7 +101,7 @@ public: bool read(string_queue & inbuf, chained_hmac & hmac); bool read_string(std::string & inbuf, - chained_hmac & hmac) { + chained_hmac & hmac) { // this is here only for the regression tests because they want to // read and write to the same type, but we want to have reads from // a string queue so that when data is read in from the network it @@ -201,6 +201,8 @@ void run_netsync_protocol(options & opts protocol_role role, netsync_connection_info const & info); +#endif // __NETCMD_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -208,5 +210,3 @@ void run_netsync_protocol(options & opts // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __NETCMD_HH__ ============================================================ --- netio.hh 68bc41e1df3d57e7a74eb5cf6249b68d29412f3d +++ netio.hh 60010c88056bdc63b4730146d293f5ed6ea6e015 @@ -329,6 +329,8 @@ assert_end_of_buffer(std::string const & % name % pos % str.size()); } +#endif // __NETIO_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -336,5 +338,3 @@ assert_end_of_buffer(std::string const & // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __NETIO_HH__ ============================================================ --- netsync.cc 550bd33295edd35c99ac6befbe6f93da9cca8639 +++ netsync.cc 64e1b397594ff5f6e0f4f2680ba66ce6fe9ffd97 @@ -386,7 +386,7 @@ public: time_t last_io_time; public: - enum + enum { working_state, shutdown_state, ============================================================ --- netxx_pipe.cc e97af13ca9326232fa0869cb0b513025b876fdf6 +++ netxx_pipe.cc 6b6ed53222f1bcb7033a0dce1d691635d6c06a53 @@ -414,10 +414,10 @@ Netxx::PipeCompatibleProbe::ready(const // Attempt to wait for the completion of the read-in-progress. - int milliseconds = ((timeout.get_sec() * 1000) + int milliseconds = ((timeout.get_sec() * 1000) + (timeout.get_usec() / 1000)); - L(FL("WaitForSingleObject(,%d)") % milliseconds); + L(FL("WaitForSingleObject(,%d)") % milliseconds); DWORD wstatus = WAIT_FAILED; ============================================================ --- netxx_pipe.hh 873bc7d111d59db057cba5ea5f9ce31ad7608e1f +++ netxx_pipe.hh 5ef141781ad2d0cae7e89725f5ac2a24c41dc3fd @@ -132,6 +132,9 @@ namespace Netxx } +#endif // __NETXX_PIPE_HH__ + + // Local Variables: // mode: C++ // fill-column: 76 @@ -139,6 +142,3 @@ namespace Netxx // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __NETXX_PIPE_HH__ - ============================================================ --- numeric_vocab.hh fdd9138b8fc70374bd96e20e41294d374a48170d +++ numeric_vocab.hh 7bcabd35993b2dd6be4ee0d0c87c8384d684e4fb @@ -70,6 +70,8 @@ widen(V const & v) #error "How do I write a constant of type s64?" #endif +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -77,5 +79,3 @@ widen(V const & v) // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- option.cc 014c3780136d90b4f6370a2494a4b8246b0be837 +++ option.cc 9d72465dc3f8c0031532fb3d54d19203266ec4db @@ -176,7 +176,7 @@ tokenize_for_command_line(string const & string cur; quote_type type = none; bool have_tok(false); - + for (string::const_iterator i = from.begin(); i != from.end(); ++i) { if (*i == '\'') @@ -321,11 +321,11 @@ void concrete_option_set::from_command_l else if (idx(args,i)().substr(0,1) == "-") { name = idx(args,i)().substr(1,1); - + o = getopt(by_name, name); if (!o.has_arg && idx(args,i)().size() != 2) throw extra_arg(name); - + if (o.has_arg) { if (idx(args,i)().size() == 2) @@ -353,7 +353,7 @@ void concrete_option_set::from_command_l read_data_for_command_line(arg, dat); args_vector fargs; tokenize_for_command_line(dat(), fargs); - + args.erase(args.begin() + i); if (separate_arg) args.erase(args.begin() + i); @@ -467,4 +467,3 @@ concrete_option_set::get_usage_strings(v // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - ============================================================ --- option.hh 65d3756b0f12e7741a308536a0d51cee021189c1 +++ option.hh 322a377f8548a2e84a5fba54671042785d134d4e @@ -60,8 +60,8 @@ namespace option { { bad_arg(std::string const & opt, arg_type const & arg); bad_arg(std::string const & opt, - arg_type const & arg, - std::string const & reason); + arg_type const & arg, + std::string const & reason); }; // from_command_line() catches this and boost::bad_lexical_cast // and converts them to bad_arg exceptions @@ -86,10 +86,10 @@ namespace option { concrete_option(); concrete_option(std::string const & names, - std::string const & desc, - bool arg, - boost::function set, - boost::function reset); + std::string const & desc, + bool arg, + boost::function set, + boost::function reset); bool operator<(concrete_option const & other) const; }; @@ -107,14 +107,14 @@ namespace option { // rather than using intermediate machinery like in options* concrete_option_set & operator()(std::string const & names, - std::string const & desc, - boost::function set, - boost::function reset = 0); + std::string const & desc, + boost::function set, + boost::function reset = 0); concrete_option_set & operator()(std::string const & names, - std::string const & desc, - boost::function set, - boost::function reset = 0); + std::string const & desc, + boost::function set, + boost::function reset = 0); concrete_option_set operator | (concrete_option_set const & other) const; void reset() const; @@ -223,10 +223,10 @@ namespace option { boost::function resetter; option(std::string const & name, - std::string const & desc, - bool arg, - void(T::*set)(std::string), - void(T::*reset)()) + std::string const & desc, + bool arg, + void(T::*set)(std::string), + void(T::*reset)()) { I(!name.empty() || !desc.empty()); description = desc; @@ -244,9 +244,9 @@ namespace option { out.has_arg = has_arg; if (setter) - out.setter = std::bind1st(setter, obj); + out.setter = std::bind1st(setter, obj); if (resetter) - out.resetter = binder_only(resetter, obj); + out.resetter = binder_only(resetter, obj); return out; } @@ -274,10 +274,10 @@ namespace option { } option_set(std::string const & name, - std::string const & desc, - bool arg, - void(T::*set)(std::string), - void(T::*reset)()) + std::string const & desc, + bool arg, + void(T::*set)(std::string), + void(T::*reset)()) { options.insert(option(name, desc, arg, set, reset)); } @@ -285,16 +285,16 @@ namespace option { { std::set out; for (typename std::set >::const_iterator i = options.begin(); - i != options.end(); ++i) - out.insert(i->instantiate(obj)); + i != options.end(); ++i) + out.insert(i->instantiate(obj)); return out; } option_set operator | (option_set const & other) const { option_set combined; std::set_union(options.begin(), options.end(), - other.options.begin(), other.options.end(), - std::inserter(combined.options, combined.options.begin())); + other.options.begin(), other.options.end(), + std::inserter(combined.options, combined.options.begin())); return combined; } option_set operator - (option_set const & other) const ============================================================ --- options.cc e89af04e97c53b86bbfff144e567a6bfd7535357 +++ options.cc 4ed21148936a06b55250339de690f8eff5d8f0b7 @@ -81,9 +81,9 @@ options::options() options::options() { # define OPTSET(name) -# define OPTVAR(group, type, name, default_) \ +# define OPTVAR(group, type, name, default_) \ name = type ( default_ ); -# define OPTION(optset, name, hasarg, optstring, description) \ +# define OPTION(optset, name, hasarg, optstring, description) \ name ## _given = false; # define OPTSET_REL(parent, child) @@ -104,7 +104,7 @@ collect_children(options::static_options i != ch.end(); ++i) { if (*i != opt) - out = out | (*(*i))(); + out = out | (*(*i))(); } return out; } @@ -132,46 +132,46 @@ options::options_type const & options::o } # define OPTSET(name) \ - options::options_type const & options::opts::name() \ - { \ - static options::options_type val = \ - collect_children(&options::opts::name) \ + options::options_type const & options::opts::name() \ + { \ + static options::options_type val = \ + collect_children(&options::opts::name) \ | options::option_type("", #name, false, 0, \ - &options::reset_optset_ ## name ); \ - return val; \ - } \ - void options::reset_optset_ ## name () \ - { \ - reset_optset(&opts:: name); \ + &options::reset_optset_ ## name ); \ + return val; \ + } \ + void options::reset_optset_ ## name () \ + { \ + reset_optset(&opts:: name); \ } -# define OPTVAR(optset, type, name, default_) \ - void options::reset_ ## name () \ - { \ - name = type ( default_ ); \ +# define OPTVAR(optset, type, name, default_) \ + void options::reset_ ## name () \ + { \ + name = type ( default_ ); \ } -# define OPTION(optset, name, hasarg, optstring, description) \ - options::options_type const & options::opts::name() \ - { \ +# define OPTION(optset, name, hasarg, optstring, description) \ + options::options_type const & options::opts::name() \ + { \ localize_monotone(); \ \ - static options::options_type val(optstring, \ - gettext(description), hasarg, \ - &options::set_ ## name , \ - &options::reset_opt_ ## name ); \ - return val; \ - } \ - void options::reset_opt_ ## name () \ - { \ - name ## _given = false; \ - reset_optset(&opts:: name); \ - } \ - void options::set_ ## name (std::string arg) \ - { \ - name ## _given = true; \ - real_set_ ## name (arg); \ - } \ + static options::options_type val(optstring, \ + gettext(description), hasarg, \ + &options::set_ ## name , \ + &options::reset_opt_ ## name ); \ + return val; \ + } \ + void options::reset_opt_ ## name () \ + { \ + name ## _given = false; \ + reset_optset(&opts:: name); \ + } \ + void options::set_ ## name (std::string arg) \ + { \ + name ## _given = true; \ + real_set_ ## name (arg); \ + } \ void options::real_set_ ## name (std::string arg) # define OPTSET_REL(parent, child) @@ -188,7 +188,7 @@ operator | (option::option_set option::option_set operator | (option::option_set const & opts, - option::option_set const & (*fun)()) + option::option_set const & (*fun)()) { return opts | fun(); } ============================================================ --- options.hh c3d069fcf7845b6e8cf8a2819d73e98c69aaee8b +++ options.hh 902b5dbb47ef7dc707ebce9e531eab4515dd71bc @@ -35,12 +35,12 @@ struct options { static options_type const & none (); static options_type const & all_options (); -# define OPTSET(name) \ +# define OPTSET(name) \ static options_type const & name (); # define OPTVAR(optset, type, name, default_) -#define OPTION(optset, name, hasarg, optstring, description) \ +#define OPTION(optset, name, hasarg, optstring, description) \ static options_type const & name (); # define OPTSET_REL(parent, child) @@ -53,21 +53,21 @@ struct options # undef OPTSET_REL }; -# define OPTSET(name) \ - private: \ +# define OPTSET(name) \ + private: \ void reset_optset_ ## name (); -# define OPTVAR(optset, type, name, default_) \ - public: \ - type name; \ +# define OPTVAR(optset, type, name, default_) \ + public: \ + type name; \ void reset_ ## name (); -#define OPTION(optset, name, hasarg, optstring, description) \ - public: \ - bool name ## _given; \ -private: \ - void set_ ## name (std::string arg); \ - void real_set_ ## name (std::string arg); \ +#define OPTION(optset, name, hasarg, optstring, description) \ + public: \ + bool name ## _given; \ +private: \ + void set_ ## name (std::string arg); \ + void real_set_ ## name (std::string arg); \ void reset_opt_ ## name (); # define OPTSET_REL(parent, child) @@ -82,7 +82,7 @@ operator | (option::option_set option::option_set operator | (option::option_set const & opts, - option::option_set const & (*fun)()); + option::option_set const & (*fun)()); #endif ============================================================ --- options_list.hh 67023185e0e775e535d178143ddad30bd6b2f298 +++ options_list.hh 7b7947d1f69b84b0639593b5534f4ace6075691e @@ -44,14 +44,14 @@ // This is a shortcut for an option which has its own variable and optset. // It will take an argument unless 'type' is 'bool'. #define OPT(name, string, type, default_, description) \ - OPTVAR(name, type, name, default_) \ + OPTVAR(name, type, name, default_) \ OPTION(name, name, has_arg(), string, description) // This is the same, except that the option and variable belong to the // 'globals' optset. These are global options, not specific to a particular // command. -#define GOPT(name, string, type, default_, description) \ - OPTVAR(globals, type, name, default_) \ +#define GOPT(name, string, type, default_, description) \ + OPTVAR(globals, type, name, default_) \ OPTION(globals, name, has_arg(), string, description) // because 'default_' is constructor arguments, and may need to be a list ============================================================ --- origin_type.hh 54082f23fb5a6cb64e725fe44df7b06517224222 +++ origin_type.hh 0d9f9f4e1e169b15eaa5c5081cd8059ad6d9a429 @@ -23,11 +23,12 @@ public: origin_aware(origin::type m) : made_from(m) {} }; +#endif + // Local Variables: // mode: C++ +// fill-column: 76 // c-file-style: "gnu" // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- outdated_indicator.cc d023ea9df38c3281c7456270293e9c8eea569891 +++ outdated_indicator.cc 1d3ec59ddbb2339b573c1a316b52ba659b2242b5 @@ -85,8 +85,6 @@ outdated_indicator_factory::note_change( impl->note_change(); } - - // Local Variables: // mode: C++ // fill-column: 76 @@ -94,4 +92,3 @@ outdated_indicator_factory::note_change( // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - ============================================================ --- outdated_indicator.hh 75b823c58d06ac45f84d198ccf90dcabbc23a985 +++ outdated_indicator.hh 25f60524f7478a08a9de6fdc90ae395cdf185b51 @@ -43,7 +43,6 @@ public: #endif - // Local Variables: // mode: C++ // fill-column: 76 @@ -51,4 +50,3 @@ public: // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - ============================================================ --- packet.cc 23dd3dd24d74f8aab78028365261af6788aba601 +++ packet.cc d0dc9d47397f902117459c3d82bd34f100e75d76 @@ -202,7 +202,7 @@ namespace } static void read_rest(istream& in, string& dest) { - + while (true) { string t; @@ -218,8 +218,8 @@ namespace string certid; iss >> certid; validate_id(certid); string name; iss >> name; validate_certname(name); string keyid; iss >> keyid; validate_key(keyid); - string val; - read_rest(iss,val); validate_arg_base64(val); + string val; + read_rest(iss,val); validate_arg_base64(val); revision_id hash(decode_hexenc_as(certid, made_from)); validate_base64(body); @@ -266,7 +266,7 @@ namespace cons.consume_old_private_key(rsa_keypair_id(args, made_from), decode_base64_as(body, made_from)); } - + void operator()(string const & type, string const & args, string const & body) const @@ -308,7 +308,7 @@ extract_packets(string const & s, packet scanning_args, found_args, scanning_body, end_1, end_2, end_3, end_4, end_5 } state = skipping; - + for (p = s.begin(); p != s.end(); p++) switch (state) { ============================================================ --- packet.hh 883e5e7c88e8dfeb148a279d970c6c4020d086bc +++ packet.hh 57a749c4a9ef6e4de431d4ad2bdf00ce6e702398 @@ -84,6 +84,8 @@ size_t read_packets(std::istream & in, p size_t read_packets(std::istream & in, packet_consumer & cons); +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -91,5 +93,3 @@ size_t read_packets(std::istream & in, p // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- parallel_iter.hh 2ee45ae23e10ab433da7101315ad4ea52435f706 +++ parallel_iter.hh 7f91744f6a12f274696bfa8bde1cb968691f2611 @@ -169,6 +169,8 @@ namespace parallel } +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -176,5 +178,3 @@ namespace parallel // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- paths.hh 6702f74f0462d64c773191e55be0983fabb393e3 +++ paths.hh bc8dc8fb4bd0f32aec0a93fe34df74d47384938a @@ -420,7 +420,7 @@ struct path_always_false : public path_p struct path_always_false : public path_predicate { virtual bool operator()(T const &) const; -}; +}; // Return a file_path, bookkeeping_path, or system_path, as appropriate. // 'path' is an external path. If to_workspace_root, path is relative to @@ -448,6 +448,8 @@ find_new_path_for(std::map const & renames, file_path const & old_path); +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -455,5 +457,3 @@ find_new_path_for(std::map2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- pch.hh 6dff430a4635cb308fd7b0c76333c8bbc7f167ab +++ pch.hh 4831fa5a656735b98e48a8e34cb3377526f87bab @@ -5,14 +5,6 @@ #ifdef WIN32 #define BOOST_NO_STDC_NAMESPACE -// Local Variables: -// mode: C++ -// fill-column: 76 -// c-file-style: "gnu" -// indent-tabs-mode: nil -// End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - #endif #include @@ -36,3 +28,11 @@ #include #include #include + +// Local Variables: +// mode: C++ +// fill-column: 76 +// c-file-style: "gnu" +// indent-tabs-mode: nil +// End: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- platform-wrapped.hh 70c1cf6a373352fa802cf407d354cf2caad92754 +++ platform-wrapped.hh 9b6adf61ff8908b94f5f6059b9f071fc39e0d5d8 @@ -23,7 +23,6 @@ inline void rename_clobberingly(any_path #endif - // Local Variables: // mode: C++ // fill-column: 76 @@ -31,4 +30,3 @@ inline void rename_clobberingly(any_path // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - ============================================================ --- platform.hh 7b09b4e28d7c7379e6336a3fa8d76cf937d3ac1f +++ platform.hh c50e7babf7716b238c7b8074f5339bfcaab67fff @@ -152,6 +152,8 @@ std::string get_locale_dir(); // determine directory to load locale data from std::string get_locale_dir(); +#endif // __PLATFORM_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -159,5 +161,3 @@ std::string get_locale_dir(); // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __PLATFORM_HH__ ============================================================ --- project.cc c33b13a28918d13f35351966e7e34b627ca990ef +++ project.cc 7614711c10af1c725062f1570b2a6f4834439197 @@ -35,7 +35,7 @@ project_t::get_branch_list(std::set inverse_graph_cache; - + for (std::vector::iterator i = got.begin(); i != got.end(); ++i) { @@ -63,7 +63,7 @@ project_t::get_branch_list(globish const db.get_branches(glob, got); names.clear(); multimap inverse_graph_cache; - + for (std::vector::iterator i = got.begin(); i != got.end(); ++i) { @@ -154,7 +154,7 @@ project_t::get_branch_heads(branch_name else it++; } - + L(FL("found heads of branch %s (%s heads)") % name % branch.second.size()); } @@ -427,4 +427,3 @@ notify_if_multiple_heads(project_t & pro // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - ============================================================ --- project.hh f67968192cfc5e513d2281f384c29b76eefdd5e7 +++ project.hh fa2e22f7fbea8b83797aa7c855baa3940d001d39 @@ -110,7 +110,6 @@ notify_if_multiple_heads(project_t & pro #endif - // Local Variables: // mode: C++ // fill-column: 76 @@ -118,4 +117,3 @@ notify_if_multiple_heads(project_t & pro // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - ============================================================ --- quick_alloc.hh ed41c0b93c8433b8f4060f6ad7834c6dccbaf44b +++ quick_alloc.hh be5bfaafed2068e24f9d87b40909ad1d26963056 @@ -8,6 +8,8 @@ # define QA(T) std::allocator< T > #endif +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -15,5 +17,3 @@ // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- randomfile.hh 86995b5fde62b718b35ef8b1231036734a5b950b +++ randomfile.hh 6cb73ec10f057f704eb11fffe93795882109e54c @@ -203,6 +203,8 @@ struct file_randomizer } }; +#endif // __RANDOMFILE_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -210,5 +212,3 @@ struct file_randomizer // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __RANDOMFILE_HH__ ============================================================ --- randomizer.cc 481e038efea222577cb47f22c3bb3614d7d7d9d5 +++ randomizer.cc 95de956e48cd3b479e5949c45e9f9781c34aa119 @@ -16,21 +16,21 @@ bool randomizer::flip(size_t n) typedef boost::mt19937 & rng_t; bool randomizer::flip(size_t n) -{ - return bernoulli(1.0 / static_cast(n)); +{ + return bernoulli(1.0 / static_cast(n)); } size_t randomizer::uniform(size_t n) { typedef boost::uniform_int dist_t; return boost::variate_generator(rng, dist_t(0, n-1))(); -} +} bool randomizer::bernoulli(double p) { typedef boost::bernoulli_distribution dist_t; return boost::variate_generator(rng, dist_t(p))(); -} +} // Local Variables: // mode: C++ ============================================================ --- randomizer.hh c4b81193a356206d33540e2c6c9f47d5cb511f13 +++ randomizer.hh 490f09880887f76baf40a00ead66f13cb107078c @@ -26,7 +26,7 @@ struct randomizer std::size_t uniform(std::size_t n); // boolean process with prob(true) = p, prob(false) = 1-p. - bool bernoulli(double p); + bool bernoulli(double p); bool flip(std::size_t n = 2); }; @@ -41,4 +41,3 @@ struct randomizer // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - ============================================================ --- rcs_file.cc ed67c5671b3697e609331ad14f952cfffde85d1f +++ rcs_file.cc 885b3fbe7b6cfed78816f0e57cd71d44616213c6 @@ -222,8 +222,8 @@ get_token(file_source & ist, static token_type get_token(file_source & ist, string & str, - size_t & line, - size_t & col) + size_t & line, + size_t & col) { bool saw_idchar = false; int i = ist.peek(); @@ -269,10 +269,10 @@ get_token(file_source & ist, break; } else - { - adv(i, line, col); - str += c; - } + { + adv(i, line, col); + str += c; + } } return TOK_STRING; break; @@ -284,7 +284,7 @@ get_token(file_source & ist, && !is_space(i)) { ist.get(c); - ++col; + ++col; if (! is_digit(c) && c != '.') saw_idchar = true; str += c; @@ -352,7 +352,7 @@ struct parser { if (ttype != want) throw oops((F("parse failure %d:%d: expecting %s, got %s with value '%s'") - % line % col % tt2str(want) % tt2str(ttype) % token).str()); + % line % col % tt2str(want) % tt2str(ttype) % token).str()); advance(); } @@ -371,7 +371,7 @@ struct parser string tmp; if (!symp(expected)) throw oops((F("parse failure %d:%d: expecting word '%s'") - % line % col % expected).str()); + % line % col % expected).str()); advance(); } @@ -386,7 +386,7 @@ struct parser { if (!wordp()) throw oops((F("parse failure %d:%d: expecting word") - % line % col).str()); + % line % col).str()); advance(); } @@ -415,14 +415,14 @@ struct parser while(symp() || nump()) { string stmp, ntmp; - if (symp()) - { - sym(stmp); colon(); num(ntmp); - } - else - { - num(stmp); colon(); num(ntmp); - } + if (symp()) + { + sym(stmp); colon(); num(ntmp); + } + else + { + num(stmp); colon(); num(ntmp); + } r.admin.symbols.insert(make_pair(ntmp, stmp)); } semi(); ============================================================ --- rcs_file.hh 4f97971ca41a02c642818bf4a6dda13010bbe28f +++ rcs_file.hh fa865ade41a0d7f42cc2969d1ad170093b71917a @@ -57,6 +57,8 @@ void parse_rcs_file(std::string const & void parse_rcs_file(std::string const & filename, rcs_file & r); +#endif // __RCS_FILE_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -64,5 +66,3 @@ void parse_rcs_file(std::string const & // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __RCS_FILE_HH__ ============================================================ --- rcs_import.hh a8e67b44e7960ed7ef21eb46abac7d658ce03689 +++ rcs_import.hh 4d945c0abf3da05913328433420a83cf240173a3 @@ -22,6 +22,8 @@ void import_cvs_repo(project_t & project system_path const & cvsroot, branch_name const & branchname); +#endif // __RCS_IMPORT_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -29,5 +31,3 @@ void import_cvs_repo(project_t & project // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __RCS_IMPORT_HH__ ============================================================ --- refiner.hh 9a8c4cec8421bdd8f8f56106c21dda20ab17d2bf +++ refiner.hh ec6282db69b98f2c748d00536c281680275b31ec @@ -39,9 +39,9 @@ refiner_callbacks refiner_callbacks { virtual void queue_refine_cmd(refinement_type ty, - merkle_node const & our_node) = 0; + merkle_node const & our_node) = 0; virtual void queue_done_cmd(netcmd_item_type ty, - size_t n_items) = 0; + size_t n_items) = 0; virtual ~refiner_callbacks() {} }; @@ -68,10 +68,10 @@ refiner merkle_ptr & node); bool merkle_node_exists(size_t level, prefix const & pref); void calculate_items_to_send(); - std::string voicestr() - { - return voice == server_voice ? "server" : "client"; - } + std::string voicestr() + { + return voice == server_voice ? "server" : "client"; + } public: @@ -96,6 +96,8 @@ public: }; +#endif // __REFINER_H__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -103,5 +105,3 @@ public: // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __REFINER_H__ ============================================================ --- restrictions.hh d5fea25c76c985979abc5e827fde4e6e8cb98e7c +++ restrictions.hh a733872f76708daa50374e273a6ef3a5909e4ef3 @@ -145,6 +145,8 @@ class path_restriction : public restrict std::map path_map; }; +#endif // header guard + // Local Variables: // mode: C++ // fill-column: 76 @@ -152,5 +154,3 @@ class path_restriction : public restrict // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // header guard ============================================================ --- rev_height.cc 2634076bced1edfbdadc9467ab7448266daeb72f +++ rev_height.cc f5cd9938feb73ae1b69b0628b9300d222395e28e @@ -28,7 +28,7 @@ using std::ostringstream; * One could also use vector. While this would be cleaner, it * would force us to convert back and forth to the database format * every now and then, and additionally inhibit the use of memcmp(). - * + * */ // Internal manipulations @@ -100,7 +100,7 @@ ostream & operator <<(ostream & os, rev_ for (size_t i = 0; i < d.size() / width; ++i) { if (!first) - os << '.'; + os << '.'; os << read_at(d, i); first = false; } ============================================================ --- rev_types.hh af3c5cf58a78153d7b6a515a25dd4d6d584b851f +++ rev_types.hh 81c80844a9083de00a1da7297528ae91737bcfbc @@ -30,7 +30,7 @@ namespace basic_io struct stanza; } -// full definitions in cset.hh +// full definitions in cset.hh typedef u32 node_id; struct cset; struct editable_tree; ============================================================ --- revision.cc 33289a2160f89ef17357550e6b7374aef57ca00b +++ revision.cc e646c35dae34ea0399ec89c3a86fff6088415efd @@ -198,7 +198,7 @@ make_restricted_revision(parent_map cons shared_ptr included(new cset()); roster_t restricted_roster; - make_restricted_roster(parent_roster(i), new_roster, + make_restricted_roster(parent_roster(i), new_roster, restricted_roster, mask); make_cset(parent_roster(i), restricted_roster, *included); safe_insert(edges, make_pair(parent_id(i), included)); @@ -224,7 +224,7 @@ make_restricted_revision(parent_map cons shared_ptr included(new cset()); roster_t restricted_roster; - make_restricted_roster(parent_roster(i), new_roster, + make_restricted_roster(parent_roster(i), new_roster, restricted_roster, mask); make_cset(parent_roster(i), restricted_roster, *included); make_cset(restricted_roster, new_roster, excluded); ============================================================ --- revision.hh 5be0a6d495ccb2c974f93ac54a45c5ef5a5a4e3a +++ revision.hh a9037068bbbb814b1043de6f0b55eed977d3b82e @@ -226,6 +226,8 @@ parse_edge(basic_io::parser & parser, parse_edge(basic_io::parser & parser, edge_map & es); +#endif // __REVISION_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -233,5 +235,3 @@ parse_edge(basic_io::parser & parser, // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __REVISION_HH__ ============================================================ --- roster.hh 90a95971b06f5586a5bd9c76dc701c643280bf87 +++ roster.hh b4257701116cab6db535932efe5893ffb042396f @@ -478,6 +478,8 @@ inline marking_map const & parent_markin return *(i->second.second); } +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -485,5 +487,3 @@ inline marking_map const & parent_markin // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- roster_delta.cc f21967cc9f37298083c2a384d167e325e2fa197d +++ roster_delta.cc 26aa90ed85b6cbdb57c1c77e97d3a0ef305e55dd @@ -28,7 +28,7 @@ using std::make_pair; using std::pair; using std::make_pair; -namespace +namespace { struct roster_delta_t @@ -206,17 +206,17 @@ namespace { case parallel::invalid: I(false); - + case parallel::in_left: // deleted safe_insert(d.nodes_deleted, i.left_key()); break; - + case parallel::in_right: // added do_delta_for_node_only_in_dest(i.right_data(), d); break; - + case parallel::in_both: // moved/patched/attribute changes do_delta_for_node_in_both(i.left_data(), i.right_data(), d); @@ -233,17 +233,17 @@ namespace { case parallel::invalid: I(false); - + case parallel::in_left: // deleted; don't need to do anything (will be handled by // nodes_deleted set break; - + case parallel::in_right: // added safe_insert(d.markings_changed, i.right_value()); break; - + case parallel::in_both: // maybe changed if (!(i.left_data() == i.right_data())) @@ -264,7 +264,7 @@ namespace symbol const attr_cleared("attr_cleared"); symbol const attr_changed("attr_changed"); symbol const marking("marking"); - + symbol const content("content"); symbol const location("location"); symbol const attr("attr"); @@ -462,7 +462,7 @@ namespace safe_insert(d.markings_changed, make_pair(nid, m)); } } - + } // end anonymous namespace void @@ -539,7 +539,7 @@ try_get_content_from_roster_delta(roster { roster_delta_t d; read_roster_delta(del, d); - + roster_delta_t::deltas_applied_t::const_iterator i = d.deltas_applied.find(nid); if (i != d.deltas_applied.end()) { @@ -566,7 +566,7 @@ try_get_content_from_roster_delta(roster return true; } } - + return false; } ============================================================ --- roster_delta.hh 1cbd73f46a1aa4864ae5b172b67662e8088b810d +++ roster_delta.hh bfa92f4bb32c3c2f6d6cfcb56c453bdbbe1fecea @@ -23,7 +23,7 @@ apply_roster_delta(roster_delta const & void apply_roster_delta(roster_delta const & del, roster_t & roster, marking_map & markings); - + bool try_get_markings_from_roster_delta(roster_delta const & del, node_id const & nid, @@ -34,7 +34,7 @@ try_get_content_from_roster_delta(roster try_get_content_from_roster_delta(roster_delta const & del, node_id const & nid, file_id & content); - + #endif // __ROSTER_DELTA_HH__ @@ -45,4 +45,3 @@ try_get_content_from_roster_delta(roster // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - ============================================================ --- roster_tests.hh 2a7c9e87be949541081a52fe18aa732a544397d6 +++ roster_tests.hh cee3c68e3a02ab972c4ff031946154342ef88b22 @@ -25,6 +25,8 @@ void test_roster_delta_on(roster_t const void test_roster_delta_on(roster_t const & a, marking_map const & a_marking, roster_t const & b, marking_map const & b_marking); +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -32,5 +34,3 @@ void test_roster_delta_on(roster_t const // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- safe_map.hh fd5389bf0c1a28081f39a4d5df9b0011c641e208 +++ safe_map.hh f07247d537c7872cbddd5a085b0f5ada242f0f5b @@ -85,6 +85,8 @@ do_safe_get(T & container, typename T::k #define safe_get(CONT, VAL) \ do_safe_get((CONT), (VAL), #CONT, __FILE__, __LINE__) +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -92,5 +94,3 @@ do_safe_get(T & container, typename T::k // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- sanity.cc 40cbfb6afc3df127fbf6c109e0e7aa4075ad2df2 +++ sanity.cc ca4bd80fa83a478d324ec37adb6468b9a884401d @@ -446,10 +446,10 @@ print_var(std::string const & value, cha print_var(std::string const & value, char const * var, char const * file, int const line, char const * func) { - std::cout << (FL("----- begin '%s' (in %s, at %s:%d)\n") + std::cout << (FL("----- begin '%s' (in %s, at %s:%d)\n") % var % func % file % line) << value - << (FL("\n----- end '%s' (in %s, at %s:%d)\n\n") + << (FL("\n----- end '%s' (in %s, at %s:%d)\n\n") % var % func % file % line); } ============================================================ --- sanity.hh a59baca5da8a73b4c38778ca73a3497409f02ce9 +++ sanity.hh ce0c494f5f8a1c27bc93386dfe46d8f65ee18f6b @@ -483,13 +483,12 @@ dump(T const & t, char const *var, #define DUMP(foo) dump(foo, #foo, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION) -////////////////////////////////////////////////////////////////////////// +#endif // __SANITY_HH__ + // Local Variables: // mode: C++ +// fill-column: 76 // c-file-style: "gnu" // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: -////////////////////////////////////////////////////////////////////////// - -#endif // __SANITY_HH__ ============================================================ --- selectors.cc c719f6e62002a6940ad8e49f2db7989427f4fb64 +++ selectors.cc 0379e566dbf2b7deaf7f209218f5d4cd0d148517 @@ -121,7 +121,7 @@ decode_selector(project_t & project, case sel_later: case sel_earlier: if (lua.hook_exists("expand_date")) - { + { E(lua.hook_expand_date(sel, tmp), origin::user, F("selector '%s' is not a valid date\n") % sel); } @@ -200,7 +200,7 @@ decode_selector(project_t & project, } } -static void +static void parse_selector(project_t & project, options const & opts, lua_hooks & lua, @@ -251,7 +251,7 @@ complete_one_selector(project_t & projec I(!value.empty()); project.db.select_parent(value, completions); break; - + case sel_author: project.db.select_cert(author_cert_name(), value, completions); break; ============================================================ --- selectors.hh 19cc6377e9afbf63e494d7bcfde3eb4754d2b510 +++ selectors.hh 7a2e92f0e1c1a1b05fc3c0c00ea2dc2b9059ebe2 @@ -44,6 +44,8 @@ void diagnose_ambiguous_expansion(projec std::set const & completions); +#endif // __SELECTORS_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -51,5 +53,3 @@ void diagnose_ambiguous_expansion(projec // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __SELECTORS_HH__ ============================================================ --- sha1.cc 52cd7b95bf6ac52cd9020624ec7e4a3bb998d038 +++ sha1.cc a662852697928ff72315d3d9f435305ddc9bb376 @@ -85,7 +85,6 @@ CMD_HIDDEN(benchmark_sha1, "benchmark_sh #endif } - // Local Variables: // mode: C++ // fill-column: 76 @@ -93,4 +92,3 @@ CMD_HIDDEN(benchmark_sha1, "benchmark_sh // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - ============================================================ --- simplestring_xform.cc be8b49996d330de5d23552cf2c8fcb38d5b8ddc2 +++ simplestring_xform.cc 506008109458c58abc016f9546384db4ed61650e @@ -113,7 +113,7 @@ void split_into_lines(string const & in, if (diff_compat) { // special handling: produce diff(1) compatible output s += (in.find_first_of("\r") != string::npos ? "\r\n" : "\n"); - s += "\\ No newline at end of file"; + s += "\\ No newline at end of file"; } out.push_back(s); } ============================================================ --- simplestring_xform.hh 0f62eaf3d669fa38fde3351bc29f166f7555c924 +++ simplestring_xform.hh d732cfc308a8910807ad9350ba6d7c293219ab18 @@ -106,17 +106,19 @@ std::string remove_ws(std::string const std::string remove_ws(std::string const & s); // remove leading chars from string -std::string trim_left(std::string const & s, +std::string trim_left(std::string const & s, std::string const & chars = "\n\r\t "); -// remove trailing chars from string -std::string trim_right(std::string const & s, +// remove trailing chars from string +std::string trim_right(std::string const & s, std::string const & chars = "\n\r\t "); // remove leading and trailing chars from string -std::string trim(std::string const & s, +std::string trim(std::string const & s, std::string const & chars = "\n\r\t "); +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -124,5 +126,3 @@ std::string trim(std::string const & s, // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- ssh_agent.cc 5a9bd4037c3249449c0b7bdee7b3df795cba7581 +++ ssh_agent.cc a9b3a1f2f41e7381007069ee96f76bef97aecac5 @@ -396,7 +396,7 @@ ssh_agent::has_key(const keypair & key) if (!pub_key) throw recoverable_failure(origin::system, "has_key: Failed to get monotone RSA public key"); - + vector ssh_keys = get_keys(); for (vector::const_iterator si = ssh_keys.begin(); si != ssh_keys.end(); ++si) @@ -509,4 +509,3 @@ ssh_agent::add_identity(RSA_PrivateKey c // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - ============================================================ --- ssh_agent.hh c9b7efaf4b0f2c137336046b0ebe3ccff7ad5076 +++ ssh_agent.hh c3293f416dcb980dd2cede7108612c92e4bc3d68 @@ -39,7 +39,9 @@ private: private: boost::scoped_ptr s; }; - + +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -47,5 +49,3 @@ private: // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- string_queue.hh 1326b1642a49c87e22c5dc727ea019c502213ca0 +++ string_queue.hh d2184fccefabdb4ac69d5616bf13fc21ada15408 @@ -118,7 +118,7 @@ public: { // don't bother shrinking unless it will help a lot, and // we're using enough memory to care. - size_t a_new_size = (size_t) (used_size () * 1.1); // leave some headroom + size_t a_new_size = (size_t) (used_size () * 1.1); // leave some headroom resize_buffer (std::max ((size_t) 8192, a_new_size)); } if (do_selfcheck) @@ -251,6 +251,8 @@ private: std::string selfcheck_str; }; +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -258,5 +260,3 @@ private: // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- tester-plaf.hh b6b7ad97e517261fdb37d05064e5f1365197f529 +++ tester-plaf.hh e9e164562a9022398b417351dab5a8662237ff15 @@ -90,6 +90,9 @@ void do_remove_recursive(std::string con // These functions are actually in tester.cc but are used by tester-plaf.cc. void do_remove_recursive(std::string const & dir); +#endif + + // Local Variables: // mode: C++ // fill-column: 76 @@ -97,6 +100,3 @@ void do_remove_recursive(std::string con // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif - ============================================================ --- transforms.hh b2fdb8c0ed6409e99fac04d55e765d38c23158fd +++ transforms.hh 9be76fde6f1634f9606101c7028f0051b39fa918 @@ -148,6 +148,8 @@ void calculate_ident(revision_data const void calculate_ident(revision_data const & dat, revision_id & ident); +#endif // __TRANSFORMS_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -155,5 +157,3 @@ void calculate_ident(revision_data const // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __TRANSFORMS_HH__ ============================================================ --- txt2c.cc 810cb63bef54dd15ec21812c34032343b73c668c +++ txt2c.cc 22ef07ab43c37b4d954cb171203cbe4aa3a267f6 @@ -65,7 +65,7 @@ generate_code(string & result, } ostringstream os; - + os << "// DO NOT EDIT\n" << "// this file is automatically generated from " << fname << ",\n" << "// any changes you make will be destroyed when it is regenerated\n" ============================================================ --- ui.cc 617c42e7a6cc179979544fc0db59383a8f8ffafc +++ ui.cc 62f1f7056425bf6bbd3beb02ee742eee4fd58adb @@ -437,7 +437,7 @@ void user_interface::initialize() void user_interface::initialize() { imp = new user_interface::impl; - + cout.exceptions(ios_base::badbit); #ifdef SYNC_WITH_STDIO_WORKS clog.sync_with_stdio(false); ============================================================ --- ui.hh 698164ee671be4906fe4c8ee03a3b8fd001de5d6 +++ ui.hh 1a9728da7d53a52ac0b4dfb7f2728045081973f6 @@ -98,6 +98,8 @@ format_usage_strings(std::vector const & descriptions, unsigned int namelen); +#endif // __UI_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -105,5 +107,3 @@ format_usage_strings(std::vector2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __UI_HH__ ============================================================ --- unit-tests/basic_io.cc d9722a5d70813f6ca1aa92e1c04a135c8a4f3a80 +++ unit-tests/basic_io.cc 538770889b3e70342026027977a9c35ef3bf4bcb @@ -39,4 +39,4 @@ UNIT_TEST(binary_transparency) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/charset.cc 91077286a68892e8664e4516ebf87d304941a51f +++ unit-tests/charset.cc 33530ee817a25d4941d236f4af919957931445ca @@ -409,4 +409,4 @@ UNIT_TEST(utf8_validation) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/commands.cc e0f918182b56e04dd75854cd9e3fe57a402328f0 +++ unit-tests/commands.cc d5a24210a23b5ba2efb29dacbbf28c88b17fc70c @@ -20,7 +20,7 @@ operator | (option::option_set option::option_set operator | (option::option_set const & opts, - option::option_set const & (*fun)()) + option::option_set const & (*fun)()) { return opts | fun(); } @@ -303,4 +303,4 @@ UNIT_TEST(command_find_command) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/cset.cc 7d16409c51ab9dd2599eeac49e43cbc456a6c7d3 +++ unit-tests/cset.cc 28a06dc65c661141c07a93b69533c42d352a3586 @@ -697,4 +697,4 @@ UNIT_TEST(root_dir) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/dates.cc 4b41c972bd9629ccdddb28ec2cff917f97ac0a7a +++ unit-tests/dates.cc af8a777e15c6cccc98f7c006dfe4d84ffd5636ba @@ -313,7 +313,7 @@ UNIT_TEST(from_unix_epoch) OK_(EARLIEST_SUPPORTED_DATE, "0001-01-01T00:00:00"); UNIT_TEST_CHECK_THROW(date_t(EARLIEST_SUPPORTED_DATE-1), std::logic_error); - + #undef OK } @@ -447,4 +447,4 @@ UNIT_TEST(roundtrip_all_year_boundaries) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/globish.cc d2db751fddfa0d0bc0d0df2f735ae7304bcbf151 +++ unit-tests/globish.cc 16645f0f37122cc2534d83dfd32bb38368d0e9e8 @@ -39,7 +39,7 @@ UNIT_TEST(syntax) { "[+-/]", "[+\\,\\-./]" }, { "\xC2\xA1", "\xC2\xA1" }, // U+00A1 in UTF8 - + { "*", "*" }, { "\\*", "\\*" }, { "[*]", "\\*" }, @@ -236,4 +236,4 @@ UNIT_TEST(nested_matches) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/graph.cc 9d1dad603ecf364e8a0154ef418f04ef5ea3973c +++ unit-tests/graph.cc c03ea24f2bbe86e0034a0be7ed668b2891da145c @@ -159,7 +159,7 @@ struct mock_rev_graph : rev_graph { // assign sensible heights height_map.clear(); - + // toposort expects parent->child rev_ancestry_map parent_to_child; for (rev_ancestry_map::const_iterator i = child_to_parent_map.begin(); @@ -169,7 +169,7 @@ struct mock_rev_graph : rev_graph } vector topo_revs; toposort_rev_ancestry(parent_to_child, topo_revs); - + // this is ugly but works. just give each one a sequential number. rev_height top = rev_height::root_height(); u32 num = 1; @@ -179,7 +179,7 @@ struct mock_rev_graph : rev_graph height_map.insert(make_pair(*r, top.child_height(num))); } } - + virtual void get_parents(revision_id const & node, set & parents) const { parents.clear(); @@ -190,20 +190,20 @@ struct mock_rev_graph : rev_graph safe_insert(parents, i->second); } } - + virtual void get_children(revision_id const & node, set & parents) const { // not required I(false); } - + virtual void get_height(revision_id const & rev, rev_height & h) const { MM(rev); h = safe_get(height_map, rev); } - - + + rev_ancestry_map const & child_to_parent_map; map height_map; }; @@ -225,7 +225,7 @@ run_a_get_uncommon_ancestors_test(rev_an set_difference(true_right_ancestors.begin(), true_right_ancestors.end(), true_left_ancestors.begin(), true_left_ancestors.end(), inserter(true_right_uncommon_ancestors, true_right_uncommon_ancestors.begin())); - + set calculated_left_uncommon_ancestors, calculated_right_uncommon_ancestors; MM(calculated_left_uncommon_ancestors); MM(calculated_right_uncommon_ancestors); @@ -246,7 +246,7 @@ UNIT_TEST(get_uncommon_ancestors_nasty_c { // This tests the nasty case described in the giant comment above // get_uncommon_ancestors: - // + // // 9 // |\ . Extraneous dots brought to you by the // 8 \ . Committee to Shut Up the C Preprocessor @@ -413,4 +413,4 @@ UNIT_TEST(get_uncommon_ancestors_randoml // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/merge_3way.cc 7f56ea3d267d93bfcdfaf39ddc2839e712aba755 +++ unit-tests/merge_3way.cc c3a2f75290711c12829e59e5b26fd1e5bf657595 @@ -192,4 +192,4 @@ UNIT_TEST(merge_deletions) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/merge_roster.cc e83b6301720c6db5bb09c65bccb48ca5ac6f2a5e +++ unit-tests/merge_roster.cc 8e60819d5307c992f84f41b295c07900cd6addb0 @@ -1250,4 +1250,4 @@ UNIT_TEST(complex_structural_conflicts) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/netcmd.cc 4ac3c2dd1580efa5134f750c2f1454e99e908863 +++ unit-tests/netcmd.cc 6f32770480ff18eb89f5131cd4da26572e8e203e @@ -283,4 +283,4 @@ UNIT_TEST(functions) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/netxx_pipe.cc 181510dab2c0c141d7575f035f6dadd91ac1560f +++ unit-tests/netxx_pipe.cc 8079a37e6515c9447167cfc70edcee6a89899aff @@ -90,4 +90,4 @@ catch (recoverable_failure &e) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/option.cc a98ee374f118b6153162b465728e7244f00853a1 +++ unit-tests/option.cc 81d914901386f286e56b93bdd1fbfda1ad98aa35 @@ -80,4 +80,4 @@ UNIT_TEST(concrete_options) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/outdated_indicator.cc dc593bf8294eaaf05595b0b18bcb6136cb1f4610 +++ unit-tests/outdated_indicator.cc 7763f324495b4930c469b97f92c9f83a24d51c0b @@ -29,4 +29,4 @@ UNIT_TEST(basic) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/packet.cc 99c63c53f2b82b88f6dafb9839056dbe69ea74f8 +++ unit-tests/packet.cc 0886a71bcaacbe45af4109ca95108d28af7dd842 @@ -60,7 +60,7 @@ UNIT_TEST(validators) N_THROW(f.validate_certname("ABCDEFGHIJKLMNOPQRSTUVWXYZ" "abcdefghijklmnopqrstuvwxyz" "0123456789-")); - + Y_THROW(f.validate_certname("")); Y_THROW(f.validate_certname("address@hidden")); Y_THROW(f.validate_certname("graydon at venge dot net")); @@ -164,4 +164,4 @@ UNIT_TEST(roundabout) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/paths.cc 294a3b564606d0e3237d3392906832a66c83c904 +++ unit-tests/paths.cc 7465bbf45840f38209712842ee79c6642bcc9482 @@ -1026,4 +1026,4 @@ UNIT_TEST(find_old_new_path_for) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/refiner.cc 212627343ce39518d16392092da2103880b063fb +++ unit-tests/refiner.cc 8aec2b41ff7d6f7ac1ee5cb8d701fca0edfab9c6 @@ -366,4 +366,4 @@ UNIT_TEST(count_1024) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/restrictions.cc 90ac7ff1a2560b3f65a6aeea2efa8a3ffc0f3a46 +++ unit-tests/restrictions.cc c7f6ce107a7c5599ed0dac7ecfff2b9f0268f0b3 @@ -836,4 +836,4 @@ UNIT_TEST(include_depth_2) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/rev_height.cc 449562e54a13e606ac164c46658893b972977f4f +++ unit-tests/rev_height.cc c4badb69187cd720c1ba87c32ff5fbd5a0ff0a39 @@ -29,7 +29,7 @@ UNIT_TEST(count_up) I(read_at(h(), 0) == 0); I(read_at(h(), 1) == 0); I(read_at(h(), 2) == n); - } + } } UNIT_TEST(children) @@ -58,7 +58,7 @@ UNIT_TEST(children) L(FL("gen %d: %d children, survivor %d") % generations % children % survivor_no); - + u32 parent_len = h().size() / width; rev_height survivor; MM(survivor); @@ -114,4 +114,4 @@ UNIT_TEST(comparisons) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/revision.cc 22d5e143205c9909fadb6f4c5a627e432a01412d +++ unit-tests/revision.cc d79f05dc96e7ec2e63c699d1022593789278715d @@ -65,4 +65,4 @@ UNIT_TEST(from_network) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/roster.cc 4bb7cf5442f7f16b20a470e605b0a919119d0196 +++ unit-tests/roster.cc 26f278e0c4f1db6a2d06480acc20b97039c5f4c9 @@ -2083,7 +2083,7 @@ create_random_unification_task(roster_t editable_roster_base & right_erb, editable_roster_for_merge & left_erm, editable_roster_for_merge & right_erm, - randomizer & rng) + randomizer & rng) { size_t n_nodes = 20 + rng.uniform(60); @@ -2367,4 +2367,4 @@ UNIT_TEST(unify_rosters_end_to_end_attr_ // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/sha1.cc ac4543c655de43bdffc5ddaba3c511b1dcc53a74 +++ unit-tests/sha1.cc dcaf3439d0f7ca6a95746b258b0bee1dbb376044 @@ -107,9 +107,9 @@ UNIT_TEST(pseudo_message) for (int i = 3; i < 1003; i++) { - data msg(MD[i-3] + MD[i-2] + MD[i-1], origin::internal); + data msg(MD[i-3] + MD[i-2] + MD[i-1], origin::internal); calculate_ident(msg, output); - MD[i] = output(); + MD[i] = output(); } id expect(decode_hexenc_as(pseudo_checkpoints[j], origin::internal)); @@ -142,7 +142,7 @@ namespace { // SHA-1 tests are configured for BYTE oriented implementations // Generated on Wed Feb 08 14:59:32 2006 -char const * const short_message_in[] = +char const * const short_message_in[] = { "", "a8", @@ -239,7 +239,7 @@ char const * const short_message_in[] = 0 }; -char const * const short_message_out[] = +char const * const short_message_out[] = { "da39a3ee5e6b4b0d3255bfef95601890afd80709", "99f2aa95e36f95c2acb0eaf23998f030638f3f15", @@ -314,7 +314,7 @@ char const * const short_message_out[] = // SHA tests are configured for BYTE oriented implementations // Generated on Wed Feb 08 14:59:32 2006 -char const * const long_message_in[] = +char const * const long_message_in[] = { "ec29561244ede706b6eb30a1c371d74450a105c3f9735f7fa9fe38cf67f304a5736a106e92" "e17139a6813b1c81a4f3d3fb9546ab4296fa9f722826c066869edacd73b2548035185813" @@ -6175,7 +6175,7 @@ char const * const long_message_in[] = 0 }; -char const * const long_message_out[] = +char const * const long_message_out[] = { "970111c4e77bcc88cc20459c02b69b4aa8f58217", "0423dc76a8791107d14e13f5265b343f24cc0f19", @@ -6251,7 +6251,7 @@ char const pseudo_seed[] = "8bfd162cb9d3 char const pseudo_seed[] = "8bfd162cb9d3b04dcb7e54b4ddb2b5d8d9c899f8"; -char const * const pseudo_checkpoints[] = +char const * const pseudo_checkpoints[] = { "6a3a5b517df036a753a50201323743854aca905d", "b5405f3152d0289411b5ffa30cc8d3058854fef4", ============================================================ --- unit-tests/simplestring_xform.cc 2b998292cf315420f3254869124275cf1bb964db +++ unit-tests/simplestring_xform.cc 03649bf0eb4f9ab5f50594b5ac9a915456e49f11 @@ -131,4 +131,4 @@ UNIT_TEST(trimming) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/string_queue.cc ab5a11313c3ed142a83b135a38d1417114b8064b +++ unit-tests/string_queue.cc c2e3a25ff75876791bd5b70dde967796ecec07b3 @@ -69,4 +69,4 @@ UNIT_TEST(basic) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/transforms.cc eebedcadbd8f1cc21fdeb5c2bb566dc26ea89f7f +++ unit-tests/transforms.cc 73b208da2aa37fa7b9c84324782d10adf7424cce @@ -60,4 +60,4 @@ UNIT_TEST(corruption_check) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/uri.cc 83484f081b8a03e0316df7d4d4082830bf72768b +++ unit-tests/uri.cc be871d7b14f2fd2c066b4759ae43abc2f2d08912 @@ -15,13 +15,13 @@ test_one_uri(string scheme, static void test_one_uri(string scheme, - string user, - string ipv6_host, - string normal_host, - string port, - string path, - string query, - string fragment) + string user, + string ipv6_host, + string normal_host, + string port, + string path, + string query, + string fragment) { string built; @@ -40,22 +40,22 @@ test_one_uri(string scheme, host = normal_host; if (! (user.empty() - && host.empty() - && port.empty())) + && host.empty() + && port.empty())) { built += "//"; if (! user.empty()) - built += (user + '@'); + built += (user + '@'); if (! host.empty()) - built += host; + built += host; if (! port.empty()) - { - built += ':'; - built += port; - } + { + built += ':'; + built += port; + } } if (! path.empty()) @@ -137,4 +137,4 @@ UNIT_TEST(urldecode) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/vocab.cc 1d7d9a06fd70fb9d013a53e87cbad73baa274792 +++ unit-tests/vocab.cc bfb299c88dd2b2988aaf1c6d9a110e62896597f4 @@ -71,4 +71,4 @@ UNIT_TEST(verify_hexenc_id) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit-tests/xdelta.cc 429356c79bac3c54426db6286bff3bfb4e5b8a83 +++ unit-tests/xdelta.cc a0183bed5c69963c3a39531792657ba3b97b763b @@ -197,17 +197,17 @@ UNIT_TEST(rolling_sanity_check) static const string::size_type blocksz = 64; char testbuf[testbufsize]; - for(unsigned i = 0; i < testbufsize; ++i) + for(unsigned i = 0; i < testbufsize; ++i) { testbuf[i] = xdelta_chargen(xdelta_prng); } - for(unsigned advanceby = 0; advanceby < testbufsize; ++advanceby) + for(unsigned advanceby = 0; advanceby < testbufsize; ++advanceby) { adler32 incremental(reinterpret_cast(testbuf), blocksz); - for(unsigned i = 0; i < advanceby; ++i) + for(unsigned i = 0; i < advanceby; ++i) { incremental.out(static_cast(testbuf[i])); - if ((i + blocksz) < testbufsize) + if ((i + blocksz) < testbufsize) { incremental.in(static_cast(testbuf[i+blocksz])); } @@ -215,7 +215,7 @@ UNIT_TEST(rolling_sanity_check) adler32 skip(reinterpret_cast(testbuf), blocksz); u32 new_lo = advanceby; u32 new_hi = new_lo + blocksz; - if (new_hi > testbufsize) + if (new_hi > testbufsize) { new_hi = testbufsize; } @@ -224,7 +224,7 @@ UNIT_TEST(rolling_sanity_check) UNIT_TEST_CHECK(skip.sum() == incremental.sum()); } L(FL("rolling sanity check passed")); -} +} // Local Variables: // mode: C++ @@ -232,4 +232,4 @@ UNIT_TEST(rolling_sanity_check) // c-file-style: "gnu" // indent-tabs-mode: nil // End: -// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unit_tester.cc 8734397c969f332c57e2e2e246502c072bb2103e +++ unit_tester.cc ee385ca238b903be23ddbaeef78d2ee78f474e8b @@ -242,7 +242,7 @@ int main(int argc, char * argv[]) string group, test; group = test_to_run.substr(0, sep); test = test_to_run.substr(sep+1, string::npos); - + group_list_t::const_iterator g = unit_tests().find(group); if (g == unit_tests().end()) ============================================================ --- unit_tests.hh 48d2f3e88792009a1f883da4e7d7926b802fd016 +++ unit_tests.hh 6b954b0c842e44cd5e8f3caf92fc9ee7354fd888 @@ -97,6 +97,8 @@ namespace unit_test { } \ static void unit_test::t_##TEST() +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -104,5 +106,3 @@ namespace unit_test { // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- unix/fs.cc dceea237ff47043805e967acb5040ce3170de2d8 +++ unix/fs.cc 6a14757e5551b259f87054adbd53173e25ce9bc4 @@ -176,7 +176,7 @@ do_read_directory(string const & path, string p(path); if (p == "") p = "."; - + dirhandle dir(p); struct dirent *d; struct stat st; @@ -195,12 +195,12 @@ do_read_directory(string const & path, case DT_DIR: // directory dirs.consume(d->d_name); continue; - + case DT_UNKNOWN: // unknown type case DT_LNK: // symlink - must find out what's at the other end default: break; - } + } #endif // the use of stat rather than lstat here is deliberate. @@ -255,9 +255,9 @@ do_read_directory(string const & path, } return; } - - + + void rename_clobberingly(string const & from, string const & to) { @@ -340,7 +340,7 @@ make_temp_file(string const & dir, strin v /= base; tmp.at(tmp.size() - 5) = letters[v % base]; v /= base; - + int fd = open(tmp.c_str(), O_RDWR|O_CREAT|O_EXCL, mode); int err = errno; ============================================================ --- unix/get_system_flavour.cc 97543576570865c331d16d5ffe11cdc118624530 +++ unix/get_system_flavour.cc c2b5a4b599251b363f308aa884cfaeb4eb237e61 @@ -13,7 +13,7 @@ void get_system_flavour(std::string & id struct utsname n; /* Solaris has >= 0 as success, while Linux only knows 0 - as >0 is not an - error condition there, relax a bit */ + error condition there, relax a bit */ I(uname(&n) >= 0); ident = (FL("%s %s %s %s") % n.sysname ============================================================ --- unix/process.cc 43c3fe5e6a4f465e35e9b3c55859f8e6f6f1e1f0 +++ unix/process.cc feac2afcdb6084a21b68c6ff72dafc9e914a4127 @@ -185,7 +185,7 @@ pid_t process_spawn_pipe(char const * co int infds[2]; int outfds[2]; pid_t pid; - + if (pipe(infds) < 0) return -1; if (pipe(outfds) < 0) @@ -194,7 +194,7 @@ pid_t process_spawn_pipe(char const * co close(infds[1]); return -1; } - + switch(pid = vfork()) { case -1: @@ -217,7 +217,7 @@ pid_t process_spawn_pipe(char const * co close(outfds[1]); } close(outfds[0]); - + execvp(argv[0], (char * const *)argv); raise(SIGKILL); } @@ -226,7 +226,7 @@ pid_t process_spawn_pipe(char const * co close(outfds[1]); *in = fdopen(infds[1], "w"); *out = fdopen(outfds[0], "r"); - + return pid; } @@ -262,7 +262,7 @@ int process_wait(pid_t pid, int *res, in *res = 0; return -1; } - if (WIFEXITED(status)) + if (WIFEXITED(status)) *res = WEXITSTATUS(status); else *res = -WTERMSIG(status); ============================================================ --- unix/read_password.cc fc7956632728a871f4de6f547171ac397d1b8489 +++ unix/read_password.cc 781410699fe1a5325ae2efca87fc3871c6647a44 @@ -11,14 +11,14 @@ #include "sanity.hh" -static void +static void echo_on(struct termios & save_term) { tcsetattr(0, TCSANOW, &save_term); } -static void -echo_off(struct termios & save_term) +static void +echo_off(struct termios & save_term) { struct termios temp; tcgetattr(0,&save_term); @@ -27,10 +27,10 @@ echo_off(struct termios & save_term) tcsetattr(0, TCSANOW, &temp); } -void +void read_password(std::string const & prompt, char * buf, size_t bufsz) { - struct termios save_term; + struct termios save_term; I(buf != NULL); memset(buf, 0, bufsz); std::cout << prompt; ============================================================ --- unix/ssh_agent_platform.cc 271c9bebfa66789128441aa1452f30d5fa962c8a +++ unix/ssh_agent_platform.cc ca283542525ff3050ab2b3a657137fb3c5ed5d9b @@ -35,7 +35,7 @@ connect_to_agent() connect_to_agent() { const char *authsocket = getenv("SSH_AUTH_SOCK"); - + if (!authsocket || !*authsocket) { L(FL("ssh_agent: no agent")); @@ -46,14 +46,14 @@ connect_to_agent() if (sock < 0) { W(F("ssh_agent: failed to create a socket: %s") - % strerror(errno)); + % strerror(errno)); return -1; } if (fcntl(sock, F_SETFD, FD_CLOEXEC)) { close(sock); W(F("ssh_agent: failed to set socket as close-on-exec: %s") - % strerror(errno)); + % strerror(errno)); return -1; } @@ -65,7 +65,7 @@ connect_to_agent() { close(sock); W(F("ssh_agent: failed to connect to agent: %s") - % strerror(errno)); + % strerror(errno)); return -1; } @@ -96,11 +96,11 @@ ssh_agent_platform::write_data(string co ssize_t sent = ::send(sock, buf, put, MSG_NOSIGNAL); E(sent >= 0, origin::system, - F("ssh_agent: error during send: %s") % strerror(errno)); + F("ssh_agent: error during send: %s") % strerror(errno)); if (sent == 0) - E(++deadcycles < 8, origin::system, - F("ssh_agent: giving up after %d ineffective sends to agent") - % deadcycles); + E(++deadcycles < 8, origin::system, + F("ssh_agent: giving up after %d ineffective sends to agent") + % deadcycles); buf += sent; put -= sent; @@ -109,7 +109,7 @@ ssh_agent_platform::write_data(string co F("ssh_agent: sent %u extra bytes to agent") % -put); } -void +void ssh_agent_platform::read_data(string::size_type len, string & out) { I(connected()); @@ -126,10 +126,10 @@ ssh_agent_platform::read_data(string::si ssize_t recvd = ::recv(sock, buf, min(get, bufsize), MSG_WAITALL); E(recvd >= 0, origin::system, - F("ssh_agent: error during receive: %s") % strerror(errno)); + F("ssh_agent: error during receive: %s") % strerror(errno)); if (recvd == 0) - E(++deadcycles < 8, origin::system, - F("ssh_agent: giving up after %d ineffective receives from agent")); + E(++deadcycles < 8, origin::system, + F("ssh_agent: giving up after %d ineffective receives from agent")); out.append(buf, recvd); get -= recvd; @@ -137,3 +137,11 @@ ssh_agent_platform::read_data(string::si E(get == 0, origin::system, F("ssh_agent: received %u extra bytes from agent") % -get); } + +// Local Variables: +// mode: C++ +// fill-column: 76 +// c-file-style: "gnu" +// indent-tabs-mode: nil +// End: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unix/ssh_agent_platform.hh fdf540a64a48b22b9b7941feb7850b879f353eac +++ unix/ssh_agent_platform.hh 80bc92de73e40e1906c156e49f8927fa9483e2d8 @@ -24,3 +24,11 @@ public: }; #endif + +// Local Variables: +// mode: C++ +// fill-column: 76 +// c-file-style: "gnu" +// indent-tabs-mode: nil +// End: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unix/tester-check-net.cc 093f6aa88a8aafd110387c0f9df09afc1c44185d +++ unix/tester-check-net.cc 89fdb78ff4c9cd7fe4a60bca1afdf5fbf00b5bbd @@ -1,5 +1,5 @@ /* 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. @@ -81,7 +81,7 @@ static int get_socket(int (*b_or_c)(int, sin6.sin6_family = AF_INET6; sin6.sin6_port = htons(port); sin6.sin6_addr = in6addr_loopback; - + sfd = socket(PF_INET6, SOCK_STREAM, 0); if (sfd >= 0) { @@ -106,7 +106,7 @@ static int server(void) sfd = get_socket(bind); if (sfd < 0) return 1; - + if (listen(sfd, 1)) { fprintf(stderr, "server: listen: %s\n", strerror(errno)); @@ -274,12 +274,10 @@ int main(void) #endif -/* - Local Variables: - mode: C - fill-column: 76 - c-file-style: "gnu" - indent-tabs-mode: nil - End: - vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - */ +// Local Variables: +// mode: C++ +// fill-column: 76 +// c-file-style: "gnu" +// indent-tabs-mode: nil +// End: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- unix/tester-plaf.cc 839e25268631815a9c6a3a8864a4b9d5dc4a78a1 +++ unix/tester-plaf.cc bcbcd37f68b536f66b86b22af6ea82ef7a1d5111 @@ -213,7 +213,7 @@ char * make_temp_dir() delete [] tmpdir; return templ; } - + E(errno == EEXIST, origin::system, F("mkdir(%s) failed: %s") % tmpdir % os_strerror(errno)); @@ -450,7 +450,7 @@ void run_tests_in_children(test_enumerat E(sigaction(SIGCHLD, &sa, &osa) == 0, origin::system, F("setting SIGCHLD handler: %s") % os_strerror(errno)); - + while (next_test(t)) { do @@ -484,7 +484,7 @@ void run_tests_in_children(test_enumerat } while (acquire_token()); - + // This must be done before we try to redirect stdout/err to a file // within testdir. If we did it in the child, we would have to do it // before it was safe to issue diagnostics. ============================================================ --- update.cc 04ca1a313bbd21e3fb4654074b36a791246052af +++ update.cc 7a3e42759fc4ce4b4ef3693b7dcca4cf7f477c12 @@ -161,7 +161,7 @@ pick_update_candidates(lua_hooks & lua, if (ignore_suspend_certs) return; - + set active_candidates; for (set::const_iterator i = candidates.begin(); i != candidates.end(); i++) ============================================================ --- update.hh 182e0764bd0c84327c2b1f073fc3eaf3642ad4d2 +++ update.hh ba78cd61383ee268f56bc37682a490bfac7ee9bb @@ -32,6 +32,8 @@ void pick_update_candidates(lua_hooks & branch_name const & branchname, bool ignore_suspend_certs); +#endif // __UPDATE_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -39,5 +41,3 @@ void pick_update_candidates(lua_hooks & // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __UPDATE_HH__ ============================================================ --- uri.cc fcf41abf3ae0212694c7db6eab281e707f3a345e +++ uri.cc 1c57c3a5fa0f0899e60e71b2b79caea4d1c3596d @@ -148,7 +148,7 @@ urldecode(string const & in, origin::typ urldecode(string const & in, origin::type made_from) { string out; - + for (string::const_iterator i = in.begin(); i != in.end(); ++i) { if (*i != '%') @@ -162,7 +162,7 @@ urldecode(string const & in, origin::typ ++i; E(i != in.end(), made_from, F("Bad URLencoded string '%s'") % in); d2 = *i; - + char c = 0; switch(d1) { @@ -208,7 +208,7 @@ urldecode(string const & in, origin::typ out += c; } } - + return out; } ============================================================ --- uri.hh cf5fd067baa8047fb5400ae462aad5840361fa71 +++ uri.hh f47e00a95933cc7b73d3023993100072625d8fef @@ -29,6 +29,8 @@ urldecode(std::string const & in, origin std::string urldecode(std::string const & in, origin::type made_from); +#endif + // Local Variables: // mode: C++ // fill-column: 76 @@ -36,5 +38,3 @@ urldecode(std::string const & in, origin // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif ============================================================ --- vector.hh 978075c1e0d5965855106d5e6a4f82518fdde041 +++ vector.hh 6c7d7e9c1f2c26a95d0d51fbbe7db9982e4309c2 @@ -91,11 +91,12 @@ dump(std::vector const & vec, std::st } }; +#endif // __VECTOR_HH__ + // Local Variables: // mode: C++ +// fill-column: 76 // c-file-style: "gnu" // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __VECTOR_HH__ ============================================================ --- vocab.hh 8519acc2d76a0ae326f0935adcea296391d2d750 +++ vocab.hh 2bd325ccd8f3e2af59352517f3570991d60ce29e @@ -140,6 +140,8 @@ fake_id(); id fake_id(); +#endif // __VOCAB_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -147,5 +149,3 @@ fake_id(); // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __VOCAB_HH__ ============================================================ --- vocab_cast.hh d6cdeb15c439fcb834d27482e480741c4cf608da +++ vocab_cast.hh bd143db00172c1dff56eace0fa2c82e7299bacce @@ -14,8 +14,8 @@ void typecast_vocab_container(From const void typecast_vocab_container(From const & from, To & to) { std::transform(from.begin(), from.end(), std::inserter(to, to.end()), - &typecast_vocab); + &typecast_vocab); } // You won't use this directly either. @@ -31,8 +31,8 @@ void add_decoration_to_container(From co void add_decoration_to_container(From const & from, To & to) { std::transform(from.begin(), from.end(), std::inserter(to, to.end()), - &add_decoration); + &add_decoration); } template @@ -42,3 +42,11 @@ void vocabify_container(From const & fro } #endif + +// Local Variables: +// mode: C++ +// fill-column: 76 +// c-file-style: "gnu" +// indent-tabs-mode: nil +// End: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- vocab_hash.hh 9d01d5332e1d652f00fc962841a5610a6e59a287 +++ vocab_hash.hh 7fd5a04439ab35f212daaad1b673f6dea894ae25 @@ -13,53 +13,53 @@ #include "vocab.hh" #include "hash_map.hh" -#define ENCODING(enc) \ - namespace hashmap { \ - template \ - struct hash > \ - { \ - size_t operator()(enc const & t) const \ - { \ - return hash()(t()); \ - } \ - }; \ +#define ENCODING(enc) \ + namespace hashmap { \ + template \ + struct hash > \ + { \ + size_t operator()(enc const & t) const \ + { \ + return hash()(t()); \ + } \ + }; \ } #define ENCODING_NOVERIFY(enc) ENCODING(enc) -#define DECORATE(dec) \ - namespace hashmap { \ - template \ - struct hash > \ - { \ - size_t operator()(dec const & t) const \ - { \ - return hash()(t.inner()); \ - } \ - }; \ +#define DECORATE(dec) \ + namespace hashmap { \ + template \ + struct hash > \ + { \ + size_t operator()(dec const & t) const \ + { \ + return hash()(t.inner()); \ + } \ + }; \ } -#define ATOMIC(ty) \ - namespace hashmap { \ - template<> \ - struct hash \ - { \ - size_t operator()(ty const & t) const \ - { \ - return hash()(t()); \ - } \ - }; \ +#define ATOMIC(ty) \ + namespace hashmap { \ + template<> \ + struct hash \ + { \ + size_t operator()(ty const & t) const \ + { \ + return hash()(t()); \ + } \ + }; \ } -#define ATOMIC_BINARY(ty) \ - namespace hashmap { \ - template<> \ - struct hash \ - { \ - size_t operator()(ty const & t) const \ - { \ - return hash()(t()); \ - } \ - }; \ +#define ATOMIC_BINARY(ty) \ + namespace hashmap { \ + template<> \ + struct hash \ + { \ + size_t operator()(ty const & t) const \ + { \ + return hash()(t()); \ + } \ + }; \ } #define ATOMIC_HOOKED(ty,hook) ATOMIC(ty) #define ATOMIC_NOVERIFY(ty) ATOMIC(ty) @@ -74,3 +74,11 @@ #undef ATOMIC_NOVERIFY #endif + +// Local Variables: +// mode: C++ +// fill-column: 76 +// c-file-style: "gnu" +// indent-tabs-mode: nil +// End: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- vocab_macros.hh db691c053cae7fa496c004608fe39f576fd6fa7e +++ vocab_macros.hh 6c97f3c4c3b4ac6766ac0c42ffd802168d72a582 @@ -279,7 +279,6 @@ void dump(dec const & obj, std::s void dump(dec const & obj, std::string & out) \ { dump(obj.inner(), out); } - // Local Variables: // mode: C++ // fill-column: 76 @@ -287,4 +286,3 @@ void dump(dec const & obj, std::s // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - ============================================================ --- vocab_terms.hh 8b4bb85bf082eb78e3c2b22ce78081c70f06eeed +++ vocab_terms.hh 28341d787d1cbaba84a00ab5b176939b0a81e05e @@ -117,4 +117,3 @@ EXTERN template class base64< gzip2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - ============================================================ --- win32/fs.cc 9dee8425649922f9cf98200c8d79c3a0b01f8290 +++ win32/fs.cc 16b42480fad9d8f471dae8b84db11ab3479d726f @@ -138,7 +138,7 @@ get_path_status(std::string const & path || err == ERROR_BAD_NETPATH) return path::nonexistent; - E(false, origin::system, F("%s: GetFileAttributes error: %s") % path % os_strerror(err)); + E(false, origin::system, F("%s: GetFileAttributes error: %s") % path % os_strerror(err)); } else if (attrs & FILE_ATTRIBUTE_DIRECTORY) return path::directory; @@ -187,7 +187,7 @@ namespace } if (FindNextFile(h, data)) return true; - E(GetLastError() == ERROR_NO_MORE_FILES, origin::system, + E(GetLastError() == ERROR_NO_MORE_FILES, origin::system, F("error while reading directory: %s") % os_strerror(errno)); last = true; return false; @@ -267,13 +267,13 @@ rename_clobberingly_impl(const char * fr { HMODULE hModule = LoadLibrary("kernel32"); if (hModule) - fnMoveFileEx = reinterpret_cast - (GetProcAddress(hModule, "MoveFileExA")); + fnMoveFileEx = reinterpret_cast + (GetProcAddress(hModule, "MoveFileExA")); if (fnMoveFileEx) - { - L(FL("using MoveFileEx for renames")); - MoveFileExAvailable = YES; - } + { + L(FL("using MoveFileEx for renames")); + MoveFileExAvailable = YES; + } else { L(FL("using DeleteFile/MoveFile fallback for renames")); @@ -286,14 +286,14 @@ rename_clobberingly_impl(const char * fr if (MoveFileExAvailable == YES) { if (fnMoveFileEx(from, to, MOVEFILE_REPLACE_EXISTING)) - return true; + return true; else if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) return false; else { MoveFileExAvailable = NO; L(FL("MoveFileEx failed with CALL_NOT_IMPLEMENTED, using fallback")); - } + } } // This is not even remotely atomic, but what can you do? ============================================================ --- win32/get_system_flavour.cc df4829cf15d2a0ec0c4a63c60f9cef2b15496168 +++ win32/get_system_flavour.cc 9a3d6b976c35c20ffe50e1fb6e723efe4006a1fd @@ -14,9 +14,9 @@ struct table_entry char *val; }; -void key_to_string(unsigned long key, +void key_to_string(unsigned long key, table_entry *table, - std::string & str, + std::string & str, std::string const & def) { while (table->val != 0) @@ -73,7 +73,7 @@ static table_entry processors[] = { static table_entry processors[] = { #ifdef PROCESSOR_ARCHITECTURE_INTEL - { PROCESSOR_ARCHITECTURE_INTEL, "ia32" }, + { PROCESSOR_ARCHITECTURE_INTEL, "ia32" }, #endif #ifdef PROCESSOR_ARCHITECTURE_IA64 { PROCESSOR_ARCHITECTURE_IA64, "ia64" }, @@ -129,7 +129,7 @@ void get_system_flavour(std::string & id GetSystemInfo(&si); I(GetVersionEx(&vi)); - + std::string family, processor; key_to_string(vi.dwPlatformId, families, family, "unknown"); @@ -160,7 +160,7 @@ void get_system_flavour(std::string & id } ident = (F("Windows %s (%d.%d, build %d, %s) on %s") - % family + % family % vi.dwMajorVersion % vi.dwMinorVersion % vi.dwBuildNumber ============================================================ --- win32/main.cc 2f73d3121a41dd868d41f71fd87e40a8979c560b +++ win32/main.cc 5a71222d0355a0c8f699b69e3e13e95ee52ca872 @@ -88,7 +88,7 @@ seh_reporting_function(LPEXCEPTION_POINT case EXCEPTION_ACCESS_VIOLATION: report_error("memory access violation"); break; - + case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: report_error("array bounds exceeded"); break; @@ -190,7 +190,7 @@ main(int argc, char ** argv) } else { argv0 = argv[0]; } - + SetUnhandledExceptionFilter(&seh_reporting_function); #ifdef MS_CRT_DEBUG_HOOK ============================================================ --- win32/process.cc 097e18737531f5b702b62c55a7b98899bab4f7ac +++ win32/process.cc 34244703491fe7f3a5d7271d3f4e1eadf3398f2a @@ -170,7 +170,7 @@ redir::redir(int which, char const * fil sa.nLength = sizeof(SECURITY_ATTRIBUTES); sa.lpSecurityDescriptor = 0; sa.bInheritHandle = true; - + file = CreateFile(filename, (which==0?GENERIC_READ:GENERIC_WRITE), FILE_SHARE_READ, ============================================================ --- win32/read_password.cc 8b6380a4788c7ce6b75c2497abc159e466c37d36 +++ win32/read_password.cc 24f94f0c5768283f77dd11b5cb4eff5a2885f965 @@ -11,7 +11,7 @@ #include "sanity.hh" -void +void read_password(std::string const & prompt, char * buf, size_t bufsz) { HANDLE mt_stdin; @@ -24,7 +24,7 @@ read_password(std::string const & prompt I(mt_stdin != NULL); // NULL is non-interactive. Can't get a passphrase if we're non-interactive if (GetConsoleMode(mt_stdin, &origmode) == 0) { - /* This looks like we're not a real windows console. + /* This looks like we're not a real windows console. Possibly MSYS or Cygwin. We'll do the best we can to make the password invisible in the absence of tcsetattr, namely emitting vt100 codes to change the foreground and ============================================================ --- win32/ssh_agent_platform.cc 0c9cfe97c961efffa7b19b1fda41252722bdd64c +++ win32/ssh_agent_platform.cc e06f146740f518ca444678d266b982d234ae061b @@ -109,3 +109,11 @@ ssh_agent_platform::read_data(u32 const //keep track of how much we've read read_len += len; } + +// Local Variables: +// mode: C++ +// fill-column: 76 +// c-file-style: "gnu" +// indent-tabs-mode: nil +// End: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- win32/ssh_agent_platform.hh d331366b5dde642fb849cdf0b2016803563c0eed +++ win32/ssh_agent_platform.hh 5b62f5f8d1e4158a47839d3b0005531d4d5a3c83 @@ -31,3 +31,11 @@ public: }; #endif + +// Local Variables: +// mode: C++ +// fill-column: 76 +// c-file-style: "gnu" +// indent-tabs-mode: nil +// End: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- win32/tester-check-net.cc 898174e2fc36137c9e27823ad89633df94c46066 +++ win32/tester-check-net.cc 5a33162d303659f396e377380ce64015ac0ee79b @@ -4,3 +4,11 @@ int main(void) { return 0; } + +// Local Variables: +// mode: C++ +// fill-column: 76 +// c-file-style: "gnu" +// indent-tabs-mode: nil +// End: +// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: ============================================================ --- work.hh a9f41416559c2d0f44c43aa75b8cf49f2ddc0e05 +++ work.hh 06639353bb835eb913d2287cc35a2f96fe69230a @@ -131,7 +131,7 @@ public: void perform_deletions(database & db, std::set const & targets, - bool recursive, + bool recursive, bool bookkeep_only); void perform_rename(database & db, @@ -257,6 +257,8 @@ private: workspace & work; }; +#endif // __WORK_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -264,6 +266,3 @@ private: // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __WORK_HH__ - ============================================================ --- xdelta.cc 1e3f4949b1b62015a6453efb5a4f7bcb1c9bf5c7 +++ xdelta.cc 5094e62fb1c7881a0b8da6331f2fc7488a342146 @@ -226,7 +226,7 @@ compute_delta_insns(string const & a, for (string::size_type sz = b.size(), - lo = 0; + lo = 0; lo < sz; ) { string::size_type apos = 0, alen = 1, badvance = 1; @@ -243,7 +243,7 @@ compute_delta_insns(string const & a, { copy_insn(delta, apos, alen); u32 save_lo = lo; - if (badvance <= blocksz) + if (badvance <= blocksz) { string::size_type next = lo; I(next < b.size() && (lo + badvance - 1) < b.size()); @@ -265,11 +265,11 @@ compute_delta_insns(string const & a, // it does a multiply, but for now, ignore this; it turns out that // advancements in the range of [2..blocksz-1] are actually really // rare. - if (badvance >= blocksz/2) + if (badvance >= blocksz/2) { u32 new_lo = save_lo + badvance; u32 new_hi = new_lo + blocksz; - if (new_hi > b.size()) + if (new_hi > b.size()) { new_hi = b.size(); } @@ -286,7 +286,7 @@ compute_delta_insns(string const & a, I(lo < b.size()); insert_insn(delta, b[lo]); rolling.out(static_cast(b[lo])); - if (lo + blocksz < b.size()) + if (lo + blocksz < b.size()) { rolling.in(static_cast(b[lo+blocksz])); } @@ -761,7 +761,7 @@ inverse_delta_writing_applicator : for (set::iterator i = copied_extents.begin(); i != copied_extents.end(); ++i) - { + { // It is possible that this extent left a gap after the // previously copied extent; in this case we wish to pad // the intermediate space with an insert. ============================================================ --- xdelta.hh f8be14aa8c299a8b1bb241c4eafabcb34fff20f6 +++ xdelta.hh e2926cc2e87c1962303f9f11cbd588f08e4e2341 @@ -54,9 +54,11 @@ void invert_xdelta(std::string const & o u64 measure_delta_target_size(std::string const & delta); void invert_xdelta(std::string const & old_str, - std::string const & delta, - std::string & delta_inverse); + std::string const & delta, + std::string & delta_inverse); +#endif // __XDELTA_HH__ + // Local Variables: // mode: C++ // fill-column: 76 @@ -64,5 +66,3 @@ void invert_xdelta(std::string const & o // indent-tabs-mode: nil // End: // vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: - -#endif // __XDELTA_HH__