recipes/bazaar/files/import_dirarg.patch

   1 --- bazaar-1.2.orig/src/baz/tests/test-import-baz.sh
   2 +++ bazaar-1.2/src/baz/tests/test-import-baz.sh
   3 @@ -23,7 +23,9 @@
   4  tla init-tree --nested jane@example.com--2003/hello-world--mainline--1.0
   5  tla id-tagging-method explicit
   6  tla add hello-world.c README
   7 -tla import -L 'initial import'
   8 +cd ..
   9 +tla import -d hello-world--mainline--1.0 -L 'initial import'
  10 +cd hello-world--mainline--1.0
  11  tla categories -A jane@example.com--2003 >&2
  12  test "$(tla categories -A jane@example.com--2003)" = "hello-world"
  13  test "$(tla branches jane@example.com--2003/hello-world)" = "hello-world--mainline"
  14 --- bazaar-1.2.orig/src/baz/commands/import.c
  15 +++ bazaar-1.2/src/baz/commands/import.c
  16 @@ -32,7 +32,7 @@
  17
  18  \f
  19
  20 -static t_uchar * usage = N_("[options] [directory] [archive]/version");
  21 +static t_uchar * usage = N_("[options] [directory] [[archive]/version]");
  22
  23  #define OPTS(OP) \
  24    OP (opt_help_msg, "h", "help", 0, \
  25 @@ -42,12 +42,14 @@
  26    OP (opt_version, "V", "version", 0, \
  27        N_("Display a release identifier string\n" \
  28        "and exit.")) \
  29 +  OP (opt_dir, "d", "dir DIR", 1, \
  30 +      N_("Change to DIR first.")) \
  31    OP (opt_log, "l", "log FILE", 1, \
  32        N_("Commit with log file FILE.")) \
  33    OP (opt_summary, "s", "summary TEXT", 1, \
  34        N_("log with summary TEXT plus log-for-merge output") ) \
  35    OP (opt_automatic, "a", "automatic", 0, \
  36 -      N_("Initialise dir as a working tree, add all source-looking files in dir and import.") ) \
  37 +      N_("Initialise dir as a working tree, add all source-looking files in dir and import. This requires version to operate.") ) \
  38    OP (opt_log_msg, "L", "log-message TEXT", 1, \
  39        N_("log with TEXT"))
  40
  41 @@ -157,6 +159,12 @@
  42            safe_printfmt (2, "ill-formed argument for `%s' (`%s')\n", option->opt_string, option->arg_string);
  43            goto usage_error;
  44
  45 +       case opt_dir:
  46 +         {
  47 +           automatic = 0;
  48 +           break;
  49 +         }
  50 +
  51          case opt_log:
  52            {
  53              log_file = str_save (0, option->arg_string);