#
#
# patch "cmd.cc"
#  from [1cfec6b4c6f2737366730df48bbe1b4f65beb5b6]
#    to [cbee51161900c1cf8a23cf3832275a53e4359d78]
# 
# patch "git_export.cc"
#  from [73960511874db160b8bce1fd33f178716cb534f6]
#    to [d5b856f5f9138740e1b796fd5844f97e53656dd2]
# 
# patch "options_list.hh"
#  from [0fad18f650474b8915b45b7e04d61459bdc7db78]
#    to [34543c3b82cf4f5a6de16eff6f9a88f1523a0ac6]
#
============================================================
--- cmd.cc	1cfec6b4c6f2737366730df48bbe1b4f65beb5b6
+++ cmd.cc	cbee51161900c1cf8a23cf3832275a53e4359d78
@@ -63,8 +63,8 @@ CMD_GROUP(packet_io, "packet_io", "", CM
 CMD_GROUP(packet_io, "packet_io", "", CMD_REF(__root__),
           N_("Commands for packet reading and writing"),
           "");
-CMD_GROUP(rcs, "rcs", "", CMD_REF(__root__),
-          N_("Commands for interaction with RCS and CVS"),
+CMD_GROUP(vcs, "vcs", "", CMD_REF(__root__),
+          N_("Commands for interaction with other version control systems"),
           "");
 CMD_GROUP(review, "review", "", CMD_REF(__root__),
           N_("Commands to review revisions"),
============================================================
--- git_export.cc	73960511874db160b8bce1fd33f178716cb534f6
+++ git_export.cc	d5b856f5f9138740e1b796fd5844f97e53656dd2
@@ -236,12 +236,12 @@ read_mappings(system_path const & path, 
 
   for (vector<string>::const_iterator i = lines.begin(); i != lines.end(); ++i)
     {
-      string line = trim_ws(*i);
+      string line = trim(*i);
       size_t index = line.find('=');
       if (index != string::npos || index < line.length()-1)
         {
-          string key = trim_ws(line.substr(0, index));
-          string value = trim_ws(line.substr(index+1));
+          string key = trim(line.substr(0, index));
+          string value = trim(line.substr(index+1));
           mappings[key] = value;
         }
       else if (!line.empty())
@@ -265,17 +265,17 @@ import_marks(system_path const & marks_f
       string tmp;
           
       marks.get(c);
-      N(c == ':', F("missing leading ':' in marks file"));
+      E(c == ':', origin::user, F("missing leading ':' in marks file"));
       marks >> mark;
 
       marks.get(c);
-      N(c == ' ', F("missing space after mark"));
+      E(c == ' ', origin::user, F("missing space after mark"));
       marks >> tmp;
-      N(tmp.size() == 40, F("bad revision id in marks file"));
-      revision_id revid(decode_hexenc(tmp));
+      E(tmp.size() == 40, origin::user, F("bad revision id in marks file"));
+      revision_id revid(decode_hexenc(tmp, origin::user), origin::user);
 
       marks.get(c);
-      N(c == '\n', F("incomplete line in marks file"));
+      E(c == '\n', origin::user, F("incomplete line in marks file"));
 
       marked_revs[revid] = mark;
       if (mark > mark_id) mark_id = mark+1;
@@ -293,7 +293,7 @@ export_marks(system_path const & marks_f
          i = marked_revs.begin(); i != marked_revs.end(); ++i)
     marks << ":" << i->second << " " << i->first << "\n";
   
-  data mark_data(marks.str());
+  data mark_data(marks.str(), origin::internal);
   system_path tmp("."); // use the current directory for tmp
   write_data(marks_file, mark_data, tmp);
 }
@@ -409,8 +409,8 @@ export_changes(database & db,
 
       if (author != authors.end())
         {
-          author_name = trim_ws(author->inner().value());
-          author_key  = trim_ws(author->inner().key());
+          author_name = trim(author->inner().value());
+          author_key  = trim(author->inner().key());
         }
 
       // all monotone keys and authors that don't follow the "Name <email>"
@@ -450,7 +450,7 @@ export_changes(database & db,
       if (!branches.empty())
         branch_name = branches.begin()->inner().value();
 
-      branch_name = trim_ws(branch_name);
+      branch_name = trim(branch_name);
 
       lookup_iterator branch_lookup = branch_map.find(branch_name);
 
@@ -594,7 +594,7 @@ export_changes(database & db,
           branch++;
           for ( ; branch != branches.end(); ++branch)
             {
-              branch_name = trim_ws(branch->inner().value());
+              branch_name = trim(branch->inner().value());
 
               lookup_iterator branch_lookup = branch_map.find(branch_name);
 
============================================================
--- options_list.hh	0fad18f650474b8915b45b7e04d61459bdc7db78
+++ options_list.hh	34543c3b82cf4f5a6de16eff6f9a88f1523a0ac6
@@ -729,7 +729,7 @@ OPT(authors_file, "authors-file", system
     gettext_noop("file mapping author names from original to new values"))
 #ifdef option_bodies
 {
-  authors_file = system_path(arg);
+  authors_file = system_path(arg, origin::user);
 }
 #endif
 
@@ -737,7 +737,7 @@ OPT(branches_file, "branches-file", syst
     gettext_noop("file mapping branch names from original to new values "))
 #ifdef option_bodies
 {
-  branches_file = system_path(arg);
+  branches_file = system_path(arg, origin::user);
 }
 #endif
 
@@ -773,7 +773,7 @@ OPT(import_marks, "import-marks", system
     gettext_noop("load the internal marks table before exporting revisions"))
 #ifdef option_bodies
 {
-  import_marks = system_path(arg);
+  import_marks = system_path(arg, origin::user);
 }
 #endif
 
@@ -781,7 +781,7 @@ OPT(export_marks, "export-marks", system
     gettext_noop("save the internal marks table after exporting revisions"))
 #ifdef option_bodies
 {
-  export_marks = system_path(arg);
+  export_marks = system_path(arg, origin::user);
 }
 #endif