# # patch "ChangeLog" # from [1090c79c97099815b389755788e15849163caec8] # to [3778f43c1b9c5e6e9013d0f94897f95d36cf07fe] # # patch "app_state.cc" # from [92734e46c4a6a9ce393b5c8a6256a1c81cb90a9f] # to [e305f61ae2b99d6d540ad6bebd7e796452363147] # # patch "change_set.cc" # from [6bcdb918b63b567fd5f75d78a9b10703926b21e7] # to [364a9629171b39a5337ac7ef7ce72b7dfe249045] # # patch "commands.cc" # from [e906b13585b94293e8afb716d074d7ae412dc0dc] # to [467f15799d4f2ce8da3095a56a35502a0548f8b0] # # patch "inodeprint.cc" # from [529f367b3cbb60dc5eae0b7e0ff089b617afb4d9] # to [c96e97f83afb3dfad9cafaab8baf3595e7971698] # # patch "manifest.cc" # from [f69a4a7d11f78b7b5fae2c03113b127d62891aec] # to [80adc9e34ed90a739138fd61c977c77bd9a70fe3] # # patch "packet.cc" # from [e51ed2792c8751cf45a0344503d3860c0d38d3f1] # to [ac38aac6e3209972c9417388914ddc795ed4a53a] # # patch "rcs_import.cc" # from [6a279d2f8e166c40298eeec637593c82e5462d0d] # to [140b9da9093485a0aa06a4ffbe9e99818da7a8e1] # # patch "work.cc" # from [ff8c34d524010170c8946c1eb76116aa1ba84c2a] # to [3c3b481a34f7a4a64a35e6777256afe79d8f3ec5] # ======================================================================== --- ChangeLog 1090c79c97099815b389755788e15849163caec8 +++ ChangeLog 3778f43c1b9c5e6e9013d0f94897f95d36cf07fe @@ -1,4 +1,8 @@ 2005-08-24 Nathaniel Smith + + * Switch many instances to using convenience functions. + +2005-08-24 Nathaniel Smith * paths.hh (file_path_internal, file_path_external): Define convenience functions. ======================================================================== --- app_state.cc 92734e46c4a6a9ce393b5c8a6256a1c81cb90a9f +++ app_state.cc e305f61ae2b99d6d540ad6bebd7e796452363147 @@ -175,7 +175,7 @@ // assume current directory if ((depth != -1) && restrictions.empty()) { - restrictions.insert(file_path(external, ".")); + restrictions.insert(file_path_external(".")); } } ======================================================================== --- change_set.cc 6bcdb918b63b567fd5f75d78a9b10703926b21e7 +++ change_set.cc 364a9629171b39a5337ac7ef7ce72b7dfe249045 @@ -2775,19 +2775,19 @@ { parser.sym(); parser.str(t1); - cs.add_file(file_path(internal, t1)); + cs.add_file(file_path_internal(t1)); } else if (parser.symp(syms::delete_file)) { parser.sym(); parser.str(t1); - cs.delete_file(file_path(internal, t1)); + cs.delete_file(file_path_internal(t1)); } else if (parser.symp(syms::delete_dir)) { parser.sym(); parser.str(t1); - cs.delete_dir(file_path(internal, t1)); + cs.delete_dir(file_path_internal(t1)); } else if (parser.symp(syms::rename_file)) { @@ -2795,8 +2795,8 @@ parser.str(t1); parser.esym(syms::to); parser.str(t2); - cs.rename_file(file_path(internal, t1), - file_path(internal, t2)); + cs.rename_file(file_path_internal(t1), + file_path_internal(t2)); } else if (parser.symp(syms::rename_dir)) { @@ -2804,8 +2804,8 @@ parser.str(t1); parser.esym(syms::to); parser.str(t2); - cs.rename_dir(file_path(internal, t1), - file_path(internal, t2)); + cs.rename_dir(file_path_internal(t1), + file_path_internal(t2)); } else break; @@ -2887,7 +2887,7 @@ parser.hex(src); parser.esym(syms::to); parser.hex(dst); - cs.deltas.insert(std::make_pair(file_path(internal, path), + cs.deltas.insert(std::make_pair(file_path_internal(path), std::make_pair(file_id(src), file_id(dst)))); } @@ -3103,24 +3103,24 @@ { change_set cs; - cs.delete_file(file_path(internal, "usr/lib/zombie")); - cs.add_file(file_path(internal, "usr/bin/cat"), + cs.delete_file(file_path_internal("usr/lib/zombie")); + cs.add_file(file_path_internal("usr/bin/cat"), file_id(hexenc("adc83b19e793491b1c6ea0fd8b46cd9f32e592fc"))); - cs.add_file(file_path(internal, "usr/local/bin/dog"), + cs.add_file(file_path_internal("usr/local/bin/dog"), file_id(hexenc("adc83b19e793491b1c6ea0fd8b46cd9f32e592fc"))); - cs.rename_file(file_path(internal, "usr/local/bin/dog"), - file_path(internal, "usr/bin/dog")); - cs.rename_file(file_path(internal, "usr/bin/cat"), - file_path(internal, "usr/local/bin/chicken")); - cs.add_file(file_path(internal, "usr/lib/libc.so"), + cs.rename_file(file_path_internal("usr/local/bin/dog"), + file_path_internal("usr/bin/dog")); + cs.rename_file(file_path_internal("usr/bin/cat"), + file_path_internal("usr/local/bin/chicken")); + cs.add_file(file_path_internal("usr/lib/libc.so"), file_id(hexenc("435e816c30263c9184f94e7c4d5aec78ea7c028a"))); // FIXME: this should be valid, but our directory semantics are broken. Re-add // tests for things like this when fixing directory semantics! (see bug tracker) - // cs.rename_dir(file_path(internal, "usr/lib"), - // file_path(internal, "usr/local/lib")); - cs.rename_dir(file_path(internal, "some/dir"), - file_path(internal, "some/other/dir")); - cs.apply_delta(file_path(internal, "usr/local/bin/chicken"), + // cs.rename_dir(file_path_internal("usr/lib"), + // file_path_internal("usr/local/lib")); + cs.rename_dir(file_path_internal("some/dir"), + file_path_internal("some/other/dir")); + cs.apply_delta(file_path_internal("usr/local/bin/chicken"), file_id(hexenc("c6a4a6196bb4a744207e1a6e90273369b8c2e925")), file_id(hexenc("fe18ec0c55cbc72e4e51c58dc13af515a2f3a892"))); spin_change_set(cs); @@ -3142,23 +3142,23 @@ change_set cs; manifest_map a; - a.insert(std::make_pair(file_path(internal, "usr/lib/zombie"), + a.insert(std::make_pair(file_path_internal("usr/lib/zombie"), file_id(hexenc("92ceb3cd922db36e48d5c30764e0f5488cdfca28")))); - cs.delete_file(file_path(internal, "usr/lib/zombie")); - cs.add_file(file_path(internal, "usr/bin/cat"), + cs.delete_file(file_path_internal("usr/lib/zombie")); + cs.add_file(file_path_internal("usr/bin/cat"), file_id(hexenc("adc83b19e793491b1c6ea0fd8b46cd9f32e592fc"))); - cs.add_file(file_path(internal, "usr/local/dog"), + cs.add_file(file_path_internal("usr/local/dog"), file_id(hexenc("adc83b19e793491b1c6ea0fd8b46cd9f32e592fc"))); - a.insert(std::make_pair(file_path(internal, "usr/foo"), + a.insert(std::make_pair(file_path_internal("usr/foo"), file_id(hexenc("9a4d3ae90b0cc26758e17e1f80229a13f57cad6e")))); - cs.rename_file(file_path(internal, "usr/foo"), - file_path(internal, "usr/bar")); - cs.apply_delta(file_path(internal, "usr/bar"), + cs.rename_file(file_path_internal("usr/foo"), + file_path_internal("usr/bar")); + cs.apply_delta(file_path_internal("usr/bar"), file_id(hexenc("9a4d3ae90b0cc26758e17e1f80229a13f57cad6e")), file_id(hexenc("fe18ec0c55cbc72e4e51c58dc13af515a2f3a892"))); - a.insert(std::make_pair(file_path(internal, "usr/quuux"), + a.insert(std::make_pair(file_path_internal("usr/quuux"), file_id(hexenc("fe18ec0c55cbc72e4e51c58dc13af515a2f3a892")))); - cs.apply_delta(file_path(internal, "usr/quuux"), + cs.apply_delta(file_path_internal("usr/quuux"), file_id(hexenc("fe18ec0c55cbc72e4e51c58dc13af515a2f3a892")), file_id(hexenc("c6a4a6196bb4a744207e1a6e90273369b8c2e925"))); @@ -3183,20 +3183,20 @@ { change_set cs1, cs2, csa; - cs1.add_file(file_path(internal, "usr/lib/zombie"), + cs1.add_file(file_path_internal("usr/lib/zombie"), file_id(hexenc("adc83b19e793491b1c6ea0fd8b46cd9f32e592fc"))); - cs1.rename_file(file_path(internal, "usr/lib/apple"), - file_path(internal, "usr/lib/orange")); - cs1.rename_dir(file_path(internal, "usr/lib/moose"), - file_path(internal, "usr/lib/squirrel")); + cs1.rename_file(file_path_internal("usr/lib/apple"), + file_path_internal("usr/lib/orange")); + cs1.rename_dir(file_path_internal("usr/lib/moose"), + file_path_internal("usr/lib/squirrel")); dump_change_set("neutralize target", cs1); - cs2.delete_file(file_path(internal, "usr/lib/zombie")); - cs2.rename_file(file_path(internal, "usr/lib/orange"), - file_path(internal, "usr/lib/apple")); - cs2.rename_dir(file_path(internal, "usr/lib/squirrel"), - file_path(internal, "usr/lib/moose")); + cs2.delete_file(file_path_internal("usr/lib/zombie")); + cs2.rename_file(file_path_internal("usr/lib/orange"), + file_path_internal("usr/lib/apple")); + cs2.rename_dir(file_path_internal("usr/lib/squirrel"), + file_path_internal("usr/lib/moose")); dump_change_set("neutralizer", cs2); @@ -3228,20 +3228,20 @@ { change_set cs1, cs2, csa; - cs1.delete_file(file_path(internal, "usr/lib/zombie")); - cs1.rename_file(file_path(internal, "usr/lib/orange"), - file_path(internal, "usr/lib/apple")); - cs1.rename_dir(file_path(internal, "usr/lib/squirrel"), - file_path(internal, "usr/lib/moose")); + cs1.delete_file(file_path_internal("usr/lib/zombie")); + cs1.rename_file(file_path_internal("usr/lib/orange"), + file_path_internal("usr/lib/apple")); + cs1.rename_dir(file_path_internal("usr/lib/squirrel"), + file_path_internal("usr/lib/moose")); dump_change_set("non-interference A", cs1); - cs2.add_file(file_path(internal, "usr/lib/zombie"), + cs2.add_file(file_path_internal("usr/lib/zombie"), file_id(hexenc("adc83b19e793491b1c6ea0fd8b46cd9f32e592fc"))); - cs2.rename_file(file_path(internal, "usr/lib/pear"), - file_path(internal, "usr/lib/orange")); - cs2.rename_dir(file_path(internal, "usr/lib/spy"), - file_path(internal, "usr/lib/squirrel")); + cs2.rename_file(file_path_internal("usr/lib/pear"), + file_path_internal("usr/lib/orange")); + cs2.rename_dir(file_path_internal("usr/lib/spy"), + file_path_internal("usr/lib/squirrel")); dump_change_set("non-interference B", cs2); @@ -3304,47 +3304,47 @@ void combine() { do_combine = true; } void add_file(which_t which, std::string const & path, file_id fid = fid1) { - getit(which).add_file(file_path(internal, path), fid); + getit(which).add_file(file_path_internal(path), fid); if (do_combine) - combined.add_file(file_path(internal, path), fid); + combined.add_file(file_path_internal(path), fid); } void apply_delta(which_t which, std::string const & path, file_id from_fid, file_id to_fid) { - getit(which).apply_delta(file_path(internal, path), from_fid, to_fid); + getit(which).apply_delta(file_path_internal(path), from_fid, to_fid); if (do_combine) - combined.apply_delta(file_path(internal, path), from_fid, to_fid); + combined.apply_delta(file_path_internal(path), from_fid, to_fid); } void delete_file(which_t which, std::string const & path) { - getit(which).delete_file(file_path(internal, path)); + getit(which).delete_file(file_path_internal(path)); if (do_combine) - combined.delete_file(file_path(internal, path)); + combined.delete_file(file_path_internal(path)); } void delete_dir(which_t which, std::string const & path) { - getit(which).delete_dir(file_path(internal, path)); + getit(which).delete_dir(file_path_internal(path)); if (do_combine) - combined.delete_dir(file_path(internal, path)); + combined.delete_dir(file_path_internal(path)); } void rename_file(which_t which, std::string const & path1, std::string const & path2) { - getit(which).rename_file(file_path(internal, path1), - file_path(internal, path2)); + getit(which).rename_file(file_path_internal(path1), + file_path_internal(path2)); if (do_combine) - combined.rename_file(file_path(internal, path1), - file_path(internal, path2)); + combined.rename_file(file_path_internal(path1), + file_path_internal(path2)); } void rename_dir(which_t which, std::string const & path1, std::string const & path2) { - getit(which).rename_dir(file_path(internal, path1), - file_path(internal, path2)); + getit(which).rename_dir(file_path_internal(path1), + file_path_internal(path2)); if (do_combine) - combined.rename_dir(file_path(internal, path1), - file_path(internal, path2)); + combined.rename_dir(file_path_internal(path1), + file_path_internal(path2)); } void run() { ======================================================================== --- commands.cc e906b13585b94293e8afb716d074d7ae412dc0dc +++ commands.cc 467f15799d4f2ce8da3095a56a35502a0548f8b0 @@ -1072,7 +1072,7 @@ vector paths; for (vector::const_iterator i = args.begin(); i != args.end(); ++i) - paths.push_back(file_path(external, *i)); + paths.push_back(file_path_external(*i)); build_additions(paths, m_old, app, work); @@ -1096,7 +1096,7 @@ vector paths; for (vector::const_iterator i = args.begin(); i != args.end(); ++i) - paths.push_back(file_path(external, *i)); + paths.push_back(file_path_external(*i)); build_deletions(paths, m_old, app, work); @@ -1121,8 +1121,8 @@ change_set::path_rearrangement work; get_path_rearrangement(work); - build_rename(file_path(external, idx(args, 0)), - file_path(external, idx(args, 1)), + build_rename(file_path_external(idx(args, 0)), + file_path_external(idx(args, 1)), m_old, work); put_path_rearrangement(work); @@ -1247,7 +1247,7 @@ if (args.size() == 1) { - read_localized_data(file_path(external, idx(args, 0)), dat, app.lua); + read_localized_data(file_path_external(idx(args, 0)), dat, app.lua); } else { @@ -1288,7 +1288,7 @@ { revision_id rid; complete(app, idx(args, 1)(), rid); - file_path fp = file_path(external, idx(args, 2)); + file_path fp = file_path_external(idx(args, 2)); manifest_id mid; app.db.get_revision_manifest(rid, mid); manifest_map m; @@ -3499,7 +3499,7 @@ throw usage(name); if (args.size() > 0) - file = file_path(external, idx(args, 0)); /* specified a file */ + file = file_path_external(idx(args, 0)); /* specified a file */ set< pair > frontier; ======================================================================== --- inodeprint.cc 529f367b3cbb60dc5eae0b7e0ff089b617afb4d9 +++ inodeprint.cc c96e97f83afb3dfad9cafaab8baf3595e7971698 @@ -42,7 +42,7 @@ file_name = dat().substr(file_name_begin); else file_name = dat().substr(file_name_begin, pos - file_name_begin); - ipm.insert(inodeprint_entry(file_path(internal, file_name), + ipm.insert(inodeprint_entry(file_path_internal(file_name), hexenc(ident))); // skip past the '\n' ++pos; ======================================================================== --- manifest.cc f69a4a7d11f78b7b5fae2c03113b127d62891aec +++ manifest.cc 80adc9e34ed90a739138fd61c977c77bd9a70fe3 @@ -227,7 +227,7 @@ file_name = dat().substr(file_name_begin); else file_name = dat().substr(file_name_begin, pos - file_name_begin); - man.insert(manifest_entry(file_path(internal, file_name), + man.insert(manifest_entry(file_path_internal(file_name), hexenc(ident))); // skip past the '\n' ++pos; ======================================================================== --- packet.cc e51ed2792c8751cf45a0344503d3860c0d38d3f1 +++ packet.cc ac38aac6e3209972c9417388914ddc795ed4a53a @@ -1506,7 +1506,7 @@ manifest_map mm; manifest_data mdata; manifest_id mid; - mm.insert(make_pair(file_path("foo/bar.txt"), + mm.insert(make_pair(file_path_internal("foo/bar.txt"), file_id(hexenc("cfb81b30ab3133a31b52eb50bd1c86df67eddec4")))); write_manifest_map(mm, mdata); calculate_ident(mdata, mid); @@ -1517,9 +1517,9 @@ manifest_data mdata2; manifest_id mid2; manifest_delta mdelta; - mm2.insert(make_pair(file_path("foo/bar.txt"), + mm2.insert(make_pair(file_path_internal("foo/bar.txt"), file_id(hexenc("5b20eb5e5bdd9cd674337fc95498f468d80ef7bc")))); - mm2.insert(make_pair(file_path("bunk.txt"), + mm2.insert(make_pair(file_path_internal("bunk.txt"), file_id(hexenc("54f373ed07b4c5a88eaa93370e1bbac02dc432a8")))); write_manifest_map(mm2, mdata2); calculate_ident(mdata2, mid2); ======================================================================== --- rcs_import.cc 6a279d2f8e166c40298eeec637593c82e5462d0d +++ rcs_import.cc 140b9da9093485a0aa06a4ffbe9e99818da7a8e1 @@ -781,7 +781,7 @@ if (last_slash!=std::string::npos && last_slash>=5 && ss.substr(last_slash-5,6)=="Attic/") ss.erase(last_slash-5,6); - curr_file = file_path(internal, ss); + curr_file = file_path_internal(ss); curr_file_interned = path_interner.intern(ss); } ======================================================================== --- work.cc ff8c34d524010170c8946c1eb76116aa1ba84c2a +++ work.cc 3c3b481a34f7a4a64a35e6777256afe79d8f3ec5 @@ -594,7 +594,7 @@ void get_attr_path(file_path & a_path) { - a_path = file_path(internal, attr_file_name); + a_path = file_path_internal(attr_file_name); L(F("attribute map path is %s\n") % a_path); } @@ -622,7 +622,7 @@ { parser.sym(); parser.str(file); - file_path fp(internal, file); + file_path fp = file_path_internal(file); while (parser.symp() && !parser.symp(syms::file))