[Monotone-commits-diffs] net.venge.monotone.string-sanitization: fc4e68d3f3a44f72e589bded36693d8464bfc4f3

[code]

revision:            fc4e68d3f3a44f72e589bded36693d8464bfc4f3
date:                2011-02-26T12:42:20
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone.string-sanitization
changelog:
* src/cmd_netsync.cc (extract_client_connection_info,
  CMD_AUTOMATE_NO_STDIO(remote_stdio), CMD(push), CMD_AUTOMATE(push),
  CMD(pull), CMD_AUTOMATE(pull), CMD(sync), CMD_AUTOMATE(sync),
  CMD_NO_WORKSPACE(clone)): Change all of relevant occurences of URL to
  URI.
* src/migrate_schema.cc: Change all of relevant occurences of URL to URI.
* src/network/connection_info.cc (netsync_connection_info::setup_from_sync): 
  Change all of relevant occurences of URL to URI.

manifest:
format_version "1"

new_manifest [333837d22f58c92982d79358580c3ebeec5a54ed]

old_revision [7afccf57eeb078b8d12ea6e9bb567f50926195cc]

patch "src/cmd_netsync.cc"
 from [d29a3ff0c706db0f2cae9323f53079bca16fd889]
   to [3d113ad0ef6d4511f12e75df1e4a597698d06258]

patch "src/migrate_schema.cc"
 from [778717ded91866aaabea3752ebd5d44400ce8595]
   to [a613cb26783685a29dd39905551b3ddc7fdaf891]

patch "src/network/connection_info.cc"
 from [b732c16161db2394aac449f50c6a6921e553ef22]
   to [2370ac29e52f3bb36eaa8ba6c9339594129d0a42]
============================================================
--- src/migrate_schema.cc	778717ded91866aaabea3752ebd5d44400ce8595
+++ src/migrate_schema.cc	a613cb26783685a29dd39905551b3ddc7fdaf891
@@ -381,7 +381,7 @@ char const migrate_merge_url_and_group[]
   // migrate the posting_queue table
   "ALTER TABLE posting_queue RENAME TO tmp;"
   "CREATE TABLE posting_queue"
-  "  ( url not null,   -- URL we are going to send this to\n"
+  "  ( url not null,   -- URI we are going to send this to\n"
   "    content not null -- the packets we're going to send\n"
   "  );"
   "INSERT INTO posting_queue"
@@ -391,7 +391,7 @@ char const migrate_merge_url_and_group[]
   // migrate the incoming_queue table
   "ALTER TABLE incoming_queue RENAME TO tmp;"
   "CREATE TABLE incoming_queue "
-  "  ( url not null,    -- URL we got this bundle from\n"
+  "  ( url not null,    -- URI we got this bundle from\n"
   "    content not null -- the packets we're going to read\n"
   "  );"
   "INSERT INTO incoming_queue"
@@ -401,7 +401,7 @@ char const migrate_merge_url_and_group[]
   // migrate the sequence_numbers table
   "ALTER TABLE sequence_numbers RENAME TO tmp;"
   "CREATE TABLE sequence_numbers "
-  "  ( url primary key, -- URL to read from\n"
+  "  ( url primary key, -- URI to read from\n"
   "    major not null,  -- 0 in news servers, may be higher in depots\n"
   "    minor not null   -- last article / packet sequence number we got\n"
   "  );"
============================================================
--- src/cmd_netsync.cc	d29a3ff0c706db0f2cae9323f53079bca16fd889
+++ src/cmd_netsync.cc	3d113ad0ef6d4511f12e75df1e4a597698d06258
@@ -65,7 +65,7 @@ extract_client_connection_info(options &
       if (args.size() == 1)
         {
           E(!opts.exclude_given, origin::user,
-            F("cannot use --exclude in URL mode"));
+            F("cannot use --exclude in URI mode"));
 
           netsync_connection_info::setup_from_uri(opts, project.db, lua, type,
                                                   idx(args, 0), info);
@@ -105,7 +105,7 @@ CMD_AUTOMATE_NO_STDIO(remote_stdio,
 }
 
 CMD_AUTOMATE_NO_STDIO(remote_stdio,
-                      N_("[URL]\n[ADDRESS[:PORTNUMBER]]"),
+                      N_("[URI]\n[ADDRESS[:PORTNUMBER]]"),
                       N_("Opens an 'automate stdio' connection to a remote server"),
                       "",
                       options::opts::max_netsync_version |
@@ -538,7 +538,7 @@ CMD(push, "push", "", CMD_REF(network),
 }
 
 CMD(push, "push", "", CMD_REF(network),
-    N_("[URL]\n[ADDRESS[:PORTNUMBER] [PATTERN ...]]"),
+    N_("[URI]\n[ADDRESS[:PORTNUMBER] [PATTERN ...]]"),
     N_("Pushes branches to a netsync server"),
     N_("This will push all branches that match the pattern given in PATTERN "
        "to the netsync server at the address ADDRESS."),
@@ -561,7 +561,7 @@ CMD(push, "push", "", CMD_REF(network),
     print_dryrun_info_cmd(source_role, counts, project);
 }
 
-CMD_AUTOMATE(push, N_("[URL]\n[ADDRESS[:PORTNUMBER] [PATTERN ...]]"),
+CMD_AUTOMATE(push, N_("[URI]\n[ADDRESS[:PORTNUMBER] [PATTERN ...]]"),
              N_("Pushes branches to a netsync server"),
              "",
              options::opts::max_netsync_version |
@@ -587,7 +587,7 @@ CMD(pull, "pull", "", CMD_REF(network),
 }
 
 CMD(pull, "pull", "", CMD_REF(network),
-    N_("[URL]\n[ADDRESS[:PORTNUMBER] [PATTERN ...]]"),
+    N_("[URI]\n[ADDRESS[:PORTNUMBER] [PATTERN ...]]"),
     N_("Pulls branches from a netsync server"),
     N_("This pulls all branches that match the pattern given in PATTERN "
        "from the netsync server at the address ADDRESS."),
@@ -622,7 +622,7 @@ CMD(pull, "pull", "", CMD_REF(network),
     }
 }
 
-CMD_AUTOMATE(pull, N_("[URL]\n[ADDRESS[:PORTNUMBER] [PATTERN ...]]"),
+CMD_AUTOMATE(pull, N_("[URI]\n[ADDRESS[:PORTNUMBER] [PATTERN ...]]"),
              N_("Pulls branches from a netsync server"),
              "",
              options::opts::max_netsync_version |
@@ -648,7 +648,7 @@ CMD(sync, "sync", "", CMD_REF(network),
 }
 
 CMD(sync, "sync", "", CMD_REF(network),
-    N_("[URL]\n[ADDRESS[:PORTNUMBER] [PATTERN ...]]"),
+    N_("[URI]\n[ADDRESS[:PORTNUMBER] [PATTERN ...]]"),
     N_("Synchronizes branches with a netsync server"),
     N_("This synchronizes branches that match the pattern given in PATTERN "
        "with the netsync server at the address ADDRESS."),
@@ -688,7 +688,7 @@ CMD(sync, "sync", "", CMD_REF(network),
     }
 }
 
-CMD_AUTOMATE(sync, N_("[URL]\n[ADDRESS[:PORTNUMBER] [PATTERN ...]]"),
+CMD_AUTOMATE(sync, N_("[URI]\n[ADDRESS[:PORTNUMBER] [PATTERN ...]]"),
              N_("Synchronizes branches with a netsync server"),
              "",
              options::opts::max_netsync_version | options::opts::min_netsync_version |
@@ -720,7 +720,7 @@ CMD_NO_WORKSPACE(clone, "clone", "", CMD
 }
 
 CMD_NO_WORKSPACE(clone, "clone", "", CMD_REF(network),
-                 N_("URL [DIRECTORY]\nHOST[:PORTNUMBER] BRANCH [DIRECTORY]"),
+                 N_("URI [DIRECTORY]\nHOST[:PORTNUMBER] BRANCH [DIRECTORY]"),
                  N_("Checks out a revision from a remote database into a directory"),
                  N_("If a revision is given, that's the one that will be checked out.  "
                     "Otherwise, it will be the head of the branch supplied.  "
@@ -765,7 +765,7 @@ CMD_NO_WORKSPACE(clone, "clone", "", CMD
    if (url_arg)
     {
       E(!app.opts.exclude_given, origin::user,
-        F("cannot use --exclude in URL mode"));
+        F("cannot use --exclude in URI mode"));
 
       netsync_connection_info::setup_from_uri(app.opts, project.db, app.lua,
                                               netsync_connection, server, info);
@@ -870,7 +870,7 @@ CMD_NO_WORKSPACE(clone, "clone", "", CMD
           for (set<revision_id>::const_iterator i = heads.begin(); i != heads.end(); ++i)
             P(i18n_format("  %s")
               % describe_revision(app.opts, app.lua, project, *i));
-          P(F("choose one with '%s clone -r<id> URL'") % prog_name);
+          P(F("choose one with '%s clone -r<id> URI'") % prog_name);
           E(false, origin::user, F("branch '%s' has multiple heads") % app.opts.branch);
         }
       ident = *(heads.begin());
============================================================
--- src/network/connection_info.cc	b732c16161db2394aac449f50c6a6921e553ef22
+++ src/network/connection_info.cc	2370ac29e52f3bb36eaa8ba6c9339594129d0a42
@@ -425,7 +425,7 @@ netsync_connection_info::setup_from_sync
   bool query_exists = !info->client.uri.query.empty();
 
   E(!(include_exclude_given && query_exists), origin::user,
-    F("include / exclude pattern was given both as part of the URL "
+    F("include / exclude pattern was given both as part of the URI "
       "and as a separate argument."));
 
   vector<arg_type> includes, excludes;