upgrading package: monotone 0.38 -> 0.39

monotone/monotone.patch.rse

@@ -63,9 +63,9 @@
                                        www.engelschall.com
 
 Index: app_state.cc
---- app_state.cc.orig	2007-12-12 20:45:21 +0100
-+++ app_state.cc	2007-12-13 08:59:14 +0100
-@@ -138,13 +138,24 @@
+--- app_state.cc	6be9949e433ff6166fd030b34d8eb2d3e18c10b6
++++ app_state.cc	ce1cdaffff8c14261ab0a22a16571a0737532bbb
+@@ -138,13 +138,24 @@ app_state::create_workspace(system_path 
    go_to_workspace(new_dir);
    mark_std_paths_used();
  
@@ -91,9 +91,9 @@ Index: app_state.cc
  
    make_branch_sticky();
 Index: cmd_diff_log.cc
---- cmd_diff_log.cc.orig	2007-12-12 20:45:27 +0100
-+++ cmd_diff_log.cc	2007-12-13 08:59:14 +0100
-@@ -96,6 +96,27 @@
+--- cmd_diff_log.cc	baea6a3047420da7d1cff17f2669f973e0643e56
++++ cmd_diff_log.cc	f17665eb2b1be7eaef00380fef3e6c170cd1c152
+@@ -96,6 +96,27 @@ print_indented_set(ostream & os,
                     set<file_path> const & s,
                     size_t max_cols)
  {
@@ -121,7 +121,7 @@ Index: cmd_diff_log.cc
    size_t cols = 8;
    os << "       ";
    for (set<file_path>::const_iterator i = s.begin();
-@@ -113,6 +134,7 @@
+@@ -113,6 +134,7 @@ print_indented_set(ostream & os,
        cols += str.size() + 1;
      }
    os << '\n';
@@ -129,7 +129,7 @@ Index: cmd_diff_log.cc
  }
  
  void
-@@ -131,7 +153,11 @@
+@@ -131,7 +153,11 @@ changes_summary::print(ostream & os, siz
        for (map<file_path, file_path>::const_iterator
             i = cs.nodes_renamed.begin();
             i != cs.nodes_renamed.end(); i++)
@@ -141,7 +141,7 @@ Index: cmd_diff_log.cc
             << " to " << i->second << '\n';
      }
  
-@@ -232,8 +258,13 @@
+@@ -232,8 +258,13 @@ dump_diffs(cset const & cs,
             set<file_path> const & paths,
             bool limit_paths = false)
  {
@@ -155,7 +155,7 @@ Index: cmd_diff_log.cc
  
    for (map<file_path, file_id>::const_iterator
           i = cs.files_added.begin();
-@@ -242,6 +273,9 @@
+@@ -242,6 +273,9 @@ dump_diffs(cset const & cs,
        if (limit_paths && paths.find(i->first) == paths.end())
          continue;
  
@@ -165,7 +165,7 @@ Index: cmd_diff_log.cc
        output << patch_sep << '\n';
        data unpacked;
        vector<string> lines;
-@@ -288,6 +322,9 @@
+@@ -288,6 +322,9 @@ dump_diffs(cset const & cs,
        file_data f_old;
        data data_old, data_new;
  
@@ -175,7 +175,7 @@ Index: cmd_diff_log.cc
        output << patch_sep << '\n';
  
        app.db.get_file_version(delta_entry_src(i), f_old);
-@@ -503,6 +540,9 @@
+@@ -503,6 +540,9 @@ CMD(diff, "diff", "di", CMD_REF(informat
    data summary;
    write_cset(included, summary);
  
@@ -185,7 +185,7 @@ Index: cmd_diff_log.cc
    vector<string> lines;
    split_into_lines(summary(), lines);
    cout << "#\n";
-@@ -518,6 +558,9 @@
+@@ -518,6 +558,9 @@ CMD(diff, "diff", "di", CMD_REF(informat
        cout << "# " << _("no changes") << '\n';
      }
    cout << "#\n";
@@ -195,7 +195,7 @@ Index: cmd_diff_log.cc
  
    if (app.opts.diff_format == external_diff)
      {
-@@ -881,7 +924,11 @@
+@@ -881,7 +924,11 @@ CMD(log, "log", "", CMD_REF(informative)
            else
              {
                out << string(65, '-') << '\n';
@@ -207,7 +207,7 @@ Index: cmd_diff_log.cc
  
                changes_summary csum;
  
-@@ -896,12 +943,21 @@
+@@ -896,12 +943,21 @@ CMD(log, "log", "", CMD_REF(informative)
  
                for (set<revision_id>::const_iterator anc = ancestors.begin();
                     anc != ancestors.end(); ++anc)
@@ -229,7 +229,7 @@ Index: cmd_diff_log.cc
  
                if (!app.opts.no_files && !csum.cs.empty())
                  {
-@@ -911,7 +967,11 @@
+@@ -911,7 +967,11 @@ CMD(log, "log", "", CMD_REF(informative)
                  }
  
                log_certs(out, app, rid, changelog_name, "ChangeLog: ", true);
@@ -242,9 +242,9 @@ Index: cmd_diff_log.cc
  
            if (app.opts.diffs)
 Index: cmd_netsync.cc
---- cmd_netsync.cc.orig	2007-12-12 20:45:28 +0100
-+++ cmd_netsync.cc	2007-12-13 08:59:14 +0100
-@@ -179,7 +179,11 @@
+--- cmd_netsync.cc	92bc91c7137e339e086b3ab761f1aed5df203143
++++ cmd_netsync.cc	06dde80e2d7cc9bf8c9413a3df408dbb4cf36110
+@@ -179,7 +179,11 @@ CMD(pull, "pull", "", CMD_REF(network),
    find_key_if_needed(addr, include_pattern, exclude_pattern, app, false);
  
    if (app.opts.signing_key() == "")
@@ -256,7 +256,7 @@ Index: cmd_netsync.cc
  
    std::list<utf8> uris;
    uris.push_back(addr);
-@@ -277,7 +281,11 @@
+@@ -277,7 +281,11 @@ CMD(clone, "clone", "", CMD_REF(network)
    app.create_workspace(workspace_dir);
  
    if (internal_db)
@@ -268,7 +268,7 @@ Index: cmd_netsync.cc
    else
      app.set_database(app.opts.dbname);
  
-@@ -299,7 +307,11 @@
+@@ -299,7 +307,11 @@ CMD(clone, "clone", "", CMD_REF(network)
                       app, false);
  
    if (app.opts.signing_key() == "")
@@ -281,9 +281,9 @@ Index: cmd_netsync.cc
    if (!app.db.var_exists(default_include_pattern_key)
        || app.opts.set_default)
 Index: cmd_ws_commit.cc
---- cmd_ws_commit.cc.orig	2007-12-12 20:45:28 +0100
-+++ cmd_ws_commit.cc	2007-12-13 08:59:14 +0100
-@@ -66,7 +66,14 @@
+--- cmd_ws_commit.cc	e21e2bb8831ce7e62bc428cf32ae10931b5e73e8
++++ cmd_ws_commit.cc	80856a59e293d7aa2bcc14cfce5896e1276a1921
+@@ -66,7 +66,14 @@ revision_summary(revision_t const & rev,
  
        for (set<file_path>::const_iterator i = cs.dirs_added.begin();
              i != cs.dirs_added.end(); ++i)
@@ -298,7 +298,7 @@ Index: cmd_ws_commit.cc
  
        for (map<file_path, file_id>::const_iterator i = cs.files_added.begin();
              i != cs.files_added.end(); ++i)
-@@ -1355,7 +1362,11 @@
+@@ -1396,7 +1403,11 @@ CMD_NO_WORKSPACE(import, "import", "", C
    catch (...)
      {
        // clean up before rethrowing
@@ -311,9 +311,9 @@ Index: cmd_ws_commit.cc
      }
  
 Index: diff_patch.cc
---- diff_patch.cc.orig	2007-12-12 20:45:30 +0100
-+++ diff_patch.cc	2007-12-13 08:59:14 +0100
-@@ -1324,6 +1324,9 @@
+--- diff_patch.cc	2d882bd69beabffdef24078ecae588118f8f51cb
++++ diff_patch.cc	d4d89f2eebbe0d2f7f42e6eb014c3960e5dccdb4
+@@ -1448,6 +1448,9 @@ make_diff(string const & filename1,
      {
        case unified_diff:
        {
@@ -323,7 +323,7 @@ Index: diff_patch.cc
          ost << "--- " << filename1 << '\t' << id1 << '\n';
          ost << "+++ " << filename2 << '\t' << id2 << '\n';
  
-@@ -1333,6 +1336,9 @@
+@@ -1457,6 +1460,9 @@ make_diff(string const & filename1,
        }
        case context_diff:
        {
@@ -334,9 +334,9 @@ Index: diff_patch.cc
          ost << "--- " << filename2 << '\t' << id2 << '\n';
  
 Index: file_io.cc
---- file_io.cc.orig	2007-12-12 20:45:31 +0100
-+++ file_io.cc	2007-12-13 08:59:14 +0100
-@@ -398,16 +398,36 @@
+--- file_io.cc	358fb964dc42e7f936a136342b93bb3a4744d1b3
++++ file_io.cc	6b452acaa58ca24fa5611ea3e6e82e83a7cf7552
+@@ -398,16 +398,36 @@ write_data(file_path const & path, data 
  write_data(file_path const & path, data const & dat)
  {
    // use the bookkeeping root as the temporary directory.
@@ -374,9 +374,9 @@ Index: file_io.cc
  
  void
 Index: lua_hooks.cc
---- lua_hooks.cc.orig	2007-12-12 20:45:33 +0100
-+++ lua_hooks.cc	2007-12-13 08:59:14 +0100
-@@ -162,7 +162,11 @@
+--- lua_hooks.cc	26dbfb8306a7b7b4871f61877c7fd0f72abadfdd
++++ lua_hooks.cc	87a5a20651f2010b1e08c38274b29e0e6434e077
+@@ -162,7 +162,11 @@ lua_hooks::workspace_rcfilename(bookkeep
  void
  lua_hooks::workspace_rcfilename(bookkeeping_path & file)
  {
@@ -389,9 +389,9 @@ Index: lua_hooks.cc
  
  
 Index: monotone.cc
---- monotone.cc.orig	2007-12-12 20:45:33 +0100
-+++ monotone.cc	2007-12-13 08:59:14 +0100
-@@ -229,12 +229,28 @@
+--- monotone.cc	8289cbcfbca10f561afa6e06bf279f6b70e93599
++++ monotone.cc	2560f9465773c1178c539e51c66efe1a99109881
+@@ -211,12 +211,28 @@ cpp_main(int argc, char ** argv)
                if (!app.opts.dbname.empty())
                  app.db.set_filename(app.opts.dbname);
              }
@@ -421,9 +421,9 @@ Index: monotone.cc
            // at this point we allow a workspace (meaning search for it
            // and if found read _MTN/options, but don't use the data quite
 Index: options_list.hh
---- options_list.hh.orig	2007-12-12 20:45:35 +0100
-+++ options_list.hh	2007-12-13 08:59:14 +0100
-@@ -178,6 +178,24 @@
+--- options_list.hh	1f1eb3ce7a6a72870d0a42ef7f79b58eef621127
++++ options_list.hh	82cddc1ff530f09a32cf7d2c58d6b9ef01449147
+@@ -178,6 +178,24 @@ OPTION(diff_options, no_show_encloser, f
    no_show_encloser = true;
  }
  #endif
@@ -449,9 +449,9 @@ Index: options_list.hh
  OPT(diffs, "diffs", bool, false, gettext_noop("print diffs along with logs"))
  #ifdef option_bodies
 Index: paths.cc
---- paths.cc.orig	2007-12-12 20:45:35 +0100
-+++ paths.cc	2007-12-13 08:59:14 +0100
-@@ -226,7 +226,11 @@
+--- paths.cc	d850c3efae62041b8003589817387e5877f63b01
++++ paths.cc	30e8e5ea486bbbda2344474f7bfa86f0b152c438
+@@ -226,7 +226,11 @@ in_bookkeeping_dir(string const & path)
  static inline bool
  in_bookkeeping_dir(string const & path)
  {
@@ -463,7 +463,7 @@ Index: paths.cc
      return false;
    if (path.size() == 1 || (path[1] != 'M' && path[1] != 'm'))
      return false;
-@@ -919,6 +923,9 @@
+@@ -919,6 +923,9 @@ find_and_go_to_workspace(string const & 
    // first look for the current name of the bookkeeping directory.
    // if we don't find it, look for it under the old name, so that
    // migration has a chance to work.
@@ -474,9 +474,9 @@ Index: paths.cc
      if (!find_bookdir(root, old_bookkeeping_root_component, current, removed))
        return false;
 Index: paths.hh
---- paths.hh.orig	2007-12-12 20:45:35 +0100
-+++ paths.hh	2007-12-13 08:59:14 +0100
-@@ -325,6 +325,15 @@
+--- paths.hh	7dd47155b2962d3e4f5fe8764b11c955791803fc
++++ paths.hh	d29c84938079b1571cc843c7b7c6c61e420421d7
+@@ -328,6 +328,15 @@ private:
  // for migration
  #define old_bookkeeping_root_component (path_component("MT"))
  
@@ -493,16 +493,16 @@ Index: paths.hh
  class system_path : public any_path
  {
 Index: roster_merge.cc
---- roster_merge.cc.orig	2007-12-12 20:45:37 +0100
-+++ roster_merge.cc	2007-12-13 08:59:14 +0100
-@@ -633,6 +633,20 @@
+--- roster_merge.cc	d565f9299ca85d77bd1d7f2a29196d7161f0ea08
++++ roster_merge.cc	630d1821e0631e49557bea17008bf88093ec4aa8
+@@ -1273,6 +1273,20 @@ roster_merge(roster_t const & left_paren
            result.roster.detach_node(n->self);
-           result.illegal_name_conflicts.push_back(conflict);
+           result.invalid_name_conflicts.push_back(conflict);
          }
 +#if defined(RSE) /* alt-book-keeping-root */
 +      if (result_root->has_child(alt_bookkeeping_root_component))
 +        {
-+          illegal_name_conflict conflict;
++          invalid_name_conflict conflict;
 +          node_t n = result_root->get_child(alt_bookkeeping_root_component);
 +          conflict.nid = n->self;
 +          conflict.parent_name.first = n->parent;
@@ -510,15 +510,15 @@ Index: roster_merge.cc
 +          I(n->name == alt_bookkeeping_root_component);
 +
 +          result.roster.detach_node(n->self);
-+          result.illegal_name_conflicts.push_back(conflict);
++          result.invalid_name_conflicts.push_back(conflict);
 +        }
 +#endif
      }
  }
  
 Index: std_hooks.lua
---- std_hooks.lua.orig	2007-12-12 20:45:39 +0100
-+++ std_hooks.lua	2007-12-13 10:12:23 +0100
+--- std_hooks.lua	432725fc36dde06af213797306121385491fda0c
++++ std_hooks.lua	fc4aa2c8e1e8963817dea1a47b21f19ee7292b11
 @@ -284,6 +284,15 @@
     if user_log_message == "" or string.sub(user_log_message, -1) ~= "\n" then
        tmp:write("\n")
@@ -704,9 +704,9 @@ Index: std_hooks.lua
 +--  #endif
 +
 Index: work.cc
---- work.cc.orig	2007-12-12 20:45:48 +0100
-+++ work.cc	2007-12-13 08:59:14 +0100
-@@ -53,28 +53,44 @@
+--- work.cc	bcea6fae446e61352e4a12e0259a9094970a9829
++++ work.cc	1282657792888a3159211df49da6afa167e8cbb4
+@@ -53,28 +53,44 @@ get_revision_path(bookkeeping_path & m_p
  static void
  get_revision_path(bookkeeping_path & m_path)
  {
@@ -751,7 +751,7 @@ Index: work.cc
    L(FL("inodeprints path is %s") % ip_path);
  }
  
-@@ -205,7 +221,11 @@
+@@ -205,7 +221,11 @@ workspace::get_user_log_path(bookkeeping
  void
  workspace::get_user_log_path(bookkeeping_path & ul_path)
  {
@@ -763,7 +763,7 @@ Index: work.cc
    L(FL("user log path is %s") % ul_path);
  }
  
-@@ -387,7 +407,11 @@
+@@ -387,7 +407,11 @@ workspace::get_local_dump_path(bookkeepi
  void
  workspace::get_local_dump_path(bookkeeping_path & d_path)
  {
@@ -775,7 +775,7 @@ Index: work.cc
    L(FL("local dump path is %s") % d_path);
  }
  
-@@ -747,7 +771,11 @@
+@@ -747,7 +771,11 @@ path_for_detached_nids()
  static inline bookkeeping_path
  path_for_detached_nids()
  {
@@ -787,7 +787,7 @@ Index: work.cc
  }
  
  static inline bookkeeping_path
-@@ -1483,9 +1511,15 @@
+@@ -1483,9 +1511,15 @@ workspace::perform_pivot_root(file_path 
    N(is_dir_t(new_roster.get_node(new_root)),
      F("proposed new root directory '%s' is not a directory") % new_root);
    {
@@ -804,9 +804,9 @@ Index: work.cc
  
    {
 Index: work_migration.cc
---- work_migration.cc.orig	2007-12-12 20:45:48 +0100
-+++ work_migration.cc	2007-12-13 08:59:14 +0100
-@@ -55,9 +55,18 @@
+--- work_migration.cc	3d58c3332cd195309eacf5cc52d4e88ad66a6c81
++++ work_migration.cc	f044e25cc757899f97d413f3fe109a9bafe73553
+@@ -55,9 +55,18 @@ get_ws_format()
  {
    unsigned int format;
    bookkeeping_path f_path = bookkeeping_root / "format";
@@ -825,7 +825,7 @@ Index: work_migration.cc
          format = 1;
        else if (directory_exists(file_path() / old_bookkeeping_root_component))
          format = 0;
-@@ -69,7 +78,11 @@
+@@ -69,7 +78,11 @@ get_ws_format()
        data f_dat;
        try
          {
@@ -837,7 +837,7 @@ Index: work_migration.cc
            format = lexical_cast<unsigned int>(remove_ws(f_dat()));
          }
        catch (exception & e)
-@@ -80,7 +93,11 @@
+@@ -80,7 +93,11 @@ get_ws_format()
        if (format == 1)
          {
            W(F("_MTN/format should not exist in a format 1 workspace; corrected"));
@@ -849,7 +849,7 @@ Index: work_migration.cc
          }
      }
    return format;
-@@ -90,6 +107,9 @@
+@@ -90,6 +107,9 @@ workspace::write_ws_format()
  workspace::write_ws_format()
  {
    bookkeeping_path f_path = bookkeeping_root / "format";
@@ -859,7 +859,7 @@ Index: work_migration.cc
    // one or other side of this conditional will always be dead code, but
    // both sides should be preserved, to document all historical formats.
    // N.B. this will _not_ do the right thing for format 0.  Which is fine.
-@@ -97,10 +117,19 @@
+@@ -97,10 +117,19 @@ workspace::write_ws_format()
      {
        if (file_exists(f_path))
          delete_file(f_path);
@@ -879,7 +879,7 @@ Index: work_migration.cc
        write_data(f_path, f_dat);
      }
  }
-@@ -180,7 +209,11 @@
+@@ -180,7 +209,11 @@ migrate_1_to_2()
    // information, and _MTN/work does not exist; also, there may be more than
    // one parent revision, but we do not have to worry about that here.
  
@@ -891,7 +891,7 @@ Index: work_migration.cc
    data base_rev_data; MM(base_rev_data);
    try 
      {
-@@ -196,7 +229,11 @@
+@@ -196,7 +229,11 @@ migrate_1_to_2()
  
    cset workcs; 
    MM(workcs);

monotone/monotone.spec

@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        EVAL
 Group:        SCM
 License:      GPL
-Version:      0.38
-Release:      20080101
+Version:      0.39
+Release:      20080227
 
 #   package options
 %option       with_rse  yes