~ubuntu-branches/debian/sid/subversion/sid

« back to all changes in this revision

Viewing changes to subversion/libsvn_fs_base/bdb/nodes-table.c

  • Committer: Package Import Robot
  • Author(s): James McCoy, Peter Samuelson, James McCoy
  • Date: 2014-01-12 19:48:33 UTC
  • mfrom: (0.2.10)
  • Revision ID: package-import@ubuntu.com-20140112194833-w3axfwksn296jn5x
Tags: 1.8.5-1
[ Peter Samuelson ]
* New upstream release.  (Closes: #725787) Rediff patches:
  - Remove apr-abi1 (applied upstream), rename apr-abi2 to apr-abi
  - Remove loosen-sqlite-version-check (shouldn't be needed)
  - Remove java-osgi-metadata (applied upstream)
  - svnmucc prompts for a changelog if none is provided. (Closes: #507430)
  - Remove fix-bdb-version-detection, upstream uses "apu-config --dbm-libs"
  - Remove ruby-test-wc (applied upstream)
  - Fix “svn diff -r N file” when file has svn:mime-type set.
    (Closes: #734163)
  - Support specifying an encoding for mod_dav_svn's environment in which
    hooks are run.  (Closes: #601544)
  - Fix ordering of “svnadmin dump” paths with certain APR versions.
    (Closes: #687291)
  - Provide a better error message when authentication fails with an
    svn+ssh:// URL.  (Closes: #273874)
  - Updated Polish translations.  (Closes: #690815)

[ James McCoy ]
* Remove all traces of libneon, replaced by libserf.
* patches/sqlite_3.8.x_workaround: Upstream fix for wc-queries-test test
  failurse.
* Run configure with --with-apache-libexecdir, which allows removing part of
  patches/rpath.
* Re-enable auth-test as upstream has fixed the problem of picking up
  libraries from the environment rather than the build tree.
  (Closes: #654172)
* Point LD_LIBRARY_PATH at the built auth libraries when running the svn
  command during the build.  (Closes: #678224)
* Add a NEWS entry describing how to configure mod_dav_svn to understand
  UTF-8.  (Closes: #566148)
* Remove ancient transitional package, libsvn-ruby.
* Enable compatibility with Sqlite3 versions back to Wheezy.
* Enable hardening flags.  (Closes: #734918)
* patches/build-fixes: Enable verbose build logs.
* Build against the default ruby version.  (Closes: #722393)

Show diffs side-by-side

added added

removed removed

Lines of Context:
99
99
  /* Get the current value associated with the `next-key' key in the table.  */
100
100
  svn_fs_base__str_to_dbt(&query, NEXT_KEY_KEY);
101
101
  svn_fs_base__trail_debug(trail, "nodes", "get");
102
 
  SVN_ERR(BDB_WRAP(fs, _("allocating new node ID (getting 'next-key')"),
 
102
  SVN_ERR(BDB_WRAP(fs, N_("allocating new node ID (getting 'next-key')"),
103
103
                   bfd->nodes->get(bfd->nodes, trail->db_txn,
104
104
                                   &query,
105
105
                                   svn_fs_base__result_dbt(&result),
117
117
                           svn_fs_base__str_to_dbt(&query, NEXT_KEY_KEY),
118
118
                           svn_fs_base__str_to_dbt(&result, next_key),
119
119
                           0);
120
 
  SVN_ERR(BDB_WRAP(fs, _("bumping next node ID key"), db_err));
 
120
  SVN_ERR(BDB_WRAP(fs, N_("bumping next node ID key"), db_err));
121
121
 
122
122
  /* Create and return the new node id. */
123
123
  *id_p = svn_fs_base__id_create(next_node_id, copy_id, txn_id, pool);
179
179
  DBT key;
180
180
 
181
181
  svn_fs_base__trail_debug(trail, "nodes", "del");
182
 
  return BDB_WRAP(fs, _("deleting entry from 'nodes' table"),
 
182
  return BDB_WRAP(fs, N_("deleting entry from 'nodes' table"),
183
183
                  bfd->nodes->del(bfd->nodes,
184
184
                                  trail->db_txn,
185
185
                                  svn_fs_base__id_to_dbt(&key, id, pool),
217
217
    return svn_fs_base__err_dangling_id(fs, id);
218
218
 
219
219
  /* Handle any other error conditions.  */
220
 
  SVN_ERR(BDB_WRAP(fs, _("reading node revision"), db_err));
 
220
  SVN_ERR(BDB_WRAP(fs, N_("reading node revision"), db_err));
221
221
 
222
222
  /* If our caller doesn't really care about the return value here,
223
223
     just return successfully. */
250
250
  SVN_ERR(svn_fs_base__unparse_node_revision_skel(&skel, noderev,
251
251
                                                  bfd->format, pool));
252
252
  svn_fs_base__trail_debug(trail, "nodes", "put");
253
 
  return BDB_WRAP(fs, _("storing node revision"),
 
253
  return BDB_WRAP(fs, N_("storing node revision"),
254
254
                  bfd->nodes->put(bfd->nodes, db_txn,
255
255
                                  svn_fs_base__id_to_dbt(&key, id, pool),
256
256
                                  svn_fs_base__skel_to_dbt(&value, skel,