# 
# 
# patch "ChangeLog"
#  from [1053d6d9218b686c0a97634958aa656054b2e989]
#    to [aed8e136cebbbb9376bc11f5ebedf747f57f3b7b]
# 
# patch "cmd_ws_commit.cc"
#  from [2b8db3e6627adffc82f96048b50ffe29defb8e24]
#    to [56b8da305737799f6573c70b590c95fd48c0bff9]
# 
# patch "tests/import/__driver__.lua"
#  from [a3091607bf6b3fdaf6266cd844efc4412b176c2a]
#    to [c661552cff943671d6b3dac78abbe7e906aa45de]
# 
============================================================
--- ChangeLog	1053d6d9218b686c0a97634958aa656054b2e989
+++ ChangeLog	aed8e136cebbbb9376bc11f5ebedf747f57f3b7b
@@ -1,3 +1,9 @@
+2006-12-01  Richard Levitte  <address@hidden>
+
+	* cmd_ws_commit.cc (CMD_NO_WORKSPACE(import)): Add the usual
+	restriction options, as well as --author and --date.
+	* tests/import/__driver__.lua: Test the restrictions a bit.
+
 2006-11-30  Richard Levitte  <address@hidden>
 
 	* cmd_ws_commit.cc (CMD_NO_WORKSPACE(import)), options_list.hh:
============================================================
--- cmd_ws_commit.cc	2b8db3e6627adffc82f96048b50ffe29defb8e24
+++ cmd_ws_commit.cc	56b8da305737799f6573c70b590c95fd48c0bff9
@@ -947,8 +947,11 @@ CMD_NO_WORKSPACE(import, N_("tree"), N_(
 
 CMD_NO_WORKSPACE(import, N_("tree"), N_("DIRECTORY"),
   N_("import the contents of the given directory tree into a given branch"),
-  options::opts::branch | options::opts::revision | options::opts::message |
-  options::opts::dryrun)
+  options::opts::branch | options::opts::revision |
+  options::opts::message | options::opts::msgfile |
+  options::opts::dryrun |
+  options::opts::no_ignore | options::opts::exclude |
+  options::opts::author | options::opts::date)
 {
   revision_id ident;
   system_path dir;
@@ -1015,10 +1018,17 @@ CMD_NO_WORKSPACE(import, N_("tree"), N_(
   app.work.put_work_rev(rev);
 
   vector<utf8> empty_args;
+  options save_opts;
   // add --unknown
+  save_opts.no_ignore = app.opts.no_ignore;
+  save_opts.exclude_patterns = app.opts.exclude_patterns;
+  app.opts.no_ignore = false;
+  app.opts.exclude_patterns = std::vector<utf8>();
   app.opts.unknown = true;
   process(app, "add", empty_args);
   app.opts.unknown = false;
+  app.opts.no_ignore = save_opts.no_ignore;
+  app.opts.exclude_patterns = save_opts.exclude_patterns;
 
   // drop --missing
   app.opts.missing = true;
============================================================
--- tests/import/__driver__.lua	a3091607bf6b3fdaf6266cd844efc4412b176c2a
+++ tests/import/__driver__.lua	c661552cff943671d6b3dac78abbe7e906aa45de
@@ -5,6 +5,7 @@ writefile("importdir/importmefirst", "ve
 ------------------------------------------------------------------------------
 -- First attempt, import something completely fresh.
 writefile("importdir/importmefirst", "version 0 of first test file\n")
+writefile("importdir/.mtn-ignore", "CVS\n")
 
 check(mtn("import", "importdir",
 	  "--message", "Import one, fresh start",
@@ -18,14 +19,20 @@ writefile("importdir/importmefirst", "ve
 ------------------------------------------------------------------------------
 -- Second attempt, import something with a changed file.
 writefile("importdir/importmefirst", "version 1 of first test file\n")
+writefile("importdir/importmeignored", "version 0 of first ignored file\n")
 
 check(mtn("import", "importdir",
+	  "--no-respect-ignore",
+	  "--exclude", "importmeignored",
 	  "--message", "Import two, a changed file",
 	  "--branch", "importbranch"), 0, false, false)
 
+remove("importdir/importmeignored")
+
 check(mtn("checkout", "exportdir2", "--branch", "importbranch"),
       0, false, false)
 
+check(not exists("exportdir2/importmeignored"))
 check(samefile("importdir/importmefirst", "exportdir2/importmefirst"))
 
 ------------------------------------------------------------------------------