# # # rename "CVS_prot" # to "mtn_cvs/CVS_prot" # # patch "Makefile.am" # from [43fc2e981abe555214637b7cb5fb46be6450d5ea] # to [99e71640c0d159c9e761cae856b6bb1a3a10ff0b] # # patch "app_state.cc" # from [b019525fdcafd10824e009ff4e81a3e452276ad4] # to [b3c5589d9b1aebac69c1153a5007da58285e7a27] # # patch "app_state.hh" # from [466fb2014e64007ece12c66f790d7411937fb02a] # to [e781e86f39ca825138d67bccb5bfbeeff7cc665c] # # patch "commands.cc" # from [6b1ee8a550c399edede1cf3a09d0b418eb024c05] # to [bea3a3a5f0a708cd23c58ba9f7974fff9e3622ec] # # patch "monotone.cc" # from [5faf9ca66a1bc4f28f70b6bb0e15c3f6de4fc3c8] # to [3882a5fe2f33a24186ef50f1a6a64e65d13e49a6] # # patch "monotone.texi" # from [663f1413f7af7d9cc010c001c73cd2fd501e31dd] # to [22ed2ab06ba84e06c71aba93182937c131482ce2] # # patch "options.hh" # from [f8bf16b1cf73506dfcbd4761cce16d3e463d9409] # to [db7002b03fc93c0456a360c5cc212c6b796950c9] # ============================================================ --- Makefile.am 43fc2e981abe555214637b7cb5fb46be6450d5ea +++ Makefile.am 99e71640c0d159c9e761cae856b6bb1a3a10ff0b @@ -56,12 +56,12 @@ legacy.cc legacy.hh \ \ lru_cache.h \ + \ piece_table.cc netxx_pipe.cc \ cleanup.hh unit_tests.hh interner.hh \ cycle_detector.hh randomfile.hh adler32.hh quick_alloc.hh \ netio.hh smap.hh gettext.h \ package_revision.c package_revision.h \ - cvs_client.cc cvs_sync.cc \ package_full_revision.c package_full_revision.h options.hh \ i18n.h hash_map.hh parallel_iter.hh safe_map.hh pch.hh ============================================================ --- app_state.cc b019525fdcafd10824e009ff4e81a3e452276ad4 +++ app_state.cc b3c5589d9b1aebac69c1153a5007da58285e7a27 @@ -33,7 +33,6 @@ : branch_name(""), db(system_path()), keys(this), recursive(false), stdhooks(true), rcfiles(true), diffs(false), no_merges(false), set_default(false), verbose(false), date_set(false), - cvspull_full(), search_root("/"), depth(-1), last(-1), next(-1), diff_format(unified_diff), diff_args_provided(false), use_lca(false), execute(false), bind_address(""), bind_port(""), @@ -268,12 +267,6 @@ } void -app_state::set_since(utf8 const & s) -{ - sync_since = s; -} - -void app_state::set_last(long l) { N(l > 0, ============================================================ --- app_state.hh 466fb2014e64007ece12c66f790d7411937fb02a +++ app_state.hh e781e86f39ca825138d67bccb5bfbeeff7cc665c @@ -51,8 +51,6 @@ boost::posix_time::ptime date; utf8 author; system_path search_root; - utf8 sync_since; - bool cvspull_full; std::vector revision_selectors; std::vector exclude_patterns; std::vector extra_rcfiles; @@ -113,7 +111,6 @@ void set_date(utf8 const & date); void set_author(utf8 const & author); void set_depth(long depth); - void set_since(utf8 const & since); void set_last(long last); void set_next(long next); void set_pidfile(system_path const & pidfile); ============================================================ --- commands.cc 6b1ee8a550c399edede1cf3a09d0b418eb024c05 +++ commands.cc bea3a3a5f0a708cd23c58ba9f7974fff9e3622ec @@ -9,7 +9,6 @@ #include #include "transforms.hh" -#include "cvs_sync.hh" #include "inodeprint.hh" #include "cmd.hh" @@ -446,59 +445,3 @@ else given = false; } - - -// missing: compression level (-z), cvs-branch (-r), since (-D) -CMD(cvs_pull, "network", "[CVS-REPOSITORY CVS-MODULE [CVS-BRANCH]]", - "(re-)import a module from a remote cvs repository", - OPT_BRANCH_NAME % OPT_SINCE % OPT_FULL) -{ - if (args.size() == 1 || args.size() > 3) throw usage(name); - - string repository,module,branch; - if (args.size() >= 2) - { repository = idx(args, 0)(); - module = idx(args, 1)(); - if (args.size()==3) - branch=idx(args, 2)(); - } - N(!app.branch_name().empty(), F("no destination branch specified\n")); - - cvs_sync::pull(repository,module,branch,app); -} - - -CMD(cvs_push, "network", "[CVS-REPOSITORY CVS-MODULE [CVS-BRANCH]]", - "commit changes in local database to a remote cvs repository", - OPT_BRANCH_NAME % OPT_REVISION) -{ - if (args.size() == 1 || args.size() > 3) throw usage(name); - - string repository,module,branch; - if (args.size() >= 2) - { repository = idx(args, 0)(); - module = idx(args, 1)(); - if (args.size()==3) - branch=idx(args, 2)(); - } - cvs_sync::push(repository,module,branch,app); -} - - -CMD(cvs_takeover, "working copy", "[CVS-MODULE]", - "put a CVS working directory under monotone's control", OPT_BRANCH_NAME) -{ - if (args.size() > 1) throw usage(name); - string module; - if (args.size() == 1) module = idx(args, 0)(); - N(!app.branch_name().empty(), F("no destination branch specified\n")); - cvs_sync::takeover(app, module); -} - -CMD(cvs_debug, "network", "COMMAND ARG", - "e.g. manifest REVISION give you a list of cvs revisions per file", OPT_BRANCH_NAME) -{ - if (args.size() != 2) throw usage(name); - cvs_sync::debug(idx(args, 0)(), idx(args, 1)(), app); -} - ============================================================ --- monotone.cc 5faf9ca66a1bc4f28f70b6bb0e15c3f6de4fc3c8 +++ monotone.cc 3882a5fe2f33a24186ef50f1a6a64e65d13e49a6 @@ -61,8 +61,6 @@ {"last", 0, POPT_ARG_LONG, &arglong, OPT_LAST, gettext_noop("limit log output to the last number of entries"), NULL}, {"next", 0, POPT_ARG_LONG, &arglong, OPT_NEXT, gettext_noop("limit log output to the next number of entries"), NULL}, {"pid-file", 0, POPT_ARG_STRING, &argstr, OPT_PIDFILE, gettext_noop("record process id of server"), NULL}, - {"since", 0, POPT_ARG_STRING, &argstr, OPT_SINCE, "set history start for CVS pull", NULL}, - {"full", 0, POPT_ARG_NONE, &argstr, OPT_FULL, "ignore already pulled CVS revisions", NULL}, {"brief", 0, POPT_ARG_NONE, NULL, OPT_BRIEF, gettext_noop("print a brief version of the normal output"), NULL}, {"diffs", 0, POPT_ARG_NONE, NULL, OPT_DIFFS, gettext_noop("print diffs along with logs"), NULL}, {"no-merges", 0, POPT_ARG_NONE, NULL, OPT_NO_MERGES, gettext_noop("exclude merges when printing logs"), NULL}, @@ -443,14 +441,6 @@ app.set_depth(arglong); break; - case OPT_SINCE: - app.set_since(string(argstr)); - break; - - case OPT_FULL: - app.cvspull_full=true; - break; - case OPT_BRIEF: global_sanity.set_brief(); break; ============================================================ --- monotone.texi 663f1413f7af7d9cc010c001c73cd2fd501e31dd +++ monotone.texi 22ed2ab06ba84e06c71aba93182937c131482ce2 @@ -3374,6 +3374,7 @@ @page @node Using packets @section Using packets + Suppose you made changes to your database, and want to send those changes to someone else but for some reason you cannot use netsync. Or maybe you want to extract and inject individual revisions automatically @@ -3399,8 +3400,6 @@ @end smallexample Now set up a branch in A: -Change your working directory to the topmost directory of a CVS project and -enter @smallexample @group @@ -3596,7 +3595,7 @@ @smallexample @group -$ monotone --branch=org.gnome.cvs.glade-- cvs_takeover glade-- +$ mtn --branch=org.gnome.cvs.glade-- cvs_takeover glade-- @end group @end smallexample @@ -3619,7 +3618,7 @@ @smallexample @group -$ monotone --branch=org.gnome.cvs.glade-- --since=2005-01-01T00:00:00 cvs_pull :pserver:anonymous@@anoncvs.gnome.org:/cvs/gnome glade-- +$ mtn --branch=org.gnome.cvs.glade-- --since=2005-01-01T00:00:00 cvs_pull :pserver:anonymous@@anoncvs.gnome.org:/cvs/gnome glade-- @end group @end smallexample @@ -3637,7 +3636,7 @@ @smallexample @group -$ monotone --branch=org.gnome.cvs.glade-- cvs_push +$ mtn --branch=org.gnome.cvs.glade-- cvs_push @end group @end smallexample @@ -4528,8 +4527,8 @@ in case someone, for some odd reason, decides to put a ``*'' into their branch name. address@hidden monotone cvs_pull [--since @var{time}] address@hidden @var{module} address@hidden address@hidden monotone cvs_push address@hidden @var{module} address@hidden address@hidden mtn cvs_pull [--since @var{time}] address@hidden @var{module} address@hidden address@hidden mtn cvs_push address@hidden @var{module} address@hidden These commands communicate with a CVS server. @code{cvs_pull} works like @code{cvs update} and @code{cvs_push} is like @code{cvs commit}. See also @xref{cvssync,,cvssync introduction}. ============================================================ --- options.hh f8bf16b1cf73506dfcbd4761cce16d3e463d9409 +++ options.hh db7002b03fc93c0456a360c5cc212c6b796950c9 @@ -54,5 +54,3 @@ #define OPT_NO_FILES 45 #define OPT_LOG 46 #define OPT_RECURSIVE 47 -#define OPT_SINCE 48 -#define OPT_FULL 49