|
|
svn commit: r13186 - in branches/ruby: . build/ac-macros contrib/client-sid: msg#00367version-control.subversion.svn
Author: kou Date: Sun Feb 27 19:19:25 2005 New Revision: 13186 Added: branches/ruby/aclocal.m4 - copied unchanged from r13185, trunk/aclocal.m4 branches/ruby/doc/book/book/README (props changed) - copied unchanged from r13185, trunk/doc/book/book/README branches/ruby/doc/translations/german/book/README - copied unchanged from r13185, trunk/doc/translations/german/book/README branches/ruby/doc/translations/norwegian_nb/book/README - copied unchanged from r13185, trunk/doc/translations/norwegian_nb/book/README branches/ruby/doc/translations/russian/book/README - copied unchanged from r13185, trunk/doc/translations/russian/book/README branches/ruby/doc/translations/spanish/book/README - copied unchanged from r13185, trunk/doc/translations/spanish/book/README branches/ruby/subversion/libsvn_client/info.c (props changed) - copied unchanged from r13185, trunk/subversion/libsvn_client/info.c Removed: branches/ruby/doc/book/HACKING branches/ruby/doc/book/REVIEW branches/ruby/doc/book/TODO branches/ruby/doc/book/book-dist.py branches/ruby/doc/book/book/appa.xml branches/ruby/doc/book/book/appb.xml branches/ruby/doc/book/book/appc.xml branches/ruby/doc/book/book/appd.xml branches/ruby/doc/book/book/book.xml branches/ruby/doc/book/book/ch00.xml branches/ruby/doc/book/book/ch01.xml branches/ruby/doc/book/book/ch02.xml branches/ruby/doc/book/book/ch03.xml branches/ruby/doc/book/book/ch04.xml branches/ruby/doc/book/book/ch05.xml branches/ruby/doc/book/book/ch06.xml branches/ruby/doc/book/book/ch07.xml branches/ruby/doc/book/book/ch08.xml branches/ruby/doc/book/book/ch09.xml branches/ruby/doc/book/book/colo.xml branches/ruby/doc/book/book/copyright.xml branches/ruby/doc/book/book/foreword.xml branches/ruby/doc/book/book/glossary.xml branches/ruby/doc/book/book/images/ branches/ruby/doc/book/book/styles.css branches/ruby/doc/book/outline.txt branches/ruby/doc/translations/german/book/book.xml branches/ruby/doc/translations/german/book/ch00.xml branches/ruby/doc/translations/german/book/ch01.xml branches/ruby/doc/translations/german/book/ch02.xml branches/ruby/doc/translations/german/book/ch07.xml branches/ruby/doc/translations/german/book/ch08.xml branches/ruby/doc/translations/german/book/ch09.xml branches/ruby/doc/translations/german/book/foreword.xml branches/ruby/doc/translations/norwegian_nb/HACKING branches/ruby/doc/translations/norwegian_nb/LAST_UPDATED branches/ruby/doc/translations/norwegian_nb/REVIEW branches/ruby/doc/translations/norwegian_nb/TODO branches/ruby/doc/translations/norwegian_nb/TRANSLATION-STATUS branches/ruby/doc/translations/norwegian_nb/book-dist.py branches/ruby/doc/translations/norwegian_nb/book/appa.xml branches/ruby/doc/translations/norwegian_nb/book/appb.xml branches/ruby/doc/translations/norwegian_nb/book/appc.xml branches/ruby/doc/translations/norwegian_nb/book/appd.xml branches/ruby/doc/translations/norwegian_nb/book/book.xml branches/ruby/doc/translations/norwegian_nb/book/ch00.xml branches/ruby/doc/translations/norwegian_nb/book/ch01.xml branches/ruby/doc/translations/norwegian_nb/book/ch02.xml branches/ruby/doc/translations/norwegian_nb/book/ch03.xml branches/ruby/doc/translations/norwegian_nb/book/ch04.xml branches/ruby/doc/translations/norwegian_nb/book/ch05.xml branches/ruby/doc/translations/norwegian_nb/book/ch06.xml branches/ruby/doc/translations/norwegian_nb/book/ch07.xml branches/ruby/doc/translations/norwegian_nb/book/ch08.xml branches/ruby/doc/translations/norwegian_nb/book/ch09.xml branches/ruby/doc/translations/norwegian_nb/book/colo.xml branches/ruby/doc/translations/norwegian_nb/book/copyright.xml branches/ruby/doc/translations/norwegian_nb/book/foreword.xml branches/ruby/doc/translations/norwegian_nb/book/glossary.xml branches/ruby/doc/translations/norwegian_nb/book/images/ branches/ruby/doc/translations/norwegian_nb/book/styles.css branches/ruby/doc/translations/norwegian_nb/outline.txt branches/ruby/doc/translations/russian/book/appb.xml branches/ruby/doc/translations/russian/book/book.xml branches/ruby/doc/translations/russian/book/images/ branches/ruby/doc/translations/russian/readme.txt branches/ruby/doc/translations/spanish/.aspell_ignore branches/ruby/doc/translations/spanish/COORDINADOR branches/ruby/doc/translations/spanish/LEAME branches/ruby/doc/translations/spanish/Makefile branches/ruby/doc/translations/spanish/README branches/ruby/doc/translations/spanish/TODO branches/ruby/doc/translations/spanish/TRABAJO branches/ruby/doc/translations/spanish/author_statistics.py branches/ruby/doc/translations/spanish/book/appa.xml branches/ruby/doc/translations/spanish/book/appb.xml branches/ruby/doc/translations/spanish/book/appc.xml branches/ruby/doc/translations/spanish/book/appd.xml branches/ruby/doc/translations/spanish/book/book.xml branches/ruby/doc/translations/spanish/book/book.xml.aspell_ignore branches/ruby/doc/translations/spanish/book/ch00.xml branches/ruby/doc/translations/spanish/book/ch00.xml.aspell_ignore branches/ruby/doc/translations/spanish/book/ch01.xml branches/ruby/doc/translations/spanish/book/ch01.xml.aspell_ignore branches/ruby/doc/translations/spanish/book/ch02.xml branches/ruby/doc/translations/spanish/book/ch03.xml branches/ruby/doc/translations/spanish/book/ch03.xml.aspell_ignore branches/ruby/doc/translations/spanish/book/ch04.xml branches/ruby/doc/translations/spanish/book/ch04.xml.aspell_ignore branches/ruby/doc/translations/spanish/book/ch05.xml branches/ruby/doc/translations/spanish/book/ch06.xml branches/ruby/doc/translations/spanish/book/ch07.xml branches/ruby/doc/translations/spanish/book/ch08.xml branches/ruby/doc/translations/spanish/book/ch08.xml.aspell_ignore branches/ruby/doc/translations/spanish/book/ch09.xml branches/ruby/doc/translations/spanish/book/colo.xml branches/ruby/doc/translations/spanish/book/copyright.xml branches/ruby/doc/translations/spanish/book/foreword.xml branches/ruby/doc/translations/spanish/book/foreword.xml.aspell_ignore branches/ruby/doc/translations/spanish/book/glossary.xml branches/ruby/doc/translations/spanish/book/images/ branches/ruby/doc/translations/spanish/book/styles.css branches/ruby/doc/translations/spanish/glosario_traduccion branches/ruby/doc/translations/spanish/publicacion_oficial branches/ruby/doc/translations/spanish/weekly_report.py Modified: branches/ruby/HACKING branches/ruby/Makefile.in branches/ruby/autogen.sh branches/ruby/build.conf branches/ruby/build/ac-macros/berkeley-db.m4 branches/ruby/build/ac-macros/neon.m4 branches/ruby/build/ac-macros/svn-macros.m4 branches/ruby/configure.in branches/ruby/contrib/client-side/psvn/psvn.el branches/ruby/contrib/client-side/svnmerge branches/ruby/contrib/client-side/vc-svn.el branches/ruby/doc/book/README branches/ruby/notes/locking/TODO.txt branches/ruby/notes/releases.txt branches/ruby/packages/win32-innosetup/svn.iss branches/ruby/packages/win32-innosetup/templates/svn_dynamics.iss branches/ruby/packages/win32-innosetup/templates/svn_version.iss branches/ruby/subversion/bindings/java/javahl/build/build.xml branches/ruby/subversion/bindings/java/javahl/native/JNIUtil.cpp branches/ruby/subversion/bindings/java/javahl/native/JNIUtil.h branches/ruby/subversion/bindings/java/javahl/native/Path.cpp branches/ruby/subversion/bindings/java/javahl/native/Path.h branches/ruby/subversion/bindings/java/javahl/native/SVNClient.cpp branches/ruby/subversion/bindings/java/javahl/native/SVNClient.h branches/ruby/subversion/bindings/java/javahl/native/Targets.cpp branches/ruby/subversion/bindings/java/javahl/native/Targets.h branches/ruby/subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp branches/ruby/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClient.java branches/ruby/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java branches/ruby/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java branches/ruby/subversion/clients/cmdline/export-cmd.c branches/ruby/subversion/clients/cmdline/info-cmd.c branches/ruby/subversion/clients/cmdline/main.c branches/ruby/subversion/clients/cmdline/propdel-cmd.c branches/ruby/subversion/clients/cmdline/propedit-cmd.c branches/ruby/subversion/clients/cmdline/propset-cmd.c branches/ruby/subversion/clients/cmdline/switch-cmd.c branches/ruby/subversion/include/svn_client.h branches/ruby/subversion/include/svn_cmdline.h branches/ruby/subversion/include/svn_ra.h branches/ruby/subversion/include/svn_repos.h branches/ruby/subversion/include/svn_wc.h branches/ruby/subversion/libsvn_client/add.c branches/ruby/subversion/libsvn_client/checkout.c branches/ruby/subversion/libsvn_client/client.h branches/ruby/subversion/libsvn_client/commit.c branches/ruby/subversion/libsvn_client/commit_util.c branches/ruby/subversion/libsvn_client/copy.c branches/ruby/subversion/libsvn_client/delete.c branches/ruby/subversion/libsvn_client/diff.c branches/ruby/subversion/libsvn_client/export.c branches/ruby/subversion/libsvn_client/externals.c branches/ruby/subversion/libsvn_client/log.c branches/ruby/subversion/libsvn_client/prop_commands.c branches/ruby/subversion/libsvn_client/ra.c branches/ruby/subversion/libsvn_client/relocate.c branches/ruby/subversion/libsvn_client/resolved.c branches/ruby/subversion/libsvn_client/revert.c branches/ruby/subversion/libsvn_client/revisions.c branches/ruby/subversion/libsvn_client/status.c branches/ruby/subversion/libsvn_client/switch.c branches/ruby/subversion/libsvn_client/update.c branches/ruby/subversion/libsvn_client/url.c branches/ruby/subversion/libsvn_delta/compose_delta.c branches/ruby/subversion/libsvn_delta/delta.h branches/ruby/subversion/libsvn_delta/text_delta.c branches/ruby/subversion/libsvn_delta/xdelta.c branches/ruby/subversion/libsvn_fs_base/dag.c branches/ruby/subversion/libsvn_fs_base/err.c branches/ruby/subversion/libsvn_fs_base/fs.c branches/ruby/subversion/libsvn_fs_base/reps-strings.c branches/ruby/subversion/libsvn_fs_base/revs-txns.c branches/ruby/subversion/libsvn_fs_base/tree.c branches/ruby/subversion/libsvn_fs_fs/dag.c branches/ruby/subversion/libsvn_fs_fs/fs.c branches/ruby/subversion/libsvn_fs_fs/fs_fs.c branches/ruby/subversion/libsvn_fs_fs/revs-txns.c branches/ruby/subversion/libsvn_fs_fs/tree.c branches/ruby/subversion/libsvn_ra_svn/client.c branches/ruby/subversion/libsvn_repos/delta.c branches/ruby/subversion/libsvn_repos/dump.c branches/ruby/subversion/libsvn_repos/load.c branches/ruby/subversion/libsvn_repos/log.c branches/ruby/subversion/libsvn_repos/reporter.c branches/ruby/subversion/libsvn_repos/rev_hunt.c branches/ruby/subversion/libsvn_subr/cmdline.c branches/ruby/subversion/libsvn_subr/io.c branches/ruby/subversion/libsvn_subr/utf.c branches/ruby/subversion/libsvn_wc/adm_crawler.c branches/ruby/subversion/libsvn_wc/adm_files.c branches/ruby/subversion/libsvn_wc/adm_ops.c branches/ruby/subversion/libsvn_wc/copy.c branches/ruby/subversion/libsvn_wc/entries.c branches/ruby/subversion/libsvn_wc/lock.c branches/ruby/subversion/libsvn_wc/log.c branches/ruby/subversion/libsvn_wc/update_editor.c branches/ruby/subversion/libsvn_wc/wc.h branches/ruby/subversion/mod_dav_svn/file_revs.c branches/ruby/subversion/po/ja.po branches/ruby/subversion/po/nb.po branches/ruby/subversion/po/pl.po branches/ruby/subversion/po/pt_BR.po branches/ruby/subversion/po/sv.po branches/ruby/subversion/po/zh_TW.po branches/ruby/subversion/svnadmin/main.c branches/ruby/subversion/svndumpfilter/main.c branches/ruby/subversion/svnlook/main.c branches/ruby/subversion/svnserve/main.c branches/ruby/subversion/svnversion/main.c branches/ruby/subversion/tests/clients/cmdline/README branches/ruby/subversion/tests/clients/cmdline/blame_tests.py branches/ruby/subversion/tests/clients/cmdline/export_tests.py branches/ruby/tools/client-side/bash_completion branches/ruby/tools/hook-scripts/commit-email.pl.in branches/ruby/www/project_links.html branches/ruby/www/svn_1.1_releasenotes.html Log: Ruby branch: Weekly merge from trunk (-r13060:13185) to branch. Modified: branches/ruby/HACKING Url: http://svn.collab.net/viewcvs/svn/branches/ruby/HACKING?view=diff&rev=13186&p1=branches/ruby/HACKING&r1=13185&p2=branches/ruby/HACKING&r2=13186 ============================================================================== --- branches/ruby/HACKING (original) +++ branches/ruby/HACKING Sun Feb 27 19:19:25 2005 @@ -968,6 +968,26 @@ changed -- not only does consistency aid readability, it also allows software to colorize log entries automatically. +As an exception to the above, if you make exactly the same change in +several files, list all the changed files in one entry. For example: + + * subversion/libsvn_ra_pigeons/twirl.c, + subversion/libsvn_ra_pigeons/roost.c: + Include svn_private_config.h. + +If all the changed files are deep inside the source tree, you can +shorten the file name entries by noting the common prefix before the +change entries: + + [in subversion/bindings/swig/birdsong] + + * dialects/nightingale.c (get_base_pitch): Allow 3/4-tone + pitch variation to account for trait variability amongst + isolated populations Erithacus megarhynchos. + + * dialects/gallus_domesticus.c: Remove. Unreliable due to + extremely low brain-to-body mass ratio. + If your change is related to a specific issue in the issue tracker, then include a string like "issue #N" in the log message. For example, if a patch resolves issue 1729, then the log message might Modified: branches/ruby/Makefile.in Url: http://svn.collab.net/viewcvs/svn/branches/ruby/Makefile.in?view=diff&rev=13186&p1=branches/ruby/Makefile.in&r1=13185&p2=branches/ruby/Makefile.in&r2=13186 ============================================================================== --- branches/ruby/Makefile.in (original) +++ branches/ruby/Makefile.in Sun Feb 27 19:19:25 2005 @@ -32,9 +32,8 @@ DESIGN_DIR = doc/programmer/design BOOK_TOP = doc/book -BOOK_DIR = ${BOOK_TOP}/book MDOCS_DIR = ${BOOK_TOP}/misc-docs -DOC_DIRS = $(DESIGN_DIR) $(BOOK_DIR) $(MDOCS_DIR) +DOC_DIRS = $(DESIGN_DIR) $(MDOCS_DIR) SWIG_SRC_DIR = $(abs_srcdir)/subversion/bindings/swig SWIG_BUILD_DIR = $(abs_builddir)/subversion/bindings/swig @@ -481,17 +480,16 @@ # DOCUMENTATION RULES # Every single document in every format. -doc: doc-design doc-book doc-misc-docs +doc: doc-design doc-misc-docs # Build all types of a certain doc. -doc-book: doc-book-html doc-book-pdf doc-book-ps doc-misc-docs: doc-misc-docs-html doc-misc-docs-pdf doc-misc-docs-ps doc-design: doc-design-info doc-design-html doc-design-txt # Build all docs of a certain type. -doc-all-html: doc-design-html doc-book-html doc-misc-docs-html -doc-all-pdf: doc-design-pdf doc-book-pdf dock-misc-docs-pdf -doc-all-ps: doc-design-ps doc-book-ps dock-misc-docs-ps +doc-all-html: doc-design-html doc-misc-docs-html +doc-all-pdf: doc-design-pdf dock-misc-docs-pdf +doc-all-ps: doc-design-ps dock-misc-docs-ps doc-all-info: doc-design-info # Different outputs for the 'design' document, written in texinfo. @@ -502,15 +500,6 @@ doc-design-dvi: doc/programmer/design/svn-design.dvi doc-design-ps: doc/programmer/design/svn-design.ps doc-design-pdf: doc/programmer/design/svn-design.pdf - -# Different outputs for the main Subversion 'book', written in docbook. -# Assumes you have {xsltproc, fop, stylesheets} installed. -doc-book-html: - cd ${BOOK_TOP} && $(MAKE) book-html -doc-book-pdf: - cd ${BOOK_TOP} && $(MAKE) book-pdf -doc-book-ps: - cd ${BOOK_TOP} && $(MAKE) book-ps # Different outputs for the misc docs. # Assumes you have {xsltproc, fop, stylesheets} installed. Copied: branches/ruby/aclocal.m4 (from r13185, trunk/aclocal.m4) Url: http://svn.collab.net/viewcvs/svn/branches/ruby/aclocal.m4?view=diff&rev=13186&p1=trunk/aclocal.m4&r1=13185&p2=branches/ruby/aclocal.m4&r2=13186 ============================================================================== Modified: branches/ruby/autogen.sh Url: http://svn.collab.net/viewcvs/svn/branches/ruby/autogen.sh?view=diff&rev=13186&p1=branches/ruby/autogen.sh&r1=13185&p2=branches/ruby/autogen.sh&r2=13186 ============================================================================== --- branches/ruby/autogen.sh (original) +++ branches/ruby/autogen.sh Sun Feb 27 19:19:25 2005 @@ -61,10 +61,6 @@ echo "Copying libtool helper: $ltfile" cp $ltfile ac-helpers/libtool.m4 -# This is just temporary until people's workspaces are cleared -- remove -# any old aclocal.m4 left over from prior build so it doesn't cause errors. -rm -f aclocal.m4 - # Create the file detailing all of the build outputs for SVN. # # Note: this dependency on Python is fine: only SVN developers use autogen.sh @@ -105,9 +101,6 @@ fi # Produce config.h.in -# Do this before the automake (automake barfs if the header isn't available). -# Do it after the aclocal command -- automake sets up the header to depend -# on aclocal.m4 echo "Creating svn_private_config.h.in..." ${AUTOHEADER:-autoheader} Modified: branches/ruby/build.conf Url: http://svn.collab.net/viewcvs/svn/branches/ruby/build.conf?view=diff&rev=13186&p1=branches/ruby/build.conf&r1=13185&p2=branches/ruby/build.conf&r2=13186 ============================================================================== --- branches/ruby/build.conf (original) +++ branches/ruby/build.conf Sun Feb 27 19:19:25 2005 @@ -230,7 +230,6 @@ nonlibs = apr aprutil install = apache-mod msvc-libs = mod_dav.lib libhttpd.lib -undefined-lib-symbols = yes [mod_authz_svn] description = Subversion path-based authorization module for Apache @@ -240,7 +239,6 @@ libs = libsvn_subr install = apache-mod msvc-libs = libhttpd.lib -undefined-lib-symbols = yes [svnserve] description = Subversion Server Modified: branches/ruby/build/ac-macros/berkeley-db.m4 Url: http://svn.collab.net/viewcvs/svn/branches/ruby/build/ac-macros/berkeley-db.m4?view=diff&rev=13186&p1=branches/ruby/build/ac-macros/berkeley-db.m4&r1=13185&p2=branches/ruby/build/ac-macros/berkeley-db.m4&r2=13186 ============================================================================== --- branches/ruby/build/ac-macros/berkeley-db.m4 (original) +++ branches/ruby/build/ac-macros/berkeley-db.m4 Sun Feb 27 19:19:25 2005 @@ -171,9 +171,7 @@ # Or that it resides in a non-standard location which we would have # to compensate with using something like -R`$apu_config --prefix`/lib. # - changequote(<<, >>)dnl - svn_apu_bdb_lib="`$apu_config --libs | sed -e 's/.*\(-ldb[^ ]*\).*/\1/'`" - changequote([, ])dnl + svn_apu_bdb_lib=["`$apu_config --libs | sed -e 's/.*\(-ldb[^ ]*\).*/\1/'`"] CPPFLAGS="$SVN_APRUTIL_INCLUDES $CPPFLAGS" LIBS="`$apu_config --ldflags` $svn_apu_bdb_lib $LIBS" Modified: branches/ruby/build/ac-macros/neon.m4 Url: http://svn.collab.net/viewcvs/svn/branches/ruby/build/ac-macros/neon.m4?view=diff&rev=13186&p1=branches/ruby/build/ac-macros/neon.m4&r1=13185&p2=branches/ruby/build/ac-macros/neon.m4&r2=13186 ============================================================================== --- branches/ruby/build/ac-macros/neon.m4 (original) +++ branches/ruby/build/ac-macros/neon.m4 Sun Feb 27 19:19:25 2005 @@ -89,10 +89,8 @@ NEON_LIBS="$NEON_LIBS $NEON_LIBS_NEW" # Also find out which macros neon defines (but ignore extra include paths): # this will include -DNEON_SSL if neon was built with SSL support - changequote(<<, >>)dnl - CFLAGS="$CFLAGS `$SHELL $abs_builddir/neon/neon-config --cflags | sed -e 's/-I[^ ]*//g'`" - SVN_NEON_INCLUDES="$SVN_NEON_INCLUDES `$SHELL $abs_builddir/neon/neon-config --cflags | sed -e 's/-D[^ ]*//g'`" - changequote([, ])dnl + CFLAGS=["$CFLAGS `$SHELL $abs_builddir/neon/neon-config --cflags | sed -e 's/-I[^ ]*//g'`"] + SVN_NEON_INCLUDES=["$SVN_NEON_INCLUDES `$SHELL $abs_builddir/neon/neon-config --cflags | sed -e 's/-D[^ ]*//g'`"] svn_lib_neon="yes" fi @@ -129,11 +127,9 @@ case "$NEON_VERSION" in $NEON_WANTED_REGEX) - changequote(<<, >>)dnl - SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'` + SVN_NEON_INCLUDES=[`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`] NEON_LIBS=`$neon_config --libs` - CFLAGS="$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`" - changequote([, ])dnl + CFLAGS=["$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"] svn_lib_neon="yes" ;; *) Modified: branches/ruby/build/ac-macros/svn-macros.m4 Url: http://svn.collab.net/viewcvs/svn/branches/ruby/build/ac-macros/svn-macros.m4?view=diff&rev=13186&p1=branches/ruby/build/ac-macros/svn-macros.m4&r1=13185&p2=branches/ruby/build/ac-macros/svn-macros.m4&r2=13186 ============================================================================== --- branches/ruby/build/ac-macros/svn-macros.m4 (original) +++ branches/ruby/build/ac-macros/svn-macros.m4 Sun Feb 27 19:19:25 2005 @@ -17,8 +17,15 @@ EOF - for arg in [$]0 "[$]@"; do - echo "\"[$]arg\" \\" >> $1 + echo "exec \"[$]0\" \\" >> $1 + for arg in "[$]@"; do + case $arg in + --no-create) ;; + --no-recursion) ;; + *) + echo "\"$arg\" \\" >> $1 + ;; + esac done echo '"[$]@"' >> $1 chmod +x $1 @@ -41,10 +48,8 @@ test -d $1 || $MKDIR $1 cd $1 - changequote(, )dnl # A "../" for each directory in /$config_subdirs. - ac_dots=`echo $apr_config_subdirs|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'` - changequote([, ])dnl + ac_dots=[`echo $apr_config_subdirs|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`] # Make the cache file name correct relative to the subdirectory. case "$cache_file" in Modified: branches/ruby/configure.in Url: http://svn.collab.net/viewcvs/svn/branches/ruby/configure.in?view=diff&rev=13186&p1=branches/ruby/configure.in&r1=13185&p2=branches/ruby/configure.in&r2=13186 ============================================================================== --- branches/ruby/configure.in (original) +++ branches/ruby/configure.in Sun Feb 27 19:19:25 2005 @@ -18,7 +18,6 @@ [esyscmd(python build/getversion.py subversion/include/svn_version.h)], [http://subversion.tigris.org/]) -dnl AC_CONFIG_SRCDIR is *required*; sanity-checks that our src dir exists. AC_CONFIG_SRCDIR(subversion/include/svn_types.h) AC_CONFIG_AUX_DIR(ac-helpers) @@ -37,29 +36,10 @@ MKDIR="$INSTALL -d" AC_SUBST(MKDIR) -dnl Grab our own macros -sinclude(build/ac-macros/berkeley-db.m4) -sinclude(build/ac-macros/svn-apache.m4) -sinclude(build/ac-macros/svn-macros.m4) -sinclude(build/ac-macros/neon.m4) -sinclude(build/ac-macros/find_apr.m4) -sinclude(build/ac-macros/apr.m4) -sinclude(build/ac-macros/find_apu.m4) -sinclude(build/ac-macros/aprutil.m4) -sinclude(build/ac-macros/java.m4) -sinclude(build/ac-macros/swig.m4) - - -dnl Grab the libtool macros -sinclude(ac-helpers/libtool.m4) - dnl Generate config.nice early (before the args are munged) SVN_CONFIG_NICE(config.nice) -dnl AC_CONFIG_HEADER causes `autoheader' to produce svn_private_config.h.in for us. -dnl (We can add custom defines by creating ./acconfig.h if we wish.) -AC_CONFIG_HEADER(subversion/svn_private_config.h) dnl Check for programs --------------------- @@ -103,13 +83,11 @@ dnl Configure APR -------------------------- dnl verify apr version and set apr flags -changequote(<<, >>) dnl These regular expressions should not contain "\(" and "\)". -APR_VER_REGEX="0\.9\.[5-9]" +APR_VER_REGEX=["0\.9\.[5-9]"] APR_VER_REGEX_TOO="1\." -APU_VER_REGEX="0\.9\.[5-9]" +APU_VER_REGEX=["0\.9\.[5-9]"] APU_VER_REGEX_TOO="1\." -changequote([, ]) SVN_LIB_APR($APR_VER_REGEX, $APR_VER_REGEX_TOO) SVN_LIB_APRUTIL($APU_VER_REGEX, $APU_VER_REGEX_TOO) @@ -144,7 +122,7 @@ SVN_BINDIR="`eval echo ${SVN_BINDIR}`" AC_SUBST(SVN_BINDIR) -dnl provide ${bindir} in svn_private.h for use in compiled code +dnl provide ${bindir} in svn_private_config.h for use in compiled code AC_DEFINE_UNQUOTED(SVN_BINDIR, "${SVN_BINDIR}", [Defined to be the path to the installed binaries]) @@ -528,14 +506,10 @@ dnl At the moment, we don't want optimization, because we're dnl debugging. dnl ### actually, debugging should be fine with the default -O2 - changequote(,) - CFLAGS="`echo $CFLAGS' ' | sed -e 's/-O[^ ]* //g'`" - changequote([,]) + CFLAGS=["`echo $CFLAGS' ' | sed -e 's/-O[^ ]* //g'`"] else if test "$enable_debugging" = "no" ; then - changequote(,) - CFLAGS="`echo $CFLAGS' ' | sed -e 's/-g[0-9] //g' | sed -e 's/-g//g'`" - changequote([,]) + CFLAGS=["`echo $CFLAGS' ' | sed -e 's/-g[0-9] //g' | sed -e 's/-g//g'`"] fi fi @@ -753,7 +727,9 @@ dnl Final step: create the Makefile ---------------------------- +AC_CONFIG_HEADER(subversion/svn_private_config.h) AC_CONFIG_FILES([Makefile]) +AC_CONFIG_COMMANDS(mkdir-init, [make mkdir-init]) SVN_CONFIG_SCRIPT(svn-config) SVN_CONFIG_SCRIPT(tools/backup/hot-backup.py) @@ -766,11 +742,6 @@ SVN_CONFIG_SCRIPT(subversion/bindings/swig/perl/native/Makefile.PL) AC_OUTPUT - - -dnl Create all of the build directories -make mkdir-init - dnl Print warning messages about what we did and didn't configure at the dnl end, where people will actually see them. Modified: branches/ruby/contrib/client-side/psvn/psvn.el Url: http://svn.collab.net/viewcvs/svn/branches/ruby/contrib/client-side/psvn/psvn.el?view=diff&rev=13186&p1=branches/ruby/contrib/client-side/psvn/psvn.el&r1=13185&p2=branches/ruby/contrib/client-side/psvn/psvn.el&r2=13186 ============================================================================== --- branches/ruby/contrib/client-side/psvn/psvn.el (original) +++ branches/ruby/contrib/client-side/psvn/psvn.el Sun Feb 27 19:19:25 2005 @@ -39,7 +39,7 @@ ;; l - svn-status-show-svn-log run 'svn log' ;; i - svn-status-info run 'svn info' ;; r - svn-status-revert run 'svn revert' -;; M-v - svn-status-resolved run 'svn resolved' +;; X v - svn-status-resolved run 'svn resolved' ;; U - svn-status-update-cmd run 'svn update' ;; c - svn-status-commit-file run 'svn commit' ;; a - svn-status-add-file run 'svn add --non-recursive' @@ -60,6 +60,7 @@ ;; m - svn-status-set-user-mark ;; u - svn-status-unset-user-mark ;; $ - svn-status-toggle-elide +;; w - svn-status-copy-filename-as-kill ;; DEL - svn-status-unset-user-mark-backwards ;; * ! - svn-status-unset-all-usermarks ;; * ? - svn-status-mark-unknown @@ -774,6 +775,8 @@ "Subkeymap used in `svn-status-mode' for option commands.") (defvar svn-status-mode-trac-map () "Subkeymap used in `svn-status-mode' for trac issue tracker commands.") +(defvar svn-status-mode-extension-map () + "Subkeymap used in `svn-status-mode' for some seldom used commands.") (when (not svn-status-mode-map) (setq svn-status-mode-map (make-sparse-keymap)) @@ -815,6 +818,7 @@ (kbd "DEL")) ; GNU Emacs 'svn-status-unset-user-mark-backwards) (define-key svn-status-mode-map (kbd "$") 'svn-status-toggle-elide) + (define-key svn-status-mode-map (kbd "w") 'svn-status-copy-filename-as-kill) (define-key svn-status-mode-map (kbd ".") 'svn-status-goto-root-or-return) (define-key svn-status-mode-map (kbd "I") 'svn-status-parse-info) (define-key svn-status-mode-map (kbd "V") 'svn-status-svnversion) @@ -833,7 +837,6 @@ (define-key svn-status-mode-map (kbd "i") 'svn-status-info) (define-key svn-status-mode-map (kbd "b") 'svn-status-blame) (define-key svn-status-mode-map (kbd "=") 'svn-status-show-svn-diff) - (define-key svn-status-mode-map (kbd "M-v") 'svn-status-resolved) ;; [(control ?=)] is unreachable on TTY, but you can use "*u" instead. ;; (Is the "u" mnemonic for something?) (define-key svn-status-mode-map (kbd "C-=") 'svn-status-show-svn-diff-for-marked-files) @@ -875,6 +878,10 @@ ;; TODO: Why is `svn-status-select-line' in `svn-status-mode-property-map'? (define-key svn-status-mode-property-map (kbd "RET") 'svn-status-select-line) (define-key svn-status-mode-map (kbd "P") svn-status-mode-property-map)) +(when (not svn-status-mode-extension-map) + (setq svn-status-mode-extension-map (make-sparse-keymap)) + (define-key svn-status-mode-extension-map (kbd "v") 'svn-status-resolved) + (define-key svn-status-mode-map (kbd "X") svn-status-mode-extension-map)) (when (not svn-status-mode-options-map) (setq svn-status-mode-options-map (make-sparse-keymap)) (define-key svn-status-mode-options-map (kbd "s") 'svn-status-save-state) @@ -1166,6 +1173,16 @@ (defun svn-status-line-info->set-lastchangerev (line-info value) (setcar (nthcdr 5 line-info) value)) +(defun svn-status-copy-filename-as-kill (arg) + "Copy the actual file name to the kill-ring. +When called with the prefix argument 0, use the full path name." + (interactive "P") + (let ((str (if (eq arg 0) + (svn-status-line-info->full-path (svn-status-get-line-information)) + (svn-status-line-info->filename (svn-status-get-line-information))))) + (kill-new str) + (message "Copied %s" str))) + (defun svn-status-toggle-elide () (interactive) (let ((st-info svn-status-info) @@ -2130,7 +2147,7 @@ (full-path (svn-status-line-info->full-path (svn-status-get-line-information))) (version)) (unless (file-directory-p simple-path) - (setq simple-path (file-name-directory simple-path)) + (setq simple-path (or (file-name-directory simple-path) ".")) (setq full-path (file-name-directory full-path))) (setq version (shell-command-to-string (concat "svnversion -n " full-path))) (message (format "svnversion for '%s': %s" simple-path version)) Modified: branches/ruby/contrib/client-side/svnmerge Url: http://svn.collab.net/viewcvs/svn/branches/ruby/contrib/client-side/svnmerge?view=diff&rev=13186&p1=branches/ruby/contrib/client-side/svnmerge&r1=13185&p2=branches/ruby/contrib/client-side/svnmerge&r2=13186 ============================================================================== --- branches/ruby/contrib/client-side/svnmerge (original) +++ branches/ruby/contrib/client-side/svnmerge Sun Feb 27 19:19:25 2005 @@ -48,6 +48,10 @@ SRCREV=`echo '$Rev$' | sed 's/^\$Rev: \([0-9]\{1,\}\).\{0,\}$/\1/g'` SRCDATE=`echo '$Date$' | sed 's/^\$Date: .\{0,\}(\(.\{0,\}\)).\{0,\}$/\1/g'` +# We expect non-localized output +LC_MESSAGES="C" +export LC_MESSAGES + # Subroutine to output usage message usage() { Modified: branches/ruby/contrib/client-side/vc-svn.el Url: http://svn.collab.net/viewcvs/svn/branches/ruby/contrib/client-side/vc-svn.el?view=diff&rev=13186&p1=branches/ruby/contrib/client-side/vc-svn.el&r1=13185&p2=branches/ruby/contrib/client-side/vc-svn.el&r2=13186 ============================================================================== --- branches/ruby/contrib/client-side/vc-svn.el (original) +++ branches/ruby/contrib/client-side/vc-svn.el Sun Feb 27 19:19:25 2005 @@ -1,414 +1,4 @@ -;;;; vc-svn.el --- a VC backend for Subversion -;;;; Jim Blandy <jimb-bqtBzms/kfRWk0Htik3J/w@xxxxxxxxxxxxxxxx> --- July 2002 - -;;; Writing this back end has shown up some problems in VC: bugs, -;;; shortcomings in the back end interface, and so on. But I want to -;;; first produce code that Subversion users can use with an already -;;; released Emacs distribution. -;;; -;;; So for now we're working within the limitations of the released -;;; VC; once we've got something functional, then we can start writing -;;; VC patches. - - -;;; To make this file load on demand, put this file into a directory -;;; in `load-path', and add this line to a startup file: -;;; -;;; (add-to-list 'vc-handled-backends 'SVN) - - -;;; To do here: -;;; Provide more of the optional VC backend functions: -;;; - dir-state -;;; - merge across arbitrary revisions -;;; -;;; Maybe we want more info in mode-line-string. Status of props? Status -;;; compared to what's in the repository (svn st -u) ? -;;; -;;; VC passes the vc-svn-register function a COMMENT argument, which -;;; is like the file description in CVS and RCS. Could we store the -;;; COMMENT as a Subversion property? Would that show up in fancy DAV -;;; web folder displays, or would it just languish in obscurity, the -;;; way CVS and RCS descriptions do? -;;; -;;; After manual merging, need some way to run `svn resolved'. Perhaps -;;; we should just prompt for approval when somebody tries to commit a -;;; conflicted file? -;;; -;;; vc-svn ought to handle more gracefully an attempted commit that -;;; fails with "Transaction is out of date". Probably the best -;;; approach is to ask "file is not up-to-date; do you want to merge -;;; now?" I think vc-cvs does this. -;;; -;;; Perhaps show the "conflicted" marker in the modeline? -;;; -;;; If conflicted, before committing or merging, ask the user if they -;;; want to mark the file as resolved. -;;; -;;; Won't searching for strings in svn output cause trouble if the -;;; locale language is not English? -;;; -;;; After merging news, need to recheck our idea of which workfile -;;; version we have. Reverting the file does this but we need to -;;; force it. Note that this can be necessary even if the file has -;;; not changed. -;;; -;;; Does everything work properly if we're rolled back to an old -;;; revision? -;;; -;;; Perhaps need to implement vc-svn-latest-on-branch-p? - - -;;; To do in VC: -;;; -;;; Make sure vc's documentation for `workfile-unchanged-p' default -;;; function mentions that it must not run asynchronously, and the -;;; symptoms if it does. -;;; -;;; Fix logic for finding log entries. -;;; -;;; Allow historical diff to choose an appropriate default previous -;;; revision number. I think this entails moving vc-previous-revision -;;; et al into the back end. -;;; -;;; Should vc-BACKEND-checkout really have to set the workfile version -;;; itself? -;;; -;;; Fix smerge for svn conflict markers. -;;; -;;; We can have files which are not editable for reasons other than -;;; needing to be checked out. For example, they might be a read-only -;;; view of an old revision opened with [C-x v ~]. (See vc-merge) -;;; -;;; Would be nice if there was a way to mark a file as -;;; just-checked-out, aside from updating the checkout-time property -;;; which in theory is not to be changed by backends. - - -(add-to-list 'vc-handled-backends 'SVN) - -(defcustom vc-svn-program-name "svn" - "*Name of Subversion client program, for use by Emacs's VC package." - :type 'string - :group 'vc - :version "21.2.90.2") - -(defcustom vc-svn-diff-switches nil - "*A string or list of strings specifying extra switches for `svn diff' under VC." - :type '(repeat string) - :group 'vc - :version "21.2.90.2") - -(defun vc-svn-registered (file) - "Return true if FILE is registered under Subversion." - ;; First, a quick false positive test: is there a `.svn/entries' file? - (and (file-exists-p (expand-file-name ".svn/entries" - (file-name-directory file))) - (not (null (vc-svn-run-status file))))) - - -(put 'vc-svn-with-output-buffer 'lisp-indent-function 0) -(defmacro vc-svn-with-output-buffer (&rest body) - "Save excursion, switch to buffer ` *Subversion Output*', and erase it." - `(save-excursion - ;; Let's not delete this buffer when we're done --- leave - ;; it around for debugging. - (set-buffer (get-buffer-create " *Subversion Output*")) - (erase-buffer) - ,@body)) - - -(defun vc-svn-pop-up-error (&rest args) - "Pop up the Subversion output buffer, and raise an error with ARGS." - (pop-to-buffer " *Subversion Output*") - (goto-char (point-min)) - (shrink-window-if-larger-than-buffer) - (apply 'error args)) - - -(defun vc-svn-run-status (file &optional update) - "Run `svn status -v' on FILE, and return the result. -If optional arg UPDATE is true, pass the `-u' flag to check against -the repository, across the network. -See `vc-svn-parse-status' for a description of the result." - (vc-svn-with-output-buffer - - ;; We should call vc-do-command here, but Subversion exits with an - ;; error status if FILE isn't under its control, and we want to - ;; return that as nil, not display it to the user. We can tell - ;; vc-do-command to - - (let ((status (apply 'call-process vc-svn-program-name nil t nil - (append '("status" "-v") - (if update '("-u") '()) - (list file))))) - (goto-char (point-min)) - (if (not (equal 0 status)) ; not zerop; status can be a string - ;; If you ask for the status of a file that isn't even in a - ;; Subversion-controlled directory, then Subversion exits with - ;; this error. - (if (or (looking-at "\\(.*\n\\)*.*is not a working copy") - (looking-at "\\(.*\n\\)*.*is not a versioned resource") - (looking-at "\\(.*\n\\)*.*: No such file or directory")) - nil - ;; Other errors we should actually report to the user. - (vc-svn-pop-up-error - "Error running Subversion to check status of `%s'" - (file-name-nondirectory file))) - - ;; Otherwise, we've got valid status output in the buffer, so - ;; just parse that. - (vc-svn-parse-status))))) - - -(defun vc-svn-parse-status () - "Parse the output from `svn status -v' at point. -We return nil for a file not under Subversion's control, -or (STATE LOCAL CHANGED) for files that are, where: -STATE is the file's VC state (see the documentation for `vc-state'), -LOCAL is the base revision in the working copy, and -CHANGED is the last revision in which it was changed. -Both LOCAL and CHANGED are strings, not numbers. -If we passed `svn status' the `-u' flag, then CHANGED could be a later -revision than LOCAL. -If the file is newly added, LOCAL is \"0\" and CHANGED is nil." - (let ((state (vc-svn-parse-state-only))) - (cond - ((not state) nil) - ;; A newly added file has no revision. - ((looking-at "....\\s-+\\(\\*\\s-+\\)?[-0]\\s-+\\?") - (list state "0" nil)) - ((looking-at "....\\s-+\\(\\*\\s-+\\)?\\([0-9]+\\)\\s-+\\([0-9]+\\)") - (list state - (match-string 2) - (match-string 3))) - ((looking-at "^I +") nil) ;; An ignored file - ((looking-at " \\{40\\}") nil) ;; A file that is not in the wc nor svn? - (t (error "Couldn't parse output from `svn status -v'"))))) - - -(defun vc-svn-parse-state-only () - "Parse the output from `svn status -v' at point, and return a state. -The documentation for the function `vc-state' describes the possible values." - (cond - ;; Be careful --- some of the later clauses here could yield false - ;; positives, if the clauses preceding them didn't screen those - ;; out. Making a pattern more selective could break something. - - ;; nil The given file is not under version control, - ;; or does not exist. - ((looking-at "\\?\\|^$") nil) - - ;; 'needs-patch The file has not been edited by the - ;; user, but there is a more recent version - ;; on the current branch stored in the - ;; master file. - ((looking-at " ..\\s-+\\*") 'needs-patch) - - ;; 'up-to-date The working file is unmodified with - ;; respect to the latest version on the - ;; current branch, and not locked. - ;; - ;; This is also returned for files which do not - ;; exist, as will be the case when finding a - ;; new file in a svn-controlled directory. That - ;; case is handled in vc-svn-parse-status. - ((looking-at " ") 'up-to-date) - - ;; 'needs-merge The file has been edited by the user, - ;; and there is also a more recent version - ;; on the current branch stored in the - ;; master file. This state can only occur - ;; if locking is not used for the file. - ((looking-at "\\S-+\\s-+\\*") 'needs-merge) - - ;; 'edited The working file has been edited by the - ;; user. If locking is used for the file, - ;; this state means that the current - ;; version is locked by the calling user. - (t 'edited))) - - -;;; Is it really safe not to check for updates? I haven't seen any -;;; cases where failing to check causes a problem that is not caught -;;; in some other way. However, there *are* cases where checking -;;; needlessly causes network delay, such as C-x v v. The common case -;;; is for the commit to be OK; we can handle errors if they occur. -- mbp -(defun vc-svn-state (file) - "Return the current version control state of FILE. -For a list of possible return values, see `vc-state'. - -This function should do a full and reliable state computation; it is -usually called immediately after `C-x v v'. `vc-svn-state-heuristic' -provides a faster heuristic when visiting a file. - -For svn this does *not* check for updates in the repository, because -that needlessly slows down vc when the repository is remote. Instead, -we rely on Subversion to trap situations such as needing a merge -before commit." - (car (vc-svn-run-status file))) - - -(defun vc-svn-state-heuristic (file) - "Estimate the version control state of FILE at visiting time. -For a list of possible values, see the doc string of `vc-state'. -This is supposed to be considerably faster than `vc-svn-state'. It -just runs `svn status -v', without the `-u' flag, so it's a strictly -local operation." - (car (vc-svn-run-status file))) - - - -(defun vc-svn-workfile-version (file) - "Return the current workfile version of FILE." - (cadr (vc-svn-run-status file))) - - -(defun vc-svn-checkout-model (file) - 'implicit) - - -(defun vc-svn-register (file &optional rev comment) - "Register FILE with Subversion. -REV is an initial revision; Subversion ignores it. -COMMENT is an initial description of the file; currently this is ignored." - (vc-svn-with-output-buffer - (let ((status (call-process vc-svn-program-name nil t nil "add" file))) - (or (equal 0 status) ; not zerop; status can be a string - (vc-svn-pop-up-error "Error running Subversion to add `%s'" - (file-name-nondirectory file)))))) - - -(defun vc-svn-checkin (file rev comment) - (apply 'vc-do-command nil 0 vc-svn-program-name file - "commit" (if comment (list "-m" comment) '()))) - - -(defun vc-svn-checkout (file &optional editable rev destfile) - "Check out revision REV of FILE into the working area. -The EDITABLE argument must be non-nil, since Subversion doesn't -support locking. -If REV is non-nil, that is the revision to check out (default is -current workfile version). If REV is the empty string, that means to -check out the head of the trunk. For Subversion, that's equivalent to -passing nil. -If optional arg DESTFILE is given, it is an alternate filename to -write the contents to; we raise an error." - (unless editable - (error "VC asked Subversion to check out a read-only copy of file")) - (when destfile - (error "VC asked Subversion to check out a file under another name")) - (when (equal rev "") - (setq rev nil)) - (apply 'vc-do-command nil 0 vc-svn-program-name file - "update" (if rev (list "-r" rev) '())) - (vc-file-setprop file 'vc-workfile-version nil)) - - -(defun vc-svn-revert (file &optional contents-done) - "Revert FILE back to the current workfile version. -If optional arg CONTENTS-DONE is non-nil, then the contents of FILE -have already been reverted from a version backup, and this function -only needs to update the status of FILE within the backend. This -function ignores the CONTENTS-DONE argument." - (vc-do-command nil 0 vc-svn-program-name file "revert")) - - -(defun vc-svn-merge-news (file) - "Merge recent changes into FILE. - -This calls `svn update'. In the case of conflicts, Subversion puts -conflict markers into the file and leaves additional temporary files -containing the `ancestor', `mine', and `other' files. - -You may need to run `svn resolved' by hand once these conflicts have -been resolved. - -Returns a vc status, which is used to determine whether conflicts need -to be merged." - (prog1 - (vc-do-command nil 0 vc-svn-program-name file "update") - - ;; This file may not have changed in the revisions which were - ;; merged, which means that its mtime on disk will not have been - ;; updated. However, the workfile version may still have been - ;; updated, and we want that to be shown correctly in the - ;; modeline. - - ;; vc-cvs does something like this - (vc-file-setprop file 'vc-checkout-time 0) - (vc-file-setprop file 'vc-workfile-version - (vc-svn-workfile-version file)))) - - -(defun vc-svn-print-log (file) - "Insert the revision log of FILE into the *vc* buffer." - (vc-do-command nil 'async vc-svn-program-name file "log")) - - -(defun vc-svn-show-log-entry (version) - "Search the log entry for VERSION in the current buffer. -Make sure it is displayed in the buffer's window." - (when (re-search-forward (concat "^-+\n\\(rev\\) " - (regexp-quote version) - ":[^|]+|[^|]+| [0-9]+ lines?")) - (goto-char (match-beginning 1)) - (recenter 1))) - - -(defun vc-svn-diff (file &optional rev1 rev2) - "Insert the diff for FILE into the *vc-diff* buffer. -If REV1 and REV2 are non-nil, report differences from REV1 to REV2. -If REV1 is nil, use the current workfile version (as found in the -repository) as the older version; if REV2 is nil, use the current -workfile contents as the newer version. -This function returns a status of either 0 (no differences found), or -1 (either non-empty diff or the diff is run asynchronously)." - (let* ((diff-switches-list - ;; In Emacs 21.3.50 or so, the `vc-diff-switches-list' macro - ;; started requiring its symbol argument to be quoted. - (condition-case nil - (vc-diff-switches-list svn) - (void-variable (vc-diff-switches-list 'SVN)))) - (status (vc-svn-run-status file)) - (local (elt status 1)) - (changed (elt status 2)) - - ;; If rev1 is the default (the base revision) set it to nil. - ;; This is nice because it lets us recognize when the diff - ;; will run locally, and thus when we shouldn't bother to run - ;; it asynchronously. But it's also necessary, since a diff - ;; for vc-default-workfile-unchanged-p *must* run - ;; synchronously, or else you'll end up with two diffs in the - ;; *vc-diff* buffer. `vc-diff-workfile-unchanged-p' passes - ;; the base revision explicitly, but this kludge lets us - ;; recognize that we can run the diff synchronously anyway. - ;; Fragile, no? - (rev1 (if (and rev1 (not (equal rev1 local))) rev1)) - - (rev-switches-list - (cond - ;; Given base rev against given rev. - ((and rev1 rev2) (list "-r" (format "%s:%s" rev1 rev2))) - ;; Given base rev against working copy. - (rev1 (list "-r" rev1)) - ;; Working copy base against given rev. - (rev2 (list "-r" (format "%s:%s" local rev2))) - ;; Working copy base against working copy. - (t '()))) - - ;; Run diff asynchronously if we're going to have to go - ;; across the network. - (async (or rev1 rev2))) - - (let ((status (apply 'vc-do-command "*vc-diff*" (if async 'async 0) - vc-svn-program-name file - (append '("diff") rev-switches-list)))) - (if (or async (> (buffer-size (get-buffer "*vc-diff*")) 0)) - 1 0)))) - -(defun vc-svn-find-version (file rev buffer) - (vc-do-command buffer 0 vc-svn-program-name file - "cat" "-r" rev)) - -(provide 'vc-svn) +;; This file no longer lives here, it lives in FSF Emacs. +(error + "http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/vc-svn.el + is the new canonical location of vc-svn.el, in the FSF Emacs tree.") Deleted: /branches/ruby/doc/book/HACKING Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/HACKING?view=auto&rev=13185 ============================================================================== Modified: branches/ruby/doc/book/README Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/README?view=diff&rev=13186&p1=branches/ruby/doc/book/README&r1=13185&p2=branches/ruby/doc/book/README&r2=13186 ============================================================================== --- branches/ruby/doc/book/README (original) +++ branches/ruby/doc/book/README Sun Feb 27 19:19:25 2005 @@ -1,13 +1,14 @@ -HOW-TO: Compiling the Subversion Book -====================================== +HOW-TO: Compiling Subversion DocBook XML Documents +=================================================== -This Subversion Book is written in Docbook Lite, a scaled-down version -of the Docbook DTD, used by O'Reilly & Associates. +The Subversion project uses for some of its documentation Docbook +Lite, a scaled-down version of the Docbook DTD, used by O'Reilly & +Associates. The goal of this document is to give simple instructions to anyone who -wants to compile this book into a useful format, like HTML or PDF. It -should state *exactly* which tools to use, and how to invoke them, in -simplest terms. +wants to compile Subversion DocBook documents into a useful format, +like HTML or PDF. It should state *exactly* which tools to use, and +how to invoke them, in simplest terms. Table of Contents: @@ -24,15 +25,6 @@ It's very short and clears up many things. - Note that there are actually two DocBook documents here: The book - itself, "Version Control with Subversion", and a miscellaneous - holding area known only as the "misc docs" (e.g., misc-docs.pdf, - etc). The Misc Docs hold material that either isn't yet ready to go - into the book itself, or which may never go into the book but - instead into companion documents that will also be available from - the Subversion site. Think of Misc Docs as a temporary, but - published, holding area. - II. COMPILING THE DOCS @@ -56,7 +48,7 @@ tools/xsl/. -2. Use XSLT to transform the book. +2. Use XSLT to transform the documents. XSLT applies an .xsl stylesheet to an .xml file, and produces some new markup document. @@ -82,8 +74,8 @@ make all-html - This produces an HTML version of the book in book/book.html, and - HTML for the miscellaneous docs in misc-docs/misc-docs.html. + This produces an HTML version for the Subversion DocBook docs in + misc-docs/misc-docs.html. 3. Make a PDF file. @@ -120,14 +112,14 @@ environment. Try java.sun.com or www.blackdown.org if you don't already have that. - Sometimes building the book can use more memory than Java is - willing to allocate by default, and you may need to increase the - default heap size. With Sun's JVM, this is accomplished by - passing the arguments "-Xms100m -Xmx200m" (known to work with - versions 1.2.x-1.4.x, and likely different for JVMs from other - vendors). To tell fop.sh about these arguments, pass them via - the environment variable FOP_OPTS (which is also configurable in - your ~/.foprc). + Sometimes building the DocBook documents can use more memory than + Java is willing to allocate by default, and you may need to + increase the default heap size. With Sun's JVM, this is + accomplished by passing the arguments "-Xms100m -Xmx200m" (known + to work with versions 1.2.x-1.4.x, and likely different for JVMs + from other vendors). To tell fop.sh about these arguments, pass + them via the environment variable FOP_OPTS (which is also + configurable in your ~/.foprc). $ export FOP_OPTS="-Xms100m -Xmx200m" @@ -146,8 +138,8 @@ make all-pdf - This produces PDF for the book in book/book.pdf, and - PDF for the miscellaneous docs in misc-docs/misc-docs.pdf. + This produces PDF for the Subversion DocBook documents in + misc-docs/misc-docs.pdf. III. HACKING ON THE DOCS Deleted: /branches/ruby/doc/book/REVIEW Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/REVIEW?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/book/TODO Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/TODO?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/book/book-dist.py Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book-dist.py?view=auto&rev=13185 ============================================================================== Copied: branches/ruby/doc/book/book/README (from r13185, trunk/doc/book/book/README) Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book/README?view=diff&rev=13186&p1=trunk/doc/book/book/README&r1=13185&p2=branches/ruby/doc/book/book/README&r2=13186 ============================================================================== Deleted: /branches/ruby/doc/book/book/appa.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book/appa.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/book/book/appb.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book/appb.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/book/book/appc.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book/appc.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/book/book/appd.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book/appd.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/book/book/book.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book/book.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/book/book/ch00.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book/ch00.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/book/book/ch01.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book/ch01.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/book/book/ch02.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book/ch02.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/book/book/ch03.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book/ch03.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/book/book/ch04.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book/ch04.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/book/book/ch05.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book/ch05.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/book/book/ch06.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book/ch06.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/book/book/ch07.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book/ch07.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/book/book/ch08.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book/ch08.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/book/book/ch09.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book/ch09.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/book/book/colo.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book/colo.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/book/book/copyright.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book/copyright.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/book/book/foreword.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book/foreword.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/book/book/glossary.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book/glossary.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/book/book/styles.css Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book/styles.css?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/book/outline.txt Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/outline.txt?view=auto&rev=13185 ============================================================================== Copied: branches/ruby/doc/translations/german/book/README (from r13185, trunk/doc/translations/german/book/README) Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/german/book/README?view=diff&rev=13186&p1=trunk/doc/translations/german/book/README&r1=13185&p2=branches/ruby/doc/translations/german/book/README&r2=13186 ============================================================================== Deleted: /branches/ruby/doc/translations/german/book/book.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/german/book/book.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/german/book/ch00.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/german/book/ch00.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/german/book/ch01.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/german/book/ch01.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/german/book/ch02.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/german/book/ch02.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/german/book/ch07.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/german/book/ch07.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/german/book/ch08.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/german/book/ch08.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/german/book/ch09.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/german/book/ch09.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/german/book/foreword.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/german/book/foreword.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/HACKING Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/HACKING?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/LAST_UPDATED Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/LAST_UPDATED?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/REVIEW Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/REVIEW?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/TODO Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/TODO?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/TRANSLATION-STATUS Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/TRANSLATION-STATUS?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/book-dist.py Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/book-dist.py?view=auto&rev=13185 ============================================================================== Copied: branches/ruby/doc/translations/norwegian_nb/book/README (from r13185, trunk/doc/translations/norwegian_nb/book/README) Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/book/README?view=diff&rev=13186&p1=trunk/doc/translations/norwegian_nb/book/README&r1=13185&p2=branches/ruby/doc/translations/norwegian_nb/book/README&r2=13186 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/book/appa.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/book/appa.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/book/appb.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/book/appb.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/book/appc.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/book/appc.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/book/appd.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/book/appd.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/book/book.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/book/book.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/book/ch00.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/book/ch00.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/book/ch01.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/book/ch01.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/book/ch02.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/book/ch02.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/book/ch03.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/book/ch03.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/book/ch04.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/book/ch04.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/book/ch05.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/book/ch05.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/book/ch06.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/book/ch06.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/book/ch07.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/book/ch07.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/book/ch08.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/book/ch08.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/book/ch09.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/book/ch09.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/book/colo.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/book/colo.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/book/copyright.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/book/copyright.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/book/foreword.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/book/foreword.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/book/glossary.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/book/glossary.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/book/styles.css Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/book/styles.css?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/norwegian_nb/outline.txt Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/norwegian_nb/outline.txt?view=auto&rev=13185 ============================================================================== Copied: branches/ruby/doc/translations/russian/book/README (from r13185, trunk/doc/translations/russian/book/README) Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/russian/book/README?view=diff&rev=13186&p1=trunk/doc/translations/russian/book/README&r1=13185&p2=branches/ruby/doc/translations/russian/book/README&r2=13186 ============================================================================== Deleted: /branches/ruby/doc/translations/russian/book/appb.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/russian/book/appb.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/russian/book/book.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/russian/book/book.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/russian/readme.txt Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/russian/readme.txt?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/.aspell_ignore Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/.aspell_ignore?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/COORDINADOR Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/COORDINADOR?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/LEAME Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/LEAME?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/Makefile Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/Makefile?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/README Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/README?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/TODO Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/TODO?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/TRABAJO Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/TRABAJO?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/author_statistics.py Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/author_statistics.py?view=auto&rev=13185 ============================================================================== Copied: branches/ruby/doc/translations/spanish/book/README (from r13185, trunk/doc/translations/spanish/book/README) Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/README?view=diff&rev=13186&p1=trunk/doc/translations/spanish/book/README&r1=13185&p2=branches/ruby/doc/translations/spanish/book/README&r2=13186 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/appa.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/appa.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/appb.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/appb.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/appc.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/appc.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/appd.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/appd.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/book.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/book.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/book.xml.aspell_ignore Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/book.xml.aspell_ignore?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/ch00.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/ch00.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/ch00.xml.aspell_ignore Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/ch00.xml.aspell_ignore?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/ch01.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/ch01.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/ch01.xml.aspell_ignore Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/ch01.xml.aspell_ignore?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/ch02.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/ch02.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/ch03.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/ch03.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/ch03.xml.aspell_ignore Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/ch03.xml.aspell_ignore?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/ch04.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/ch04.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/ch04.xml.aspell_ignore Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/ch04.xml.aspell_ignore?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/ch05.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/ch05.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/ch06.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/ch06.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/ch07.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/ch07.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/ch08.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/ch08.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/ch08.xml.aspell_ignore Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/ch08.xml.aspell_ignore?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/ch09.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/ch09.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/colo.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/colo.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/copyright.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/copyright.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/foreword.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/foreword.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/foreword.xml.aspell_ignore Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/foreword.xml.aspell_ignore?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/glossary.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/glossary.xml?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/book/styles.css Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/styles.css?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/glosario_traduccion Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/glosario_traduccion?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/publicacion_oficial Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/publicacion_oficial?view=auto&rev=13185 ============================================================================== Deleted: /branches/ruby/doc/translations/spanish/weekly_report.py Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/weekly_report.py?view=auto&rev=13185 ============================================================================== Modified: branches/ruby/notes/locking/TODO.txt Url: http://svn.collab.net/viewcvs/svn/branches/ruby/notes/locking/TODO.txt?view=diff&rev=13186&p1=branches/ruby/notes/locking/TODO.txt&r1=13185&p2=branches/ruby/notes/locking/TODO.txt&r2=13186 ============================================================================== --- branches/ruby/notes/locking/TODO.txt (original) +++ branches/ruby/notes/locking/TODO.txt Sun Feb 27 19:19:25 2005 @@ -1,10 +1,9 @@ -TOD for locking +TODO for locking =============== This is a summary of the current state of the locking implementation. -* svn:needs-lock property (fitz) -* svn info URL +* svn info URL (sussman) * svn update removes defunct locks svn status -u shows locking info from repo - Rev reporter in libsvn_repos (lundblad) - Rev svn_ra_reporter and RA APIs (lundblad) @@ -16,8 +15,7 @@ - Client changes * client test cases (fitz) [broad cases done] * Fix svn_fs_access_t handling in svnserve -* Fix svn_ra_unlcok force==true for ra_dav. -* libsvn_fs_fs writelock handling bugs +* Fix svn_ra_unlock force==true for ra_dav. * Improve cmdline help messages * svn lock and unlock should continue with next target on certain errors * Decide what should happen when unlocking in commit operation if an error Modified: branches/ruby/notes/releases.txt Url: http://svn.collab.net/viewcvs/svn/branches/ruby/notes/releases.txt?view=diff&rev=13186&p1=branches/ruby/notes/releases.txt&r1=13185&p2=branches/ruby/notes/releases.txt&r2=13186 ============================================================================== --- branches/ruby/notes/releases.txt (original) +++ branches/ruby/notes/releases.txt Sun Feb 27 19:19:25 2005 @@ -89,18 +89,39 @@ To make sure httpd.conf is properly set up for DAV access, see subversion/tests/clients/cmdline/README. + You should also have libtool-1.4.3 and autoconf-2.5x installed + from source. It is important that you do not use distribution + shipped versions of this software as they are often patched in + ways that are not portable. + Also, see sections 'Building the Latest Source under Unix' and 'BUILDING A SUBVERSION SERVER' in the INSTALL file. for more detailed build information. + When building the Windows .zip release be sure to use the apr files + from the .zip packaging of Apache. Additionally you'll want to + also include the apr-iconv directory from right next to apr-util in + the Apache zip file. See INSTALL, section I.1, for details. + 7. Merge CHANGES into the release branch. Do it the same way as described in section 4 in this document when merging fixes to the release branch. -8. Run './dist.sh -v X.Y.Z -r 1234 -pr branches/X.Y.Z' +8. Build the tarballs and zip file + + a) Run './dist.sh -v X.Y.Z -r 1234 -pr branches/X.Y.Z' + + Watch dist.sh's output to make sure everything goes smoothly; when + it's done, you'll have 'subversion-X.Y.Z.tar.gz' and + 'subversion-X.Y.Z.tar.bz2' in the cwd. + + b) Be sure to replace the apr, apr-util and apr-iconv dirs with the + ones from the .zip packaging of Apache, before building the .zip, + as mentioned above in 6. + + c) Run './dist.sh -v X.Y.Z -r 1234 -pr branches/X.Y.Z -zip' - Watch dist.sh's output to make sure everything goes smoothly; when - it's done, you'll have 'subversion-X.Y.Z.tar.gz' and - 'subversion-X.Y.Z.tar.bz2' in the cwd. + Again watch dist.sh's output to make sure everything goes smoothly; + when it's done, you'll have 'subversion-X.Y.Z.zip' in the cwd. 9. Test one or both of the tarballs: a) tar zxvf subversion-X.Y.Z.tar.gz; cd subversion-X.Y.Z @@ -181,7 +202,9 @@ 10. Use GPG to sign release. - [Details to be filled in later]. + gpg -b --armor subversion-X.Y.Z.tar.gz + gpg -b --armor subversion-X.Y.Z.tar.bz2 + gpg -b --armor subversion-X.Y.Z.zip 11. Upload the tarballs to http://subversion.tigris.org/tarballs/. Modified: branches/ruby/packages/win32-innosetup/svn.iss Url: http://svn.collab.net/viewcvs/svn/branches/ruby/packages/win32-innosetup/svn.iss?view=diff&rev=13186&p1=branches/ruby/packages/win32-innosetup/svn.iss&r1=13185&p2=branches/ruby/packages/win32-innosetup/svn.iss&r2=13186 ============================================================================== --- branches/ruby/packages/win32-innosetup/svn.iss (original) +++ branches/ruby/packages/win32-innosetup/svn.iss Sun Feb 27 19:19:25 2005 @@ -58,7 +58,7 @@ Source: in\subversion\Readme.dist; DestDir: {app}; DestName: Readme.txt Source: W32notes.txt; DestDir: {app} Source: {#= path_setup_in}\subversion\svn-proxy-template.reg; DestDir: {app}; Flags: ignoreversion -Source: {#= path_svnclient}\..\README.txt; DestDir: {app}; DestName: Buildnotes.txt +Source: {#= path_svn_win32}\README.txt; DestDir: {app}; DestName: Buildnotes.txt Source: {#= path_svnclient}\svn.exe; DestDir: {app}\bin; Flags: ignoreversion Source: {#= path_svnadmin}\svnadmin.exe; DestDir: {app}\bin; Flags: ignoreversion Source: {#= path_svnlook}\svnlook.exe; DestDir: {app}\bin; Flags: ignoreversion @@ -77,8 +77,7 @@ Source: {#= path_libapr_dll}\libapr.dll; DestDir: {app}\bin; Flags: ignoreversion Source: {#= path_libaprutil_dll}\libaprutil.dll; DestDir: {app}\bin; Flags: ignoreversion Source: {#= path_libapriconv_dll}\libapriconv.dll; DestDir: {app}\bin; Flags: ignoreversion -;Source: {#= path_iconv_dll}\iconv.dll; DestDir: {app}\bin; Flags: ignoreversion -Source: {#= path_intl_dll}\intl.dll; DestDir: {app}\bin; Flags: ignoreversion +Source: {#= path_intl_dll}\intl3_svn.dll; DestDir: {app}\bin; Flags: ignoreversion ; VC7 Runtime #ifdef VC7 Modified: branches/ruby/packages/win32-innosetup/templates/svn_dynamics.iss Url: http://svn.collab.net/viewcvs/svn/branches/ruby/packages/win32-innosetup/templates/svn_dynamics.iss?view=diff&rev=13186&p1=branches/ruby/packages/win32-innosetup/templates/svn_dynamics.iss&r1=13185&p2=branches/ruby/packages/win32-innosetup/templates/svn_dynamics.iss&r2=13186 ============================================================================== --- branches/ruby/packages/win32-innosetup/templates/svn_dynamics.iss (original) +++ branches/ruby/packages/win32-innosetup/templates/svn_dynamics.iss Sun Feb 27 19:19:25 2005 @@ -21,7 +21,7 @@ ;Build defines ---------------------------------------------------------------- ; File names -#define libdb_dll "libdb42.dll" +#define libdb_dll "libdb43.dll" ; Uncomment the defines if true #define inc_dbgsyms @@ -32,57 +32,59 @@ #define apache_ver_min "2.0.49" ; You should edit the paths below the examples according to your system +#define path_svn_win32 "C:\work\Subversion\binaries_svn\svn-win32\" ;Subversion Core -------------------------------------------------------------- ; Basic files -#define path_svnclient "C:\work\Subversion\binaries_svn\svn-win32\bin" -#define path_svnadmin "C:\work\Subversion\binaries_svn\svn-win32\bin" -#define path_svnlook "C:\work\Subversion\binaries_svn\svn-win32\bin" -#define path_svnserve "C:\work\Subversion\binaries_svn\svn-win32\bin" -#define path_svnversion "C:\work\Subversion\binaries_svn\svn-win32\bin" -#define path_svndumpfilter "C:\work\Subversion\binaries_svn\svn-win32\bin" +#define path_svnclient (path_svn_win32 + "bin") +#define path_svnadmin (path_svn_win32 + "bin") +#define path_svnlook (path_svn_win32 + "bin") +#define path_svnserve (path_svn_win32 + "bin") +#define path_svnversion (path_svn_win32 + "bin") +#define path_svndumpfilter (path_svn_win32 + "bin") +#define path_locale (path_svn_win32 + "share\locale") ; APR -#define path_libapr_dll "C:\work\Subversion\binaries_svn\svn-win32\bin" -#define path_libaprutil_dll "C:\work\Subversion\binaries_svn\svn-win32\bin" -#define path_libapriconv_dll "C:\work\Subversion\binaries_svn\svn-win32\bin" -#define path_iconv_dll "C:\work\Subversion\binaries_svn\svn-win32\bin" -#define path_intl_dll "C:\work\Subversion\binaries_svn\svn-win32\bin" +#define path_libapr_dll (path_svn_win32 + "bin") +#define path_libaprutil_dll (path_svn_win32 + "bin") +#define path_libapriconv_dll (path_svn_win32 + "bin") +#define path_iconv_dll (path_svn_win32 + "bin") +#define path_intl_dll (path_svn_win32 + "bin") ; httpd -#define path_davsvn "C:\work\Subversion\binaries_svn\svn-win32\httpd" -#define path_authzsvn "C:\work\Subversion\binaries_svn\svn-win32\httpd" +#define path_davsvn (path_svn_win32 + "bin") +#define path_authzsvn (path_svn_win32 + "bin") ; Misc -#define path_msvcr70_dll "C:\work\Subversion\binaries_svn\svn-win32\bin" -#define path_brkdb_dll "C:\work\Subversion\binaries_svn\svn-win32\bin" -#define path_svnpath "tools\svnpath" -#define path_iconv "C:\work\Subversion\binaries_svn\svn-win32\iconv" -#define path_ssl "C:\work\Subversion\binaries_svn\svn-win32\bin" +#define path_msvcr70_dll (path_svn_win32 + "bin") +#define path_brkdb_dll (path_svn_win32 + "bin") +#define path_svnpath "tools\svnpath" +#define path_iconv (path_svn_win32 + "iconv") +#define path_ssl (path_svn_win32 + "bin") ;Debug symbols ---------------------------------------------------------------- ; Basic files -#define path_svnclient_pdb "C:\work\Subversion\binaries_svn\svn-win32\bin" -#define path_svnadmin_pdb "C:\work\Subversion\binaries_svn\svn-win32\bin" -#define path_svnlook_pdb "C:\work\Subversion\binaries_svn\svn-win32\bin" -#define path_svnserve_pdb "C:\work\Subversion\binaries_svn\svn-win32\bin" -#define path_svnversion_pdb "C:\work\Subversion\binaries_svn\svn-win32\bin" -#define path_svndumpfilter_pdb "C:\work\Subversion\binaries_svn\svn-win32\bin" +#define path_svnclient_pdb (path_svn_win32 + "bin") +#define path_svnadmin_pdb (path_svn_win32 + "bin") +#define path_svnlook_pdb (path_svn_win32 + "bin") +#define path_svnserve_pdb (path_svn_win32 + "bin") +#define path_svnversion_pdb (path_svn_win32 + "bin") +#define path_svndumpfilter_pdb (path_svn_win32 + "bin") ; httpd -#define path_davsvn_pdb "C:\work\Subversion\binaries_svn\svn-win32\httpd" -#define path_authzsvn_pdb "C:\work\Subversion\binaries_svn\svn-win32\httpd" +#define path_davsvn_pdb (path_svn_win32 + "bin") +#define path_authzsvn_pdb (path_svn_win32 + "bin") ; Misc -#define path_iconv_pdb "C:\work\Subversion\binaries_svn\svn-win32\iconv" -#define path_libapr_pdb "C:\work\Subversion\binaries_svn\svn-win32\lib\apr" -#define path_libapu_pdb "C:\work\Subversion\binaries_svn\svn-win32\lib\apr-util" -#define path_py_libsvn_pdb "C:\work\Subversion\binaries_svn\svn-win32\python\libsvn" +#define path_iconv_pdb (path_svn_win32 + "iconv") +#define path_libapr_pdb (path_svn_win32 + "lib\apr") +#define path_libapu_pdb (path_svn_win32 + "lib\apr-util") +#define path_py_libsvn_pdb (path_svn_win32 + "python\libsvn") ;Development ------------------------------------------------------------------- -#define path_dev_doc "C:\work\Subversion\binaries_svn\svn-win32\doc" -#define path_dev_inc "C:\work\Subversion\binaries_svn\svn-win32\include" -#define path_dev_inc_apr "C:\work\Subversion\binaries_svn\svn-win32\include\apr" -#define path_dev_inc_apu "C:\work\Subversion\binaries_svn\svn-win32\include\apr-util" -#define path_dev_lib "C:\work\Subversion\binaries_svn\svn-win32\lib" -#define path_dev_lib_apr "C:\work\Subversion\binaries_svn\svn-win32\lib\apr" -#define path_dev_lib_apu "C:\work\Subversion\binaries_svn\svn-win32\lib\apr-util" +#define path_dev_doc (path_svn_win32 + "doc") +#define path_dev_inc (path_svn_win32 + "include") +#define path_dev_inc_apr (path_svn_win32 + "include\apr") +#define path_dev_inc_apu (path_svn_win32 + "include\apr-util") +#define path_dev_lib (path_svn_win32 + "lib") +#define path_dev_lib_apr (path_svn_win32 + "lib\apr") +#define path_dev_lib_apu (path_svn_win32 + "lib\apr-util") ;Python bindings -#define path_py_bind_libsvn "C:\work\Subversion\binaries_svn\python_bindings\libsvn" -#define path_py_bind_svn "C:\work\Subversion\binaries_svn\python_bindings\svn" +#define path_py_bind_libsvn (path_svn_win32 + "python\libsvn") +#define path_py_bind_svn (path_svn_win32 + "python\svn") Modified: branches/ruby/packages/win32-innosetup/templates/svn_version.iss Url: http://svn.collab.net/viewcvs/svn/branches/ruby/packages/win32-innosetup/templates/svn_version.iss?view=diff&rev=13186&p1=branches/ruby/packages/win32-innosetup/templates/svn_version.iss&r1=13185&p2=branches/ruby/packages/win32-innosetup/templates/svn_version.iss&r2=13186 ============================================================================== --- branches/ruby/packages/win32-innosetup/templates/svn_version.iss (original) +++ branches/ruby/packages/win32-innosetup/templates/svn_version.iss Sun Feb 27 19:19:25 2005 @@ -5,6 +5,6 @@ ; mk_distro and set the version info from there. ; This file is ignored by the Subversion repository when it resides in ; "packages\win32-innosetup". -#define svn_version "X.XX.X" -#define svn_pretxtrelease "XX" -#define svn_release "XXXX" +#define svn_version "X.X.X" +#define svn_pretxtrevision "-r" +#define svn_revision "11581" Modified: branches/ruby/subversion/bindings/java/javahl/build/build.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/bindings/java/javahl/build/build.xml?view=diff&rev=13186&p1=branches/ruby/subversion/bindings/java/javahl/build/build.xml&r1=13185&p2=branches/ruby/subversion/bindings/java/javahl/build/build.xml&r2=13186 ============================================================================== --- branches/ruby/subversion/bindings/java/javahl/build/build.xml (original) +++ branches/ruby/subversion/bindings/java/javahl/build/build.xml Sun Feb 27 19:19:25 2005 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<project name="svnjavahl" default="javah" basedir=".."> +<project name="svnjavahl" default="build" basedir=".."> <target name="javah"> <javah classpath="classes" verbose="yes" destdir="include"> <class name="org.tigris.subversion.javahl.CommitItemStateFlags"/> @@ -15,6 +15,23 @@ <class name="org.tigris.subversion.javahl.SVNClient"/> <class name="org.tigris.subversion.javahl.SVNClientLogLevel"/> </javah> + </target> + <target name="javac" unless="junit.path"> + <javac compiler="modern" destdir="classes"> + <src path="src"/> + <exclude name="org/tigris/subversion/javahl/tests/**"/> + </javac> + </target> + <target name="javac-tests" if="junit.path"> + <javac compiler="modern" destdir="classes"> + <src path="src"/> + <classpath path="${junit.path}"/> + </javac> + </target> + <target name="build"> + <antcall target="javac"/> + <antcall target="javac-tests"/> + <antcall target="javah"/> </target> <target name="javadoc"> <javadoc sourcepath="src" destdir="javadoc" windowtitle="Subversion java high level binding" > Modified: branches/ruby/subversion/bindings/java/javahl/native/JNIUtil.cpp Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/bindings/java/javahl/native/JNIUtil.cpp?view=diff&rev=13186&p1=branches/ruby/subversion/bindings/java/javahl/native/JNIUtil.cpp&r1=13185&p2=branches/ruby/subversion/bindings/java/javahl/native/JNIUtil.cpp&r2=13186 ============================================================================== --- branches/ruby/subversion/bindings/java/javahl/native/JNIUtil.cpp (original) +++ branches/ruby/subversion/bindings/java/javahl/native/JNIUtil.cpp Sun Feb 27 19:19:25 2005 @@ -28,7 +28,8 @@ #include <svn_pools.h> #include <svn_config.h> -#include "svn_path.h" +#include <svn_path.h> +#include <apr_file_info.h> #include "svn_private_config.h" #ifdef WIN32 /* FIXME: We're using an internal APR header here, which means we @@ -709,4 +710,64 @@ env->ThrowNew(clazz, message); setExceptionThrown(); env->DeleteLocalRef(clazz); +} +svn_error_t *JNIUtil::preprocessPath(const char *&path, apr_pool_t * pool) +{ + /* URLs and wc-paths get treated differently. */ + if (svn_path_is_url (path)) + { + /* No need to canonicalize a URL's case or path separators. */ + + /* Convert to URI. */ + path = svn_path_uri_from_iri (path, pool); + /* Auto-escape some ASCII characters. */ + path = svn_path_uri_autoescape (path, pool); + + /* The above doesn't guarantee a valid URI. */ + if (! svn_path_is_uri_safe (path)) + return svn_error_createf (SVN_ERR_BAD_URL, 0, + _("URL '%s' is not properly URI-encoded"), + path); + + /* Verify that no backpaths are present in the URL. */ + if (svn_path_is_backpath_present (path)) + return svn_error_createf (SVN_ERR_BAD_URL, 0, + _("URL '%s' contains a '..' element"), + path); + + /* strip any trailing '/' */ + path = svn_path_canonicalize (path, pool); + } + else /* not a url, so treat as a path */ + { + const char *apr_target; + char *truenamed_target; /* APR-encoded */ + apr_status_t apr_err; + + /* canonicalize case, and change all separators to '/'. */ + SVN_ERR (svn_path_cstring_from_utf8 (&apr_target, path, + pool)); + apr_err = apr_filepath_merge (&truenamed_target, "", apr_target, + APR_FILEPATH_TRUENAME, pool); + + if (!apr_err) + /* We have a canonicalized APR-encoded target now. */ + apr_target = truenamed_target; + else if (APR_STATUS_IS_ENOENT (apr_err)) + /* It's okay for the file to not exist, that just means we + have to accept the case given to the client. We'll use + the original APR-encoded target. */ + ; + else + return svn_error_createf (apr_err, NULL, + _("Error resolving case of '%s'"), + svn_path_local_style (path, + pool)); + + /* convert back to UTF-8. */ + SVN_ERR (svn_path_cstring_to_utf8 (&path, apr_target, pool)); + path = svn_path_canonicalize (path, pool); + + } + return NULL; } Modified: branches/ruby/subversion/bindings/java/javahl/native/JNIUtil.h Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/bindings/java/javahl/native/JNIUtil.h?view=diff&rev=13186&p1=branches/ruby/subversion/bindings/java/javahl/native/JNIUtil.h&r1=13185&p2=branches/ruby/subversion/bindings/java/javahl/native/JNIUtil.h&r2=13186 ============================================================================== --- branches/ruby/subversion/bindings/java/javahl/native/JNIUtil.h (original) +++ branches/ruby/subversion/bindings/java/javahl/native/JNIUtil.h Sun Feb 27 19:19:25 2005 @@ -45,6 +45,7 @@ class JNIUtil { public: + static svn_error_t *preprocessPath(const char *&path, apr_pool_t * pool); static void throwNullPointerException(const char *message); static jbyteArray makeJByteArray(const signed char *data, int length); static void setRequestPool(Pool *pool); Modified: branches/ruby/subversion/bindings/java/javahl/native/Path.cpp Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/bindings/java/javahl/native/Path.cpp?view=diff&rev=13186&p1=branches/ruby/subversion/bindings/java/javahl/native/Path.cpp&r1=13185&p2=branches/ruby/subversion/bindings/java/javahl/native/Path.cpp&r2=13186 ============================================================================== --- branches/ruby/subversion/bindings/java/javahl/native/Path.cpp (original) +++ branches/ruby/subversion/bindings/java/javahl/native/Path.cpp Sun Feb 27 19:19:25 2005 @@ -71,10 +71,10 @@ } else { - const char * int_path = svn_path_internal_style (pi_path, + m_error_occured = JNIUtil::preprocessPath(pi_path, JNIUtil::getRequestPool()->pool() ); - m_path = int_path; + m_path = pi_path; } } @@ -105,3 +105,8 @@ init (pi_path.c_str ()); return *this; } + +svn_error_t *Path::error_occured() const +{ + return m_error_occured; +} \ No newline at end of file Modified: branches/ruby/subversion/bindings/java/javahl/native/Path.h Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/bindings/java/javahl/native/Path.h?view=diff&rev=13186&p1=branches/ruby/subversion/bindings/java/javahl/native/Path.h&r1=13185&p2=branches/ruby/subversion/bindings/java/javahl/native/Path.h&r2=13186 ============================================================================== --- branches/ruby/subversion/bindings/java/javahl/native/Path.h (original) +++ branches/ruby/subversion/bindings/java/javahl/native/Path.h Sun Feb 27 19:19:25 2005 @@ -26,7 +26,7 @@ #pragma once #endif // _MSC_VER > 1000 #include <string> - +struct svn_error_t; /** * Encapsulation for Subversion Path handling */ @@ -36,6 +36,8 @@ // the path to be stored std::string m_path; + svn_error_t *m_error_occured; + /** * initialize the class * @@ -83,6 +85,9 @@ */ const char * c_str() const; + + svn_error_t * + error_occured() const; }; // !defined(AFX_PATH_H__A143CB2A_1115_4770_8CD5_AA33CCD285FA__INCLUDED_) Modified: branches/ruby/subversion/bindings/java/javahl/native/SVNClient.cpp Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/bindings/java/javahl/native/SVNClient.cpp?view=diff&rev=13186&p1=branches/ruby/subversion/bindings/java/javahl/native/SVNClient.cpp&r1=13185&p2=branches/ruby/subversion/bindings/java/javahl/native/SVNClient.cpp&r2=13186 ============================================================================== --- branches/ruby/subversion/bindings/java/javahl/native/SVNClient.cpp (original) +++ branches/ruby/subversion/bindings/java/javahl/native/SVNClient.cpp Sun Feb 27 19:19:25 2005 @@ -137,7 +137,8 @@ /** * List directory entries of a URL */ -jobjectArray SVNClient::list(const char *url, Revision &revision, bool recurse) +jobjectArray SVNClient::list(const char *url, Revision &revision, + Revision &pegRevision, bool recurse) { Pool requestPool; svn_client_ctx_t *ctx = getContext(NULL); @@ -152,9 +153,18 @@ return NULL; } + Path urlPath(url); + svn_error_t *Err = urlPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return NULL; + } + apr_hash_t *dirents; - svn_error_t *Err = svn_client_ls (&dirents, url, - const_cast<svn_opt_revision_t*>(revision.revision ()), + Err = svn_client_ls2 (&dirents, urlPath.c_str(), + pegRevision.revision(), + revision.revision (), recurse, ctx, requestPool.pool()); if (Err == NULL) { @@ -243,7 +253,7 @@ jobjectArray SVNClient::status(const char *path, bool descend, bool onServer, - bool getAll, bool noIgnore) + bool getAll, bool noIgnore, bool ignoreExternals) { status_baton statusBaton; Pool requestPool; @@ -261,17 +271,24 @@ { return NULL; } + Path checkedPath(path); + svn_error_t *Err = checkedPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return NULL; + } rev.kind = svn_opt_revision_unspecified; statusBaton.pool = requestPool.pool(); - const char *intPath = svn_path_internal_style (path, requestPool.pool()); - svn_error_t *Err = svn_client_status ( - &youngest, intPath, &rev, statusReceiver, + Err = svn_client_status2 ( + &youngest, checkedPath.c_str(), &rev, statusReceiver, &statusBaton, descend ? TRUE : FALSE, getAll ? TRUE : FALSE, onServer ? TRUE : FALSE, noIgnore ? TRUE : FALSE, + ignoreExternals ? TRUE : FALSE, ctx, requestPool.pool()); if (Err == NULL) @@ -342,9 +359,15 @@ rev.kind = svn_opt_revision_unspecified; statusBaton.pool = requestPool.pool(); - const char *intPath = svn_path_internal_style (path, requestPool.pool()); + Path intPath(path); + svn_error_t *Err = intPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return NULL; + } - svn_error_t *Err = svn_client_status (&youngest, intPath, &rev, + Err = svn_client_status (&youngest, intPath.c_str(), &rev, statusReceiver, &statusBaton, FALSE, TRUE, // get_All @@ -401,7 +424,7 @@ jobjectArray SVNClient::logMessages(const char *path, Revision &revisionStart, Revision &revisionEnd, bool stopOnCopy, - bool discoverPaths) + bool discoverPaths, long limit) { std::vector<jobject> logs; Pool requestPool; @@ -412,16 +435,23 @@ return NULL; } - m_lastPath = svn_path_internal_style (path, requestPool.pool()); - Targets target (m_lastPath.c_str () ); svn_client_ctx_t *ctx = getContext(NULL); if(ctx == NULL) { return NULL; } - svn_error_t *Err = svn_client_log (target.array (requestPool), + Targets target (path); + const apr_array_header_t *targets = target.array(requestPool); + svn_error_t *Err = target.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return NULL; + } + Err = svn_client_log2 (targets, revisionStart.revision (), revisionEnd.revision (), + limit, discoverPaths, stopOnCopy, messageReceiver, &logs, ctx, requestPool.pool()); @@ -473,7 +503,8 @@ } jlong SVNClient::checkout(const char *moduleName, const char *destPath, - Revision &revision, bool recurse) + Revision &revision, Revision &pegRevision, + bool recurse, bool ignoreExternals) { Pool requestPool; apr_pool_t * apr_pool = requestPool.pool (); @@ -489,7 +520,20 @@ return -1; } - m_lastPath = svn_path_internal_style (destPath, apr_pool); + Path url(moduleName); + Path path(destPath); + svn_error_t *Err = url.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return -1; + } + Err = path.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return -1; + } svn_revnum_t retval; svn_client_ctx_t *ctx = getContext(NULL); @@ -498,12 +542,12 @@ return -1; } - svn_error_t *Err = svn_client_checkout2 (&retval, moduleName, - m_lastPath.c_str (), - revision.revision (), + Err = svn_client_checkout2 (&retval, url.c_str(), + path.c_str (), + pegRevision.revision (), revision.revision (), recurse, - FALSE, // ignore externals + ignoreExternals, ctx, apr_pool); @@ -527,15 +571,21 @@ svn_client_commit_info_t *commit_info = NULL; Pool requestPool; apr_pool_t * apr_pool = requestPool.pool (); -// m_lastPath = path; svn_client_ctx_t *ctx = getContext(message); if(ctx == NULL) { return; } + const apr_array_header_t *targets2 = targets.array(requestPool); + svn_error_t *Err = targets.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } - svn_error_t *Err = svn_client_delete (&commit_info, - targets.array(requestPool), force, + Err = svn_client_delete (&commit_info, + targets2, force, ctx, apr_pool); if(Err != NULL) JNIUtil::handleSVNError(Err); @@ -553,14 +603,20 @@ return; } - m_lastPath = svn_path_internal_style (path, apr_pool); svn_client_ctx_t *ctx = getContext(NULL); - Targets target (m_lastPath.c_str () ); + Targets target (path); + const apr_array_header_t *targets = target.array(requestPool); + svn_error_t *Err = target.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } if(ctx == NULL) { return; } - svn_error_t *Err = svn_client_revert (target.array(requestPool), recurse, + Err = svn_client_revert (targets, recurse, ctx, apr_pool); if(Err != NULL) @@ -568,7 +624,7 @@ } -void SVNClient::add(const char *path, bool recurse) +void SVNClient::add(const char *path, bool recurse, bool force) { Pool requestPool; apr_pool_t * apr_pool = requestPool.pool (); @@ -579,49 +635,70 @@ return; } - m_lastPath = svn_path_internal_style (path, apr_pool); + Path intPath(path); + svn_error_t *Err = intPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } svn_client_ctx_t *ctx = getContext(NULL); if(ctx == NULL) { return; } - svn_error_t *Err = svn_client_add (m_lastPath.c_str (), recurse, ctx, - apr_pool); + Err = svn_client_add2 (intPath.c_str (), recurse, force, + ctx, apr_pool); if(Err != NULL) JNIUtil::handleSVNError(Err); } -jlong SVNClient::update(const char *path, Revision &revision, bool recurse) +jlongArray SVNClient::update(Targets &targets, Revision &revision, bool recurse, + bool ignoreExternals) { Pool requestPool; apr_pool_t * apr_pool = requestPool.pool (); - if(path == NULL) + svn_client_ctx_t *ctx = getContext(NULL); + apr_array_header_t *retval; + if(ctx == NULL) { - JNIUtil::throwNullPointerException("path"); - return -1; + return NULL; } - - m_lastPath = svn_path_internal_style (path, apr_pool); - svn_client_ctx_t *ctx = getContext(NULL); - svn_revnum_t retval; - if(ctx == NULL) + const apr_array_header_t *array = targets.array(requestPool); + svn_error_t *Err = targets.error_occured(); + if(Err != NULL) { - return -1; + JNIUtil::handleSVNError(Err); + return NULL; } - svn_error_t *Err = svn_client_update (&retval, m_lastPath.c_str (), + Err = svn_client_update2 (&retval, array, revision.revision (), recurse, + ignoreExternals, ctx, apr_pool); if(Err != NULL) { - JNIUtil::handleSVNError(Err); - return -1; + JNIUtil::handleSVNError(Err); + return NULL; } - return retval; + JNIEnv *env = JNIUtil::getEnv(); + jlongArray ret = env->NewLongArray(retval->nelts); + if(JNIUtil::isJavaExceptionThrown()) + return NULL; + jlong *retArray = env->GetLongArrayElements(ret, NULL); + if(JNIUtil::isJavaExceptionThrown()) + return NULL; + for(int i = 0; i < retval->nelts; i++) + { + jlong rev = APR_ARRAY_IDX (retval, i, svn_revnum_t); + retArray[i] = rev; + } + env->ReleaseLongArrayElements(ret, retArray, 0); + return ret; } @@ -630,13 +707,20 @@ Pool requestPool; apr_pool_t * apr_pool = requestPool.pool (); svn_client_commit_info_t *commit_info = NULL; + const apr_array_header_t *targets2 = targets.array(requestPool); + svn_error_t *Err = targets.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return NULL; + } svn_client_ctx_t *ctx = getContext(message); if(ctx == NULL) { return -1; } - svn_error_t *Err = svn_client_commit (&commit_info, - targets.array (requestPool), + Err = svn_client_commit (&commit_info, + targets2, !recurse, ctx, apr_pool); if(Err != NULL) JNIUtil::handleSVNError(Err); @@ -664,8 +748,20 @@ return; } - Path sourcePath = srcPath; - m_lastPath = svn_path_internal_style (destPath, apr_pool); + Path sourcePath(srcPath); + svn_error_t *Err = sourcePath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } + Path destinationPath(destPath); + Err = destinationPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } svn_client_commit_info_t *commit_info = NULL; svn_client_ctx_t *ctx = getContext(message); @@ -674,10 +770,10 @@ return; } - svn_error_t *Err = svn_client_copy (&commit_info, + Err = svn_client_copy (&commit_info, sourcePath.c_str (), revision.revision(), - m_lastPath.c_str (), + destinationPath.c_str (), ctx, apr_pool); if(Err != NULL) @@ -686,7 +782,7 @@ } void SVNClient::move(const char *srcPath, const char *destPath, - const char *message, Revision &revision, bool force) + const char *message, bool force) { Pool requestPool; apr_pool_t * apr_pool = requestPool.pool (); @@ -702,8 +798,22 @@ return; } svn_client_commit_info_t *commit_info = NULL; - Path sourcePath = srcPath; - m_lastPath = svn_path_internal_style (destPath, apr_pool); + Path sourcePath(srcPath); + svn_error_t *Err = sourcePath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } + + Path destinationPath(destPath); + Err = destinationPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } + svn_client_ctx_t *ctx = getContext(message); if(ctx == NULL) { @@ -711,10 +821,9 @@ } - svn_error_t *Err = svn_client_move (&commit_info, + Err = svn_client_move2 (&commit_info, sourcePath.c_str (), - revision.revision (), - m_lastPath.c_str (), + destinationPath.c_str (), force, ctx, apr_pool); @@ -732,9 +841,16 @@ { return; } + const apr_array_header_t *targets2 = targets.array(requestPool); + svn_error_t *Err = targets.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } - svn_error_t *Err = svn_client_mkdir (&commit_info, - targets.array(requestPool), + Err = svn_client_mkdir (&commit_info, + targets2, ctx, apr_pool); @@ -752,13 +868,20 @@ JNIUtil::throwNullPointerException("path"); return; } - m_lastPath = svn_path_internal_style (path, apr_pool); + Path intPath(path); + svn_error_t *Err = intPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } + svn_client_ctx_t *ctx = getContext(NULL); if(ctx == NULL) { return; } - svn_error_t *Err = svn_client_cleanup (m_lastPath.c_str (), ctx, apr_pool); + Err = svn_client_cleanup (intPath.c_str (), ctx, apr_pool); if(Err != NULL) JNIUtil::handleSVNError(Err); @@ -774,13 +897,19 @@ JNIUtil::throwNullPointerException("path"); return; } - m_lastPath = svn_path_internal_style (path, apr_pool); + Path intPath(path); + svn_error_t *Err = intPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } svn_client_ctx_t *ctx = getContext(NULL); if(ctx == NULL) { return; } - svn_error_t *Err = svn_client_resolved (m_lastPath.c_str (), + Err = svn_client_resolved (intPath.c_str (), recurse, ctx, apr_pool); @@ -791,7 +920,9 @@ } jlong SVNClient::doExport(const char *srcPath, const char *destPath, - Revision &revision,bool force) + Revision &revision, Revision &pegRevision, bool force, + bool ignoreExternals, bool recurse, + const char *nativeEOL) { Pool requestPool; apr_pool_t * apr_pool = requestPool.pool (); @@ -805,19 +936,34 @@ JNIUtil::throwNullPointerException("destPath"); return -1; } - Path sourcePath = srcPath; - m_lastPath = svn_path_internal_style (destPath, apr_pool); + Path sourcePath(srcPath); + svn_error_t *Err = sourcePath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return -1; + } + Path destinationPath(destPath); + Err = destinationPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return -1; + } svn_revnum_t retval; svn_client_ctx_t *ctx = getContext(NULL); if(ctx == NULL) { return -1; } - svn_error_t *Err = svn_client_export (&retval, sourcePath.c_str (), - m_lastPath.c_str (), - const_cast<svn_opt_revision_t*>( - revision.revision ()), + Err = svn_client_export3 (&retval, sourcePath.c_str (), + destinationPath.c_str (), + pegRevision.revision(), + revision.revision (), force, + ignoreExternals, + recurse, + nativeEOL, ctx, apr_pool); if(Err != NULL) @@ -845,15 +991,29 @@ JNIUtil::throwNullPointerException("url"); return -1; } - m_lastPath = svn_path_internal_style (path, apr_pool); + Path intUrl(url); + svn_error_t *Err = intUrl.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return -1; + } + Path intPath(path); + Err = intPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return -1; + } + svn_revnum_t retval; - svn_client_ctx_t *ctx = getContext(NULL); + svn_client_ctx_t *ctx = getContext(NULL); if(ctx == NULL) { return -1; } - svn_error_t *Err = svn_client_switch (&retval, m_lastPath.c_str (), - url, + Err = svn_client_switch (&retval, intPath.c_str (), + intUrl.c_str(), revision.revision (), recurse, ctx, @@ -882,7 +1042,21 @@ JNIUtil::throwNullPointerException("url"); return; } - m_lastPath = svn_path_internal_style (path, apr_pool); + Path intPath(path); + svn_error_t *Err = intPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } + Path intUrl(url); + Err = intUrl.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } + svn_client_commit_info_t *commit_info = NULL; svn_client_ctx_t *ctx = getContext(message); if(ctx == NULL) @@ -890,9 +1064,9 @@ return; } - svn_error_t *Err = svn_client_import (&commit_info, - m_lastPath.c_str (), - url, + Err = svn_client_import (&commit_info, + intPath.c_str (), + intUrl.c_str(), !recurse, ctx, apr_pool); @@ -904,7 +1078,8 @@ void SVNClient::merge(const char *path1, Revision &revision1, const char *path2, Revision &revision2, - const char *localPath, bool force, bool recurse) + const char *localPath, bool force, bool recurse, + bool ignoreAncestry, bool dryRun) { Pool requestPool; if(path1 == NULL) @@ -923,24 +1098,45 @@ return; } apr_pool_t * apr_pool = requestPool.pool (); - m_lastPath = svn_path_internal_style (localPath, apr_pool); - Path srcPath1 = path1; + Path intLocalPath(localPath); + svn_error_t *Err = intLocalPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } + + Path srcPath1(path1); + Err = srcPath1.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } + Path srcPath2 = path2; + Err = srcPath2.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } + svn_client_ctx_t *ctx = getContext(NULL); if(ctx == NULL) { return; } - svn_error_t *Err = svn_client_merge (srcPath1.c_str (), + Err = svn_client_merge (srcPath1.c_str (), revision1.revision (), srcPath2.c_str (), revision2.revision (), - localPath, + intLocalPath.c_str(), recurse, - FALSE, // ignore_ancestry + ignoreAncestry, force, - FALSE, + dryRun, ctx, apr_pool); @@ -948,12 +1144,69 @@ JNIUtil::handleSVNError(Err); } +void SVNClient::merge(const char *path, Revision &pegRevision, + Revision &revision1, Revision &revision2, + const char *localPath, bool force, bool recurse, + bool ignoreAncestry, bool dryRun) +{ + Pool requestPool; + if(path == NULL) + { + JNIUtil::throwNullPointerException("path"); + return; + } + if(localPath == NULL) + { + JNIUtil::throwNullPointerException("localPath"); + return; + } + apr_pool_t * apr_pool = requestPool.pool (); + Path intLocalPath(localPath); + svn_error_t *Err = intLocalPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } + + Path srcPath(path); + Err = srcPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } + + svn_client_ctx_t *ctx = getContext(NULL); + if(ctx == NULL) + { + return; + } + + Err = svn_client_merge_peg (srcPath.c_str (), + revision1.revision (), + revision2.revision (), + pegRevision.revision(), + intLocalPath.c_str(), + recurse, + ignoreAncestry, + force, + dryRun, + ctx, + apr_pool); + + if(Err != NULL) + JNIUtil::handleSVNError(Err); + +} + /** * Get a property */ jobject SVNClient::propertyGet(jobject jthis, const char *path, - const char *name, Revision &revision) + const char *name, Revision &revision, + Revision &pegRevision) { Pool requestPool; if(path == NULL) @@ -967,7 +1220,13 @@ return NULL; } apr_pool_t * apr_pool = requestPool.pool (); - m_lastPath = svn_path_internal_style (path, apr_pool); + Path intPath(path); + svn_error_t *Err = intPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return NULL; + } svn_client_ctx_t *ctx = getContext(NULL); if(ctx == NULL) @@ -976,9 +1235,10 @@ } apr_hash_t *props; - svn_error_t *Err = svn_client_propget(&props, + Err = svn_client_propget2(&props, name, - m_lastPath.c_str(), + intPath.c_str(), + pegRevision.revision(), revision.revision(), FALSE, ctx, @@ -1007,7 +1267,7 @@ } jobjectArray SVNClient::properties(jobject jthis, const char *path, - Revision & revision) + Revision & revision, Revision &pegRevision) { apr_array_header_t * props; Pool requestPool; @@ -1017,7 +1277,13 @@ return NULL; } apr_pool_t * apr_pool = requestPool.pool (); - m_lastPath = svn_path_internal_style (path, apr_pool); + Path intPath(path); + svn_error_t *Err = intPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return NULL; + } svn_client_ctx_t *ctx = getContext(NULL); if(ctx == NULL) @@ -1025,8 +1291,9 @@ return NULL; } - svn_error_t *Err = svn_client_proplist (&props, - m_lastPath.c_str (), + Err = svn_client_proplist2 (&props, + intPath.c_str (), + pegRevision.revision(), revision.revision(), FALSE, ctx, @@ -1093,7 +1360,7 @@ } void SVNClient::propertySet(const char *path, const char *name, - const char *value, bool recurse) + const char *value, bool recurse, bool force) { Pool requestPool; if(path == NULL) @@ -1112,10 +1379,11 @@ return; } svn_string_t *val = svn_string_create(value, requestPool.pool()); - propertySet(path, name, val, recurse); + propertySet(path, name, val, recurse, force); } -void SVNClient::propertySet(const char *path, const char *name, JNIByteArray &value, bool recurse) +void SVNClient::propertySet(const char *path, const char *name, + JNIByteArray &value, bool recurse, bool force) { Pool requestPool; if(path == NULL) @@ -1136,7 +1404,7 @@ svn_string_t *val = svn_string_ncreate((const char *)value.getBytes(), value.getLength(), requestPool.pool()); - propertySet(path, name, val, recurse); + propertySet(path, name, val, recurse, force); } void SVNClient::propertyRemove(const char *path, const char *name, @@ -1153,11 +1421,11 @@ JNIUtil::throwNullPointerException("name"); return; } - propertySet(path, name, (svn_string_t*)NULL, recurse); + propertySet(path, name, (svn_string_t*)NULL, recurse, false); } void SVNClient::propertyCreate(const char *path, const char *name, - const char *value, bool recurse) + const char *value, bool recurse, bool force) { Pool requestPool; if(path == NULL) @@ -1176,11 +1444,11 @@ return; } svn_string_t *val = svn_string_create(value, requestPool.pool()); - propertySet(path, name, val, recurse); + propertySet(path, name, val, recurse, force); } void SVNClient::propertyCreate(const char *path, const char *name, - JNIByteArray &value, bool recurse) + JNIByteArray &value, bool recurse, bool force) { Pool requestPool; if(path == NULL) @@ -1202,13 +1470,14 @@ svn_string_t *val = svn_string_ncreate((const char *)value.getBytes(), value.getLength(), requestPool.pool()); - propertySet(path, name, val, recurse); + propertySet(path, name, val, recurse, force); } void SVNClient::diff(const char *target1, Revision &revision1, const char *target2, Revision &revision2, - const char *outfileName,bool recurse) + const char *outfileName,bool recurse, bool ignoreAncestry, + bool noDiffDelete, bool force) { Pool requestPool; svn_error_t *err = NULL; @@ -1232,6 +1501,21 @@ if(ctx == NULL) return; + Path intTarget1(target1); + svn_error_t *Err = intTarget1.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } + Path intTarget2(target2); + Err = intTarget2.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } + apr_file_t *outfile = NULL; apr_status_t rv; rv = apr_file_open(&outfile, @@ -1249,17 +1533,93 @@ // we don't use any options options = svn_cstring_split ("", " \t\n\r", TRUE, requestPool.pool()); - svn_error_t *Err = svn_client_diff ( + Err = svn_client_diff2 ( options, // options - svn_path_internal_style (target1, - requestPool.pool()), + intTarget1.c_str(), revision1.revision(), - svn_path_internal_style (target2, - requestPool.pool()) , + intTarget2.c_str(), revision2.revision(), recurse ? TRUE : FALSE, - TRUE, // ignore_ancestry - FALSE, // no_diff_deleted + ignoreAncestry ? TRUE : FALSE, + noDiffDelete ? TRUE : FALSE, + force ? TRUE : FALSE, + outfile, + NULL, + // errFile (not needed when using default diff) + ctx, + requestPool.pool()); + + rv = apr_file_close(outfile); + if (rv != APR_SUCCESS) + { + err = svn_error_create(rv, NULL,_("Cannot close file.")); + JNIUtil::handleSVNError(err); + return; + } + + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } +} +void SVNClient::diff(const char *target, Revision &pegRevision, + Revision &startRevision, Revision &endRevision, + const char *outfileName,bool recurse, bool ignoreAncestry, + bool noDiffDelete, bool force) +{ + Pool requestPool; + svn_error_t *err = NULL; + apr_array_header_t *options; + if(target == NULL) + { + JNIUtil::throwNullPointerException("target"); + return; + } + if(outfileName == NULL) + { + JNIUtil::throwNullPointerException("outfileName"); + return; + } + svn_client_ctx_t *ctx = getContext(NULL); + if(ctx == NULL) + return; + + Path intTarget(target); + svn_error_t *Err = intTarget.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } + + apr_file_t *outfile = NULL; + apr_status_t rv; + rv = apr_file_open(&outfile, + svn_path_internal_style (outfileName, + requestPool.pool()), + APR_CREATE|APR_WRITE|APR_TRUNCATE , APR_OS_DEFAULT, + requestPool.pool()); + if (rv != APR_SUCCESS) + { + err = svn_error_create(rv, NULL,_("Cannot open file.")); + JNIUtil::handleSVNError(err); + return; + } + + // we don't use any options + options = svn_cstring_split ("", " \t\n\r", TRUE, requestPool.pool()); + + Err = svn_client_diff_peg2 ( + options, // options + intTarget.c_str(), + pegRevision.revision(), + startRevision.revision(), + endRevision.revision(), + recurse ? TRUE : FALSE, + ignoreAncestry ? TRUE : FALSE, + noDiffDelete ? TRUE : FALSE, + force ? TRUE : FALSE, outfile, NULL, // errFile (not needed when using default diff) @@ -1861,17 +2221,31 @@ } void SVNClient::propertySet(const char *path, const char *name, - svn_string_t *value, bool recurse) + svn_string_t *value, bool recurse, bool force) { - svn_error_t * error = svn_client_propset (name, value, - svn_path_internal_style (path, - JNIUtil::getRequestPool()->pool()), - recurse, JNIUtil::getRequestPool()->pool()); - if(error != NULL) - JNIUtil::handleSVNError(error); + Path intPath(path); + svn_error_t *Err = intPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } + + svn_client_ctx_t *ctx = getContext(NULL); + if(ctx == NULL) + return; + Err = svn_client_propset2 (name, value, + intPath.c_str(), + recurse, + force, + ctx, + JNIUtil::getRequestPool()->pool()); + if(Err!= NULL) + JNIUtil::handleSVNError(Err); } -jbyteArray SVNClient::fileContent(const char *path, Revision &revision) +jbyteArray SVNClient::fileContent(const char *path, Revision &revision, + Revision &pegRevision) { Pool requestPool; if(path == NULL) @@ -1879,7 +2253,13 @@ JNIUtil::throwNullPointerException("path"); return NULL; } - path = svn_path_internal_style (path, requestPool.pool()); + Path intPath(path); + svn_error_t *Err = intPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return NULL; + } svn_stream_t *read_stream = NULL; size_t size = 0; @@ -1889,10 +2269,8 @@ // the server { - const char *ori_path = svn_path_internal_style(path, - requestPool.pool()); const char *base_path; - svn_error_t *err = svn_wc_get_pristine_copy_path (ori_path, + svn_error_t *err = svn_wc_get_pristine_copy_path (intPath.c_str(), &base_path, requestPool.pool()); if(err != NULL) @@ -1924,18 +2302,16 @@ // (not good) { - const char *ori_path = svn_path_internal_style(path, - requestPool.pool()); apr_file_t *file = NULL; apr_finfo_t finfo; - apr_status_t apr_err = apr_stat(&finfo, ori_path, + apr_status_t apr_err = apr_stat(&finfo, intPath.c_str(), APR_FINFO_MIN, requestPool.pool()); if(apr_err) { JNIUtil::handleAPRError(apr_err, _("open file")); return NULL; } - apr_err = apr_file_open(&file, ori_path, APR_READ, 0, + apr_err = apr_file_open(&file, intPath.c_str(), APR_READ, 0, requestPool.pool()); if(apr_err) { @@ -1954,8 +2330,9 @@ } svn_stringbuf_t *buf = svn_stringbuf_create("", requestPool.pool()); read_stream = svn_stream_from_stringbuf(buf, requestPool.pool()); - svn_error_t *err = svn_client_cat (read_stream, - path, revision.revision(), ctx, requestPool.pool()); + svn_error_t *err = svn_client_cat2 (read_stream, + intPath.c_str(), pegRevision.revision(), revision.revision(), + ctx, requestPool.pool()); if(err != NULL) { JNIUtil::handleSVNError(err); @@ -2077,7 +2454,13 @@ return NULL; } apr_pool_t * apr_pool = requestPool.pool (); - m_lastPath = svn_path_internal_style (path, apr_pool); + Path intPath(path); + svn_error_t *Err = intPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return NULL; + } svn_client_ctx_t *ctx = getContext(NULL); if(ctx == NULL) @@ -2087,11 +2470,11 @@ const char *URL; svn_string_t *propval; svn_revnum_t set_rev; - svn_error_t * error = svn_client_url_from_path (&URL, path, apr_pool); + Err = svn_client_url_from_path (&URL, intPath.c_str(), apr_pool); - if(error != SVN_NO_ERROR) + if(Err != SVN_NO_ERROR) { - JNIUtil::handleSVNError(error); + JNIUtil::handleSVNError(Err); return NULL; } @@ -2103,12 +2486,12 @@ return NULL; } - error = svn_client_revprop_get (name, &propval, + Err = svn_client_revprop_get (name, &propval, URL, rev.revision(), &set_rev, ctx, apr_pool); - if(error != SVN_NO_ERROR) + if(Err != SVN_NO_ERROR) { - JNIUtil::handleSVNError(error); + JNIUtil::handleSVNError(Err); return NULL; } if(propval == NULL) @@ -2136,7 +2519,30 @@ JNIUtil::throwNullPointerException("to"); return; } - m_lastPath = svn_path_internal_style (path, apr_pool); + Path intPath(path); + svn_error_t *Err = intPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } + + Path intFrom(from); + Err = intFrom.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } + + Path intTo(to); + Err = intTo.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } + svn_client_ctx_t *ctx = getContext(NULL); if(ctx == NULL) @@ -2145,12 +2551,12 @@ } - svn_error_t * error = svn_client_relocate (path != NULL? path:"", from, to, + Err = svn_client_relocate (intPath.c_str(), intFrom.c_str(), intTo.c_str(), recurse, ctx, apr_pool); - if(error != SVN_NO_ERROR) + if(Err != SVN_NO_ERROR) { - JNIUtil::handleSVNError(error); + JNIUtil::handleSVNError(Err); return; } } @@ -2181,7 +2587,13 @@ return NULL; } apr_pool_t * apr_pool = requestPool.pool (); - m_lastPath = svn_path_internal_style (path, apr_pool); + Path intPath(path); + svn_error_t *Err = intPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return NULL; + } svn_client_ctx_t *ctx = getContext(NULL); if(ctx == NULL) @@ -2190,16 +2602,16 @@ } svn_stringbuf_t *buf = svn_stringbuf_create("", apr_pool); svn_stream_t *read_stream = svn_stream_from_stringbuf(buf, apr_pool); - svn_error_t * error = svn_client_blame (path, + Err = svn_client_blame (intPath.c_str(), revisionStart.revision(), revisionEnd.revision(), blame_receiver, read_stream, ctx, apr_pool); - if(error != SVN_NO_ERROR) + if(Err != SVN_NO_ERROR) { - JNIUtil::handleSVNError(error); + JNIUtil::handleSVNError(Err); return NULL; } size_t size = buf->len; @@ -2215,13 +2627,13 @@ { return NULL; } - svn_error_t *err = svn_stream_read (read_stream, (char *)retdata, + Err = svn_stream_read (read_stream, (char *)retdata, &size); - if(err != NULL) + if(Err != NULL) { env->ReleaseByteArrayElements(ret, retdata, 0); - JNIUtil::handleSVNError(err); + JNIUtil::handleSVNError(Err); return NULL; } env->ReleaseByteArrayElements(ret, retdata, 0); @@ -2244,7 +2656,8 @@ ((BlameCallback *)baton)->callback(revision, author, date, line, pool); return NULL; } -void SVNClient::blame(const char *path, Revision &revisionStart, +void SVNClient::blame(const char *path, Revision &pegRevision, + Revision &revisionStart, Revision &revisionEnd, BlameCallback *callback) { Pool requestPool; @@ -2254,23 +2667,30 @@ return; } apr_pool_t * apr_pool = requestPool.pool (); - m_lastPath = svn_path_internal_style (path, apr_pool); + Path intPath(path); + svn_error_t *Err = intPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } svn_client_ctx_t *ctx = getContext(NULL); if(ctx == NULL) { return; } - svn_error_t * error = svn_client_blame (path, + svn_error_t * error = svn_client_blame2 (intPath.c_str(), + pegRevision.revision(), revisionStart.revision(), revisionEnd.revision(), blame_receiver2, callback, ctx, apr_pool); - if(error != SVN_NO_ERROR) + if(Err != SVN_NO_ERROR) { - JNIUtil::handleSVNError(error); + JNIUtil::handleSVNError(Err); return; } } @@ -2320,19 +2740,25 @@ return NULL; } apr_pool_t * apr_pool = requestPool.pool (); - const char *intpath = svn_path_internal_style (path, apr_pool); + Path intPath(path); + svn_error_t *Err = intPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return NULL; + } - svn_error_t *err = svn_wc_adm_probe_open2(&adm_access, NULL, intpath, + Err = svn_wc_adm_probe_open2(&adm_access, NULL, intPath.c_str(), FALSE, 0, apr_pool); - if(err != NULL) + if(Err != NULL) { - JNIUtil::handleSVNError(err); + JNIUtil::handleSVNError(Err); return NULL; } - err = svn_wc_entry(&entry, intpath, adm_access, FALSE, apr_pool); - if(err != NULL) + Err = svn_wc_entry(&entry, intPath.c_str(), adm_access, FALSE, apr_pool); + if(Err != NULL) { - JNIUtil::handleSVNError(err); + JNIUtil::handleSVNError(Err); return NULL; } return createJavaInfo(entry); @@ -2546,7 +2972,13 @@ return ; } apr_pool_t * apr_pool = requestPool.pool (); - m_lastPath = svn_path_internal_style (path, apr_pool); + Path intPath(path); + svn_error_t *Err = intPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return; + } svn_client_ctx_t *ctx = getContext(NULL); if(ctx == NULL) @@ -2554,11 +2986,11 @@ return ; } const char *URL; - svn_error_t * error = svn_client_url_from_path (&URL, path, apr_pool); + Err = svn_client_url_from_path (&URL, intPath.c_str(), apr_pool); - if(error != SVN_NO_ERROR) + if(Err != SVN_NO_ERROR) { - JNIUtil::handleSVNError(error); + JNIUtil::handleSVNError(Err); return ; } @@ -2573,11 +3005,11 @@ svn_string_t *val = svn_string_create(value, apr_pool); svn_revnum_t set_revision; - error = svn_client_revprop_set (name, val, URL, rev.revision(), + Err = svn_client_revprop_set (name, val, URL, rev.revision(), &set_revision, force, ctx, apr_pool); - if(error != SVN_NO_ERROR) + if(Err != SVN_NO_ERROR) { - JNIUtil::handleSVNError(error); + JNIUtil::handleSVNError(Err); return ; } @@ -2685,23 +3117,30 @@ sb.done = FALSE; sb.pool = requestPool.pool(); - path = svn_path_internal_style (path, requestPool.pool()); + Path intPath(path); + svn_error_t *Err = intPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return NULL; + } + int wc_format; svn_client_ctx_t ctx = { 0 }; - svn_error_t *error = svn_wc_check_wc (path, &wc_format, requestPool.pool()); - if(error != NULL) + Err = svn_wc_check_wc (intPath.c_str(), &wc_format, requestPool.pool()); + if(Err != NULL) { - JNIUtil::handleSVNError(error); + JNIUtil::handleSVNError(Err); return NULL; } if (! wc_format) { svn_node_kind_t kind; - error = svn_io_check_path (path, &kind, requestPool.pool()); - if(error != NULL) + Err = svn_io_check_path (intPath.c_str(), &kind, requestPool.pool()); + if(Err != NULL) { - JNIUtil::handleSVNError(error); + JNIUtil::handleSVNError(Err); return NULL; } if (kind == svn_node_dir) @@ -2729,14 +3168,14 @@ ctx.cancel_func = cancel; ctx.cancel_baton = &sb; - error = svn_client_status (NULL, path, &rev, analyze_status, + Err = svn_client_status (NULL, intPath.c_str(), &rev, analyze_status, &sb, TRUE, TRUE, FALSE, FALSE, &ctx, requestPool.pool()); - if (error && (error->apr_err == SVN_ERR_CANCELLED)) - svn_error_clear (error); - else if(error != NULL) + if (Err&& (Err->apr_err == SVN_ERR_CANCELLED)) + svn_error_clear (Err); + else if(Err != NULL) { - JNIUtil::handleSVNError(error); + JNIUtil::handleSVNError(Err); return NULL; } @@ -2784,10 +3223,17 @@ return NULL; } apr_pool_t * apr_pool = requestPool.pool (); - path = svn_path_internal_style (path, apr_pool); + Path intPath(path); + svn_error_t *Err = intPath.error_occured(); + if(Err != NULL) + { + JNIUtil::handleSVNError(Err); + return NULL; + } + const char *URL; svn_revnum_t set_rev; - svn_error_t * error = svn_client_url_from_path (&URL, path, apr_pool); + Err = svn_client_url_from_path (&URL, intPath.c_str(), apr_pool); svn_client_ctx_t *ctx = getContext(NULL); if(ctx == NULL) @@ -2795,7 +3241,7 @@ return NULL; } - svn_error_t *Err = svn_client_revprop_list (&props, + Err = svn_client_revprop_list (&props, URL, revision.revision(), &set_rev, Modified: branches/ruby/subversion/bindings/java/javahl/native/SVNClient.h Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/bindings/java/javahl/native/SVNClient.h?view=diff&rev=13186&p1=branches/ruby/subversion/bindings/java/javahl/native/SVNClient.h&r1=13185&p2=branches/ruby/subversion/bindings/java/javahl/native/SVNClient.h&r2=13186 ============================================================================== --- branches/ruby/subversion/bindings/java/javahl/native/SVNClient.h (original) +++ branches/ruby/subversion/bindings/java/javahl/native/SVNClient.h Sun Feb 27 19:19:25 2005 @@ -49,57 +49,67 @@ void setConfigDirectory(const char *configDir); jbyteArray blame(const char *path, Revision& revisionStart, Revision &revisionEnd); - void blame(const char *path, Revision &revisionStart, + void blame(const char *path, Revision &pegRevision, + Revision &revisionStart, Revision &revisionEnd, BlameCallback *callback); void relocate(const char *from, const char *to, const char *path, bool recurse); - jbyteArray fileContent(const char *path, Revision &revision); + jbyteArray fileContent(const char *path, Revision &revision, + Revision &pegRevision); void propertyCreate(const char *path, const char *name, - JNIByteArray &value, bool recurse); + JNIByteArray &value, bool recurse, bool force); void propertyCreate(const char *path, const char *name, - const char *value, bool recurse); + const char *value, bool recurse, bool force); void propertyRemove(const char *path, const char *name, bool recurse); void propertySet(const char *path, const char *name, - JNIByteArray &value, bool recurse); + JNIByteArray &value, bool recurse, bool force); void propertySet(const char *path, const char *name, const char *value, - bool recurse); + bool recurse, bool force); jobjectArray properties(jobject jthis, const char *path, - Revision &revision); + Revision &revision, Revision &pegRevision); void merge(const char *path1, Revision &revision1, const char *path2, Revision &revision2, const char *localPath, bool force, - bool recurse); + bool recurse, bool ignoreAncestry, bool dryRun); + void merge(const char *path, Revision &pegRevision, Revision &revision1, + Revision &revision2, const char *localPath, bool force, + bool recurse, bool ignoreAncestry, bool dryRun); void doImport(const char *path, const char *url, const char *message, bool recurse); jlong doSwitch(const char *path, const char *url, Revision &revision, bool recurse); jlong doExport(const char *srcPath, const char *destPath, - Revision &revision, bool force); + Revision &revision, Revision &pegRevision, bool force, + bool ignoreExternals, bool recurse, + const char *nativeEOL); void resolved(const char *path, bool recurse); void cleanup(const char *path); void mkdir(Targets &targets, const char *message); void move(const char *srcPath, const char *destPath, - const char *message, Revision &revision, bool force); + const char *message, bool force); void copy(const char *srcPath, const char *destPath, const char *message, Revision &revision); jlong commit(Targets &targets, const char *message, bool recurse); - jlong update(const char *path, Revision &revision, bool recurse); - void add(const char *path, bool recurse); + jlongArray update(Targets &targets, Revision &revision, bool recurse, + bool ignoreExternals); + void add(const char *path, bool recurse, bool force); void revert(const char *path, bool recurse); void remove(Targets &targets, const char *message,bool force); void notification(Notify *notify); jlong checkout(const char *moduleName, const char *destPath, - Revision &revision, bool recurse); + Revision &revision, Revision &pegRevsion, bool recurse, + bool ignoreExternals); jobjectArray logMessages(const char *path, Revision &revisionStart, Revision &revisionEnd, bool stopOnCopy, - bool discoverPaths); + bool discoverPaths, long limit); void setPrompt(Prompter *prompter); void password(const char *pi_password); void username(const char *pi_username); jobject info(const char *path); jobject singleStatus(const char *path, bool onServer); jobjectArray status(const char *path, bool descend, bool onServer, - bool getAll, bool noIgnore); - jobjectArray list(const char *url, Revision &revision, bool recurse); + bool getAll, bool noIgnore, bool ignoreExternals); + jobjectArray list(const char *url, Revision &revision, + Revision &pegRevision, bool recurse); jobject revProperty(jobject jthis, const char *path, const char *name, Revision &rev); void setRevProperty(jobject jthis, const char *path, const char *name, @@ -107,10 +117,15 @@ jstring getVersionInfo(const char *path, const char *trailUrl, bool lastChanged); jobject propertyGet(jobject jthis, const char *path, const char *name, - Revision &revision); + Revision &revision, Revision &pegRevision); void diff(const char *target1, Revision &revision1, const char *target2, Revision &revision2, - const char *outfileName,bool recurse); + const char *outfileName,bool recurse, bool ignoreAncestry, + bool noDiffDelete, bool force); + void diff(const char *target, Revision &pegevision, + Revision &startRevision, Revision &endRevision, + const char *outfileName,bool recurse, bool ignoreAncestry, + bool noDiffDelete, bool force); const char * getLastPath(); void finalize(); @@ -122,7 +137,7 @@ private: static svn_error_t * checkCancel(void *cancelBaton); void propertySet(const char *path, const char *name, - svn_string_t *value, bool recurse); + svn_string_t *value, bool recurse, bool force); jobject createJavaProperty(jobject jthis, const char *path, const char *name, svn_string_t *value); jobject createJavaDirEntry(const char *path, svn_dirent_t *dirent); Modified: branches/ruby/subversion/bindings/java/javahl/native/Targets.cpp Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/bindings/java/javahl/native/Targets.cpp?view=diff&rev=13186&p1=branches/ruby/subversion/bindings/java/javahl/native/Targets.cpp&r1=13185&p2=branches/ruby/subversion/bindings/java/javahl/native/Targets.cpp&r2=13186 ============================================================================== --- branches/ruby/subversion/bindings/java/javahl/native/Targets.cpp (original) +++ branches/ruby/subversion/bindings/java/javahl/native/Targets.cpp Sun Feb 27 19:19:25 2005 @@ -42,6 +42,7 @@ { m_targetArray = NULL; m_targets.push_back (path); + m_error_occured = NULL; } void Targets::add(const char *path) { @@ -76,7 +77,14 @@ { return NULL; } - const char *tt = svn_path_internal_style (text, pool.pool()); + //const char *tt = svn_path_internal_style (text, pool.pool()); + const char *tt = (const char *)text; + svn_error_t *err = JNIUtil::preprocessPath(tt, pool.pool()); + if(err != NULL) + { + m_error_occured = err; + break; + } m_targets.push_back(tt); } if(JNIUtil::isJavaExceptionThrown()) @@ -112,4 +120,10 @@ Targets::Targets(jobjectArray jtargets) { m_targetArray = jtargets; + m_error_occured = NULL; } + +svn_error_t *Targets::error_occured() +{ + return m_error_occured; +} \ No newline at end of file Modified: branches/ruby/subversion/bindings/java/javahl/native/Targets.h Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/bindings/java/javahl/native/Targets.h?view=diff&rev=13186&p1=branches/ruby/subversion/bindings/java/javahl/native/Targets.h&r1=13185&p2=branches/ruby/subversion/bindings/java/javahl/native/Targets.h&r2=13186 ============================================================================== --- branches/ruby/subversion/bindings/java/javahl/native/Targets.h (original) +++ branches/ruby/subversion/bindings/java/javahl/native/Targets.h Sun Feb 27 19:19:25 2005 @@ -27,6 +27,7 @@ #endif // _MSC_VER > 1000 #include <jni.h> struct apr_array_header_t; +struct svn_error_t; class Pool; #include "Path.h" #include <vector> @@ -36,14 +37,14 @@ private: std::vector<Path> m_targets; jobjectArray m_targetArray; - + svn_error_t *m_error_occured; public: Targets(jobjectArray jtargets); Targets(const char *path); void add(const char *path); ~Targets(); const apr_array_header_t *array (const Pool & pool); - + svn_error_t *error_occured(); }; // !defined(AFX_TARGETS_H__61202731_41A4_43FF_97C4_7E26DC255BF1__INCLUDED_) #endif Modified: branches/ruby/subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp?view=diff&rev=13186&p1=branches/ruby/subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp&r1=13185&p2=branches/ruby/subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp&r2=13186 ============================================================================== --- branches/ruby/subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp (original) +++ branches/ruby/subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp Sun Feb 27 19:19:25 2005 @@ -105,12 +105,13 @@ /* * Class: org_tigris_subversion_javahl_SVNClient * Method: list - * Signature: (Ljava/lang/String;Lorg/tigris/subversion/javahl/Revision;Z) + * Signature: (Ljava/lang/String;Lorg/tigris/subversion/javahl/Revision; + * Lorg/tigris/subversion/javahl/Revision;Z) * [Lorg/tigris/subversion/javahl/DirEntry; */ JNIEXPORT jobjectArray JNICALL Java_org_tigris_subversion_javahl_SVNClient_list (JNIEnv* env, jobject jthis, jstring jurl, jobject jrevision, - jboolean jrecurse) + jobject jpegRevision, jboolean jrecurse) { JNIEntry(SVNClient, list); SVNClient *cl = SVNClient::getCppObject(jthis); @@ -128,16 +129,22 @@ { return NULL; } - return cl->list(url, revision, jrecurse ? true:false); + Revision pegRevision(jpegRevision); + if(JNIUtil::isExceptionThrown()) + { + return NULL; + } + return cl->list(url, revision, pegRevision, jrecurse ? true:false); } /* * Class: org_tigris_subversion_javahl_SVNClient * Method: status - * Signature: (Ljava/lang/String;ZZZZ)[Lorg/tigris/subversion/javahl/Status; + * Signature: (Ljava/lang/String;ZZZZZ)[Lorg/tigris/subversion/javahl/Status; */ JNIEXPORT jobjectArray JNICALL Java_org_tigris_subversion_javahl_SVNClient_status (JNIEnv* env, jobject jthis, jstring jpath, jboolean jrecurse, - jboolean jonServer, jboolean jgetAll, jboolean jnoIgnore) + jboolean jonServer, jboolean jgetAll, jboolean jnoIgnore, + jboolean jignoreExternals) { JNIEntry(SVNClient, status); SVNClient *cl = SVNClient::getCppObject(jthis); @@ -151,7 +158,8 @@ return NULL; } return cl->status(path, jrecurse ? true: false, jonServer ? true:false, - jgetAll ? true:false, jnoIgnore ? true:false); + jgetAll ? true:false, jnoIgnore ? true:false, + jignoreExternals ? true:false); } /* @@ -249,12 +257,13 @@ * Class: org_tigris_subversion_javahl_SVNClient * Method: logMessages * Signature: (Ljava/lang/String;Lorg/tigris/subversion/javahl/Revision; - * Lorg/tigris/subversion/javahl/Revision;ZZ) + * Lorg/tigris/subversion/javahl/Revision;ZZJ) * [Lorg/tigris/subversion/javahl/LogMessage; */ JNIEXPORT jobjectArray JNICALL Java_org_tigris_subversion_javahl_SVNClient_logMessages (JNIEnv* env, jobject jthis, jstring jpath, jobject jrevisionStart, - jobject jrevisionEnd, jboolean jstopOnCopy, jboolean jdisoverPaths) + jobject jrevisionEnd, jboolean jstopOnCopy, jboolean jdisoverPaths, + jlong jlimit) { JNIEntry(SVNClient, logMessages); SVNClient *cl = SVNClient::getCppObject(jthis); @@ -279,18 +288,20 @@ return NULL; } return cl->logMessages(path, revisionStart, revisionEnd, - jstopOnCopy ? true: false, jdisoverPaths ? true : false); + jstopOnCopy ? true: false, jdisoverPaths ? true : false, jlimit); } /* * Class: org_tigris_subversion_javahl_SVNClient * Method: checkout * Signature: (Ljava/lang/String;Ljava/lang/String; - * Lorg/tigris/subversion/javahl/Revision;Z)J + * Lorg/tigris/subversion/javahl/Revision; + * Lorg/tigris/subversion/javahl/Revision;ZZ)J */ JNIEXPORT jlong JNICALL Java_org_tigris_subversion_javahl_SVNClient_checkout (JNIEnv* env, jobject jthis, jstring jmoduleName, jstring jdestPath, - jobject jrevision, jboolean jrecurse) + jobject jrevision, jobject jpegRevision, jboolean jrecurse, + jboolean jignoreExternals) { JNIEntry(SVNClient, checkout); SVNClient *cl = SVNClient::getCppObject(jthis); @@ -304,6 +315,11 @@ { return -1; } + Revision pegRevision(jpegRevision, true); + if(JNIUtil::isExceptionThrown()) + { + return -1; + } JNIStringHolder moduleName(jmoduleName); if(JNIUtil::isExceptionThrown()) { @@ -314,7 +330,8 @@ { return -1; } - return cl->checkout(moduleName, destPath, revision, jrecurse ? true:false); + return cl->checkout(moduleName, destPath, revision, pegRevision, + jrecurse ? true : false, jignoreExternals ? true : false); } /* @@ -413,10 +430,11 @@ /* * Class: org_tigris_subversion_javahl_SVNClient * Method: add - * Signature: (Ljava/lang/String;Z)V + * Signature: (Ljava/lang/String;ZZ)V */ JNIEXPORT void JNICALL Java_org_tigris_subversion_javahl_SVNClient_add - (JNIEnv* env, jobject jthis, jstring jpath, jboolean jrecurse) + (JNIEnv* env, jobject jthis, jstring jpath, jboolean jrecurse, + jboolean jforce) { JNIEntry(SVNClient, add); SVNClient *cl = SVNClient::getCppObject(jthis); @@ -430,36 +448,37 @@ { return; } - cl->add(path, jrecurse ? true : false); + cl->add(path, jrecurse ? true : false, jforce ? true : false); } /* * Class: org_tigris_subversion_javahl_SVNClient * Method: update - * Signature: (Ljava/lang/String;Lorg/tigris/subversion/javahl/Revision;Z)J + * Signature: ([Ljava/lang/String;Lorg/tigris/subversion/javahl/Revision;ZZ)[J */ -JNIEXPORT jlong JNICALL Java_org_tigris_subversion_javahl_SVNClient_update - (JNIEnv* env, jobject jthis, jstring jpath, jobject jrevision, - jboolean jrecurse) +JNIEXPORT jlongArray JNICALL Java_org_tigris_subversion_javahl_SVNClient_update + (JNIEnv* env, jobject jthis, jobjectArray jpath, jobject jrevision, + jboolean jrecurse, jboolean jignoreExternals) { JNIEntry(SVNClient, update); SVNClient *cl = SVNClient::getCppObject(jthis); if(cl == NULL) { JNIUtil::throwError(_("bad c++ this")); - return -1; + return NULL; } Revision revision(jrevision); if(JNIUtil::isExceptionThrown()) { - return -1; + return NULL; } - JNIStringHolder path(jpath); + Targets targets(jpath); if(JNIUtil::isExceptionThrown()) { - return -1; + return NULL; } - return cl->update(path, revision, jrecurse ? true:false); + return cl->update(targets, revision, jrecurse ? true : false, + jignoreExternals ? true : false); } /* @@ -530,12 +549,11 @@ /* * Class: org_tigris_subversion_javahl_SVNClient * Method: move - * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String; - * Lorg/tigris/subversion/javahl/Revision;Z)V + * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V */ JNIEXPORT void JNICALL Java_org_tigris_subversion_javahl_SVNClient_move (JNIEnv *env, jobject jthis, jstring jsrcPath, jstring jdestPath, - jstring jmessage, jobject jrevision, jboolean jforce) + jstring jmessage, jboolean jforce) { JNIEntry(SVNClient, move); SVNClient *cl = SVNClient::getCppObject(jthis); @@ -544,11 +562,6 @@ JNIUtil::throwError(_("bad c++ this")); return; } - Revision revision(jrevision); - if(JNIUtil::isExceptionThrown()) - { - return; - } JNIStringHolder srcPath(jsrcPath); if(JNIUtil::isExceptionThrown()) { @@ -564,7 +577,7 @@ { return; } - cl->move(srcPath, destPath, message, revision, jforce ? true:false); + cl->move(srcPath, destPath, message, jforce ? true:false); } /* @@ -641,11 +654,13 @@ * Class: org_tigris_subversion_javahl_SVNClient * Method: doExport * Signature: (Ljava/lang/String;Ljava/lang/String; - * Lorg/tigris/subversion/javahl/Revision;)J + * Lorg/tigris/subversion/javahl/Revision; + * Lorg/tigris/subversion/javahl/Revision;ZZZLjava/lang/String;)J */ JNIEXPORT jlong JNICALL Java_org_tigris_subversion_javahl_SVNClient_doExport (JNIEnv* env, jobject jthis, jstring jsrcPath, jstring jdestPath, - jobject jrevision,jboolean jforce) + jobject jrevision, jobject jpegRevision, jboolean jforce, + jboolean jignoreExternals, jboolean jrecurse, jstring jnativeEOL) { JNIEntry(SVNClient, doExport); SVNClient *cl = SVNClient::getCppObject(jthis); @@ -659,6 +674,11 @@ { return -1; } + Revision pegRevision(jpegRevision); + if(JNIUtil::isExceptionThrown()) + { + return -1; + } JNIStringHolder srcPath(jsrcPath); if(JNIUtil::isExceptionThrown()) { @@ -669,7 +689,14 @@ { return -1; } - return cl->doExport(srcPath, destPath, revision, jforce ? true : false); + JNIStringHolder nativeEOL(jnativeEOL); + if(JNIUtil::isExceptionThrown()) + { + return -1; + } + return cl->doExport(srcPath, destPath, revision, pegRevision, + jforce ? true : false, jignoreExternals ? true : false, + jrecurse ? true: false, nativeEOL); } /* @@ -747,12 +774,12 @@ * Method: merge * Signature: (Ljava/lang/String;Lorg/tigris/subversion/javahl/Revision; * Ljava/lang/String;Lorg/tigris/subversion/javahl/Revision; - * Ljava/lang/String;ZZ)V + * Ljava/lang/String;ZZZZ)V */ -JNIEXPORT void JNICALL Java_org_tigris_subversion_javahl_SVNClient_merge +JNIEXPORT void JNICALL Java_org_tigris_subversion_javahl_SVNClient_merge__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2ZZZZ (JNIEnv* env, jobject jthis, jstring jpath1, jobject jrevision1, jstring jpath2, jobject jrevision2, jstring jlocalPath, jboolean jforce, - jboolean jrecurse) + jboolean jrecurse, jboolean jignoreAncestry, jboolean jdryRun) { JNIEntry(SVNClient, merge); SVNClient *cl = SVNClient::getCppObject(jthis); @@ -787,17 +814,68 @@ return; } cl->merge(path1, revision1, path2, revision2, localPath, - jforce ? true:false, jrecurse ? true:false); + jforce ? true:false, jrecurse ? true:false, + jignoreAncestry ? true:false, jdryRun ? true:false); +} +/* + * Class: org_tigris_subversion_javahl_SVNClient + * Method: merge + * Signature: (Ljava/lang/String;Lorg/tigris/subversion/javahl/Revision; + * Lorg/tigris/subversion/javahl/Revision; + * Lorg/tigris/subversion/javahl/Revision;Ljava/lang/String;ZZZZ)V + */ +JNIEXPORT void JNICALL Java_org_tigris_subversion_javahl_SVNClient_merge__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Lorg_tigris_subversion_javahl_Revision_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2ZZZZ + (JNIEnv* env, jobject jthis, jstring jpath, jobject jpegRevision, + jobject jrevision1, jobject jrevision2, jstring jlocalPath, jboolean jforce, + jboolean jrecurse, jboolean jignoreAncestry, jboolean jdryRun) +{ + JNIEntry(SVNClient, merge); + SVNClient *cl = SVNClient::getCppObject(jthis); + if(cl == NULL) + { + JNIUtil::throwError(_("bad c++ this")); + return; + } + Revision revision1(jrevision1); + if(JNIUtil::isExceptionThrown()) + { + return; + } + JNIStringHolder path(jpath); + if(JNIUtil::isExceptionThrown()) + { + return; + } + Revision revision2(jrevision2); + if(JNIUtil::isExceptionThrown()) + { + return; + } + Revision pegRevision(jpegRevision); + if(JNIUtil::isExceptionThrown()) + { + return; + } + JNIStringHolder localPath(jlocalPath); + if(JNIUtil::isExceptionThrown()) + { + return; + } + cl->merge(path, pegRevision, revision1, revision2, localPath, + jforce ? true:false, jrecurse ? true:false, + jignoreAncestry ? true:false, jdryRun ? true:false); } /* * Class: org_tigris_subversion_javahl_SVNClient * Method: properties - * Signature: (Ljava/lang/String;Lorg/tigris/subversion/javahl/Revision;) + * Signature: (Ljava/lang/String;Lorg/tigris/subversion/javahl/Revision; + * Lorg/tigris/subversion/javahl/Revision;) * [Lorg/tigris/subversion/javahl/PropertyData; */ JNIEXPORT jobjectArray JNICALL Java_org_tigris_subversion_javahl_SVNClient_properties - (JNIEnv* env, jobject jthis, jstring jpath, jobject jrevision) + (JNIEnv* env, jobject jthis, jstring jpath, jobject jrevision, + jobject jpegRevision) { JNIEntry(SVNClient, properties); SVNClient *cl = SVNClient::getCppObject(jthis); @@ -816,17 +894,22 @@ { return NULL; } - return cl->properties(jthis, path, revision); + Revision pegRevision(jpegRevision); + if(JNIUtil::isExceptionThrown()) + { + return NULL; + } + return cl->properties(jthis, path, revision, pegRevision); } /* * Class: org_tigris_subversion_javahl_SVNClient * Method: propertySet - * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V + * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZ)V */ -JNIEXPORT void JNICALL Java_org_tigris_subversion_javahl_SVNClient_propertySet__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Z +JNIEXPORT void JNICALL Java_org_tigris_subversion_javahl_SVNClient_propertySet__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2ZZ (JNIEnv* env, jobject jthis, jstring jpath, jstring jname, jstring jvalue, - jboolean jrecurse) + jboolean jrecurse, jboolean jforce) { JNIEntry(SVNClient, propertySet); SVNClient *cl = SVNClient::getCppObject(jthis); @@ -850,17 +933,18 @@ { return; } - cl->propertySet(path, name, value, jrecurse ? true:false); + cl->propertySet(path, name, value, jrecurse ? true:false, + jforce ? true:false); } /* * Class: org_tigris_subversion_javahl_SVNClient * Method: propertySet - * Signature: (Ljava/lang/String;Ljava/lang/String;[BZ)V + * Signature: (Ljava/lang/String;Ljava/lang/String;[BZZ)V */ -JNIEXPORT void JNICALL Java_org_tigris_subversion_javahl_SVNClient_propertySet__Ljava_lang_String_2Ljava_lang_String_2_3BZ +JNIEXPORT void JNICALL Java_org_tigris_subversion_javahl_SVNClient_propertySet__Ljava_lang_String_2Ljava_lang_String_2_3BZZ (JNIEnv* env, jobject jthis, jstring jpath, jstring jname, - jbyteArray jvalue, jboolean jrecurse) + jbyteArray jvalue, jboolean jrecurse, jboolean jforce ) { JNIEntry(SVNClient, propertySet); SVNClient *cl = SVNClient::getCppObject(jthis); @@ -884,7 +968,8 @@ { return; } - cl->propertySet(path, name, value, jrecurse ? true:false); + cl->propertySet(path, name, value, jrecurse ? true:false, + jforce ? true:false); } /* @@ -918,11 +1003,11 @@ /* * Class: org_tigris_subversion_javahl_SVNClient * Method: propertyCreate - * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V + * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZ)V */ -JNIEXPORT void JNICALL Java_org_tigris_subversion_javahl_SVNClient_propertyCreate__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Z +JNIEXPORT void JNICALL Java_org_tigris_subversion_javahl_SVNClient_propertyCreate__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2ZZ (JNIEnv* env, jobject jthis, jstring jpath, jstring jname, jstring jvalue, - jboolean jrecurse) + jboolean jrecurse, jboolean jforce) { JNIEntry(SVNClient, propertyCreate); SVNClient *cl = SVNClient::getCppObject(jthis); @@ -946,18 +1031,19 @@ { return; } - cl->propertyCreate(path, name, value, jrecurse ? true:false); + cl->propertyCreate(path, name, value, jrecurse ? true:false, + jforce ? true:false); } /* * Class: org_tigris_subversion_javahl_SVNClient * Method: propertyCreate - * Signature: (Ljava/lang/String;Ljava/lang/String;[BZ)V + * Signature: (Ljava/lang/String;Ljava/lang/String;[BZZ)V */ -JNIEXPORT void JNICALL Java_org_tigris_subversion_javahl_SVNClient_propertyCreate__Ljava_lang_String_2Ljava_lang_String_2_3BZ +JNIEXPORT void JNICALL Java_org_tigris_subversion_javahl_SVNClient_propertyCreate__Ljava_lang_String_2Ljava_lang_String_2_3BZZ (JNIEnv* env, jobject jthis, jstring jpath, jstring jname, jbyteArray jvalue, - jboolean jrecurse) + jboolean jrecurse, jboolean jforce) { JNIEntry(SVNClient, propertyCreate); SVNClient *cl = SVNClient::getCppObject(jthis); @@ -981,7 +1067,8 @@ { return; } - cl->propertyCreate(path, name, value, jrecurse ? true:false); + cl->propertyCreate(path, name, value, jrecurse ? true:false, + jforce ? true:false); } /* * Class: org_tigris_subversion_javahl_SVNClient @@ -1089,11 +1176,13 @@ * Class: org_tigris_subversion_javahl_SVNClient * Method: propertyGet * Signature: (Ljava/lang/String;Ljava/lang/String; + * Lorg/tigris/subversion/javahl/Revision; * Lorg/tigris/subversion/javahl/Revision;) * Lorg/tigris/subversion/javahl/PropertyData; */ JNIEXPORT jobject JNICALL Java_org_tigris_subversion_javahl_SVNClient_propertyGet - (JNIEnv *env, jobject jthis, jstring jpath, jstring jname, jobject jrevision) + (JNIEnv *env, jobject jthis, jstring jpath, jstring jname, jobject jrevision, + jobject jpegRevision) { JNIEntry(SVNClient, propertyGet); SVNClient *cl = SVNClient::getCppObject(jthis); @@ -1117,21 +1206,27 @@ { return NULL; } - return cl->propertyGet(jthis, path, name, revision); + Revision pegRevision(jpegRevision); + if(JNIUtil::isExceptionThrown()) + { + return NULL; + } + return cl->propertyGet(jthis, path, name, revision, pegRevision); } - /* +/* * Class: org_tigris_subversion_javahl_SVNClient * Method: diff * Signature: (Ljava/lang/String;Lorg/tigris/subversion/javahl/Revision; * Ljava/lang/String;Lorg/tigris/subversion/javahl/Revision; - * Ljava/lang/String;Z)V + * Ljava/lang/String;ZZZZ)V */ -JNIEXPORT void JNICALL Java_org_tigris_subversion_javahl_SVNClient_diff +JNIEXPORT void JNICALL Java_org_tigris_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2ZZZZ (JNIEnv *env, jobject jthis, jstring jtarget1, jobject jrevision1, jstring jtarget2, jobject jrevision2, jstring joutfileName, - jboolean jrecurse) + jboolean jrecurse, jboolean jignoreAncestry, jboolean jnoDiffDeleted, + jboolean jforce) { JNIEntry(SVNClient, diff); SVNClient *cl = SVNClient::getCppObject(jthis); @@ -1166,17 +1261,69 @@ return; } cl->diff(target1, revision1, target2, revision2, outfileName, - jrecurse ? true:false); + jrecurse ? true:false, jignoreAncestry ? true:false, + jnoDiffDeleted ? true:false, jforce ? true:false); +} +/* + * Class: org_tigris_subversion_javahl_SVNClient + * Method: diff + * Signature: (Ljava/lang/String;Lorg/tigris/subversion/javahl/Revision; + * Lorg/tigris/subversion/javahl/Revision; + * Lorg/tigris/subversion/javahl/Revision;Ljava/lang/String;ZZZZ)V + */ +JNIEXPORT void JNICALL Java_org_tigris_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Lorg_tigris_subversion_javahl_Revision_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2ZZZZ + (JNIEnv *env, jobject jthis, jstring jtarget, jobject jpegRevision, + jobject jstartRevision, jobject jendRevision, jstring joutfileName, + jboolean jrecurse, jboolean jignoreAncestry, jboolean jnoDiffDeleted, + jboolean jforce) +{ + JNIEntry(SVNClient, diff); + SVNClient *cl = SVNClient::getCppObject(jthis); + if(cl == NULL) + { + JNIUtil::throwError(_("bad c++ this")); + return; + } + JNIStringHolder target(jtarget); + if(JNIUtil::isExceptionThrown()) + { + return; + } + Revision pegRevision(jpegRevision); + if(JNIUtil::isExceptionThrown()) + { + return; + } + Revision startRevision(jstartRevision); + if(JNIUtil::isExceptionThrown()) + { + return; + } + Revision endRevision(jendRevision); + if(JNIUtil::isExceptionThrown()) + { + return; + } + JNIStringHolder outfileName(joutfileName); + if(JNIUtil::isExceptionThrown()) + { + return; + } + cl->diff(target, pegRevision, startRevision, endRevision, outfileName, + jrecurse ? true:false, jignoreAncestry ? true:false, + jnoDiffDeleted ? true:false, jforce ? true:false); } - /* +/* * Class: org_tigris_subversion_javahl_SVNClient * Method: fileContent - * Signature: (Ljava/lang/String;Lorg/tigris/subversion/javahl/Revision;)[B + * Signature: (Ljava/lang/String;Lorg/tigris/subversion/javahl/Revision; + * Lorg/tigris/subversion/javahl/Revision;)[B */ JNIEXPORT jbyteArray JNICALL Java_org_tigris_subversion_javahl_SVNClient_fileContent - (JNIEnv *env, jobject jthis, jstring jpath, jobject jrevision) + (JNIEnv *env, jobject jthis, jstring jpath, jobject jrevision, + jobject jpegRevision) { JNIEntry(SVNClient, propertyCreate); SVNClient *cl = SVNClient::getCppObject(jthis); @@ -1195,7 +1342,12 @@ { return NULL; } - return cl->fileContent(path, revision); + Revision pegRevision(jpegRevision); + if(JNIUtil::isExceptionThrown()) + { + return NULL; + } + return cl->fileContent(path, revision, pegRevision); } /* * Class: org_tigris_subversion_javahl_SVNClient @@ -1372,11 +1524,12 @@ * Method: blame * Signature: (Ljava/lang/String;Lorg/tigris/subversion/javahl/Revision; * Lorg/tigris/subversion/javahl/Revision; + * Lorg/tigris/subversion/javahl/Revision; * Lorg/tigris/subversion/javahl/BlameCallback;)V */ -JNIEXPORT void JNICALL Java_org_tigris_subversion_javahl_SVNClient_blame__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Lorg_tigris_subversion_javahl_Revision_2Lorg_tigris_subversion_javahl_BlameCallback_2 - (JNIEnv *env, jobject jthis, jstring jpath, jobject jrevisionStart, - jobject jrevisionEnd, jobject jblameCallback) +JNIEXPORT void JNICALL Java_org_tigris_subversion_javahl_SVNClient_blame__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Lorg_tigris_subversion_javahl_Revision_2Lorg_tigris_subversion_javahl_Revision_2Lorg_tigris_subversion_javahl_BlameCallback_2 + (JNIEnv *env, jobject jthis, jstring jpath, jobject jpegRevision, + jobject jrevisionStart, jobject jrevisionEnd, jobject jblameCallback) { JNIEntry(SVNClient, blame); SVNClient *cl = SVNClient::getCppObject(jthis); @@ -1390,6 +1543,11 @@ { return; } + Revision pegRevision(jpegRevision, false, true); + if(JNIUtil::isExceptionThrown()) + { + return; + } Revision revisionStart(jrevisionStart, false, true); if(JNIUtil::isExceptionThrown()) { @@ -1401,7 +1559,7 @@ return; } BlameCallback callback(jblameCallback); - cl->blame(path, revisionStart, revisionEnd, &callback); + cl->blame(path, pegRevision, revisionStart, revisionEnd, &callback); } /* * Class: org_tigris_subversion_javahl_SVNClient Modified: branches/ruby/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClient.java Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClient.java?view=diff&rev=13186&p1=branches/ruby/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClient.java&r1=13185&p2=branches/ruby/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClient.java&r2=13186 ============================================================================== --- branches/ruby/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClient.java (original) +++ branches/ruby/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClient.java Sun Feb 27 19:19:25 2005 @@ -105,9 +105,28 @@ * @param noIgnore get status for normaly ignored files and directories. * @return Array of Status entries. */ + public Status[] status(String path, boolean descend, + boolean onServer, boolean getAll, + boolean noIgnore) throws ClientException + { + return status(path, descend, onServer, getAll, noIgnore, false); + } + + /** + * List a directory or file of the working copy. + * + * @param path Path to explore. + * @param descend Recurse into subdirectories if existant. + * @param onServer Request status information from server. + * @param getAll get status for uninteristing files (unchanged). + * @param noIgnore get status for normaly ignored files and directories. + * @param ignoreExternals if externals are ignored during checkout + * @return Array of Status entries. + */ public native Status[] status(String path, boolean descend, boolean onServer, boolean getAll, - boolean noIgnore) throws ClientException; + boolean noIgnore, boolean ignoreExternals) + throws ClientException; /** * Lists the directory entries of an url on the server. @@ -116,7 +135,23 @@ * @param recurse recurse into subdirectories * @return Array of DirEntry objects. */ - public native DirEntry[]list(String url, Revision revision, boolean recurse) + public DirEntry[]list(String url, Revision revision, boolean recurse) + throws ClientException + { + return list(url, revision, revision, recurse); + } + + /** + * Lists the directory entries of an url on the server. + * + * @param url the url to list + * @param revision the revision to list + * @param pegRevision the revision to interpret url + * @param recurse recurse into subdirectories + * @return Array of DirEntry objects. + */ + public native DirEntry[] list(String url, Revision revision, + Revision pegRevision, boolean recurse) throws ClientException; /** @@ -180,21 +215,64 @@ * @param discoverPath * @return array of LogMessages */ + public LogMessage[] logMessages(String path, Revision revisionStart, + Revision revisionEnd, + boolean stopOnCopy, + boolean discoverPath) + throws ClientException + { + return logMessages(path, revisionStart, revisionEnd, stopOnCopy, + discoverPath, 0); + } + + /** + * Retrieve the log messages for an item + * @param path path or url to get the log message for. + * @param revisionStart first revision to show + * @param revisionEnd last revision to show + * @param stopOnCopy do not continue on copy operations + * @param discoverPath returns the paths of the changed items in the + * returned objects + * @param limit limit the number of log messages (if 0 or less no + * limit) + * @return array of LogMessages + */ public native LogMessage[] logMessages(String path, Revision revisionStart, Revision revisionEnd, - boolean stopOnCopy, boolean discoverPath) - throws ClientException; + boolean stopOnCopy, + boolean discoverPath, + long limit) throws ClientException; + /** * Executes a revision checkout. * @param moduleName name of the module to checkout. * @param destPath destination directory for checkout. * @param revision the revision to checkout. + * @param pegRevision the peg revision to interpret the path * @param recurse whether you want it to checkout files recursively. + * @param ignoreExternals if externals are ignored during checkout * @exception ClientException */ public native long checkout(String moduleName, String destPath, - Revision revision, boolean recurse) + Revision revision, Revision pegRevision, + boolean recurse, boolean ignoreExternals) throws ClientException; + + /** + * Executes a revision checkout. + * @param moduleName name of the module to checkout. + * @param destPath destination directory for checkout. + * @param revision the revision to checkout. + * @param recurse whether you want it to checkout files recursively. + * @exception ClientException + */ + public long checkout(String moduleName, String destPath, + Revision revision, boolean recurse) + throws ClientException + { + return checkout(moduleName, destPath, revision, revision, recurse, + false); + } /** * Sets the notification callback used to send processing information back * to the calling program. @@ -232,18 +310,51 @@ * @param recurse recurse into subdirectories * @exception ClientException */ - public native void add(String path, boolean recurse)throws ClientException; + public void add(String path, boolean recurse)throws ClientException + { + add(path, recurse, false); + } + + /** + * Adds a file to the repository. + * @param path path to be added. + * @param recurse recurse into subdirectories + * @param force if adding a directory and recurse true and path is a + * directory, all not already managed files are added. + * @exception ClientException + */ + public native void add(String path, boolean recurse, boolean force) + throws ClientException; + /** * Updates the directory or file from repository * @param path target file. - * @param revision the revision number to checkout. - * Revision.HEAD will checkout the + * @param revision the revision number to update. + * Revision.HEAD will update to the * latest revision. * @param recurse recursively update. * @exception ClientException */ - public native long update(String path, Revision revision, boolean recurse) + public long update(String path, Revision revision, boolean recurse) + throws ClientException + { + return update(new String[]{path}, revision, recurse, false)[0]; + } + + /** + * Updates the directories or files from repository + * @param path array of target files. + * @param revision the revision number to update. + * Revision.HEAD will update to the + * latest revision. + * @param recurse recursively update. + * @param ignoreExternals externals will be ignore during update + * @exception ClientException + */ + public native long[] update(String[] path, Revision revision, + boolean recurse, boolean ignoreExternals) throws ClientException; + /** * Commits changes to the repository. * @param path files to commit. @@ -274,9 +385,26 @@ * @param force even with local modifications. * @exception ClientException */ - public native void move(String srcPath, String destPath, String message, + public void move(String srcPath, String destPath, String message, Revision revision, boolean force) - throws ClientException; + throws ClientException + { + move(srcPath, destPath, message, force); + } + + /** + * Moves or renames a file. + * + * @param srcPath source path or url + * @param destPath destination path or url + * @param message commit message if destPath is an url + * @param force even with local modifications. + * @throws ClientException + * + */ + public native void move(String srcPath, String destPath, String message, + boolean force) throws ClientException; + /** * Creates a directory directly in a repository or creates a * directory on disk and schedules it for addition. @@ -311,9 +439,36 @@ * @param force set if it is ok to overwrite local files * @exception ClientException */ - public native long doExport(String srcPath, String destPath, + public long doExport(String srcPath, String destPath, Revision revision, boolean force) + throws ClientException + { + return doExport(srcPath, destPath, revision, revision, force, + false, true, null); + } + + /** + * Exports the contents of either a subversion repository into a + * 'clean' directory (meaning a directory with no administrative + * directories). + * + * @param srcPath the url of the repository path to be exported + * @param destPath a destination path that must not already exist. + * @param revision the revsion to be exported + * @param pegRevision the revision to interpret srcPath + * @param force set if it is ok to overwrite local files + * @param ignoreExternals ignore external during export + * @param recurse recurse to subdirectories + * @param nativeEOL which EOL characters to use during export + * @throws ClientException + * + */ + public native long doExport(String srcPath, String destPath, + Revision revision, Revision pegRevision, + boolean force, boolean ignoreExternals, + boolean recurse, String nativeEOL) throws ClientException; + /** * Update local copy to mirror a new url. * @param path the working copy path @@ -346,10 +501,57 @@ * @param recurse traverse into subdirectories * @exception ClientException */ - public native void merge(String path1, Revision revision1, String path2, + public void merge(String path1, Revision revision1, String path2, Revision revision2, String localPath, boolean force, boolean recurse) + throws ClientException + { + merge(path1,revision1, path2, revision2, localPath, force, recurse, + false, false); + } + + /** + * Merge changes from two paths into a new local path. + * + * @param path1 first path or url + * @param revision1 first revision + * @param path2 second path or url + * @param revision2 second revision + * @param localPath target local path + * @param force overwrite local changes + * @param recurse traverse into subdirectories + * @param ignoreAncestry ignore if files are not related + * @param dryRun do not change anything + * @throws ClientException + * + */ + public native void merge(String path1, Revision revision1, String path2, + Revision revision2, String localPath, + boolean force, boolean recurse, + boolean ignoreAncestry, boolean dryRun) throws ClientException; + + /** + * Merge changes from two paths into a new local path. + * + * @param path path or url + * @param pegRevision revision to interpret path + * @param revision1 first revision + * @param revision2 second revision + * @param localPath target local path + * @param force overwrite local changes + * @param recurse traverse into subdirectories + * @param ignoreAncestry ignore if files are not related + * @param dryRun do not change anything + * @throws ClientException + * + */ + public native void merge(String path, Revision pegRevision, + Revision revision1, Revision revision2, + String localPath, boolean force, boolean recurse, + boolean ignoreAncestry, boolean dryRun) + throws ClientException; + /** * Display the differences between two paths * @param target1 first path or url @@ -360,9 +562,58 @@ * @param recurse traverse into subdirectories * @exception ClientException */ - public native void diff(String target1, Revision revision1, String target2, + public void diff(String target1, Revision revision1, String target2, Revision revision2, String outFileName, - boolean recurse) throws ClientException; + boolean recurse) throws ClientException + { + diff(target1, revision1, target2, revision2, outFileName, recurse, + true, false, false); + } + + /** + * Display the differences between two paths + * + * @param target1 first path or url + * @param revision1 first revision + * @param target2 second path or url + * @param revision2 second revision + * @param outFileName file name where difference are written + * @param recurse traverse into subdirectories + * @param ignoreAncestry ignore if files are not related + * @param noDiffDeleted no output on deleted files + * @param force diff even on binary files + * @throws ClientException + * + */ + public native void diff(String target1, Revision revision1, String target2, + Revision revision2, String outFileName, boolean recurse, + boolean ignoreAncestry, boolean noDiffDeleted, + boolean force) throws ClientException; + { + //To change body of implemented methods use File | Settings | File Templates. + } + + /** + * Display the differences between two paths + * + * @param target path or url + * @param pegRevision revision tointerpret target + * @param startRevision first Revision to compare + * @param endRevision second Revision to compare + * @param outFileName file name where difference are written + * @param recurse traverse into subdirectories + * @param ignoreAncestry ignore if files are not related + * @param noDiffDeleted no output on deleted files + * @param force diff even on binary files + * @throws ClientException + * + */ + public native void diff(String target, Revision pegRevision, + Revision startRevision, Revision endRevision, + String outFileName, boolean recurse, + boolean ignoreAncestry, boolean noDiffDeleted, + boolean force) throws ClientException; + /** * Retrieves the properties of an item * @param path the path of the item @@ -380,8 +631,24 @@ * @param revision the revision of the item * @return array of property objects */ - public native PropertyData[] properties(String path, Revision revision) + public PropertyData[] properties(String path, Revision revision) + throws ClientException + { + return properties(path, revision, revision); + } + + /** + * Retrieves the properties of an item + * + * @param path the path of the item + * @param revision the revision of the item + * @param pegRevision the revision to interpret path + * @return array of property objects + */ + public native PropertyData[] properties(String path, Revision revision, + Revision pegRevision) throws ClientException; + /** * Sets one property of an item with a String value * @param path path of the item @@ -390,8 +657,27 @@ * @param recurse set property also on the subdirectories * @throws ClientException */ + public void propertySet(String path, String name, String value, + boolean recurse) throws ClientException + { + propertySet(path, name, value, recurse, false); + } + + /** + * Sets one property of an item with a String value + * + * @param path path of the item + * @param name name of the property + * @param value new value of the property + * @param recurse set property also on the subdirectories + * @param force do not check if the value is valid + * @throws ClientException + * + */ public native void propertySet(String path, String name, String value, - boolean recurse) throws ClientException; + boolean recurse, boolean force) + throws ClientException; + /** * Sets one property of an item with a byte array value * @param path path of the item @@ -400,8 +686,26 @@ * @param recurse set property also on the subdirectories * @throws ClientException */ + public void propertySet(String path, String name, byte[] value, + boolean recurse) throws ClientException + { + propertySet(path, name, value, recurse, false); + } + /** + * Sets one property of an item with a byte array value + * + * @param path path of the item + * @param name name of the property + * @param value new value of the property + * @param recurse set property also on the subdirectories + * @param force do not check if the value is valid + * @throws ClientException + * + */ public native void propertySet(String path, String name, byte[] value, - boolean recurse) throws ClientException; + boolean recurse, boolean force) + throws ClientException; + /** * Remove one property of an item. * @param path path of the item @@ -419,8 +723,27 @@ * @param recurse set property also on the subdirectories * @throws ClientException */ + public void propertyCreate(String path, String name, String value, + boolean recurse) throws ClientException + { + propertyCreate(path, name, value, recurse, false); + } + + /** + * Create and sets one property of an item with a String value + * + * @param path path of the item + * @param name name of the property + * @param value new value of the property + * @param recurse set property also on the subdirectories + * @param force do not check if the value is valid + * @throws ClientException + * + */ public native void propertyCreate(String path, String name, String value, - boolean recurse) throws ClientException; + boolean recurse, boolean force) + throws ClientException; + /** * Create and sets one property of an item with a byte array value * @param path path of the item @@ -429,8 +752,27 @@ * @param recurse set property also on the subdirectories * @throws ClientException */ + public void propertyCreate(String path, String name, byte[] value, + boolean recurse) throws ClientException + { + propertyCreate(path, name, value, recurse, false); + } + + /** + * Create and sets one property of an item with a byte array value + * + * @param path path of the item + * @param name name of the property + * @param value new value of the property + * @param recurse set property also on the subdirectories + * @param force do not check if the value is valid + * @throws ClientException + * + */ public native void propertyCreate(String path, String name, byte[] value, - boolean recurse) throws ClientException; + boolean recurse, boolean force) + throws ClientException; + /** * Retrieve one revsision property of one item * @param path path of the item @@ -488,8 +830,26 @@ * @throws ClientException * */ - public native PropertyData propertyGet(String path, String name, + public PropertyData propertyGet(String path, String name, Revision revision) + throws ClientException + { + return propertyGet(path, name, revision, revision); + } + + /** + * Retrieve one property of one iten + * + * @param path path of the item + * @param name name of property + * @param revision revision of the item + * @return the Property + * @throws ClientException + * + */ + public native PropertyData propertyGet(String path, String name, + Revision revision, + Revision pegRevision) throws ClientException; /** @@ -499,8 +859,26 @@ * @return the content as byte array * @throws ClientException */ - public native byte[] fileContent(String path, Revision revision) + public byte[] fileContent(String path, Revision revision) + throws ClientException + { + return fileContent(path, revision, revision); + } + + /** + * Retrieve the content of a file + * + * @param path the path of the file + * @param revision the revision to retrieve + * @param pegRevision the revision to interpret path + * @return the content as byte array + * @throws ClientException + * + */ + public native byte[] fileContent(String path, Revision revision, + Revision pegRevision) throws ClientException; + /** * Rewrite the url's in the working copy * @param from old url @@ -533,9 +911,28 @@ * information * @throws ClientException */ - public native void blame(String path, Revision revisionStart, + public void blame(String path, Revision revisionStart, Revision revisionEnd, BlameCallback callback) - throws ClientException; + throws ClientException + { + blame(path, revisionEnd, revisionStart, revisionEnd, callback); + } + + /** + * Retrieve the content together with the author, the revision and the date + * of the last change of each line + * @param path the path + * @param pegRevision the revision to interpret the path + * @param revisionStart the first revision to show + * @param revisionEnd the last revision to show + * @param callback callback to receive the file content and the other + * information + * @throws ClientException + */ + public native void blame(String path, Revision pegRevision, + Revision revisionStart, Revision revisionEnd, + BlameCallback callback) throws ClientException; + /** * Set directory for the configuration information * @param configDir path of the directory Modified: branches/ruby/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java?view=diff&rev=13186&p1=branches/ruby/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java&r1=13185&p2=branches/ruby/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java&r2=13186 ============================================================================== --- branches/ruby/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java (original) +++ branches/ruby/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java Sun Feb 27 19:19:25 2005 @@ -57,6 +57,20 @@ Status[]status(String path, boolean descend, boolean onServer, boolean getAll, boolean noIgnore) throws ClientException; /** + * List a directory or file of the working copy. + * + * @param path Path to explore. + * @param descend Recurse into subdirectories if existant. + * @param onServer Request status information from server. + * @param getAll get status for uninteristing files (unchanged). + * @param noIgnore get status for normaly ignored files and directories. + * @param ignoreExternals if externals are ignored during checkout + * @return Array of Status entries. + */ + Status[]status(String path, boolean descend, boolean onServer, + boolean getAll, boolean noIgnore, boolean ignoreExternals) + throws ClientException; + /** * Lists the directory entries of an url on the server. * @param url the url to list * @param revision the revision to list @@ -66,6 +80,17 @@ DirEntry[]list(String url, Revision revision, boolean recurse) throws ClientException; /** + * Lists the directory entries of an url on the server. + * @param url the url to list + * @param revision the revision to list + * @param pegRevision the revision to interpret url + * @param recurse recurse into subdirectories + * @return Array of DirEntry objects. + */ + DirEntry[]list(String url, Revision revision, Revision pegRevision, + boolean recurse) + throws ClientException; + /** * Returns the status of a single file in the path. * * @param path File to gather status. @@ -123,6 +148,35 @@ boolean discoverPath) throws ClientException; /** + * Retrieve the log messages for an item + * @param path path or url to get the log message for. + * @param revisionStart first revision to show + * @param revisionEnd last revision to show + * @param stopOnCopy do not continue on copy operations + * @param discoverPath returns the paths of the changed items in the + * returned objects + * @param limit limit the number of log messages (if 0 or less no + * limit) + * @return array of LogMessages + */ + LogMessage[] logMessages(String path, Revision revisionStart, + Revision revisionEnd, boolean stopOnCopy, + boolean discoverPath, long limit) + throws ClientException; + /** + * Executes a revision checkout. + * @param moduleName name of the module to checkout. + * @param destPath destination directory for checkout. + * @param revision the revision to checkout. + * @param pegRevision the peg revision to interpret the path + * @param recurse whether you want it to checkout files recursively. + * @param ignoreExternals if externals are ignored during checkout + * @exception ClientException + */ + long checkout(String moduleName, String destPath, Revision revision, + Revision pegRevision, boolean recurse, + boolean ignoreExternals) throws ClientException; + /** * Executes a revision checkout. * @param moduleName name of the module to checkout. * @param destPath destination directory for checkout. @@ -131,7 +185,8 @@ * @exception ClientException */ long checkout(String moduleName, String destPath, Revision revision, - boolean recurse) throws ClientException; + boolean recurse) + throws ClientException; /** * Sets the notification callback used to send processing information back * to the calling program. @@ -170,10 +225,19 @@ */ void add(String path, boolean recurse)throws ClientException; /** + * Adds a file to the repository. + * @param path path to be added. + * @param recurse recurse into subdirectories + * @param force if adding a directory and recurse true and path is a + * directory, all not already managed files are added. + * @exception ClientException + */ + void add(String path, boolean recurse, boolean force)throws ClientException; + /** * Updates the directory or file from repository * @param path target file. - * @param revision the revision number to checkout. - * Revision.HEAD will checkout the + * @param revision the revision number to update. + * Revision.HEAD will update to the * latest revision. * @param recurse recursively update. * @exception ClientException @@ -181,6 +245,18 @@ long update(String path, Revision revision, boolean recurse) throws ClientException; /** + * Updates the directories or files from repository + * @param path array of target files. + * @param revision the revision number to update. + * Revision.HEAD will update to the + * latest revision. + * @param recurse recursively update. + * @param ignoreExternals if externals are ignored during update + * @exception ClientException + */ + long[] update(String[] path, Revision revision, boolean recurse, + boolean ignoreExternals) throws ClientException; + /** * Commits changes to the repository. * @param path files to commit. * @param message log message. @@ -206,13 +282,23 @@ * @param srcPath source path or url * @param destPath destination path or url * @param message commit message if destPath is an url - * @param revision source revision + * @param revision source revision (unused) * @param force even with local modifications. * @exception ClientException */ void move(String srcPath, String destPath, String message, Revision revision, boolean force) throws ClientException; /** + * Moves or renames a file. + * @param srcPath source path or url + * @param destPath destination path or url + * @param message commit message if destPath is an url + * @param force even with local modifications. + * @exception ClientException + */ + void move(String srcPath, String destPath, String message, + boolean force) throws ClientException; + /** * Creates a directory directly in a repository or creates a * directory on disk and schedules it for addition. * @param path directories to be created @@ -247,6 +333,23 @@ long doExport(String srcPath, String destPath, Revision revision, boolean force) throws ClientException; /** + * Exports the contents of either a subversion repository into a + * 'clean' directory (meaning a directory with no administrative + * directories). + * @param srcPath the url of the repository path to be exported + * @param destPath a destination path that must not already exist. + * @param revision the revsion to be exported + * @param pegRevision the revision to interpret srcPath + * @param force set if it is ok to overwrite local files + * @param ignoreExternals ignore external during export + * @param recurse recurse to subdirectories + * @param nativeEOL which EOL characters to use during export + * @exception ClientException + */ + long doExport(String srcPath, String destPath, Revision revision, + Revision pegRevision, boolean force, boolean ignoreExternals, + boolean recurse, String nativeEOL) throws ClientException; + /** * Update local copy to mirror a new url. * @param path the working copy path * @param url the new url for the working copy @@ -282,6 +385,40 @@ Revision revision2, String localPath, boolean force, boolean recurse) throws ClientException; /** + * Merge changes from two paths into a new local path. + * @param path1 first path or url + * @param revision1 first revision + * @param path2 second path or url + * @param revision2 second revision + * @param localPath target local path + * @param force overwrite local changes + * @param recurse traverse into subdirectories + * @param ignoreAncestry ignore if files are not related + * @param dryRun do not change anything + * @exception ClientException + */ + void merge(String path1, Revision revision1, String path2, + Revision revision2, String localPath, boolean force, + boolean recurse, boolean ignoreAncestry, boolean dryRun) + throws ClientException; + /** + * Merge changes from two paths into a new local path. + * @param path path or url + * @param pegRevision revision to interpret path + * @param revision1 first revision + * @param revision2 second revision + * @param localPath target local path + * @param force overwrite local changes + * @param recurse traverse into subdirectories + * @param ignoreAncestry ignore if files are not related + * @param dryRun do not change anything + * @exception ClientException + */ + void merge(String path, Revision pegRevision, Revision revision1, + Revision revision2, String localPath, boolean force, + boolean recurse, boolean ignoreAncestry, boolean dryRun) + throws ClientException; + /** * Display the differences between two paths * @param target1 first path or url * @param revision1 first revision @@ -295,6 +432,41 @@ Revision revision2, String outFileName, boolean recurse) throws ClientException; /** + * Display the differences between two paths + * @param target1 first path or url + * @param revision1 first revision + * @param target2 second path or url + * @param revision2 second revision + * @param outFileName file name where difference are written + * @param recurse traverse into subdirectories + * @param ignoreAncestry ignore if files are not related + * @param noDiffDeleted no output on deleted files + * @param force diff even on binary files + * @exception ClientException + */ + void diff(String target1, Revision revision1, String target2, + Revision revision2, String outFileName, boolean recurse, + boolean ignoreAncestry, boolean noDiffDeleted, boolean force) + throws ClientException; + /** + * Display the differences between two paths + * @param target path or url + * @param pegRevision revision tointerpret target + * @param startRevision first Revision to compare + * @param endRevision second Revision to compare + * @param outFileName file name where difference are written + * @param recurse traverse into subdirectories + * @param ignoreAncestry ignore if files are not related + * @param noDiffDeleted no output on deleted files + * @param force diff even on binary files + * @exception ClientException + */ + void diff(String target, Revision pegRevision, Revision startRevision, + Revision endRevision, String outFileName, boolean recurse, + boolean ignoreAncestry, boolean noDiffDeleted, boolean force) + throws ClientException; + + /** * Retrieves the properties of an item * @param path the path of the item * @return array of property objects @@ -309,6 +481,16 @@ PropertyData[] properties(String path, Revision revision) throws ClientException; /** + * Retrieves the properties of an item + * @param path the path of the item + * @param revision the revision of the item + * @param pegRevision the revision to interpret path + * @return array of property objects + */ + PropertyData[] properties(String path, Revision revision, + Revision pegRevision) + throws ClientException; + /** * Sets one property of an item with a String value * @param path path of the item * @param name name of the property @@ -319,6 +501,18 @@ void propertySet(String path, String name, String value, boolean recurse) throws ClientException; /** + * Sets one property of an item with a String value + * @param path path of the item + * @param name name of the property + * @param value new value of the property + * @param recurse set property also on the subdirectories + * @param force do not check if the value is valid + * @throws ClientException + */ + void propertySet(String path, String name, String value, boolean recurse, + boolean force) + throws ClientException; + /** * Sets one property of an item with a byte array value * @param path path of the item * @param name name of the property @@ -329,6 +523,18 @@ void propertySet(String path, String name, byte[] value, boolean recurse) throws ClientException; /** + * Sets one property of an item with a byte array value + * @param path path of the item + * @param name name of the property + * @param value new value of the property + * @param recurse set property also on the subdirectories + * @param force do not check if the value is valid + * @throws ClientException + */ + void propertySet(String path, String name, byte[] value, boolean recurse, + boolean force) + throws ClientException; + /** * Remove one property of an item. * @param path path of the item * @param name name of the property @@ -348,6 +554,18 @@ void propertyCreate(String path, String name, String value, boolean recurse) throws ClientException; /** + * Create and sets one property of an item with a String value + * @param path path of the item + * @param name name of the property + * @param value new value of the property + * @param recurse set property also on the subdirectories + * @param force do not check if the value is valid + * @throws ClientException + */ + void propertyCreate(String path, String name, String value, boolean recurse, + boolean force) + throws ClientException; + /** * Create and sets one property of an item with a byte array value * @param path path of the item * @param name name of the property @@ -358,6 +576,18 @@ void propertyCreate(String path, String name, byte[] value, boolean recurse) throws ClientException; /** + * Create and sets one property of an item with a byte array value + * @param path path of the item + * @param name name of the property + * @param value new value of the property + * @param recurse set property also on the subdirectories + * @param force do not check if the value is valid + * @throws ClientException + */ + void propertyCreate(String path, String name, byte[] value, boolean recurse, + boolean force) + throws ClientException; + /** * Retrieve one revsision property of one item * @param path path of the item * @param name name of the property @@ -407,6 +637,17 @@ PropertyData propertyGet(String path, String name, Revision revision) throws ClientException; /** + * Retrieve one property of one iten + * @param path path of the item + * @param name name of property + * @param revision revision of the item + * @return the Property + * @throws ClientException + */ + PropertyData propertyGet(String path, String name, Revision revision, + Revision pegRevision) + throws ClientException; + /** * Retrieve the content of a file * @param path the path of the file * @param revision the revision to retrieve @@ -415,6 +656,16 @@ */ byte[] fileContent(String path, Revision revision) throws ClientException; /** + * Retrieve the content of a file + * @param path the path of the file + * @param revision the revision to retrieve + * @param pegRevision the revision to interpret path + * @return the content as byte array + * @throws ClientException + */ + byte[] fileContent(String path, Revision revision, Revision pegRevision) + throws ClientException; + /** * Rewrite the url's in the working copy * @param from old url * @param to new url @@ -447,6 +698,20 @@ * @throws ClientException */ void blame(String path, Revision revisionStart, Revision revisionEnd, + BlameCallback callback) throws ClientException; + /** + * Retrieve the content together with the author, the revision and the date + * of the last change of each line + * @param path the path + * @param pegRevision the revision to interpret the path + * @param revisionStart the first revision to show + * @param revisionEnd the last revision to show + * @param callback callback to receive the file content and the other + * information + * @throws ClientException + */ + void blame(String path, Revision pegRevision, Revision revisionStart, + Revision revisionEnd, BlameCallback callback) throws ClientException; /** * Set directory for the configuration information Modified: branches/ruby/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java?view=diff&rev=13186&p1=branches/ruby/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java&r1=13185&p2=branches/ruby/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java&r2=13186 ============================================================================== --- branches/ruby/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java (original) +++ branches/ruby/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java Sun Feb 27 19:19:25 2005 @@ -96,6 +96,29 @@ return worker.status(path, descend, onServer, getAll, noIgnore); } } + + /** + * List a directory or file of the working copy. + * + * @param path Path to explore. + * @param descend Recurse into subdirectories if existant. + * @param onServer Request status information from server. + * @param getAll get status for uninteristing files (unchanged). + * @param noIgnore get status for normaly ignored files and directories. + * @param ignoreExternals if externals are ignored during checkout + * @return Array of Status entries. + */ + public Status[] status(String path, boolean descend, boolean onServer, + boolean getAll, boolean noIgnore, + boolean ignoreExternals) throws ClientException + { + synchronized(clazz) + { + return worker.status(path, descend, onServer, getAll, noIgnore, + ignoreExternals); + } + } + /** * Lists the directory entries of an url on the server. * @param url the url to list @@ -111,6 +134,25 @@ return worker.list(url, revision, recurse); } } + + /** + * Lists the directory entries of an url on the server. + * + * @param url the url to list + * @param revision the revision to list + * @param pegRevision the revision to interpret url + * @param recurse recurse into subdirectories + * @return Array of DirEntry objects. + */ + public DirEntry[] list(String url, Revision revision, Revision pegRevision, + boolean recurse) throws ClientException + { + synchronized(clazz) + { + return worker.list(url, revision, pegRevision, recurse); + } + } + /** * Returns the status of a single file in the path. * @@ -215,6 +257,50 @@ stopOnCopy, discoverPath); } } + + /** + * Retrieve the log messages for an item + * @param path path or url to get the log message for. + * @param revisionStart first revision to show + * @param revisionEnd last revision to show + * @param stopOnCopy do not continue on copy operations + * @param discoverPath returns the paths of the changed items in the + * returned objects + * @param limit limit the number of log messages (if 0 or less no + * limit) + * @return array of LogMessages + */ + public LogMessage[] logMessages(String path, Revision revisionStart, + Revision revisionEnd, boolean stopOnCopy, + boolean discoverPath, long limit) + throws ClientException + { + return worker.logMessages(path, revisionStart, revisionEnd, + stopOnCopy, discoverPath, limit); + } + + /** + * Executes a revision checkout. + * @param moduleName name of the module to checkout. + * @param destPath destination directory for checkout. + * @param revision the revision to checkout. + * @param pegRevision the peg revision to interpret the path + * @param recurse whether you want it to checkout files recursively. + * @param ignoreExternals if externals are ignored during checkout + * @exception ClientException + */ + public long checkout(String moduleName, String destPath, Revision revision, + Revision pegRevision, boolean recurse, + boolean ignoreExternals) + throws ClientException + { + synchronized(clazz) + { + return worker.checkout(moduleName, destPath, revision, pegRevision, + recurse, ignoreExternals); + } + } + /** * Executes a revision checkout. * @param moduleName name of the module to checkout. @@ -224,7 +310,8 @@ * @exception ClientException */ public long checkout(String moduleName, String destPath, Revision revision, - boolean recurse) throws ClientException + boolean recurse) + throws ClientException { synchronized(clazz) { @@ -298,11 +385,28 @@ worker.add(path, recurse); } } + + /** + * Adds a file to the repository. + * @param path path to be added. + * @param recurse recurse into subdirectories + * @param force if adding a directory and recurse true and path is a + * directory, all not already managed files are added. + * @exception ClientException + */ + public void add(String path, boolean recurse, boolean force) throws ClientException + { + synchronized(clazz) + { + worker.add(path, recurse, force); + } + } + /** * Updates the directory or file from repository * @param path target file. - * @param revision the revision number to checkout. - * Revision.HEAD will checkout the + * @param revision the revision number to update. + * Revision.HEAD will update to the * latest revision. * @param recurse recursively update. * @exception ClientException @@ -315,6 +419,26 @@ return worker.update(path, revision, recurse); } } + + /** + * Updates the directories or files from repository + * @param path array of target files. + * @param revision the revision number to update. + * Revision.HEAD will update to the + * latest revision. + * @param recurse recursively update. + * @param ignoreExternals if externals are ignored during update + * @exception ClientException + */ + public long[] update(String[] path, Revision revision, boolean recurse, + boolean ignoreExternals) throws ClientException + { + synchronized(clazz) + { + return worker.update(path, revision, recurse, ignoreExternals); + } + } + /** * Commits changes to the repository. * @param path files to commit. @@ -365,6 +489,26 @@ worker.move(srcPath, destPath, message, revision, force); } } + + /** + * Moves or renames a file. + * + * @param srcPath source path or url + * @param destPath destination path or url + * @param message commit message if destPath is an url + * @param force even with local modifications. + * @throws ClientException + * + */ + public void move(String srcPath, String destPath, String message, + boolean force) throws ClientException + { + synchronized(clazz) + { + worker.move(srcPath, destPath, message, force); + } + } + /** * Creates a directory directly in a repository or creates a * directory on disk and schedules it for addition. @@ -423,6 +567,36 @@ return worker.doExport(srcPath, destPath, revision, force); } } + + /** + * Exports the contents of either a subversion repository into a + * 'clean' directory (meaning a directory with no administrative + * directories). + * + * @param srcPath the url of the repository path to be exported + * @param destPath a destination path that must not already exist. + * @param revision the revsion to be exported + * @param pegRevision the revision to interpret srcPath + * @param force set if it is ok to overwrite local files + * @param ignoreExternals ignore external during export + * @param recurse recurse to subdirectories + * @param nativeEOL which EOL characters to use during export + * @throws ClientException + * + */ + public long doExport(String srcPath, String destPath, Revision revision, + Revision pegRevision, boolean force, + boolean ignoreExternals, boolean recurse, + String nativeEOL) + throws ClientException + { + synchronized(clazz) + { + return worker.doExport(srcPath, destPath, revision, pegRevision, + force, ignoreExternals, recurse, nativeEOL); + } + } + /** * Update local copy to mirror a new url. * @param path the working copy path @@ -477,6 +651,61 @@ recurse); } } + + /** + * Merge changes from two paths into a new local path. + * + * @param path1 first path or url + * @param revision1 first revision + * @param path2 second path or url + * @param revision2 second revision + * @param localPath target local path + * @param force overwrite local changes + * @param recurse traverse into subdirectories + * @param ignoreAncestry ignore if files are not related + * @param dryRun do not change anything + * @throws ClientException + * + */ + public void merge(String path1, Revision revision1, String path2, + Revision revision2, String localPath, boolean force, + boolean recurse, boolean ignoreAncestry, boolean dryRun) + throws ClientException + { + synchronized(clazz) + { + worker.merge(path1, revision1, path2, revision2, localPath, force, + recurse, ignoreAncestry, dryRun); + } + } + + /** + * Merge changes from two paths into a new local path. + * + * @param path path or url + * @param pegRevision revision to interpret path + * @param revision1 first revision + * @param revision2 second revision + * @param localPath target local path + * @param force overwrite local changes + * @param recurse traverse into subdirectories + * @param ignoreAncestry ignore if files are not related + * @param dryRun do not change anything + * @throws ClientException + * + */ + public void merge(String path, Revision pegRevision, Revision revision1, + Revision revision2, String localPath, boolean force, + boolean recurse, boolean ignoreAncestry, boolean dryRun) + throws ClientException + { + synchronized(clazz) + { + worker.merge(path, pegRevision, revision1, revision2, localPath, + force, recurse, ignoreAncestry, dryRun); + } + } + /** * Display the differences between two paths * @param target1 first path or url @@ -497,6 +726,62 @@ recurse); } } + + /** + * Display the differences between two paths + * + * @param target1 first path or url + * @param revision1 first revision + * @param target2 second path or url + * @param revision2 second revision + * @param outFileName file name where difference are written + * @param recurse traverse into subdirectories + * @param ignoreAncestry ignore if files are not related + * @param noDiffDeleted no output on deleted files + * @param force diff even on binary files + * @throws ClientException + * + */ + public void diff(String target1, Revision revision1, String target2, + Revision revision2, String outFileName, boolean recurse, + boolean ignoreAncestry, boolean noDiffDeleted, + boolean force) throws ClientException + { + synchronized(clazz) + { + worker.diff(target1, revision1, target2, revision2, outFileName, + recurse, ignoreAncestry, noDiffDeleted, force); + } + } + + /** + * Display the differences between two paths + * + * @param target path or url + * @param pegRevision revision tointerpret target + * @param startRevision first Revision to compare + * @param endRevision second Revision to compare + * @param outFileName file name where difference are written + * @param recurse traverse into subdirectories + * @param ignoreAncestry ignore if files are not related + * @param noDiffDeleted no output on deleted files + * @param force diff even on binary files + * @throws ClientException + * + */ + public void diff(String target, Revision pegRevision, + Revision startRevision, Revision endRevision, + String outFileName, boolean recurse, + boolean ignoreAncestry, boolean noDiffDeleted, + boolean force) throws ClientException + { + synchronized(clazz) + { + worker.diff(target, pegRevision, startRevision, endRevision, + outFileName, recurse, ignoreAncestry, noDiffDeleted, force); + } + } + /** * Retrieves the properties of an item * @param path the path of the item @@ -527,6 +812,24 @@ } /** + * Retrieves the properties of an item + * + * @param path the path of the item + * @param revision the revision of the item + * @param pegRevision the revision to interpret path + * @return array of property objects + */ + public PropertyData[] properties(String path, Revision revision, + Revision pegRevision) + throws ClientException + { + synchronized(clazz) + { + return properties(path, revision, pegRevision); + } + } + + /** * Sets one property of an item with a String value * @param path path of the item * @param name name of the property @@ -542,6 +845,28 @@ worker.propertySet(path, name, value, recurse); } } + + /** + * Sets one property of an item with a String value + * + * @param path path of the item + * @param name name of the property + * @param value new value of the property + * @param recurse set property also on the subdirectories + * @param force do not check if the value is valid + * @throws ClientException + * + */ + public void propertySet(String path, String name, String value, + boolean recurse, boolean force) + throws ClientException + { + synchronized(clazz) + { + worker.propertySet(path, name, value, recurse, force); + } + } + /** * Sets one property of an item with a byte array value * @param path path of the item @@ -558,6 +883,28 @@ worker.propertySet(path, name, value, recurse); } } + + /** + * Sets one property of an item with a byte array value + * + * @param path path of the item + * @param name name of the property + * @param value new value of the property + * @param recurse set property also on the subdirectories + * @param force do not check if the value is valid + * @throws ClientException + * + */ + public void propertySet(String path, String name, byte[] value, + boolean recurse, boolean force) + throws ClientException + { + synchronized(clazz) + { + worker.propertySet(path, name, value, recurse, force); + } + } + /** * Remove one property of an item. * @param path path of the item @@ -589,6 +936,28 @@ worker.propertyCreate(path, name, value, recurse); } } + + /** + * Create and sets one property of an item with a String value + * + * @param path path of the item + * @param name name of the property + * @param value new value of the property + * @param recurse set property also on the subdirectories + * @param force do not check if the value is valid + * @throws ClientException + * + */ + public void propertyCreate(String path, String name, String value, + boolean recurse, boolean force) + throws ClientException + { + synchronized(clazz) + { + worker.propertyCreate(path, name, value, recurse, force); + } + } + /** * Create and sets one property of an item with a byte array value * @param path path of the item @@ -605,6 +974,28 @@ worker.propertyCreate(path, name, value, recurse); } } + + /** + * Create and sets one property of an item with a byte array value + * + * @param path path of the item + * @param name name of the property + * @param value new value of the property + * @param recurse set property also on the subdirectories + * @param force do not check if the value is valid + * @throws ClientException + * + */ + public void propertyCreate(String path, String name, byte[] value, + boolean recurse, boolean force) + throws ClientException + { + synchronized(clazz) + { + worker.propertyCreate(path, name, value, recurse, force); + } + } + /** * Retrieve one revsision property of one item * @param path path of the item @@ -694,6 +1085,25 @@ } /** + * Retrieve one property of one iten + * + * @param path path of the item + * @param name name of property + * @param revision revision of the item + * @return the Property + * @throws ClientException + * + */ + public PropertyData propertyGet(String path, String name, Revision revision, + Revision pegRevision) throws ClientException + { + synchronized(clazz) + { + return worker.propertyGet(path, name, revision, pegRevision); + } + } + + /** * Retrieve the content of a file * @param path the path of the file * @param revision the revision to retrieve @@ -708,6 +1118,26 @@ return worker.fileContent(path, revision); } } + + /** + * Retrieve the content of a file + * + * @param path the path of the file + * @param revision the revision to retrieve + * @param pegRevision the revision to interpret path + * @return the content as byte array + * @throws ClientException + * + */ + public byte[] fileContent(String path, Revision revision, + Revision pegRevision) throws ClientException + { + synchronized(clazz) + { + return worker.fileContent(path, revision, pegRevision); + } + } + /** * Rewrite the url's in the working copy * @param from old url @@ -760,6 +1190,29 @@ worker.blame(path, revisionStart, revisionEnd, callback); } } + + /** + * Retrieve the content together with the author, the revision and the date + * of the last change of each line + * @param path the path + * @param pegRevision the revision to interpret the path + * @param revisionStart the first revision to show + * @param revisionEnd the last revision to show + * @param callback callback to receive the file content and the other + * information + * @throws ClientException + */ + public void blame(String path, Revision pegRevision, Revision revisionStart, + Revision revisionEnd, BlameCallback callback) + throws ClientException + { + synchronized(clazz) + { + worker.blame(path, pegRevision, revisionStart, revisionEnd, + callback); + } + } + /** * Set directory for the configuration information * @param configDir path of the directory Modified: branches/ruby/subversion/clients/cmdline/export-cmd.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/clients/cmdline/export-cmd.c?view=diff&rev=13186&p1=branches/ruby/subversion/clients/cmdline/export-cmd.c&r1=13185&p2=branches/ruby/subversion/clients/cmdline/export-cmd.c&r2=13186 ============================================================================== --- branches/ruby/subversion/clients/cmdline/export-cmd.c (original) +++ branches/ruby/subversion/clients/cmdline/export-cmd.c Sun Feb 27 19:19:25 2005 @@ -74,6 +74,7 @@ err = svn_client_export3 (NULL, truefrom, to, &peg_revision, &(opt_state->start_revision), opt_state->force, opt_state->ignore_externals, + opt_state->nonrecursive ? FALSE : TRUE, opt_state->native_eol, ctx, pool); if (err && err->apr_err == SVN_ERR_WC_OBSTRUCTED_UPDATE && !opt_state->force) Modified: branches/ruby/subversion/clients/cmdline/info-cmd.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/clients/cmdline/info-cmd.c?view=diff&rev=13186&p1=branches/ruby/subversion/clients/cmdline/info-cmd.c&r1=13185&p2=branches/ruby/subversion/clients/cmdline/info-cmd.c&r2=13186 ============================================================================== --- branches/ruby/subversion/clients/cmdline/info-cmd.c (original) +++ branches/ruby/subversion/clients/cmdline/info-cmd.c Sun Feb 27 19:19:25 2005 @@ -49,51 +49,41 @@ static svn_error_t * -print_entry (const char *target, - const svn_wc_entry_t *entry, - apr_pool_t *pool) +print_info (const char *target, + const svn_info_t *info, + apr_pool_t *pool) { - svn_boolean_t text_conflict = FALSE, props_conflict = FALSE; - SVN_ERR (svn_cmdline_printf (pool, _("Path: %s\n"), svn_path_local_style (target, pool))); - /* Note: we have to be paranoid about checking that these are - valid, since svn_wc_entry() doesn't fill them in if they - aren't in the entries file. */ - - if (entry->name && strcmp (entry->name, SVN_WC_ENTRY_THIS_DIR)) - SVN_ERR (svn_cmdline_printf (pool, _("Name: %s\n"), entry->name)); + /* ### remove this someday: it's only here for cmdline output + compatibility with svn 1.1 and older. */ + if (info->kind != svn_node_dir) + SVN_ERR (svn_cmdline_printf (pool, _("Name: %s\n"), + svn_path_basename(target, pool))); - if (entry->url) - SVN_ERR (svn_cmdline_printf (pool, _("URL: %s\n"), entry->url)); + if (info->URL) + SVN_ERR (svn_cmdline_printf (pool, _("URL: %s\n"), info->URL)); - if (entry->repos) - SVN_ERR (svn_cmdline_printf (pool, _("Repository: %s\n"), entry->repos)); + if (info->repos_root_URL) + SVN_ERR (svn_cmdline_printf (pool, _("Repository Root: %s\n"), + info->repos_root_URL)); - if (entry->uuid) + if (info->repos_UUID) SVN_ERR (svn_cmdline_printf (pool, _("Repository UUID: %s\n"), - entry->uuid)); + info->repos_UUID)); - if (SVN_IS_VALID_REVNUM (entry->revision)) - SVN_ERR (svn_cmdline_printf (pool, _("Revision: %ld\n"), entry->revision)); + if (SVN_IS_VALID_REVNUM (info->rev)) + SVN_ERR (svn_cmdline_printf (pool, _("Revision: %ld\n"), info->rev)); - switch (entry->kind) + switch (info->kind) { case svn_node_file: SVN_ERR (svn_cmdline_printf (pool, _("Node Kind: file\n"))); - { - const char *dir_name; - svn_path_split (target, &dir_name, NULL, pool); - SVN_ERR (svn_wc_conflicted_p (&text_conflict, &props_conflict, - dir_name, entry, pool)); - } break; case svn_node_dir: SVN_ERR (svn_cmdline_printf (pool, _("Node Kind: directory\n"))); - SVN_ERR (svn_wc_conflicted_p (&text_conflict, &props_conflict, - target, entry, pool)); break; case svn_node_none: @@ -106,83 +96,88 @@ break; } - switch (entry->schedule) + if (info->has_wc_info) { - case svn_wc_schedule_normal: - SVN_ERR (svn_cmdline_printf (pool, _("Schedule: normal\n"))); - break; - - case svn_wc_schedule_add: - SVN_ERR (svn_cmdline_printf (pool, _("Schedule: add\n"))); - break; - - case svn_wc_schedule_delete: - SVN_ERR (svn_cmdline_printf (pool, _("Schedule: delete\n"))); - break; - - case svn_wc_schedule_replace: - SVN_ERR (svn_cmdline_printf (pool, _("Schedule: replace\n"))); - break; + switch (info->schedule) + { + case svn_wc_schedule_normal: + SVN_ERR (svn_cmdline_printf (pool, _("Schedule: normal\n"))); + break; + + case svn_wc_schedule_add: + SVN_ERR (svn_cmdline_printf (pool, _("Schedule: add\n"))); + break; + + case svn_wc_schedule_delete: + SVN_ERR (svn_cmdline_printf (pool, _("Schedule: delete\n"))); + break; + + case svn_wc_schedule_replace: + SVN_ERR (svn_cmdline_printf (pool, _("Schedule: replace\n"))); + break; - default: - break; - } - - if (entry->copied) - { - if (entry->copyfrom_url) + default: + break; + } + + if (info->copyfrom_url) SVN_ERR (svn_cmdline_printf (pool, _("Copied From URL: %s\n"), - entry->copyfrom_url)); - - if (SVN_IS_VALID_REVNUM (entry->copyfrom_rev)) + info->copyfrom_url)); + + if (SVN_IS_VALID_REVNUM (info->copyfrom_rev)) SVN_ERR (svn_cmdline_printf (pool, _("Copied From Rev: %ld\n"), - entry->copyfrom_rev)); + info->copyfrom_rev)); } - - if (entry->cmt_author) + + if (info->last_changed_author) SVN_ERR (svn_cmdline_printf (pool, _("Last Changed Author: %s\n"), - entry->cmt_author)); - - if (SVN_IS_VALID_REVNUM (entry->cmt_rev)) + info->last_changed_author)); + + if (SVN_IS_VALID_REVNUM (info->last_changed_rev)) SVN_ERR (svn_cmdline_printf (pool, _("Last Changed Rev: %ld\n"), - entry->cmt_rev)); - - if (entry->cmt_date) - SVN_ERR (svn_cl__info_print_time (entry->cmt_date, + info->last_changed_rev)); + + if (info->last_changed_date) + SVN_ERR (svn_cl__info_print_time (info->last_changed_date, _("Last Changed Date"), pool)); + + if (info->has_wc_info) + { + if (info->text_time) + SVN_ERR (svn_cl__info_print_time (info->text_time, + _("Text Last Updated"), pool)); + + if (info->prop_time) + SVN_ERR (svn_cl__info_print_time (info->prop_time, + _("Properties Last Updated"), pool)); + + if (info->checksum) + SVN_ERR (svn_cmdline_printf (pool, _("Checksum: %s\n"), + info->checksum)); + + if (info->conflict_old) + SVN_ERR (svn_cmdline_printf (pool, + _("Conflict Previous Base File: %s\n"), + svn_path_local_style (info->conflict_old, + pool))); + + if (info->conflict_wrk) + SVN_ERR (svn_cmdline_printf + (pool, _("Conflict Previous Working File: %s\n"), + svn_path_local_style (info->conflict_wrk, pool))); + + if (info->conflict_new) + SVN_ERR (svn_cmdline_printf (pool, + _("Conflict Current Base File: %s\n"), + svn_path_local_style (info->conflict_new, + pool))); + + if (info->prejfile) + SVN_ERR (svn_cmdline_printf (pool, _("Conflict Properties File: %s\n"), + svn_path_local_style (info->prejfile, + pool))); + } - if (entry->text_time) - SVN_ERR (svn_cl__info_print_time (entry->text_time, - _("Text Last Updated"), pool)); - - if (entry->prop_time) - SVN_ERR (svn_cl__info_print_time (entry->prop_time, - _("Properties Last Updated"), pool)); - - if (entry->checksum) - SVN_ERR (svn_cmdline_printf (pool, _("Checksum: %s\n"), - entry->checksum)); - - if (text_conflict && entry->conflict_old) - SVN_ERR (svn_cmdline_printf (pool, _("Conflict Previous Base File: %s\n"), - svn_path_local_style (entry->conflict_old, - pool))); - - if (text_conflict && entry->conflict_wrk) - SVN_ERR (svn_cmdline_printf - (pool, _("Conflict Previous Working File: %s\n"), - svn_path_local_style (entry->conflict_wrk, pool))); - - if (text_conflict && entry->conflict_new) - SVN_ERR (svn_cmdline_printf (pool, _("Conflict Current Base File: %s\n"), - svn_path_local_style (entry->conflict_new, - pool))); - - if (props_conflict && entry->prejfile) - SVN_ERR (svn_cmdline_printf (pool, _("Conflict Properties File: %s\n"), - svn_path_local_style (entry->prejfile, - pool))); - /* Print extra newline separator. */ SVN_ERR (svn_cmdline_printf (pool, "\n")); @@ -190,30 +185,18 @@ } + +/* A callback of type svn_info_receiver_t. */ static svn_error_t * -info_found_entry_callback (const char *path, - const svn_wc_entry_t *entry, - void *walk_baton, - apr_pool_t *pool) +info_receiver (void *baton, + const char *path, + const svn_info_t *info, + apr_pool_t *pool) { - /* We're going to receive dirents twice; we want to ignore the - first one (where it's a child of a parent dir), and only print - the second one (where we're looking at THIS_DIR.) */ - if ((entry->kind == svn_node_dir) - && (strcmp (entry->name, SVN_WC_ENTRY_THIS_DIR))) - return SVN_NO_ERROR; - - return print_entry (path, entry, pool); + return print_info (path, info, pool); } -static const svn_wc_entry_callbacks_t -entry_walk_callbacks = - { - info_found_entry_callback - }; - - /* This implements the `svn_opt_subcommand_t' interface. */ svn_error_t * @@ -226,55 +209,57 @@ apr_array_header_t *targets; apr_pool_t *subpool = svn_pool_create (pool); int i; + svn_error_t *err; + svn_opt_revision_t peg_revision; SVN_ERR (svn_opt_args_to_target_array2 (&targets, os, opt_state->targets, pool)); /* Add "." if user passed 0 arguments. */ svn_opt_push_implicit_dot_target (targets, pool); - + for (i = 0; i < targets->nelts; i++) { + const char *truepath; const char *target = ((const char **) (targets->elts))[i]; - svn_wc_adm_access_t *adm_access; - const svn_wc_entry_t *entry; - + svn_pool_clear (subpool); + SVN_ERR (svn_cl__check_cancel (ctx->cancel_baton)); - /* Make sure the user hasn't passed a URL by mistake. */ - if (svn_path_is_url (target)) - return svn_error_create - (SVN_ERR_CL_ARG_PARSING_ERROR, NULL, - _("'svn info' only works on working copy paths, not URLs")); + /* Get peg revisions. */ + SVN_ERR (svn_opt_parse_path (&peg_revision, &truepath, target, subpool)); - SVN_ERR (svn_cl__check_cancel (ctx->cancel_baton)); - SVN_ERR (svn_wc_adm_probe_open2 (&adm_access, NULL, target, FALSE, - opt_state->recursive ? -1 : 0, - subpool)); - SVN_ERR (svn_wc_entry (&entry, target, adm_access, FALSE, subpool)); - if (! entry) + /* If no peg-rev was attached to a URL target, then assume HEAD. */ + if ((svn_path_is_url (target)) + && (peg_revision.kind == svn_opt_revision_unspecified)) + peg_revision.kind = svn_opt_revision_head; + + err = svn_client_info (truepath, + &peg_revision, &(opt_state->start_revision), + info_receiver, NULL, + opt_state->recursive, ctx, subpool); + + /* If one of the targets is a non-existent URL or wc-entry, + don't bail out. Just warn and move on to the next target. */ + if (err && err->apr_err == SVN_ERR_UNVERSIONED_RESOURCE) { - /* Print non-versioned message and extra newline separator. */ - + svn_error_clear (err); SVN_ERR (svn_cmdline_printf (subpool, _("%s: (Not a versioned resource)\n\n"), svn_path_local_style (target, pool))); continue; } - - if (entry->kind == svn_node_file) - SVN_ERR (print_entry (target, entry, subpool)); - - else if (entry->kind == svn_node_dir) + else if (err && err->apr_err == SVN_ERR_RA_ILLEGAL_URL) { - if (opt_state->recursive) - /* the generic entry-walker: */ - SVN_ERR (svn_wc_walk_entries (target, adm_access, - &entry_walk_callbacks, NULL, - FALSE, pool)); - else - SVN_ERR (print_entry (target, entry, subpool)); + svn_error_clear (err); + SVN_ERR (svn_cmdline_printf + (subpool, _("%s: (Not a valid URL)\n\n"), + svn_path_local_style (target, pool))); + continue; } + else + return err; + } svn_pool_destroy (subpool); Modified: branches/ruby/subversion/clients/cmdline/main.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/clients/cmdline/main.c?view=diff&rev=13186&p1=branches/ruby/subversion/clients/cmdline/main.c&r1=13185&p2=branches/ruby/subversion/clients/cmdline/main.c&r2=13186 ============================================================================== --- branches/ruby/subversion/clients/cmdline/main.c (original) +++ branches/ruby/subversion/clients/cmdline/main.c Sun Feb 27 19:19:25 2005 @@ -322,7 +322,7 @@ " If specified, PEGREV determines in which revision the target is " "first\n" " looked up.\n"), - {'r', 'q', svn_cl__force_opt, SVN_CL__AUTH_OPTIONS, + {'r', 'q', 'N', svn_cl__force_opt, SVN_CL__AUTH_OPTIONS, svn_cl__config_dir_opt, svn_cl__native_eol_opt, svn_cl__ignore_externals_opt} }, @@ -780,7 +780,7 @@ svn_config_t *cfg; /* Initialize the app. */ - if (svn_cmdline_init ("svn", stderr) != EXIT_SUCCESS) + if (svn_cmdline_init2 ("svn", stderr, FALSE) != EXIT_SUCCESS) return EXIT_FAILURE; /* Create our top-level pool. Use a seperate mutexless allocator, @@ -1156,8 +1156,8 @@ svn_wc_adm_access_t *adm_access; const svn_wc_entry_t *e; const char *fname_utf8 = svn_path_internal_style (dash_F_arg, pool); - err = svn_wc_adm_probe_open2 (&adm_access, NULL, fname_utf8, - FALSE, 0, pool); + err = svn_wc_adm_probe_open3 (&adm_access, NULL, fname_utf8, + FALSE, 0, NULL, NULL, pool); if (! err) err = svn_wc_entry (&e, fname_utf8, adm_access, FALSE, pool); if ((err == SVN_NO_ERROR) && e) Modified: branches/ruby/subversion/clients/cmdline/propdel-cmd.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/clients/cmdline/propdel-cmd.c?view=diff&rev=13186&p1=branches/ruby/subversion/clients/cmdline/propdel-cmd.c&r1=13185&p2=branches/ruby/subversion/clients/cmdline/propdel-cmd.c&r2=13186 ============================================================================== --- branches/ruby/subversion/clients/cmdline/propdel-cmd.c (original) +++ branches/ruby/subversion/clients/cmdline/propdel-cmd.c Sun Feb 27 19:19:25 2005 @@ -119,7 +119,7 @@ opt_state->force doesn't apply to this command anyway. */ SVN_CL__TRY (svn_client_propset2 (pname_utf8, NULL, target, opt_state->recursive, - FALSE, subpool), + FALSE, ctx, subpool), success); if (success && (! opt_state->quiet)) Modified: branches/ruby/subversion/clients/cmdline/propedit-cmd.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/clients/cmdline/propedit-cmd.c?view=diff&rev=13186&p1=branches/ruby/subversion/clients/cmdline/propedit-cmd.c&r1=13185&p2=branches/ruby/subversion/clients/cmdline/propedit-cmd.c&r2=13186 ============================================================================== --- branches/ruby/subversion/clients/cmdline/propedit-cmd.c (original) +++ branches/ruby/subversion/clients/cmdline/propedit-cmd.c Sun Feb 27 19:19:25 2005 @@ -210,8 +210,9 @@ propval = svn_string_create ("", subpool); /* Split the path if it is a file path. */ - SVN_ERR (svn_wc_adm_probe_open2 (&adm_access, NULL, target, - FALSE, 0, subpool)); + SVN_ERR (svn_wc_adm_probe_open3 (&adm_access, NULL, target, + FALSE, 0, ctx->cancel_func, + ctx->cancel_baton, subpool)); SVN_ERR (svn_wc_entry (&entry, target, adm_access, FALSE, subpool)); if (! entry) return svn_error_createf @@ -245,7 +246,7 @@ SVN_ERR (svn_client_propset2 (pname_utf8, propval, target, FALSE, opt_state->force, - subpool)); + ctx, subpool)); SVN_ERR (svn_cmdline_printf (subpool, _("Set new value for property '%s' on '%s'\n"), Modified: branches/ruby/subversion/clients/cmdline/propset-cmd.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/clients/cmdline/propset-cmd.c?view=diff&rev=13186&p1=branches/ruby/subversion/clients/cmdline/propset-cmd.c&r1=13185&p2=branches/ruby/subversion/clients/cmdline/propset-cmd.c&r2=13186 ============================================================================== --- branches/ruby/subversion/clients/cmdline/propset-cmd.c (original) +++ branches/ruby/subversion/clients/cmdline/propset-cmd.c Sun Feb 27 19:19:25 2005 @@ -185,7 +185,7 @@ SVN_CL__TRY (svn_client_propset2 (pname_utf8, propval, target, opt_state->recursive, opt_state->force, - subpool), + ctx, subpool), success); if (success && (! opt_state->quiet)) Modified: branches/ruby/subversion/clients/cmdline/switch-cmd.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/clients/cmdline/switch-cmd.c?view=diff&rev=13186&p1=branches/ruby/subversion/clients/cmdline/switch-cmd.c&r1=13185&p2=branches/ruby/subversion/clients/cmdline/switch-cmd.c&r2=13186 ============================================================================== --- branches/ruby/subversion/clients/cmdline/switch-cmd.c (original) +++ branches/ruby/subversion/clients/cmdline/switch-cmd.c Sun Feb 27 19:19:25 2005 @@ -128,7 +128,8 @@ switch_url = svn_path_canonicalize (switch_url, pool); /* Validate the target */ - SVN_ERR (svn_wc_adm_probe_open2 (&adm_access, NULL, target, FALSE, 0, + SVN_ERR (svn_wc_adm_probe_open3 (&adm_access, NULL, target, FALSE, 0, + ctx->cancel_func, ctx->cancel_baton, pool)); SVN_ERR (svn_wc_entry (&entry, target, adm_access, FALSE, pool)); if (! entry) Modified: branches/ruby/subversion/include/svn_client.h Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/include/svn_client.h?view=diff&rev=13186&p1=branches/ruby/subversion/include/svn_client.h&r1=13185&p2=branches/ruby/subversion/include/svn_client.h&r2=13186 ============================================================================== --- branches/ruby/subversion/include/svn_client.h (original) +++ branches/ruby/subversion/include/svn_client.h Sun Feb 27 19:19:25 2005 @@ -438,6 +438,14 @@ * If @a ctx->notify_func is non-null, invoke @a ctx->notify_func with * @a ctx->notify_baton as the checkout progresses. * + * If @a recurse is true, check out recursively. Otherwise, check out + * just the directory represented by @a URL and its immediate + * non-directory children, but none of its child directories (if any). + * + * If @a URL refers to a file rather than a directory, return the + * error SVN_ERR_UNSUPPORTED_FEATURE. If @a URL does not exist, + * return the error SVN_ERR_RA_ILLEGAL_URL. + * * Use @a pool for any temporary allocation. */ svn_error_t * @@ -492,6 +500,10 @@ * If @a ignore_externals is set, don't process externals definitions * as part of this operation. * + * If @a recurse is true, update directories recursively; otherwise, + * update just their immediate entries, but not their child + * directories (if any). + * * If @a ctx->notify_func is non-null, invoke @a ctx->notify_func with * @a ctx->notify_baton for each item handled by the update, and also for * files restored from text-base. If @a ctx->cancel_func is non-null, invoke @@ -538,6 +550,10 @@ * @c svn_opt_revision_head, or @c svn_opt_revision_date; otherwise, * return @c SVN_ERR_CLIENT_BAD_REVISION. * + * If @a recurse is true, and @a path is a directory, switch it + * recursively; otherwise, switch just @a path and its immediate + * entries, but not its child directories (if any). + * * If @a ctx->notify_func is non-null, invoke it with @a ctx->notify_baton * on paths affected by the switch. Also invoke it for files may be restored * from the text-base because they were removed from the working copy. @@ -782,7 +798,7 @@ * @deprecated Provided for backward compatibility with the 1.1 API. * * Similar to svn_client_status2(), but with the @a ignore_externals - * parameter always set to @c TRUE. + * parameter always set to @c FALSE. */ svn_error_t * svn_client_status (svn_revnum_t *result_rev, @@ -1001,7 +1017,7 @@ * changed between @a start_revision and @a end_revision. @a path can * be either a working-copy path or URL. * - * All other options are handled identically to svn_client_diff2. + * All other options are handled identically to @c svn_client_diff2. */ svn_error_t *svn_client_diff_peg2 (const apr_array_header_t *diff_options, const char *path, @@ -1098,7 +1114,7 @@ * revision @a peg_revision, as it changed between @a revision1 and @a * revision2. * - * All other options are handled identically to svn_client_merge. + * All other options are handled identically to @c svn_client_merge. */ svn_error_t * svn_client_merge_peg (const char *source, @@ -1328,6 +1344,9 @@ * @a propname is "svn:mime-type", but @a propval is not a valid * mime-type). * + * If @a ctx->cancel_func is non-null, invoke it passing @a + * ctx->cancel_baton at various places during the operation. + * * Use @a pool for all memory allocation. */ svn_error_t * @@ -1336,6 +1355,7 @@ const char *target, svn_boolean_t recurse, svn_boolean_t force, + svn_client_ctx_t *ctx, apr_pool_t *pool); /** @@ -1568,6 +1588,12 @@ * will use the standard eol marker. Any other value will cause the * SVN_ERR_IO_UNKNOWN_EOL error to be returned. * + * If @a recurse is TRUE, export recursively. Otherwise, export + * just the directory represented by @a from and its immediate + * non-directory children, but none of its child directories (if any). + * Also, if @a recurse is FALSE, the export will behave as if + * @a ignore_externals is TRUE. + * * All allocations are done in @a pool. */ svn_error_t * @@ -1578,6 +1604,7 @@ const svn_opt_revision_t *revision, svn_boolean_t force, svn_boolean_t ignore_externals, + svn_boolean_t recurse, const char *native_eol, svn_client_ctx_t *ctx, apr_pool_t *pool); @@ -1707,6 +1734,115 @@ const svn_opt_revision_t *revision, svn_client_ctx_t *ctx, apr_pool_t *pool); + + +/** @since New in 1.2. + * + * A structure which describes various system-generated metadata about + * a working-copy path or URL. + */ +typedef struct svn_info_t +{ + /* Where the item lives in the repository. */ + const char *URL; + + /* The revision of the object. If path_or_url is a working-copy + path, then this is its current working revnum. If path_or_url + is a URL, then this is the repos revision that path_or_url lives in. */ + svn_revnum_t rev; + + /* The node's kind. */ + svn_node_kind_t kind; + + /* The root URL of the repository. */ + const char *repos_root_URL; + + /* The repository's UUID. */ + const char *repos_UUID; + + /* The last revision in which this object changed. */ + svn_revnum_t last_changed_rev; + + /* The date of the last_changed_rev. */ + apr_time_t last_changed_date; + + /* The author of the last_changed_rev. */ + const char *last_changed_author; + + /* Whether or not to ignore the next 10 wc-specific fields. */ + svn_boolean_t has_wc_info; + + /* The following things only apply to a working-copy path. See + svn_wc_entry_t explanations. */ + svn_wc_schedule_t schedule; + const char *copyfrom_url; + svn_revnum_t copyfrom_rev; + apr_time_t text_time; + apr_time_t prop_time; + const char *checksum; + const char *conflict_old; + const char *conflict_new; + const char *conflict_wrk; + const char *prejfile; + +} svn_info_t; + + +/** @since New in 1.2. + * + * The callback invoked by svn_client_info(). Each invocation + * describes @a path with the information present in @a info. Note + * that any fields within @a info may be NULL if information is + * unavailable. Use @a pool for all temporary allocation. + */ +typedef svn_error_t *(*svn_info_receiver_t) + (void *baton, + const char *path, + const svn_info_t *info, + apr_pool_t *pool); + +/** + * @since New in 1.2. + * + * Invoke @a receiver with @a receiver_baton to return information + * about @a path_or_url in @a revision. The information returned is + * system-generated metadata, not the sort of "property" metadata + * created by users. See @c svn_info_t. + * + * If both revision arguments are either @c + * svn_opt_revision_unspecified or NULL, then information will be + * pulled soley from the working copy; no network connections will be + * made. + * + * Otherwise, information will be pulled from a repository. The + * actual node revision selected is determined by the @a path_or_url + * as it exists in @a peg_revision. If @a peg_revision is @c + * svn_opt_revision_unspecified, then it defaults to @c + * svn_opt_revision_head for URLs or @c svn_opt_revision_working for + * WC targets. + * + * If @a path_or_url is not a local path, then if @a revision is of + * kind @c svn_opt_revision_previous (or some other kind that requires + * a local path), an error will be returned, because the desired + * revision cannot be determined. + * + * Use the authentication baton cached in @a ctx to authenticate + * against the repository. + * + * If @a recurse is true (and @a path_or_url is a directory) this will + * be a recursive operation, invoking @a receiver on each child. + * + */ +svn_error_t * +svn_client_info (const char *path_or_url, + const svn_opt_revision_t *peg_revision, + const svn_opt_revision_t *revision, + svn_info_receiver_t receiver, + void *receiver_baton, + svn_boolean_t recurse, + svn_client_ctx_t *ctx, + apr_pool_t *pool); + Modified: branches/ruby/subversion/include/svn_cmdline.h Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/include/svn_cmdline.h?view=diff&rev=13186&p1=branches/ruby/subversion/include/svn_cmdline.h&r1=13185&p2=branches/ruby/subversion/include/svn_cmdline.h&r2=13186 ============================================================================== --- branches/ruby/subversion/include/svn_cmdline.h (original) +++ branches/ruby/subversion/include/svn_cmdline.h Sun Feb 27 19:19:25 2005 @@ -37,13 +37,30 @@ #endif /* __cplusplus */ -/** Set up the locale for character conversion, and initialize APR. +/** + * + * @since New in 1.2 + * + * Set up the locale and initialize APR and gettext. + * Only set up LC_CTYPE when @a server_mode is true, LC_ALL otherwise. * If @a error_stream is non-null, print error messages to the stream, * using @a progname as the program name. Return @c EXIT_SUCCESS if * successful, otherwise @c EXIT_FAILURE. * * @note This function should be called exactly once at program startup, * before calling any other APR or Subversion functions. + * + */ +int svn_cmdline_init2 (const char *progname, FILE *error_stream, + svn_boolean_t server_mode); + + +/** + * + * @deprecated Provided for backward compatibility with the 1.1 API. + * + * Same as svn_cmdline_init2, but with @a server_mode set to FALSE + * */ int svn_cmdline_init (const char *progname, FILE *error_stream); Modified: branches/ruby/subversion/include/svn_ra.h Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/include/svn_ra.h?view=diff&rev=13186&p1=branches/ruby/subversion/include/svn_ra.h&r1=13185&p2=branches/ruby/subversion/include/svn_ra.h&r2=13186 ============================================================================== --- branches/ruby/subversion/include/svn_ra.h (original) +++ branches/ruby/subversion/include/svn_ra.h Sun Feb 27 19:19:25 2005 @@ -500,6 +500,10 @@ * empty string, the entire directory is updated. @a update_target * may not be NULL. * + * If @a recurse is true and the target is a directory, update + * recursively; otherwise, update just the target and its immediate + * entries, but not its child directories (if any). + * * The working copy will be updated to @a revision_to_update_to, or the * "latest" revision if this arg is invalid. * @@ -543,6 +547,10 @@ * directory represented by the @a session's URL, or empty if the * entire directory is meant to be switched. * + * If @a recurse is true and the target is a directory, switch + * recursively; otherwise, switch just the target and its immediate + * entries, but not its child directories (if any). + * * The working copy will be switched to @a revision_to_switch_to, or the * "latest" revision if this arg is invalid. * @@ -588,6 +596,10 @@ * represented by the @a session_baton's URL, or empty if the entire * directory is meant to be examined. * + * If @a recurse is true and the target is a directory, get status + * recursively; otherwise, get status for just the target and its + * immediate entries, but not its child directories (if any). + * * The caller may not perform any RA operations using @a session * before finishing the report, and may not perform any RA operations * using @a session from within the editing operations of @a status_editor. @@ -641,6 +653,10 @@ * are typically transmitted to the editor as a deletion of one thing * and the addition of another, but if this flag is @c TRUE, * unrelated items will be diffed as if they were related. + * + * If @a recurse is true and the target is a directory, diff + * recursively; otherwise, diff just target and its immediate entries, + * but not its child directories (if any). * * The caller may not perform any RA operations using @a session before * finishing the report, and may not perform any RA operations using Modified: branches/ruby/subversion/include/svn_repos.h Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/include/svn_repos.h?view=diff&rev=13186&p1=branches/ruby/subversion/include/svn_repos.h&r1=13185&p2=branches/ruby/subversion/include/svn_repos.h&r2=13186 ============================================================================== --- branches/ruby/subversion/include/svn_repos.h (original) +++ branches/ruby/subversion/include/svn_repos.h Sun Feb 27 19:19:25 2005 @@ -612,8 +612,8 @@ /** * @deprecated Provided for backward compatibility with the 1.0 API. * - * Similar to svn_repos_history(), but with @a authz_read_func and - * @a authz_read_baton always set to NULL. + * Similar to @c svn_repos_history, but with @a authz_read_func + * and @a authz_read_baton always set to NULL. */ svn_error_t * svn_repos_history (svn_fs_t *fs, @@ -910,7 +910,7 @@ /** * @deprecated Provided for backward compatibility with the 1.0 API. * - * Similar to svn_repos_fs_change_rev_prop2(), but with the + * Similar to @c svn_repos_fs_change_rev_prop2, but with the * @a authz_read_func parameter always NULL. */ svn_error_t *svn_repos_fs_change_rev_prop (svn_repos_t *repos, @@ -1195,7 +1195,7 @@ /** * @deprecated Provided for backward compatibility with the 1.0 API. * - * Similar to svn_repos_dump_fs2(), but with the @a use_deltas + * Similar to @c svn_repos_dump_fs2, but with the @a use_deltas * parameter always set to @c FALSE. */ svn_error_t *svn_repos_dump_fs (svn_repos_t *repos, @@ -1260,7 +1260,7 @@ /** * @deprecated Provided for backward compatibility with the 1.0 API. * - * Similar to svn_repos_load_fs2, but with @a use_pre_commit_hook and + * Similar to @c svn_repos_load_fs2, but with @a use_pre_commit_hook and * @a use_post_commit_hook always @c FALSE. */ svn_error_t *svn_repos_load_fs (svn_repos_t *repos, @@ -1465,8 +1465,8 @@ /** * @deprecated Provided for backward compatibility with the 1.0 API. * - * Similar to svn_repos_parse_dumpstream2, but uses the more limited - * svn_repos_parser_fns_t vtable type. + * Similar to @c svn_repos_parse_dumpstream2, but uses the more limited + * @c svn_repos_parser_fns_t vtable type. */ svn_error_t * svn_repos_parse_dumpstream (svn_stream_t *stream, @@ -1480,7 +1480,7 @@ /** * @deprecated Provided for backward compatibility with the 1.0 API. * - * Similar to svn_repos_get_fs_build_parser2, but yields the more + * Similar to @c svn_repos_get_fs_build_parser2, but yields the more * limited svn_repos_parser_fns_t vtable type. */ svn_error_t * Modified: branches/ruby/subversion/include/svn_wc.h Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/include/svn_wc.h?view=diff&rev=13186&p1=branches/ruby/subversion/include/svn_wc.h&r1=13185&p2=branches/ruby/subversion/include/svn_wc.h&r2=13186 ============================================================================== --- branches/ruby/subversion/include/svn_wc.h (original) +++ branches/ruby/subversion/include/svn_wc.h Sun Feb 27 19:19:25 2005 @@ -73,7 +73,7 @@ /** - * @since New in 1.1. + * @since New in 1.2. * * Return, in @a *adm_access, a pointer to a new access baton for the working * copy administrative area associated with the directory @a path. If @@ -100,6 +100,9 @@ * an error. The error @c SVN_ERR_WC_LOCKED will be returned if a * subdirectory of @a path is already write locked. * + * If @a cancel_func is non-null, call it with @a cancel_baton to determine + * if the client has cancelled the operation. + * * @a pool will be used to allocate memory for the baton and any subsequently * cached items. If @a adm_access has not been closed when the pool is * cleared, it will be closed automatically at that point, and removed from @@ -110,6 +113,21 @@ * the longest lifetime of all the batons in the set. This implies it must be * the root of the hierarchy. */ +svn_error_t *svn_wc_adm_open3 (svn_wc_adm_access_t **adm_access, + svn_wc_adm_access_t *associated, + const char *path, + svn_boolean_t write_lock, + int depth, + svn_cancel_func_t cancel_func, + void *cancel_baton, + apr_pool_t *pool); + +/** + * @deprecated Provided for backward compatibility with the 1.1 API. + * + * Similar to svn_wc_adm_open3(). @a depth is set to -1 if @a tree_lock + * is @c TRUE, else 0. + */ svn_error_t *svn_wc_adm_open2 (svn_wc_adm_access_t **adm_access, svn_wc_adm_access_t *associated, const char *path, @@ -120,7 +138,7 @@ /** * @deprecated Provided for backward compatibility with the 1.0 API. * - * Similar to svn_wc_adm_open2(). @a depth is set to -1 if @a tree_lock + * Similar to svn_wc_adm_open3(). @a depth is set to -1 if @a tree_lock * is @c TRUE, else 0. */ svn_error_t *svn_wc_adm_open (svn_wc_adm_access_t **adm_access, @@ -131,18 +149,33 @@ apr_pool_t *pool); /** - * @since New in 1.1. + * @since New in 1.2. * * Checks the working copy to determine the node type of @a path. If * @a path is a versioned directory then the behaviour is like that of - * @c svn_wc_adm_open2, otherwise, if @a path is a file or does not - * exist, then the behaviour is like that of @c svn_wc_adm_open2 with + * @c svn_wc_adm_open3, otherwise, if @a path is a file or does not + * exist, then the behaviour is like that of @c svn_wc_adm_open3 with * @a path replaced by the parent directory of @a path. If @a path is * an unversioned directory, the behaviour is also like that of - * @c svn_wc_adm_open2 on the parent, except that if the open fails, + * @c svn_wc_adm_open3 on the parent, except that if the open fails, * then the returned SVN_ERR_WC_NOT_DIRECTORY error refers to @a path, * not to @a path's parent. */ +svn_error_t *svn_wc_adm_probe_open3 (svn_wc_adm_access_t **adm_access, + svn_wc_adm_access_t *associated, + const char *path, + svn_boolean_t write_lock, + int depth, + svn_cancel_func_t cancel_func, + void *cancel_baton, + apr_pool_t *pool); + +/** + * @deprecated Provided for backward compatibility with the 1.1 API. + * + * Similar to svn_wc_adm_probe_open3(). @a depth is set to -1 if + * @a tree_lock is @c TRUE, else 0. + */ svn_error_t *svn_wc_adm_probe_open2 (svn_wc_adm_access_t **adm_access, svn_wc_adm_access_t *associated, const char *path, @@ -153,7 +186,7 @@ /** * @deprecated Provided for backward compatibility with the 1.0 API. * - * Similar to svn_wc_adm_probe_open2(). @a depth is set to -1 if + * Similar to svn_wc_adm_probe_open3(). @a depth is set to -1 if * @a tree_lock is @c TRUE, else 0. */ svn_error_t *svn_wc_adm_probe_open (svn_wc_adm_access_t **adm_access, @@ -176,7 +209,10 @@ * versioned directory, @c depth is ignored otherwise. If @c write_lock is * @c TRUE the access batons will hold write locks. * - * This function is essentially a combination of svn_wc_adm_open2 and + * If @a cancel_func is non-null, call it with @a cancel_baton to determine + * if the client has cancelled the operation. + * + * This function is essentially a combination of svn_wc_adm_open3 and * svn_wc_get_actual_target, with the emphasis on reducing physical IO. */ svn_error_t * @@ -186,6 +222,8 @@ const char *path, svn_boolean_t write_lock, int depth, + svn_cancel_func_t cancel_func, + void *cancel_baton, apr_pool_t *pool); /** Return, in @a *adm_access, a pointer to an existing access baton associated @@ -215,13 +253,13 @@ apr_pool_t *pool); /** - * @since New in 1.1. + * @since New in 1.2. * * Try various ways to obtain an access baton for @a path. * * First, try to obtain @a *adm_access via @c svn_wc_adm_probe_retrieve(), * but if this fails because @a associated can't give a baton for - * @a path or @a path's parent, then try @c svn_wc_adm_probe_open2(), + * @a path or @a path's parent, then try @c svn_wc_adm_probe_open3(), * this time passing @a write_lock and @a depth. If there is * still no access because @a path is not a versioned directory, then * just set @a *adm_access to null and return success. But if it is @@ -230,11 +268,29 @@ * fails for any other reason, return the corresponding error, and the * effect on @a *adm_access is also undefined.) * - * If @c svn_wc_adm_probe_open() succeeds, then add @a *adm_access to + * If @c svn_wc_adm_probe_open3() succeeds, then add @a *adm_access to * @a associated. * + * If @a cancel_func is non-null, call it with @a cancel_baton to determine + * if the client has cancelled the operation. + * * Use @a pool only for local processing, not to allocate @a *adm_access. */ +svn_error_t *svn_wc_adm_probe_try3 (svn_wc_adm_access_t **adm_access, + svn_wc_adm_access_t *associated, + const char *path, + svn_boolean_t write_lock, + int depth, + svn_cancel_func_t cancel_func, + void *cancel_baton, + apr_pool_t *pool); + +/** + * @deprecated Provided for backward compatibility with the 1.1 API. + * + * Similar to svn_wc_adm_probe_try3(). @a depth is set to -1 if + * @a tree_lock is @c TRUE, else 0. + */ svn_error_t *svn_wc_adm_probe_try2 (svn_wc_adm_access_t **adm_access, svn_wc_adm_access_t *associated, const char *path, @@ -245,7 +301,7 @@ /** * @deprecated Provided for backward compatibility with the 1.0 API. * - * Similar to svn_wc_adm_probe_try2(). @a depth is set to -1 if + * Similar to svn_wc_adm_probe_try3(). @a depth is set to -1 if * @a tree_lock is @c TRUE, else 0. */ svn_error_t *svn_wc_adm_probe_try (svn_wc_adm_access_t **adm_access, @@ -1101,7 +1157,10 @@ } svn_wc_entry_callbacks_t; -/** A generic entry-walker. +/** + * @since New in 1.2. + * + * A generic entry-walker. * * Do a recursive depth-first entry-walk beginning on @a path, which can * be a file or dir. Call callbacks in @a walk_callbacks, passing @@ -1109,6 +1168,9 @@ * allocate all entries returned. @a adm_access must be an access baton * for @a path. * + * If @a cancel_func is non-null, call it with @a cancel_baton to determine + * if the client has cancelled the operation. + * * Like our other entries interfaces, entries that are in a 'deleted' * or 'absent' state (and not scheduled for re-addition) are not * discovered, unless @a show_hidden is true. @@ -1122,6 +1184,21 @@ * distinguished by looking for @c SVN_WC_ENTRY_THIS_DIR in the 'name' * field of the entry. */ +svn_error_t *svn_wc_walk_entries2 (const char *path, + svn_wc_adm_access_t *adm_access, + const svn_wc_entry_callbacks_t + *walk_callbacks, + void *walk_baton, + svn_boolean_t show_hidden, + svn_cancel_func_t cancel_func, + void *cancel_baton, + apr_pool_t *pool); + +/** + * @deprecated Provided for backward compatibility with the 1.0 API. + * + * Similar to svn_wc_walk_entries2(), but without cancellation support. + */ svn_error_t *svn_wc_walk_entries (const char *path, svn_wc_adm_access_t *adm_access, const svn_wc_entry_callbacks_t @@ -1589,7 +1666,10 @@ apr_pool_t *pool); -/** Assuming @a path is under version control and in a state of conflict, +/** + * @since New in 1.2. + * + * Assuming @a path is under version control and in a state of conflict, * then take @a path *out* of this state. If @a resolve_text is true then * any text conflict is resolved, if @a resolve_props is true then any * property conflicts are resolved. If @a recursive is true, then search @@ -1615,6 +1695,22 @@ * information to @c notify_func (if non-@c NULL.) If only text or only * property conflict resolution was requested, and it was successful, then * success gets reported. + */ +svn_error_t *svn_wc_resolved_conflict2 (const char *path, + svn_wc_adm_access_t *adm_access, + svn_boolean_t resolve_text, + svn_boolean_t resolve_props, + svn_boolean_t recursive, + svn_wc_notify_func_t notify_func, + void *notify_baton, + svn_cancel_func_t cancel_func, + void *cancel_baton, + apr_pool_t *pool); + +/** + * @deprecated Provided for backward compatibility with the 1.0 API. + * + * Similar to svn_wc_resolved_conflict2(), but without cancellation support. */ svn_error_t *svn_wc_resolved_conflict (const char *path, svn_wc_adm_access_t *adm_access, Modified: branches/ruby/subversion/libsvn_client/add.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_client/add.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_client/add.c&r1=13185&p2=branches/ruby/subversion/libsvn_client/add.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_client/add.c (original) +++ branches/ruby/subversion/libsvn_client/add.c Sun Feb 27 19:19:25 2005 @@ -421,8 +421,9 @@ svn_wc_adm_access_t *adm_access; const char *parent_path = svn_path_dirname (path, pool); - SVN_ERR (svn_wc_adm_open2 (&adm_access, NULL, parent_path, - TRUE, 0, pool)); + SVN_ERR (svn_wc_adm_open3 (&adm_access, NULL, parent_path, + TRUE, 0, ctx->cancel_func, ctx->cancel_baton, + pool)); err = add (path, recursive, FALSE, adm_access, ctx, pool); @@ -450,8 +451,9 @@ svn_wc_adm_access_t *adm_access; const char *parent_path = svn_path_dirname (path, pool); - SVN_ERR (svn_wc_adm_open2 (&adm_access, NULL, parent_path, - TRUE, 0, pool)); + SVN_ERR (svn_wc_adm_open3 (&adm_access, NULL, parent_path, + TRUE, 0, ctx->cancel_func, ctx->cancel_baton, + pool)); err = add (path, recursive, force, adm_access, ctx, pool); Modified: branches/ruby/subversion/libsvn_client/checkout.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_client/checkout.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_client/checkout.c&r1=13185&p2=branches/ruby/subversion/libsvn_client/checkout.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_client/checkout.c (original) +++ branches/ruby/subversion/libsvn_client/checkout.c Sun Feb 27 19:19:25 2005 @@ -127,8 +127,9 @@ } /* Get PATH's entry. */ - SVN_ERR (svn_wc_adm_open2 (&adm_access, NULL, path, - FALSE, 0, pool)); + SVN_ERR (svn_wc_adm_open3 (&adm_access, NULL, path, + FALSE, 0, ctx->cancel_func, + ctx->cancel_baton, pool)); SVN_ERR (svn_wc_entry (&entry, path, adm_access, FALSE, pool)); SVN_ERR (svn_wc_adm_close (adm_access)); Modified: branches/ruby/subversion/libsvn_client/client.h Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_client/client.h?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_client/client.h&r1=13185&p2=branches/ruby/subversion/libsvn_client/client.h&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_client/client.h (original) +++ branches/ruby/subversion/libsvn_client/client.h Sun Feb 27 19:19:25 2005 @@ -195,9 +195,8 @@ during working copy commits. */ apr_array_header_t *commit_items; - /* A hash of svn_config_t's, keyed off file name (i.e. the contents of - ~/.subversion/config end up keyed off of 'config'). */ - apr_hash_t *config; + /* A client context. */ + svn_client_ctx_t *ctx; /* The pool to use for session-related items. */ apr_pool_t *pool; Modified: branches/ruby/subversion/libsvn_client/commit.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_client/commit.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_client/commit.c&r1=13185&p2=branches/ruby/subversion/libsvn_client/commit.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_client/commit.c (original) +++ branches/ruby/subversion/libsvn_client/commit.c Sun Feb 27 19:19:25 2005 @@ -1178,9 +1178,10 @@ svn_pool_destroy (subpool); } - SVN_ERR (svn_wc_adm_open2 (&base_dir_access, NULL, base_dir, + SVN_ERR (svn_wc_adm_open3 (&base_dir_access, NULL, base_dir, TRUE, /* Write lock */ lock_base_dir_recursive ? -1 : 0, /* Depth */ + ctx->cancel_func, ctx->cancel_baton, pool)); if (!lock_base_dir_recursive) @@ -1215,10 +1216,12 @@ { target = APR_ARRAY_IDX (dirs_to_lock, i, const char *); - SVN_ERR (svn_wc_adm_open2 (&adm_access, base_dir_access, + SVN_ERR (svn_wc_adm_open3 (&adm_access, base_dir_access, target, TRUE, /* Write lock */ 0, /* Depth */ + ctx->cancel_func, + ctx->cancel_baton, pool)); } } @@ -1230,10 +1233,12 @@ { target = APR_ARRAY_IDX (dirs_to_lock_recursive, i, const char *); - SVN_ERR (svn_wc_adm_open2 (&adm_access, base_dir_access, + SVN_ERR (svn_wc_adm_open3 (&adm_access, base_dir_access, target, TRUE, /* Write lock */ -1, /* Depth */ + ctx->cancel_func, + ctx->cancel_baton, pool)); } } Modified: branches/ruby/subversion/libsvn_client/commit_util.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_client/commit_util.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_client/commit_util.c&r1=13185&p2=branches/ruby/subversion/libsvn_client/commit_util.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_client/commit_util.c (original) +++ branches/ruby/subversion/libsvn_client/commit_util.c Sun Feb 27 19:19:25 2005 @@ -631,8 +631,9 @@ if (err && err->apr_err == SVN_ERR_WC_NOT_LOCKED) { svn_error_clear (err); - SVN_ERR (svn_wc_adm_open2 (&parent_access, NULL, parent, - FALSE, 0, subpool)); + SVN_ERR (svn_wc_adm_open3 (&parent_access, NULL, parent, + FALSE, 0, ctx->cancel_func, + ctx->cancel_baton, subpool)); } else if (err) { Modified: branches/ruby/subversion/libsvn_client/copy.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_client/copy.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_client/copy.c&r1=13185&p2=branches/ruby/subversion/libsvn_client/copy.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_client/copy.c (original) +++ branches/ruby/subversion/libsvn_client/copy.c Sun Feb 27 19:19:25 2005 @@ -107,9 +107,9 @@ svn_path_split (src_path, &src_parent, NULL, pool); - SVN_ERR (svn_wc_adm_open2 (&src_access, NULL, src_parent, TRUE, + SVN_ERR (svn_wc_adm_open3 (&src_access, NULL, src_parent, TRUE, src_kind == svn_node_dir ? -1 : 0, - pool)); + ctx->cancel_func, ctx->cancel_baton, pool)); /* Need to avoid attempting to open the same dir twice when source and destination overlap. */ @@ -132,8 +132,9 @@ } else { - SVN_ERR (svn_wc_adm_open2 (&adm_access, NULL, dst_parent, - TRUE, 0, pool)); + SVN_ERR (svn_wc_adm_open3 (&adm_access, NULL, dst_parent, + TRUE, 0, ctx->cancel_func, + ctx->cancel_baton,pool)); } } @@ -144,8 +145,8 @@ } else { - SVN_ERR (svn_wc_adm_open2 (&adm_access, NULL, dst_parent, TRUE, - 0, pool)); + SVN_ERR (svn_wc_adm_open3 (&adm_access, NULL, dst_parent, TRUE, 0, + ctx->cancel_func, ctx->cancel_baton, pool)); } /* Perform the copy and (optionally) delete. */ @@ -604,8 +605,9 @@ paths everywhere. */ SVN_ERR (svn_path_get_absolute (&base_path, src_path, pool)); - SVN_ERR (svn_wc_adm_probe_open2 (&adm_access, NULL, base_path, - FALSE, -1, pool)); + SVN_ERR (svn_wc_adm_probe_open3 (&adm_access, NULL, base_path, + FALSE, -1, ctx->cancel_func, + ctx->cancel_baton, pool)); /* Split the DST_URL into an anchor and target. */ svn_path_split (dst_url, &anchor, &target, pool); @@ -834,8 +836,9 @@ _("'%s' is in the way"), svn_path_local_style (dst_path, pool)); - SVN_ERR (svn_wc_adm_probe_open2 (&adm_access, NULL, dst_path, TRUE, - 0, pool)); + SVN_ERR (svn_wc_adm_probe_open3 (&adm_access, NULL, dst_path, TRUE, + 0, ctx->cancel_func, ctx->cancel_baton, + pool)); /* We've already checked for physical obstruction by a working file. But there could also be logical obstruction by an entry whose @@ -906,8 +909,9 @@ should be the copyfrom_revision when we commit later. */ const svn_wc_entry_t *d_entry; svn_wc_adm_access_t *dst_access; - SVN_ERR (svn_wc_adm_open2 (&dst_access, adm_access, dst_path, - TRUE, -1, pool)); + SVN_ERR (svn_wc_adm_open3 (&dst_access, adm_access, dst_path, + TRUE, -1, ctx->cancel_func, + ctx->cancel_baton, pool)); SVN_ERR (svn_wc_entry (&d_entry, dst_path, dst_access, FALSE, pool)); src_revnum = d_entry->revision; } @@ -1050,8 +1054,10 @@ entries file. */ svn_wc_adm_access_t *adm_access; /* ### FIXME local */ const svn_wc_entry_t *entry; - SVN_ERR (svn_wc_adm_probe_open2 (&adm_access, NULL, + SVN_ERR (svn_wc_adm_probe_open3 (&adm_access, NULL, src_path, FALSE, 0, + ctx->cancel_func, + ctx->cancel_baton, pool)); SVN_ERR (svn_wc_entry (&entry, src_path, adm_access, FALSE, pool)); Modified: branches/ruby/subversion/libsvn_client/delete.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_client/delete.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_client/delete.c&r1=13185&p2=branches/ruby/subversion/libsvn_client/delete.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_client/delete.c (original) +++ branches/ruby/subversion/libsvn_client/delete.c Sun Feb 27 19:19:25 2005 @@ -263,8 +263,9 @@ SVN_ERR (ctx->cancel_func (ctx->cancel_baton)); /* Let the working copy library handle the PATH. */ - SVN_ERR (svn_wc_adm_open2 (&adm_access, NULL, parent_path, - TRUE, 0, subpool)); + SVN_ERR (svn_wc_adm_open3 (&adm_access, NULL, parent_path, + TRUE, 0, ctx->cancel_func, + ctx->cancel_baton, subpool)); SVN_ERR (svn_client__wc_delete (path, adm_access, force, FALSE, ctx->notify_func, ctx->notify_baton, Modified: branches/ruby/subversion/libsvn_client/diff.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_client/diff.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_client/diff.c&r1=13185&p2=branches/ruby/subversion/libsvn_client/diff.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_client/diff.c (original) +++ branches/ruby/subversion/libsvn_client/diff.c Sun Feb 27 19:19:25 2005 @@ -1371,8 +1371,8 @@ } /* ### This may not be a good idea, see issue 880 */ - SVN_ERR (svn_wc_adm_probe_open2(&adm_access, NULL, path, FALSE, - 0, pool)); + SVN_ERR (svn_wc_adm_probe_open3(&adm_access, NULL, path, FALSE, + 0, NULL, NULL, pool)); SVN_ERR (svn_wc_entry (&entry, path, adm_access, FALSE, pool)); SVN_ERR (svn_wc_adm_close (adm_access)); if (! entry) @@ -1746,7 +1746,9 @@ "and its working files are supported at this time"))); SVN_ERR (svn_wc_adm_open_anchor (&adm_access, &target_access, &target, - path1, FALSE, recurse ? -1 : 0, pool)); + path1, FALSE, recurse ? -1 : 0, + ctx->cancel_func, ctx->cancel_baton, + pool)); /* Resolve named revisions to real numbers. */ SVN_ERR (svn_client__get_revision_number @@ -1963,7 +1965,9 @@ SVN_ERR (convert_to_url (&url1, path1, pool)); SVN_ERR (svn_wc_adm_open_anchor (&adm_access, &dir_access, &target, - path2, FALSE, recurse ? -1 : 0, pool)); + path2, FALSE, recurse ? -1 : 0, + ctx->cancel_func, ctx->cancel_baton, + pool)); anchor = svn_wc_adm_access_path (adm_access); /* Fetch the URL of the anchor directory. */ @@ -2437,8 +2441,10 @@ else path2 = source2; - SVN_ERR (svn_wc_adm_probe_open2 (&adm_access, NULL, target_wcpath, - ! dry_run, recurse ? -1 : 0, pool)); + SVN_ERR (svn_wc_adm_probe_open3 (&adm_access, NULL, target_wcpath, + ! dry_run, recurse ? -1 : 0, + ctx->cancel_func, ctx->cancel_baton, + pool)); SVN_ERR (svn_wc_entry (&entry, target_wcpath, adm_access, FALSE, pool)); if (entry == NULL) @@ -2544,8 +2550,10 @@ else path = source; - SVN_ERR (svn_wc_adm_probe_open2 (&adm_access, NULL, target_wcpath, - ! dry_run, recurse ? -1 : 0, pool)); + SVN_ERR (svn_wc_adm_probe_open3 (&adm_access, NULL, target_wcpath, + ! dry_run, recurse ? -1 : 0, + ctx->cancel_func, ctx->cancel_baton, + pool)); SVN_ERR (svn_wc_entry (&entry, target_wcpath, adm_access, FALSE, pool)); if (entry == NULL) Modified: branches/ruby/subversion/libsvn_client/export.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_client/export.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_client/export.c&r1=13185&p2=branches/ruby/subversion/libsvn_client/export.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_client/export.c (original) +++ branches/ruby/subversion/libsvn_client/export.c Sun Feb 27 19:19:25 2005 @@ -119,9 +119,18 @@ /* Only export 'added' files when the revision is WORKING. Otherwise, skip the 'added' files, since they didn't exist - in the BASE revision and don't have an associated text-base. */ - if (! entry || (revision->kind != svn_opt_revision_working && - entry->schedule == svn_wc_schedule_add)) + in the BASE revision and don't have an associated text-base. + + Don't export 'deleted' files and directories unless it's a + revision other than WORKING. These files and directories + don't really exists in WORKING. + + Finally, don't export an unversioned item. */ + if (! entry || + (revision->kind != svn_opt_revision_working && + entry->schedule == svn_wc_schedule_add) || + (revision->kind == svn_opt_revision_working && + entry->schedule == svn_wc_schedule_delete)) return SVN_NO_ERROR; if (revision->kind != svn_opt_revision_working) @@ -214,6 +223,7 @@ const char *to, svn_opt_revision_t *revision, svn_boolean_t force, + svn_boolean_t recurse, const char *native_eol, svn_client_ctx_t *ctx, apr_pool_t *pool) @@ -222,12 +232,13 @@ const svn_wc_entry_t *entry; svn_error_t *err; apr_pool_t *iterpool; - apr_hash_t *dirents; + apr_hash_t *entries; apr_hash_index_t *hi; apr_finfo_t finfo; - SVN_ERR (svn_wc_adm_probe_open2 (&adm_access, NULL, from, FALSE, - 0, pool)); + SVN_ERR (svn_wc_adm_probe_open3 (&adm_access, NULL, from, FALSE, + 0, ctx->cancel_func, ctx->cancel_baton, + pool)); err = svn_wc_entry (&entry, from, adm_access, FALSE, pool); if (err) { @@ -244,11 +255,17 @@ return SVN_NO_ERROR; } - /* Only export entries with the 'added' status if revision - is WORKING. Otherwise, skip it, as it doesn't exist in any - revision other than WORKING. */ - if (revision->kind != svn_opt_revision_working && - entry->schedule == svn_wc_schedule_add) + /* Only export 'added' files when the revision is WORKING. + Otherwise, skip the 'added' files, since they didn't exist + in the BASE revision and don't have an associated text-base. + + Don't export 'deleted' files and directories unless it's a + revision other than WORKING. These files and directories + don't really exists in WORKING. */ + if ((revision->kind != svn_opt_revision_working && + entry->schedule == svn_wc_schedule_add) || + (revision->kind == svn_opt_revision_working && + entry->schedule == svn_wc_schedule_delete)) return SVN_NO_ERROR; if (entry->kind == svn_node_dir) @@ -269,12 +286,11 @@ svn_error_clear (err); } - SVN_ERR (svn_io_get_dirents (&dirents, from, pool)); + SVN_ERR (svn_wc_entries_read (&entries, adm_access, TRUE, pool)); iterpool = svn_pool_create (pool); - for (hi = apr_hash_first (pool, dirents); hi; hi = apr_hash_next (hi)) + for (hi = apr_hash_first (pool, entries); hi; hi = apr_hash_next (hi)) { - const svn_node_kind_t *type; const char *item; const void *key; void *val; @@ -284,7 +300,7 @@ apr_hash_this (hi, &key, NULL, &val); item = key; - type = val; + entry = val; if (ctx->cancel_func) SVN_ERR (ctx->cancel_func (ctx->cancel_baton)); @@ -292,23 +308,29 @@ /* ### We could also invoke ctx->notify_func somewhere in ### here... Is it called for, though? Not sure. */ - if (*type == svn_node_dir) + if (entry->kind == svn_node_dir) { - if (strcmp (item, SVN_WC_ADM_DIR_NAME) == 0) + if (strcmp (item, SVN_WC_ENTRY_THIS_DIR) == 0) { - ; /* skip this, it's an administrative directory. */ + ; /* skip this, it's the current directory that we're + handling now. */ } else { - const char *new_from = svn_path_join (from, item, iterpool); - const char *new_to = svn_path_join (to, item, iterpool); + if (recurse) + { + const char *new_from = svn_path_join (from, item, + iterpool); + const char *new_to = svn_path_join (to, item, iterpool); - SVN_ERR (copy_versioned_files (new_from, new_to, revision, - force, native_eol, ctx, - iterpool)); + SVN_ERR (copy_versioned_files (new_from, new_to, + revision, force, recurse, + native_eol, ctx, + iterpool)); + } } } - else if (*type == svn_node_file) + else if (entry->kind == svn_node_file) { const char *new_from = svn_path_join (from, item, iterpool); const char *new_to = svn_path_join (to, item, iterpool); @@ -744,6 +766,7 @@ const svn_opt_revision_t *revision, svn_boolean_t force, svn_boolean_t ignore_externals, + svn_boolean_t recurse, const char *native_eol, svn_client_ctx_t *ctx, apr_pool_t *pool) @@ -851,7 +874,7 @@ &reporter, &report_baton, revnum, "", /* no sub-target */ - TRUE, /* recurse */ + recurse, export_editor, edit_baton, pool)); SVN_ERR (reporter->set_path (report_baton, "", revnum, @@ -875,7 +898,7 @@ SVN_ERR (open_root_internal (to, force, ctx->notify_func, ctx->notify_baton, pool)); - if (! ignore_externals) + if (! ignore_externals && recurse) SVN_ERR (svn_client__fetch_externals (eb->externals, TRUE, &use_sleep, ctx, pool)); } @@ -893,7 +916,7 @@ /* just copy the contents of the working copy into the target path. */ SVN_ERR (copy_versioned_files (from, to, &working_revision, force, - native_eol, ctx, pool)); + recurse, native_eol, ctx, pool)); } @@ -929,7 +952,8 @@ peg_revision.kind = svn_opt_revision_unspecified; return svn_client_export3 (result_rev, from, to, &peg_revision, - revision, force, FALSE, native_eol, ctx, pool); + revision, force, FALSE, TRUE, + native_eol, ctx, pool); } Modified: branches/ruby/subversion/libsvn_client/externals.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_client/externals.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_client/externals.c&r1=13185&p2=branches/ruby/subversion/libsvn_client/externals.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_client/externals.c (original) +++ branches/ruby/subversion/libsvn_client/externals.c Sun Feb 27 19:19:25 2005 @@ -101,7 +101,8 @@ svn_error_t *err; svn_wc_adm_access_t *adm_access; - SVN_ERR (svn_wc_adm_open2 (&adm_access, NULL, path, TRUE, -1, pool)); + SVN_ERR (svn_wc_adm_open3 (&adm_access, NULL, path, TRUE, -1, cancel_func, + cancel_baton, pool)); err = svn_wc_remove_from_revision_control (adm_access, SVN_WC_ENTRY_THIS_DIR, TRUE, FALSE, @@ -244,7 +245,8 @@ SVN_ERR (svn_client_export3 (NULL, new_item->url, path, &(new_item->revision), &(new_item->revision), - TRUE, FALSE, NULL, ib->ctx, ib->pool)); + TRUE, FALSE, TRUE, NULL, + ib->ctx, ib->pool)); else SVN_ERR (svn_client__checkout_internal (NULL, new_item->url, path, &(new_item->revision), @@ -262,7 +264,8 @@ svn_error_t *err; svn_wc_adm_access_t *adm_access; - SVN_ERR (svn_wc_adm_open2 (&adm_access, NULL, path, TRUE, -1, + SVN_ERR (svn_wc_adm_open3 (&adm_access, NULL, path, TRUE, -1, + ib->ctx->cancel_func, ib->ctx->cancel_baton, ib->pool)); /* We don't use relegate_external() here, because we know that @@ -337,8 +340,9 @@ SVN_ERR (svn_io_check_path (path, &kind, ib->pool)); if (kind == svn_node_dir) { - SVN_ERR (svn_wc_adm_open2 (&adm_access, NULL, path, TRUE, -1, - ib->pool)); + SVN_ERR (svn_wc_adm_open3 (&adm_access, NULL, path, TRUE, -1, + ib->ctx->cancel_func, + ib->ctx->cancel_baton, ib->pool)); SVN_ERR (svn_wc_entry (&ext_entry, path, adm_access, FALSE, ib->pool)); SVN_ERR (svn_wc_adm_close (adm_access)); Copied: branches/ruby/subversion/libsvn_client/info.c (from r13185, trunk/subversion/libsvn_client/info.c) Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_client/info.c?view=diff&rev=13186&p1=trunk/subversion/libsvn_client/info.c&r1=13185&p2=branches/ruby/subversion/libsvn_client/info.c&r2=13186 ============================================================================== Modified: branches/ruby/subversion/libsvn_client/log.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_client/log.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_client/log.c&r1=13185&p2=branches/ruby/subversion/libsvn_client/log.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_client/log.c (original) +++ branches/ruby/subversion/libsvn_client/log.c Sun Feb 27 19:19:25 2005 @@ -120,8 +120,9 @@ const svn_wc_entry_t *entry; const char *URL; const char *target = APR_ARRAY_IDX(targets, i, const char *); - SVN_ERR (svn_wc_adm_probe_open2 (&adm_access, NULL, target, - FALSE, 0, pool)); + SVN_ERR (svn_wc_adm_probe_open3 (&adm_access, NULL, target, + FALSE, 0, ctx->cancel_func, + ctx->cancel_baton, pool)); SVN_ERR (svn_wc_entry (&entry, target, adm_access, FALSE, pool)); if (! entry) return svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL, Modified: branches/ruby/subversion/libsvn_client/prop_commands.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_client/prop_commands.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_client/prop_commands.c&r1=13185&p2=branches/ruby/subversion/libsvn_client/prop_commands.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_client/prop_commands.c (original) +++ branches/ruby/subversion/libsvn_client/prop_commands.c Sun Feb 27 19:19:25 2005 @@ -167,6 +167,7 @@ const char *target, svn_boolean_t recurse, svn_boolean_t force, + svn_client_ctx_t *ctx, apr_pool_t *pool) { svn_wc_adm_access_t *adm_access; @@ -203,8 +204,9 @@ return svn_error_createf (SVN_ERR_CLIENT_PROPERTY_NAME, NULL, _("Bad property name: '%s'"), propname); - SVN_ERR (svn_wc_adm_probe_open2 (&adm_access, NULL, target, TRUE, - recurse ? -1 : 0, pool)); + SVN_ERR (svn_wc_adm_probe_open3 (&adm_access, NULL, target, TRUE, + recurse ? -1 : 0, ctx->cancel_func, + ctx->cancel_baton, pool)); SVN_ERR (svn_wc_entry (&node, target, adm_access, FALSE, pool)); if (!node) return svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL, @@ -222,8 +224,10 @@ wb.propval = propval; wb.force = force; - SVN_ERR (svn_wc_walk_entries (target, adm_access, - &walk_callbacks, &wb, FALSE, pool)); + SVN_ERR (svn_wc_walk_entries2 (target, adm_access, + &walk_callbacks, &wb, FALSE, + ctx->cancel_func, ctx->cancel_baton, + pool)); } else { @@ -243,7 +247,12 @@ svn_boolean_t recurse, apr_pool_t *pool) { - return svn_client_propset2 (propname, propval, target, recurse, FALSE, pool); + svn_client_ctx_t *ctx; + + SVN_ERR (svn_client_create_context (&ctx, pool)); + + return svn_client_propset2 (propname, propval, target, recurse, FALSE, + ctx, pool); } @@ -429,8 +438,8 @@ else pdir = target; - SVN_ERR (svn_wc_adm_open2 (&adm_access, NULL, pdir, FALSE, - 0, pool)); + SVN_ERR (svn_wc_adm_open3 (&adm_access, NULL, pdir, FALSE, + 0, NULL, NULL, pool)); SVN_ERR (svn_wc_entry (&entry, target, adm_access, FALSE, pool)); if (! entry) return svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL, @@ -579,8 +588,10 @@ { svn_boolean_t pristine; - SVN_ERR (svn_wc_adm_probe_open2 (&adm_access, NULL, target, - FALSE, recurse ? -1 : 0, pool)); + SVN_ERR (svn_wc_adm_probe_open3 (&adm_access, NULL, target, + FALSE, recurse ? -1 : 0, + ctx->cancel_func, ctx->cancel_baton, + pool)); SVN_ERR (svn_wc_entry (&node, target, adm_access, FALSE, pool)); if (! node) return svn_error_createf @@ -613,8 +624,10 @@ wb.propname = propname; wb.pristine = pristine; - SVN_ERR (svn_wc_walk_entries (target, adm_access, - &walk_callbacks, &wb, FALSE, pool)); + SVN_ERR (svn_wc_walk_entries2 (target, adm_access, + &walk_callbacks, &wb, FALSE, + ctx->cancel_func, ctx->cancel_baton, + pool)); } else { @@ -931,8 +944,10 @@ { svn_boolean_t pristine; - SVN_ERR (svn_wc_adm_probe_open2 (&adm_access, NULL, target, - FALSE, recurse ? -1 : 0, pool)); + SVN_ERR (svn_wc_adm_probe_open3 (&adm_access, NULL, target, + FALSE, recurse ? -1 : 0, + ctx->cancel_func, ctx->cancel_baton, + pool)); SVN_ERR (svn_wc_entry (&node, target, adm_access, FALSE, pool)); if (! node) return svn_error_createf @@ -964,8 +979,10 @@ wb.props = *props; wb.pristine = pristine; - SVN_ERR (svn_wc_walk_entries (target, adm_access, - &walk_callbacks, &wb, FALSE, pool)); + SVN_ERR (svn_wc_walk_entries2 (target, adm_access, + &walk_callbacks, &wb, FALSE, + ctx->cancel_func, ctx->cancel_baton, + pool)); } else SVN_ERR (add_to_proplist (*props, target, adm_access, pristine, pool)); Modified: branches/ruby/subversion/libsvn_client/ra.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_client/ra.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_client/ra.c&r1=13185&p2=branches/ruby/subversion/libsvn_client/ra.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_client/ra.c (original) +++ branches/ruby/subversion/libsvn_client/ra.c Sun Feb 27 19:19:25 2005 @@ -250,8 +250,9 @@ path = svn_path_join (cb->base_dir, path, pool); SVN_ERR (svn_wc_adm_probe_retrieve (&adm_access, cb->base_access, path, pool)); - SVN_ERR (svn_wc_walk_entries (path, adm_access, &walk_callbacks, &wb, - FALSE, pool)); + SVN_ERR (svn_wc_walk_entries2 (path, adm_access, &walk_callbacks, &wb, + FALSE, cb->ctx->cancel_func, + cb->ctx->cancel_baton, pool)); return SVN_NO_ERROR; } @@ -282,7 +283,7 @@ cb->base_access = base_access; cb->pool = pool; cb->commit_items = commit_items; - cb->config = ctx->config; + cb->ctx = ctx; SVN_ERR (svn_ra_open (ra_session, base_url, cbtable, cb, ctx->config, pool)); @@ -693,8 +694,9 @@ { svn_wc_adm_access_t *adm_access; const svn_wc_entry_t *entry; - SVN_ERR (svn_wc_adm_probe_open2 (&adm_access, NULL, path, - FALSE, 0, pool)); + SVN_ERR (svn_wc_adm_probe_open3 (&adm_access, NULL, path, + FALSE, 0, ctx->cancel_func, + ctx->cancel_baton, pool)); SVN_ERR (svn_wc_entry (&entry, path, adm_access, FALSE, pool)); SVN_ERR (svn_wc_adm_close (adm_access)); if (entry->copyfrom_url && revision->kind == svn_opt_revision_working) Modified: branches/ruby/subversion/libsvn_client/relocate.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_client/relocate.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_client/relocate.c&r1=13185&p2=branches/ruby/subversion/libsvn_client/relocate.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_client/relocate.c (original) +++ branches/ruby/subversion/libsvn_client/relocate.c Sun Feb 27 19:19:25 2005 @@ -125,8 +125,10 @@ struct validator_baton_t vb; /* Get an access baton for PATH. */ - SVN_ERR (svn_wc_adm_probe_open2 (&adm_access, NULL, path, - TRUE, recurse ? -1 : 0, pool)); + SVN_ERR (svn_wc_adm_probe_open3 (&adm_access, NULL, path, + TRUE, recurse ? -1 : 0, + ctx->cancel_func, ctx->cancel_baton, + pool)); /* Now, populate our validator callback baton, and call the relocate code. */ vb.ctx = ctx; Modified: branches/ruby/subversion/libsvn_client/resolved.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_client/resolved.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_client/resolved.c&r1=13185&p2=branches/ruby/subversion/libsvn_client/resolved.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_client/resolved.c (original) +++ branches/ruby/subversion/libsvn_client/resolved.c Sun Feb 27 19:19:25 2005 @@ -39,12 +39,15 @@ { svn_wc_adm_access_t *adm_access; - SVN_ERR (svn_wc_adm_probe_open2 (&adm_access, NULL, path, TRUE, - recursive ? -1 : 0, pool)); + SVN_ERR (svn_wc_adm_probe_open3 (&adm_access, NULL, path, TRUE, + recursive ? -1 : 0, + ctx->cancel_func, ctx->cancel_baton, + pool)); - SVN_ERR (svn_wc_resolved_conflict (path, adm_access, TRUE, TRUE, recursive, - ctx->notify_func, - ctx->notify_baton, pool)); + SVN_ERR (svn_wc_resolved_conflict2 (path, adm_access, TRUE, TRUE, recursive, + ctx->notify_func, ctx->notify_baton, + ctx->cancel_func, ctx->cancel_baton, + pool)); SVN_ERR (svn_wc_adm_close (adm_access)); Modified: branches/ruby/subversion/libsvn_client/revert.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_client/revert.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_client/revert.c&r1=13185&p2=branches/ruby/subversion/libsvn_client/revert.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_client/revert.c (original) +++ branches/ruby/subversion/libsvn_client/revert.c Sun Feb 27 19:19:25 2005 @@ -61,7 +61,9 @@ FALSE)); SVN_ERR (svn_wc_adm_open_anchor (&adm_access, &target_access, &target, path, - TRUE, recursive ? -1 : 0, pool)); + TRUE, recursive ? -1 : 0, + ctx->cancel_func, ctx->cancel_baton, + pool)); err = svn_wc_revert (path, adm_access, recursive, use_commit_times, ctx->cancel_func, ctx->cancel_baton, Modified: branches/ruby/subversion/libsvn_client/revisions.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_client/revisions.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_client/revisions.c&r1=13185&p2=branches/ruby/subversion/libsvn_client/revisions.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_client/revisions.c (original) +++ branches/ruby/subversion/libsvn_client/revisions.c Sun Feb 27 19:19:25 2005 @@ -78,8 +78,8 @@ return svn_error_create (SVN_ERR_CLIENT_VERSIONED_PATH_REQUIRED, NULL, NULL); - SVN_ERR (svn_wc_adm_probe_open2 (&adm_access, NULL, path, FALSE, - 0, pool)); + SVN_ERR (svn_wc_adm_probe_open3 (&adm_access, NULL, path, FALSE, + 0, NULL, NULL, pool)); SVN_ERR (svn_wc_entry (&ent, path, adm_access, FALSE, pool)); SVN_ERR (svn_wc_adm_close (adm_access)); Modified: branches/ruby/subversion/libsvn_client/status.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_client/status.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_client/status.c&r1=13185&p2=branches/ruby/subversion/libsvn_client/status.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_client/status.c (original) +++ branches/ruby/subversion/libsvn_client/status.c Sun Feb 27 19:19:25 2005 @@ -99,7 +99,9 @@ sb.deleted_in_repos = FALSE; SVN_ERR (svn_wc_adm_open_anchor (&anchor_access, &target_access, &target, - path, FALSE, descend ? -1 : 1, pool)); + path, FALSE, descend ? -1 : 1, + ctx->cancel_func, ctx->cancel_baton, + pool)); anchor = svn_wc_adm_access_path (anchor_access); /* Get the status edit, and use our wrapping status function/baton Modified: branches/ruby/subversion/libsvn_client/switch.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_client/switch.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_client/switch.c&r1=13185&p2=branches/ruby/subversion/libsvn_client/switch.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_client/switch.c (original) +++ branches/ruby/subversion/libsvn_client/switch.c Sun Feb 27 19:19:25 2005 @@ -94,7 +94,8 @@ /* ### Need to lock the whole target tree to invalidate wcprops. Does non-recursive switch really need to invalidate the whole tree? */ SVN_ERR (svn_wc_adm_open_anchor (&adm_access, &dir_access, &target, path, - TRUE, -1, pool)); + TRUE, -1, ctx->cancel_func, + ctx->cancel_baton, pool)); anchor = svn_wc_adm_access_path (adm_access); SVN_ERR (svn_wc_entry (&entry, anchor, adm_access, FALSE, pool)); Modified: branches/ruby/subversion/libsvn_client/update.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_client/update.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_client/update.c&r1=13185&p2=branches/ruby/subversion/libsvn_client/update.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_client/update.c (original) +++ branches/ruby/subversion/libsvn_client/update.c Sun Feb 27 19:19:25 2005 @@ -73,7 +73,9 @@ /* Use PATH to get the update's anchor and targets and get a write lock */ SVN_ERR (svn_wc_adm_open_anchor (&adm_access, &dir_access, &target, path, - TRUE, recurse ? -1 : 0, pool)); + TRUE, recurse ? -1 : 0, + ctx->cancel_func, ctx->cancel_baton, + pool)); anchor = svn_wc_adm_access_path (adm_access); /* Get full URL from the ANCHOR. */ Modified: branches/ruby/subversion/libsvn_client/url.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_client/url.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_client/url.c&r1=13185&p2=branches/ruby/subversion/libsvn_client/url.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_client/url.c (original) +++ branches/ruby/subversion/libsvn_client/url.c Sun Feb 27 19:19:25 2005 @@ -44,8 +44,8 @@ } else { - SVN_ERR (svn_wc_adm_probe_open2 (&adm_access, NULL, path_or_url, - FALSE, 0, pool)); + SVN_ERR (svn_wc_adm_probe_open3 (&adm_access, NULL, path_or_url, + FALSE, 0, NULL, NULL, pool)); SVN_ERR (svn_wc_entry (&entry, path_or_url, adm_access, FALSE, pool)); SVN_ERR (svn_wc_adm_close (adm_access)); Modified: branches/ruby/subversion/libsvn_delta/compose_delta.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_delta/compose_delta.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_delta/compose_delta.c&r1=13185&p2=branches/ruby/subversion/libsvn_delta/compose_delta.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_delta/compose_delta.c (original) +++ branches/ruby/subversion/libsvn_delta/compose_delta.c Sun Feb 27 19:19:25 2005 @@ -673,6 +673,9 @@ apr_size_t tgt_off = target_offset; assert(ptn_length > ptn_overlap); + /* ### FIXME: ptn_overlap is unsigned, so the if() condition + below is always true! Either it should be '> 0', or the + code block should be unconditional. See also r2288. */ if (ptn_overlap >= 0) { /* Issue second subrange in the pattern. */ Modified: branches/ruby/subversion/libsvn_delta/delta.h Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_delta/delta.h?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_delta/delta.h&r1=13185&p2=branches/ruby/subversion/libsvn_delta/delta.h&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_delta/delta.h (original) +++ branches/ruby/subversion/libsvn_delta/delta.h Sun Feb 27 19:19:25 2005 @@ -101,8 +101,10 @@ a target view TBUF. SBUF is assumed to have WINDOW->sview_len bytes of data and TBUF is assumed to have room for TLEN bytes of output. TLEN may be more than WINDOW->tview_len, so return the - actual number of bytes written. This is purely a memory operation; - nothing can go wrong as long as we have a valid window. */ + actual number of bytes written. SBUF is not touched and may be + NULL if WINDOW contains no source-copy operations. This is purely a + memory operation; nothing can go wrong as long as we have a valid + window. */ void svn_txdelta__apply_instructions (svn_txdelta_window_t *window, const char *sbuf, char *tbuf, Modified: branches/ruby/subversion/libsvn_delta/text_delta.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_delta/text_delta.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_delta/text_delta.c&r1=13185&p2=branches/ruby/subversion/libsvn_delta/text_delta.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_delta/text_delta.c (original) +++ branches/ruby/subversion/libsvn_delta/text_delta.c Sun Feb 27 19:19:25 2005 @@ -490,7 +490,6 @@ ? op->length : *tlen - tpos); /* Check some invariants common to all instructions. */ - assert (op->offset >= 0 && op->length >= 0); assert (tpos + op->length <= window->tview_len); switch (op->action_code) Modified: branches/ruby/subversion/libsvn_delta/xdelta.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_delta/xdelta.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_delta/xdelta.c&r1=13185&p2=branches/ruby/subversion/libsvn_delta/xdelta.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_delta/xdelta.c (original) +++ branches/ruby/subversion/libsvn_delta/xdelta.c Sun Feb 27 19:19:25 2005 @@ -278,7 +278,7 @@ /* If we didn't find a real match, insert the byte at the target position into the pending insert. */ - if (match == FALSE) + if (! match) { if (pending_insert != NULL) @@ -292,7 +292,7 @@ didn't find a match, we are going to generate a copy instruction when we should have generated an insert, so something about the condition above, or what the match routine did, is wrong. */ - assert (match == TRUE); + assert (match); if (pending_insert) { Modified: branches/ruby/subversion/libsvn_fs_base/dag.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_fs_base/dag.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_fs_base/dag.c&r1=13185&p2=branches/ruby/subversion/libsvn_fs_base/dag.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_fs_base/dag.c (original) +++ branches/ruby/subversion/libsvn_fs_base/dag.c Sun Feb 27 19:19:25 2005 @@ -46,6 +46,8 @@ #include "../libsvn_fs/fs-loader.h" +#include "svn_private_config.h" + /* Initializing a filesystem. */ @@ -367,7 +369,7 @@ if (strcmp (txn_id, "0")) return svn_error_createf (SVN_ERR_FS_CORRUPT, 0, - "Corrupt DB: initial transaction id not '0' in filesystem '%s'", + _("Corrupt DB: initial transaction id not '0' in filesystem '%s'"), fs->path); /* Create a default copy (better have an id of "0") */ @@ -375,7 +377,7 @@ if (strcmp (copy_id, "0")) return svn_error_createf (SVN_ERR_FS_CORRUPT, 0, - "Corrupt DB: initial copy id not '0' in filesystem '%s'", fs->path); + _("Corrupt DB: initial copy id not '0' in filesystem '%s'"), fs->path); SVN_ERR (svn_fs_bdb__create_copy (fs, copy_id, NULL, NULL, root_id, copy_kind_real, trail)); @@ -384,8 +386,8 @@ SVN_ERR (svn_fs_bdb__put_rev (&rev, fs, &revision, trail)); if (rev != 0) return svn_error_createf (SVN_ERR_FS_CORRUPT, 0, - "Corrupt DB: initial revision number is not '0'" - " in filesystem '%s'", fs->path); + _("Corrupt DB: initial revision number " + "is not '0' in filesystem '%s'"), fs->path); /* Promote our transaction to a "committed" transaction. */ SVN_ERR (svn_fs_base__txn_make_committed (fs, txn_id, rev, trail)); @@ -430,7 +432,7 @@ if (noderev->kind != svn_node_dir) return svn_error_create (SVN_ERR_FS_NOT_DIRECTORY, NULL, - "Attempted to create entry in non-directory parent"); + _("Attempted to create entry in non-directory parent")); /* If there's a DATA-KEY, there might be entries to fetch. */ if (noderev->data_key) @@ -596,26 +598,26 @@ if (! svn_path_is_single_path_component (name)) return svn_error_createf (SVN_ERR_FS_NOT_SINGLE_PATH_COMPONENT, NULL, - "Attempted to create a node with an illegal name '%s'", name); + _("Attempted to create a node with an illegal name '%s'"), name); /* Make sure that parent is a directory */ if (parent->kind != svn_node_dir) return svn_error_create (SVN_ERR_FS_NOT_DIRECTORY, NULL, - "Attempted to create entry in non-directory parent"); + _("Attempted to create entry in non-directory parent")); /* Check that the parent is mutable. */ if (! svn_fs_base__dag_check_mutable (parent, txn_id)) return svn_error_createf (SVN_ERR_FS_NOT_MUTABLE, NULL, - "Attempted to clone child of non-mutable node"); + _("Attempted to clone child of non-mutable node")); /* Check that parent does not already have an entry named NAME. */ SVN_ERR (dir_entry_id_from_node (&new_node_id, parent, name, trail)); if (new_node_id) return svn_error_createf (SVN_ERR_FS_ALREADY_EXISTS, NULL, - "Attempted to create entry that already exists"); + _("Attempted to create entry that already exists")); /* Create the new node's NODE-REVISION */ memset (&new_noderev, 0, sizeof (new_noderev)); @@ -665,13 +667,13 @@ if (node->kind != svn_node_dir) return svn_error_create (SVN_ERR_FS_NOT_DIRECTORY, NULL, - "Attempted to set entry in non-directory node"); + _("Attempted to set entry in non-directory node")); /* Check it's mutable. */ if (! svn_fs_base__dag_check_mutable (node, txn_id)) return svn_error_create (SVN_ERR_FS_NOT_DIRECTORY, NULL, - "Attempted to set entry in immutable node"); + _("Attempted to set entry in immutable node")); return set_entry (node, entry_name, id, txn_id, trail); } @@ -732,7 +734,7 @@ svn_string_t *idstr = svn_fs_base__id_unparse (node->id, node->pool); return svn_error_createf (SVN_ERR_FS_NOT_MUTABLE, NULL, - "Can't set proplist on *immutable* node-revision %s", idstr->data); + _("Can't set proplist on *immutable* node-revision %s"), idstr->data); } /* Go get a fresh NODE-REVISION for this node. */ @@ -832,13 +834,13 @@ if (! svn_fs_base__dag_check_mutable (parent, txn_id)) return svn_error_createf (SVN_ERR_FS_NOT_MUTABLE, NULL, - "Attempted to clone child of non-mutable node"); + _("Attempted to clone child of non-mutable node")); /* Make sure that NAME is a single path component. */ if (! svn_path_is_single_path_component (name)) return svn_error_createf (SVN_ERR_FS_NOT_SINGLE_PATH_COMPONENT, NULL, - "Attempted to make a child clone with an illegal name '%s'", name); + _("Attempted to make a child clone with an illegal name '%s'"), name); /* Find the node named NAME in PARENT's entries list if it exists. */ SVN_ERR (svn_fs_base__dag_open (&cur_entry, parent, name, trail)); @@ -962,19 +964,20 @@ if (parent->kind != svn_node_dir) return svn_error_createf (SVN_ERR_FS_NOT_DIRECTORY, NULL, - "Attempted to delete entry '%s' from *non*-directory node", name); + _("Attempted to delete entry '%s' from *non*-directory node"), name); /* Make sure parent is mutable. */ if (! svn_fs_base__dag_check_mutable (parent, txn_id)) return svn_error_createf (SVN_ERR_FS_NOT_MUTABLE, NULL, - "Attempted to delete entry '%s' from immutable directory node", name); + _("Attempted to delete entry '%s' from immutable directory node"), + name); /* Make sure that NAME is a single path component. */ if (! svn_path_is_single_path_component (name)) return svn_error_createf (SVN_ERR_FS_NOT_SINGLE_PATH_COMPONENT, NULL, - "Attempted to delete a node with an illegal name '%s'", name); + _("Attempted to delete a node with an illegal name '%s'"), name); /* Get a fresh NODE-REVISION for the parent node. */ SVN_ERR (get_node_revision (&parent_noderev, parent, trail)); @@ -988,7 +991,7 @@ if (! rep_key) return svn_error_createf (SVN_ERR_FS_NO_SUCH_ENTRY, NULL, - "Delete failed--directory has no entry '%s'", name); + _("Delete failed: directory has no entry '%s'"), name); /* Ensure we have a key to a mutable representation of the entries list. We'll have to update the NODE-REVISION if it points to an @@ -1023,7 +1026,7 @@ if (! id) return svn_error_createf (SVN_ERR_FS_NO_SUCH_ENTRY, NULL, - "Delete failed--directory has no entry '%s'", name); + _("Delete failed: directory has no entry '%s'"), name); /* Use the ID of this ENTRY to get the entry's node. */ SVN_ERR (svn_fs_base__dag_get_node (&node, svn_fs_base__dag_get_fs (parent), @@ -1071,7 +1074,7 @@ /* If immutable, do nothing and return immediately. */ if (! svn_fs_base__dag_check_mutable (node, txn_id)) return svn_error_createf (SVN_ERR_FS_NOT_MUTABLE, NULL, - "Attempted removal of immutable node"); + _("Attempted removal of immutable node")); /* Get a fresh node-revision. */ SVN_ERR (svn_fs_bdb__get_node_revision (&noderev, fs, id, trail)); @@ -1185,7 +1188,7 @@ if (file->kind != svn_node_file) return svn_error_createf (SVN_ERR_FS_NOT_FILE, NULL, - "Attempted to get textual contents of a *non*-file node"); + _("Attempted to get textual contents of a *non*-file node")); /* Go get a fresh node-revision for FILE. */ SVN_ERR (get_node_revision (&noderev, file, trail)); @@ -1218,7 +1221,7 @@ if (file->kind != svn_node_file) return svn_error_createf (SVN_ERR_FS_NOT_FILE, NULL, - "Attempted to get length of a *non*-file node"); + _("Attempted to get length of a *non*-file node")); /* Go get a fresh node-revision for FILE, and . */ SVN_ERR (get_node_revision (&noderev, file, trail)); @@ -1242,7 +1245,7 @@ if (file->kind != svn_node_file) return svn_error_createf (SVN_ERR_FS_NOT_FILE, NULL, - "Attempted to get checksum of a *non*-file node"); + _("Attempted to get checksum of a *non*-file node")); SVN_ERR (get_node_revision (&noderev, file, trail)); if (noderev->data_key) @@ -1271,13 +1274,13 @@ if (file->kind != svn_node_file) return svn_error_createf (SVN_ERR_FS_NOT_FILE, NULL, - "Attempted to set textual contents of a *non*-file node"); + _("Attempted to set textual contents of a *non*-file node")); /* Make sure our node is mutable. */ if (! svn_fs_base__dag_check_mutable (file, txn_id)) return svn_error_createf (SVN_ERR_FS_NOT_MUTABLE, NULL, - "Attempted to set textual contents of an immutable node"); + _("Attempted to set textual contents of an immutable node")); /* Get the node revision. */ SVN_ERR (get_node_revision (&noderev, file, trail)); @@ -1322,13 +1325,13 @@ if (file->kind != svn_node_file) return svn_error_createf (SVN_ERR_FS_NOT_FILE, NULL, - "Attempted to set textual contents of a *non*-file node"); + _("Attempted to set textual contents of a *non*-file node")); /* Make sure our node is mutable. */ if (! svn_fs_base__dag_check_mutable (file, txn_id)) return svn_error_createf (SVN_ERR_FS_NOT_MUTABLE, NULL, - "Attempted to set textual contents of an immutable node"); + _("Attempted to set textual contents of an immutable node")); /* Get the node revision. */ SVN_ERR (get_node_revision (&noderev, file, trail)); @@ -1350,9 +1353,9 @@ return svn_error_createf (SVN_ERR_CHECKSUM_MISMATCH, NULL, - "Checksum mismatch, rep '%s':\n" - " expected: %s\n" - " actual: %s\n", + _("Checksum mismatch, rep '%s':\n" + " expected: %s\n" + " actual: %s\n"), noderev->edit_key, checksum, hex); } @@ -1409,13 +1412,13 @@ if (! node_id) return svn_error_createf (SVN_ERR_FS_NOT_FOUND, NULL, - "Attempted to open non-existent child node '%s'", name); + _("Attempted to open non-existent child node '%s'"), name); /* Make sure that NAME is a single path component. */ if (! svn_path_is_single_path_component (name)) return svn_error_createf (SVN_ERR_FS_NOT_SINGLE_PATH_COMPONENT, NULL, - "Attempted to open node with an illegal name '%s'", name); + _("Attempted to open node with an illegal name '%s'"), name); /* Now get the node that was requested. */ return svn_fs_base__dag_get_node (child_p, svn_fs_base__dag_get_fs (parent), Modified: branches/ruby/subversion/libsvn_fs_base/err.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_fs_base/err.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_fs_base/err.c&r1=13185&p2=branches/ruby/subversion/libsvn_fs_base/err.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_fs_base/err.c (original) +++ branches/ruby/subversion/libsvn_fs_base/err.c Sun Feb 27 19:19:25 2005 @@ -34,7 +34,7 @@ return SVN_NO_ERROR; else return svn_error_create (SVN_ERR_FS_NOT_OPEN, 0, - "filesystem object has not been opened yet"); + _("Filesystem object has not been opened yet")); } @@ -78,7 +78,7 @@ return svn_error_createf (SVN_ERR_FS_CORRUPT, 0, - "Corrupt clone record for '%s' in transaction '%s' in filesystem '%s'", + _("Corrupt clone record for '%s' in transaction '%s' in filesystem '%s'"), base_path, svn_txn, fs->path); } @@ -98,7 +98,7 @@ svn_string_t *id_str = svn_fs_base__id_unparse (id, fs->pool); return svn_error_createf (SVN_ERR_FS_ID_NOT_FOUND, 0, - "Reference to non-existent node '%s' in filesystem '%s'", + _("Reference to non-existent node '%s' in filesystem '%s'"), id_str->data, fs->path); } @@ -119,7 +119,7 @@ return svn_error_createf (SVN_ERR_FS_CORRUPT, 0, - "Malformed ID as key in 'nodes' table of filesystem '%s'", fs->path); + _("Malformed ID as key in 'nodes' table of filesystem '%s'"), fs->path); } @@ -129,7 +129,7 @@ return svn_error_createf (SVN_ERR_FS_CORRUPT, 0, - "Corrupt value for 'next-id' key in '%s' table of filesystem '%s'", + _("Corrupt value for 'next-id' key in '%s' table of filesystem '%s'"), table, fs->path); } @@ -141,8 +141,8 @@ return svn_error_createf (SVN_ERR_FS_CORRUPT, 0, - "Corrupt entry in 'transactions' table for '%s'" - " in filesystem '%s'", txn, fs->path); + _("Corrupt entry in 'transactions' table for '%s'" + " in filesystem '%s'"), txn, fs->path); } @@ -152,7 +152,7 @@ return svn_error_createf (SVN_ERR_FS_CORRUPT, 0, - "Corrupt entry in 'copies' table for '%s' in filesystem '%s'", + _("Corrupt entry in 'copies' table for '%s' in filesystem '%s'"), copy_id, fs->path); } @@ -174,7 +174,7 @@ return svn_error_createf (SVN_ERR_FS_PATH_SYNTAX, 0, - "Search for malformed path '%s' in filesystem '%s'", + _("Search for malformed path '%s' in filesystem '%s'"), path, fs->path); } @@ -185,7 +185,7 @@ return svn_error_createf (SVN_ERR_FS_NO_SUCH_TRANSACTION, 0, - "No transaction named '%s' in filesystem '%s'", + _("No transaction named '%s' in filesystem '%s'"), txn, fs->path); } @@ -196,7 +196,7 @@ return svn_error_createf (SVN_ERR_FS_TRANSACTION_NOT_MUTABLE, 0, - "Cannot modify transaction named '%s' in filesystem '%s'", + _("Cannot modify transaction named '%s' in filesystem '%s'"), txn, fs->path); } @@ -207,7 +207,7 @@ return svn_error_createf (SVN_ERR_FS_NO_SUCH_COPY, 0, - "No copy with id '%s' in filesystem '%s'", copy_id, fs->path); + _("No copy with id '%s' in filesystem '%s'"), copy_id, fs->path); } @@ -217,6 +217,6 @@ return svn_error_createf (SVN_ERR_FS_NOT_DIRECTORY, 0, - "'%s' is not a directory in filesystem '%s'", + _("'%s' is not a directory in filesystem '%s'"), path, fs->path); } Modified: branches/ruby/subversion/libsvn_fs_base/fs.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_fs_base/fs.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_fs_base/fs.c&r1=13185&p2=branches/ruby/subversion/libsvn_fs_base/fs.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_fs_base/fs.c (original) +++ branches/ruby/subversion/libsvn_fs_base/fs.c Sun Feb 27 19:19:25 2005 @@ -73,8 +73,8 @@ || (major == SVN_FS_WANT_DB_MAJOR && minor == SVN_FS_WANT_DB_MINOR && patch < SVN_FS_WANT_DB_PATCH)) return svn_error_createf (SVN_ERR_FS_GENERAL, 0, - "Bad database version: got %d.%d.%d," - " should be at least %d.%d.%d", + _("Bad database version: got %d.%d.%d," + " should be at least %d.%d.%d"), major, minor, patch, SVN_FS_WANT_DB_MAJOR, SVN_FS_WANT_DB_MINOR, @@ -84,9 +84,9 @@ the one we compiled with. */ if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR) return svn_error_createf (SVN_ERR_FS_GENERAL, 0, - "Bad database version:" - " compiled with %d.%d.%d," - " running against %d.%d.%d", + _("Bad database version:" + " compiled with %d.%d.%d," + " running against %d.%d.%d"), DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH, @@ -102,7 +102,7 @@ { if (fs->fsap_data) return svn_error_create (SVN_ERR_FS_ALREADY_OPEN, 0, - "Filesystem object already open"); + _("Filesystem object already open")); else return SVN_NO_ERROR; } @@ -542,7 +542,6 @@ base_create (svn_fs_t *fs, const char *path, apr_pool_t *pool) { svn_error_t *svn_err; - const char *path_apr; const char *path_native; base_fs_data_t *bfd; @@ -557,7 +556,6 @@ /* Initialize the fs's path. */ fs->path = apr_pstrdup (fs->pool, path); - SVN_ERR (svn_path_cstring_from_utf8 (&path_apr, fs->path, fs->pool)); SVN_ERR (bdb_write_config (fs)); @@ -978,7 +976,7 @@ APR_OS_DEFAULT, pool); if (status) return svn_error_createf (status, NULL, - "Can't open file '%s' for reading.", + _("Can't open file '%s' for reading"), file_src_path); /* Open destination file. */ @@ -987,7 +985,7 @@ APR_OS_DEFAULT, pool); if (status) return svn_error_createf (status, NULL, - "Can't open file '%s' for writing.", + _("Can't open file '%s' for writing"), file_dst_path); /* Allocate our read/write buffer. */ @@ -1007,7 +1005,7 @@ apr_file_close(s); /* toss any error */ apr_file_close(d); /* toss any error */ return svn_error_createf (status, NULL, - "Error reading file '%s'.", + _("Error reading file '%s'"), file_src_path); } @@ -1018,7 +1016,7 @@ apr_file_close(s); /* toss any error */ apr_file_close(d); /* toss any error */ return svn_error_createf (status, NULL, - "Error writing file '%s'.", + _("Error writing file '%s'"), file_dst_path); } @@ -1026,11 +1024,11 @@ { status = apr_file_close(s); if (status) - return svn_error_createf (status, NULL, "Can't close file '%s'.", + return svn_error_createf (status, NULL, _("Can't close file '%s'"), file_src_path); status = apr_file_close(d); if (status) - return svn_error_createf (status, NULL, "Can't close file '%s'.", + return svn_error_createf (status, NULL, _("Can't close file '%s'"), file_dst_path); break; /* got EOF on read, all files closed, all done. */ @@ -1129,7 +1127,7 @@ _("Error copying logfile; the DB_LOG_AUTOREMOVE feature \n" "may be interfering with the hotcopy algorithm. If \n" "the problem persists, try deactivating this feature \n" - "in DB_CONFIG.")); + "in DB_CONFIG")); else return err; } @@ -1148,7 +1146,7 @@ _("Error running catastrophic recovery on hotcopy; the \n" "DB_LOG_AUTOREMOVE feature may be interfering with the \n" "hotcopy algorithm. If the problem persists, try deactivating \n" - "this feature in DB_CONFIG.")); + "this feature in DB_CONFIG")); else return err; } Modified: branches/ruby/subversion/libsvn_fs_base/reps-strings.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_fs_base/reps-strings.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_fs_base/reps-strings.c&r1=13185&p2=branches/ruby/subversion/libsvn_fs_base/reps-strings.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_fs_base/reps-strings.c (original) +++ branches/ruby/subversion/libsvn_fs_base/reps-strings.c Sun Feb 27 19:19:25 2005 @@ -35,6 +35,7 @@ #include "../libsvn_delta/delta.h" +#include "svn_private_config.h" /*** Helper Functions ***/ @@ -99,7 +100,7 @@ if (rep->kind != rep_kind_delta) return svn_error_create (SVN_ERR_FS_GENERAL, NULL, - "Representation is not of type 'delta'"); + _("Representation is not of type 'delta'")); /* Set up a convenience variable. */ chunks = rep->contents.delta.chunks; @@ -150,6 +151,11 @@ svn_txdelta_window_t *window; apr_pool_t *window_pool; + /* If the incoming window was self-compressed, and the combined WINDOW + exists from previous iterations, SOURCE_BUF will point to the + expanded self-compressed window. */ + char *source_buf; + /* The trail for this operation. WINDOW_POOL will be a child of TRAIL->pool. No allocations will be made from TRAIL->pool itself. */ trail_t *trail; @@ -166,7 +172,9 @@ /* Handle one window. If BATON is emtpy, copy the WINDOW into it; - otherwise, combine WINDOW with the one in BATON. */ + otherwise, combine WINDOW with the one in BATON, unless WINDOW + is self-compressed (i.e., does not copy from the source view), + in which case expand. */ static svn_error_t * compose_handler (svn_txdelta_window_t *window, void *baton) @@ -178,18 +186,38 @@ if (!cb->init && !window) return SVN_NO_ERROR; + /* We should never get here if we've already expanded a + self-compressed window. */ + assert (!cb->source_buf); + if (cb->window) { - /* Combine the incoming window with whatever's in the baton. */ - apr_pool_t *composite_pool = svn_pool_create (cb->trail->pool); - svn_txdelta_window_t *composite; - - composite = svn_txdelta__compose_windows (window, cb->window, - composite_pool); - svn_pool_destroy (cb->window_pool); - cb->window = composite; - cb->window_pool = composite_pool; - cb->done = (composite->sview_len == 0 || composite->src_ops == 0); + if (window && (window->sview_len == 0 || window->src_ops == 0)) + { + /* This is a self-compressed window. Don't combine it with + the others, because the combiner may go quadratic. Instead, + expand it here and signal that the combination has + ended. */ + apr_size_t source_len = window->tview_len; + assert (cb->window->sview_len == source_len); + cb->source_buf = apr_palloc (cb->window_pool, source_len); + svn_txdelta__apply_instructions (window, NULL, + cb->source_buf, &source_len); + cb->done = TRUE; + } + else + { + /* Combine the incoming window with whatever's in the baton. */ + apr_pool_t *composite_pool = svn_pool_create (cb->trail->pool); + svn_txdelta_window_t *composite; + + composite = svn_txdelta__compose_windows (window, cb->window, + composite_pool); + svn_pool_destroy (cb->window_pool); + cb->window = composite; + cb->window_pool = composite_pool; + cb->done = (composite->sview_len == 0 || composite->src_ops == 0); + } } else if (window) { @@ -320,7 +348,13 @@ /* cb.window is the combined delta window. Read the source text into a buffer. */ - if (fulltext && cb.window->sview_len > 0 && cb.window->src_ops > 0) + if (cb.source_buf) + { + /* The combiner already created the source text from a + self-compressed window. */ + source_buf = cb.source_buf; + } + else if (fulltext && cb.window->sview_len > 0 && cb.window->src_ops > 0) { apr_size_t source_len = cb.window->sview_len; source_buf = apr_palloc (cb.window_pool, source_len); @@ -331,8 +365,7 @@ } else { - static char empty_buf[] = ""; - source_buf = empty_buf; /* Won't read anything from here. */ + source_buf = NULL; /* Won't read anything from here. */ } if (offset > 0) @@ -451,7 +484,7 @@ if (first_chunk->version != chunk->version) return svn_error_createf (SVN_ERR_FS_CORRUPT, NULL, - "Diff version inconsistencies in representation '%s'", + _("Diff version inconsistencies in representation '%s'"), rep_key); rep_key = chunk->rep_key; @@ -707,9 +740,10 @@ if (contents_size > SVN_MAX_OBJECT_SIZE) return svn_error_createf (SVN_ERR_FS_GENERAL, NULL, - "Rep contents are too large " - "(got %" SVN_FILESIZE_T_FMT ", limit is %" APR_SIZE_T_FMT ")", - contents_size, SVN_MAX_OBJECT_SIZE); + _("Rep contents are too large: " + "got %s, limit is %s"), + apr_psprintf (trail->pool, "%" SVN_FILESIZE_T_FMT, contents_size), + apr_psprintf (trail->pool, "%" APR_SIZE_T_FMT, SVN_MAX_OBJECT_SIZE)); else str->len = (apr_size_t) contents_size; @@ -722,7 +756,7 @@ if (len != str->len) return svn_error_createf (SVN_ERR_FS_CORRUPT, NULL, - "Failure reading rep '%s'", rep_key); + _("Failure reading rep '%s'"), rep_key); /* Just the standard paranoia. */ { @@ -738,9 +772,9 @@ if (! svn_md5_digests_match (checksum, rep->checksum)) return svn_error_createf (SVN_ERR_FS_CORRUPT, NULL, - "Checksum mismatch on rep '%s':\n" - " expected: %s\n" - " actual: %s\n", rep_key, + _("Checksum mismatch on rep '%s':\n" + " expected: %s\n" + " actual: %s\n"), rep_key, svn_md5_digest_to_cstring (rep->checksum, trail->pool), svn_md5_digest_to_cstring (checksum, trail->pool)); } @@ -822,9 +856,9 @@ if (! svn_md5_digests_match (checksum, rep->checksum)) return svn_error_createf (SVN_ERR_FS_CORRUPT, NULL, - "Checksum mismatch on rep '%s':\n" - " expected: %s\n" - " actual: %s\n", args->rb->rep_key, + _("Checksum mismatch on rep '%s':\n" + " expected: %s\n" + " actual: %s\n"), args->rb->rep_key, svn_md5_digest_to_cstring (rep->checksum, trail->pool), svn_md5_digest_to_cstring (checksum, trail->pool)); } @@ -835,7 +869,7 @@ return svn_error_create (SVN_ERR_FS_REP_CHANGED, NULL, - "Null rep, but offset past zero already"); + _("Null rep, but offset past zero already")); } else *(args->len) = 0; @@ -947,7 +981,7 @@ if (! rep_is_mutable (rep, txn_id)) return svn_error_createf (SVN_ERR_FS_REP_NOT_MUTABLE, NULL, - "Rep '%s' is not mutable", rep_key); + _("Rep '%s' is not mutable"), rep_key); if (rep->kind == rep_kind_fulltext) { @@ -961,7 +995,7 @@ in this file, and it creates them fulltext. */ return svn_error_createf (SVN_ERR_FS_CORRUPT, NULL, - "Rep '%s' both mutable and non-fulltext", rep_key); + _("Rep '%s' both mutable and non-fulltext"), rep_key); } else /* unknown kind */ abort (); @@ -1138,7 +1172,7 @@ if (! rep_is_mutable (rep, txn_id)) return svn_error_createf (SVN_ERR_FS_REP_NOT_MUTABLE, NULL, - "Rep '%s' is not mutable", rep_key); + _("Rep '%s' is not mutable"), rep_key); assert (rep->kind == rep_kind_fulltext); @@ -1257,7 +1291,7 @@ /* Make sure we (still) have a key. */ if (wb->key == NULL) return svn_error_create (SVN_ERR_FS_GENERAL, NULL, - "Failed to get new string key"); + _("Failed to get new string key")); /* Restore *LEN to the value it *would* have been were it not for header stripping. */ @@ -1332,7 +1366,7 @@ if (strcmp (target, source) == 0) return svn_error_createf (SVN_ERR_FS_CORRUPT, NULL, - "Attempt to deltify '%s' against itself", + _("Attempt to deltify '%s' against itself"), target); /* Set up a handler for the svndiff data, which will write each @@ -1398,7 +1432,7 @@ if (! digest) return svn_error_createf (SVN_ERR_DELTA_MD5_CHECKSUM_ABSENT, NULL, - "Failed to calculate MD5 digest for '%s'", + _("Failed to calculate MD5 digest for '%s'"), source); /* Construct a list of the strings used by the old representation so @@ -1491,4 +1525,3 @@ return SVN_NO_ERROR; } - Modified: branches/ruby/subversion/libsvn_fs_base/revs-txns.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_fs_base/revs-txns.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_fs_base/revs-txns.c&r1=13185&p2=branches/ruby/subversion/libsvn_fs_base/revs-txns.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_fs_base/revs-txns.c (original) +++ branches/ruby/subversion/libsvn_fs_base/revs-txns.c Sun Feb 27 19:19:25 2005 @@ -40,6 +40,7 @@ #include "bdb/changes-table.h" #include "../libsvn_fs/fs-loader.h" +#include "svn_private_config.h" /*** Helpers ***/ @@ -60,10 +61,10 @@ SVN_ERR (svn_fs_bdb__get_txn (&txn, fs, txn_id, trail)); if (expect_dead && (txn->kind != transaction_kind_dead)) return svn_error_createf (SVN_ERR_FS_TRANSACTION_NOT_DEAD, 0, - "Transaction is not dead: '%s'", txn_id); + _("Transaction is not dead: '%s'"), txn_id); if ((! expect_dead) && (txn->kind == transaction_kind_dead)) return svn_error_createf (SVN_ERR_FS_TRANSACTION_DEAD, 0, - "Transaction is dead: '%s'", txn_id); + _("Transaction is dead: '%s'"), txn_id); *txn_p = txn; return SVN_NO_ERROR; } @@ -918,7 +919,7 @@ /* Now, purge it. */ SVN_ERR_W (svn_fs_base__purge_txn (txn->fs, txn->id, pool), - "Transaction aborted, but cleanup failed"); + _("Transaction aborted, but cleanup failed")); return SVN_NO_ERROR; } Modified: branches/ruby/subversion/libsvn_fs_base/tree.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_fs_base/tree.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_fs_base/tree.c&r1=13185&p2=branches/ruby/subversion/libsvn_fs_base/tree.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_fs_base/tree.c (original) +++ branches/ruby/subversion/libsvn_fs_base/tree.c Sun Feb 27 19:19:25 2005 @@ -370,7 +370,7 @@ return svn_error_createf (SVN_ERR_FS_NOT_FOUND, 0, - "File not found: transaction '%s', path '%s'", + _("File not found: transaction '%s', path '%s'"), root->txn, path); else return @@ -391,7 +391,7 @@ return svn_error_createf (SVN_ERR_FS_ALREADY_EXISTS, 0, - "File already exists: filesystem '%s', transaction '%s', path '%s'", + _("File already exists: filesystem '%s', transaction '%s', path '%s'"), fs->path, root->txn, path); else return @@ -407,7 +407,7 @@ { return svn_error_create (SVN_ERR_FS_NOT_TXN_ROOT, NULL, - "Root object must be a transaction root"); + _("Root object must be a transaction root")); } @@ -811,7 +811,7 @@ /* The path isn't finished yet; we'd better be in a directory. */ if (svn_fs_base__dag_node_kind (child) != svn_node_dir) SVN_ERR_W (svn_fs_base__err_not_directory (fs, path_so_far), - apr_pstrcat (pool, "Failure opening '", path, "'", NULL)); + apr_psprintf (pool, _("Failure opening '%s'"), path)); rest = next; here = child; @@ -1364,7 +1364,7 @@ if (root1->fs != root2->fs) return svn_error_create (SVN_ERR_FS_GENERAL, NULL, - "Asking props changed in two different filesystems"); + _("Asking props changed in two different filesystems")); args.root1 = root1; args.root2 = root2; @@ -1695,8 +1695,9 @@ pred_id = tpi_args.pred_id; if (pred_id == NULL) - return svn_error_create (SVN_ERR_FS_CORRUPT, 0, - "Corrupt DB: faulty predecessor count"); + return svn_error_create + (SVN_ERR_FS_CORRUPT, 0, + _("Corrupt DB: faulty predecessor count")); count++; } @@ -1770,7 +1771,7 @@ if (strcmp (svn_fs_base__id_txn_id (target_id), txn_id)) return svn_error_createf (SVN_ERR_FS_NOT_MUTABLE, NULL, - "Unexpected immutable node at '%s'", target_path); + _("Unexpected immutable node at '%s'"), target_path); SVN_ERR (svn_fs_bdb__get_node_revision (&noderev, fs, target_id, trail)); noderev->predecessor_id = source_id; noderev->predecessor_count = source_pred_count; @@ -1819,8 +1820,8 @@ as we expected it to be in the changes table. */ return svn_error_createf (SVN_ERR_FS_CORRUPT, NULL, - "No deletion changes for path '%s' " - "in transaction '%s' of filesystem '%s'", + _("No deletion changes for path '%s' " + "in transaction '%s' of filesystem '%s'"), path, txn_id, fs->path); } @@ -1838,7 +1839,7 @@ { svn_stringbuf_set (conflict_path, path); return svn_error_createf (SVN_ERR_FS_CONFLICT, NULL, - "Conflict at '%s'", path); + _("Conflict at '%s'"), path); } @@ -1885,7 +1886,7 @@ { return svn_error_create (SVN_ERR_FS_CORRUPT, NULL, - "Bad merge; ancestor, source, and target not all in same fs"); + _("Bad merge; ancestor, source, and target not all in same fs")); } /* We have the same fs, now check it. */ @@ -1901,7 +1902,7 @@ svn_string_t *id_str = svn_fs_base__id_unparse (target_id, trail->pool); return svn_error_createf (SVN_ERR_FS_GENERAL, NULL, - "Bad merge; target '%s' has id '%s', same as ancestor", + _("Bad merge; target '%s' has id '%s', same as ancestor"), target_path, id_str->data); } @@ -2150,7 +2151,7 @@ if (! svn_fs_base__dag_check_mutable (target, txn_id)) return svn_error_createf (SVN_ERR_FS_NOT_MUTABLE, NULL, - "Unexpected immutable node at '%s'", target_path); + _("Unexpected immutable node at '%s'"), target_path); SVN_ERR (svn_fs_base__dag_set_entry (target, t_entry->name, s_entry->id, @@ -2240,7 +2241,7 @@ if (! svn_fs_base__dag_check_mutable (target, txn_id)) return svn_error_createf (SVN_ERR_FS_NOT_MUTABLE, NULL, - "Unexpected immutable node at '%s'", target_path); + _("Unexpected immutable node at '%s'"), target_path); SVN_ERR (svn_fs_base__dag_delete (target, t_entry->name, txn_id, trail)); @@ -2334,7 +2335,7 @@ if (! svn_fs_base__dag_check_mutable (target, txn_id)) return svn_error_createf (SVN_ERR_FS_NOT_MUTABLE, NULL, - "Unexpected immutable node at '%s'", target_path); + _("Unexpected immutable node at '%s'"), target_path); SVN_ERR (svn_fs_base__dag_set_entry (target, s_entry->name, s_entry->id, txn_id, trail)); @@ -2505,7 +2506,7 @@ trail->pool); return svn_error_createf (SVN_ERR_FS_TXN_OUT_OF_DATE, NULL, - "Transaction '%s' out of date with respect to revision '%s'", + _("Transaction '%s' out of date with respect to revision '%s'"), txn_name, id_str->data); } @@ -2681,7 +2682,7 @@ { return svn_error_create (SVN_ERR_FS_CORRUPT, NULL, - "Bad merge; ancestor, source, and target not all in same fs"); + _("Bad merge; ancestor, source, and target not all in same fs")); } /* ### kff todo: is there any compelling reason to get the nodes in @@ -2853,7 +2854,7 @@ /* We can't remove the root of the filesystem. */ if (! parent_path->parent) return svn_error_create (SVN_ERR_FS_ROOT_DIR, NULL, - "The root directory cannot be deleted"); + _("The root directory cannot be deleted")); /* Make the parent directory mutable, and do the deletion. */ SVN_ERR (make_path_mutable (root, parent_path->parent, path, trail)); @@ -2992,8 +2993,9 @@ return not_txn (to_root); if (from_root->is_txn_root) - return svn_error_create (SVN_ERR_UNSUPPORTED_FEATURE, NULL, - "Copy from mutable tree not currently supported"); + return svn_error_create + (SVN_ERR_UNSUPPORTED_FEATURE, NULL, + _("Copy from mutable tree not currently supported")); args.from_root = from_root; args.from_path = from_path; @@ -3467,9 +3469,9 @@ return svn_error_createf (SVN_ERR_CHECKSUM_MISMATCH, NULL, - "Base checksum mismatch on '%s':\n" - " expected: %s\n" - " actual: %s\n", + _("Base checksum mismatch on '%s':\n" + " expected: %s\n" + " actual: %s\n"), tb->path, tb->base_checksum, hex); } @@ -3713,7 +3715,7 @@ if (root1->fs != root2->fs) return svn_error_create (SVN_ERR_FS_GENERAL, NULL, - "Asking contents changed in two different filesystems"); + _("Asking contents changed in two different filesystems")); /* Check that both paths are files. */ { @@ -3722,12 +3724,12 @@ SVN_ERR (base_check_path (&kind, root1, path1, pool)); if (kind != svn_node_file) return svn_error_createf - (SVN_ERR_FS_GENERAL, NULL, "'%s' is not a file", path1); + (SVN_ERR_FS_GENERAL, NULL, _("'%s' is not a file"), path1); SVN_ERR (base_check_path (&kind, root2, path2, pool)); if (kind != svn_node_file) return svn_error_createf - (SVN_ERR_FS_GENERAL, NULL, "'%s' is not a file", path2); + (SVN_ERR_FS_GENERAL, NULL, _("'%s' is not a file"), path2); } args.root1 = root1; Modified: branches/ruby/subversion/libsvn_fs_fs/dag.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_fs_fs/dag.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_fs_fs/dag.c&r1=13185&p2=branches/ruby/subversion/libsvn_fs_fs/dag.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_fs_fs/dag.c (original) +++ branches/ruby/subversion/libsvn_fs_fs/dag.c Sun Feb 27 19:19:25 2005 @@ -34,6 +34,8 @@ #include "../libsvn_fs/fs-loader.h" +#include "svn_private_config.h" + /* Initializing a filesystem. */ @@ -360,19 +362,19 @@ if (! svn_path_is_single_path_component (name)) return svn_error_createf (SVN_ERR_FS_NOT_SINGLE_PATH_COMPONENT, NULL, - "Attempted to create a node with an illegal name '%s'", name); + _("Attempted to create a node with an illegal name '%s'"), name); /* Make sure that parent is a directory */ if (parent->kind != svn_node_dir) return svn_error_create (SVN_ERR_FS_NOT_DIRECTORY, NULL, - "Attempted to create entry in non-directory parent"); + _("Attempted to create entry in non-directory parent")); /* Check that the parent is mutable. */ if (! svn_fs_fs__dag_check_mutable (parent, txn_id)) return svn_error_createf (SVN_ERR_FS_NOT_MUTABLE, NULL, - "Attempted to clone child of non-mutable node"); + _("Attempted to clone child of non-mutable node")); /* Create the new node's NODE-REVISION */ memset (&new_noderev, 0, sizeof (new_noderev)); @@ -416,7 +418,7 @@ if (noderev->kind != svn_node_dir) return svn_error_create (SVN_ERR_FS_NOT_DIRECTORY, NULL, - "Can't get entries of non-directory"); + _("Can't get entries of non-directory")); return svn_fs_fs__rep_contents_dir (entries, node->fs, noderev, pool); } @@ -434,13 +436,13 @@ if (node->kind != svn_node_dir) return svn_error_create (SVN_ERR_FS_NOT_DIRECTORY, NULL, - "Attempted to set entry in non-directory node"); + _("Attempted to set entry in non-directory node")); /* Check it's mutable. */ if (! svn_fs_fs__dag_check_mutable (node, txn_id)) return svn_error_create (SVN_ERR_FS_NOT_DIRECTORY, NULL, - "Attempted to set entry in immutable node"); + _("Attempted to set entry in immutable node")); return set_entry (node, entry_name, id, kind, txn_id, pool); } Modified: branches/ruby/subversion/libsvn_fs_fs/fs.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_fs_fs/fs.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_fs_fs/fs.c&r1=13185&p2=branches/ruby/subversion/libsvn_fs_fs/fs.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_fs_fs/fs.c (original) +++ branches/ruby/subversion/libsvn_fs_fs/fs.c Sun Feb 27 19:19:25 2005 @@ -46,7 +46,7 @@ { if (fs->fsap_data) return svn_error_create (SVN_ERR_FS_ALREADY_OPEN, 0, - "Filesystem object already open"); + _("Filesystem object already open")); else return SVN_NO_ERROR; } Modified: branches/ruby/subversion/libsvn_fs_fs/fs_fs.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_fs_fs/fs_fs.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_fs_fs/fs_fs.c&r1=13185&p2=branches/ruby/subversion/libsvn_fs_fs/fs_fs.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_fs_fs/fs_fs.c (original) +++ branches/ruby/subversion/libsvn_fs_fs/fs_fs.c Sun Feb 27 19:19:25 2005 @@ -1541,9 +1541,9 @@ apr_md5_final (checksum, &rb->md5_context); if (! svn_md5_digests_match (checksum, rb->checksum)) return svn_error_createf (SVN_ERR_FS_CORRUPT, NULL, - "Checksum mismatch while reading representation:\n" - " expected: %s\n" - " actual: %s\n", + _("Checksum mismatch while reading representation:\n" + " expected: %s\n" + " actual: %s\n"), svn_md5_digest_to_cstring (rb->checksum, rb->pool), svn_md5_digest_to_cstring (checksum, rb->pool)); } @@ -2341,8 +2341,8 @@ return svn_error_createf (SVN_ERR_IO_UNIQUE_NAMES_EXHAUSTED, NULL, - "Unable to create transaction directory " - "in '%s' for revision %ld", + _("Unable to create transaction directory " + "in '%s' for revision %ld"), fs->path, rev); } Modified: branches/ruby/subversion/libsvn_fs_fs/revs-txns.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_fs_fs/revs-txns.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_fs_fs/revs-txns.c&r1=13185&p2=branches/ruby/subversion/libsvn_fs_fs/revs-txns.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_fs_fs/revs-txns.c (original) +++ branches/ruby/subversion/libsvn_fs_fs/revs-txns.c Sun Feb 27 19:19:25 2005 @@ -34,6 +34,8 @@ #include "../libsvn_fs/fs-loader.h" +#include "svn_private_config.h" + /*** Helpers ***/ @@ -53,10 +55,10 @@ SVN_ERR (svn_fs_fs__get_txn (&txn, fs, txn_id, pool)); if (expect_dead && (txn->kind != transaction_kind_dead)) return svn_error_createf (SVN_ERR_FS_TRANSACTION_NOT_DEAD, 0, - "Transaction is not dead: '%s'", txn_id); + _("Transaction is not dead: '%s'"), txn_id); if ((! expect_dead) && (txn->kind == transaction_kind_dead)) return svn_error_createf (SVN_ERR_FS_TRANSACTION_NOT_DEAD, 0, - "Transaction is dead: '%s'", txn_id); + _("Transaction is dead: '%s'"), txn_id); *txn_p = txn; return SVN_NO_ERROR; } @@ -197,7 +199,7 @@ /* Now, purge it. */ SVN_ERR_W (svn_fs_fs__purge_txn (txn->fs, txn->id, pool), - "Transaction cleanup failed"); + _("Transaction cleanup failed")); return SVN_NO_ERROR; } Modified: branches/ruby/subversion/libsvn_fs_fs/tree.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_fs_fs/tree.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_fs_fs/tree.c&r1=13185&p2=branches/ruby/subversion/libsvn_fs_fs/tree.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_fs_fs/tree.c (original) +++ branches/ruby/subversion/libsvn_fs_fs/tree.c Sun Feb 27 19:19:25 2005 @@ -290,7 +290,7 @@ return svn_error_createf (SVN_ERR_FS_NOT_FOUND, 0, - "File not found: transaction '%s', path '%s'", + _("File not found: transaction '%s', path '%s'"), root->txn, path); else return @@ -311,7 +311,7 @@ return svn_error_createf (SVN_ERR_FS_ALREADY_EXISTS, 0, - "File already exists: filesystem '%s', transaction '%s', path '%s'", + _("File already exists: filesystem '%s', transaction '%s', path '%s'"), fs->path, root->txn, path); else return @@ -327,7 +327,7 @@ { return svn_error_create (SVN_ERR_FS_NOT_TXN_ROOT, NULL, - "Root object must be a transaction root"); + _("Root object must be a transaction root")); } @@ -736,7 +736,7 @@ /* The path isn't finished yet; we'd better be in a directory. */ if (svn_fs_fs__dag_node_kind (child) != svn_node_dir) SVN_ERR_W (svn_fs_fs__err_not_directory (fs, path_so_far), - apr_pstrcat (pool, "Failure opening '", path, "'", NULL)); + apr_psprintf (pool, _("Failure opening '%s'"), path)); rest = next; here = child; @@ -1131,7 +1131,7 @@ if (root1->fs != root2->fs) return svn_error_create (SVN_ERR_FS_GENERAL, NULL, - "Asking props changed in two different filesystems"); + _("Asking props changed in two different filesystems")); SVN_ERR (get_dag (&node1, root1, path1, pool)); SVN_ERR (get_dag (&node2, root2, path2, pool)); @@ -1189,7 +1189,7 @@ if (svn_fs_fs__id_txn_id (target_id) == NULL) return svn_error_createf (SVN_ERR_FS_NOT_MUTABLE, NULL, - "Unexpected immutable node at '%s'", target_path); + _("Unexpected immutable node at '%s'"), target_path); SVN_ERR (svn_fs_fs__get_node_revision (&noderev, fs, target_id, pool)); noderev->predecessor_id = source_id; @@ -1242,8 +1242,8 @@ as we expected it to be in the changes table. */ return svn_error_createf (SVN_ERR_FS_CORRUPT, NULL, - "No deletion changes for path '%s' " - "in transaction '%s' of filesystem '%s'", + _("No deletion changes for path '%s' " + "in transaction '%s' of filesystem '%s'"), path, txn_id, fs->path); } @@ -1261,7 +1261,7 @@ { svn_stringbuf_set (conflict_path, path); return svn_error_createf (SVN_ERR_FS_CONFLICT, NULL, - "Conflict at '%s'", path); + _("Conflict at '%s'"), path); } @@ -1308,7 +1308,7 @@ { return svn_error_create (SVN_ERR_FS_CORRUPT, NULL, - "Bad merge; ancestor, source, and target not all in same fs"); + _("Bad merge; ancestor, source, and target not all in same fs")); } /* We have the same fs, now check it. */ @@ -1324,7 +1324,7 @@ svn_string_t *id_str = svn_fs_fs__id_unparse (target_id, pool); return svn_error_createf (SVN_ERR_FS_GENERAL, NULL, - "Bad merge; target '%s' has id '%s', same as ancestor", + _("Bad merge; target '%s' has id '%s', same as ancestor"), target_path, id_str->data); } @@ -1571,7 +1571,7 @@ if (! svn_fs_fs__dag_check_mutable (target, txn_id)) return svn_error_createf (SVN_ERR_FS_NOT_MUTABLE, NULL, - "Unexpected immutable node at '%s'", target_path); + _("Unexpected immutable node at '%s'"), target_path); SVN_ERR (svn_fs_fs__dag_set_entry (target, t_entry->name, s_entry->id, s_entry->kind, @@ -1663,7 +1663,7 @@ if (! svn_fs_fs__dag_check_mutable (target, txn_id)) return svn_error_createf (SVN_ERR_FS_NOT_MUTABLE, NULL, - "Unexpected immutable node at '%s'", target_path); + _("Unexpected immutable node at '%s'"), target_path); SVN_ERR (svn_fs_fs__dag_delete (target, t_entry->name, txn_id, pool)); @@ -1757,7 +1757,7 @@ if (! svn_fs_fs__dag_check_mutable (target, txn_id)) return svn_error_createf (SVN_ERR_FS_NOT_MUTABLE, NULL, - "Unexpected immutable node at '%s'", target_path); + _("Unexpected immutable node at '%s'"), target_path); SVN_ERR (svn_fs_fs__dag_set_entry (target, s_entry->name, s_entry->id, s_entry->kind, @@ -2012,7 +2012,7 @@ { return svn_error_create (SVN_ERR_FS_CORRUPT, NULL, - "Bad merge; ancestor, source, and target not all in same fs"); + _("Bad merge; ancestor, source, and target not all in same fs")); } /* ### kff todo: is there any compelling reason to get the nodes in @@ -2144,7 +2144,7 @@ /* We can't remove the root of the filesystem. */ if (! parent_path->parent) return svn_error_create (SVN_ERR_FS_ROOT_DIR, NULL, - "The root directory cannot be deleted"); + _("The root directory cannot be deleted")); /* Make the parent directory mutable, and do the deletion. */ SVN_ERR (make_path_mutable (root, parent_path->parent, path, pool)); @@ -2183,8 +2183,9 @@ assert (from_root->fs == to_root->fs); if (from_root->is_txn_root) - return svn_error_create (SVN_ERR_UNSUPPORTED_FEATURE, NULL, - "Copy from mutable tree not currently supported"); + return svn_error_create + (SVN_ERR_UNSUPPORTED_FEATURE, NULL, + _("Copy from mutable tree not currently supported")); /* Get the NODE for FROM_PATH in FROM_ROOT.*/ SVN_ERR (get_dag (&from_node, from_root, from_path, pool)); @@ -2586,9 +2587,9 @@ return svn_error_createf (SVN_ERR_CHECKSUM_MISMATCH, NULL, - "Base checksum mismatch on '%s':\n" - " expected: %s\n" - " actual: %s\n", + _("Base checksum mismatch on '%s':\n" + " expected: %s\n" + " actual: %s\n"), tb->path, tb->base_checksum, hex); } @@ -2816,7 +2817,7 @@ if (root1->fs != root2->fs) return svn_error_create (SVN_ERR_FS_GENERAL, NULL, - "Asking contents changed in two different filesystems"); + _("Asking contents changed in two different filesystems")); /* Check that both paths are files. */ { @@ -2825,12 +2826,12 @@ SVN_ERR (fs_check_path (&kind, root1, path1, pool)); if (kind != svn_node_file) return svn_error_createf - (SVN_ERR_FS_GENERAL, NULL, "'%s' is not a file", path1); + (SVN_ERR_FS_GENERAL, NULL, _("'%s' is not a file"), path1); SVN_ERR (fs_check_path (&kind, root2, path2, pool)); if (kind != svn_node_file) return svn_error_createf - (SVN_ERR_FS_GENERAL, NULL, "'%s' is not a file", path2); + (SVN_ERR_FS_GENERAL, NULL, _("'%s' is not a file"), path2); } SVN_ERR (get_dag (&node1, root1, path1, pool)); Modified: branches/ruby/subversion/libsvn_ra_svn/client.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_ra_svn/client.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_ra_svn/client.c&r1=13185&p2=branches/ruby/subversion/libsvn_ra_svn/client.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_ra_svn/client.c (original) +++ branches/ruby/subversion/libsvn_ra_svn/client.c Sun Feb 27 19:19:25 2005 @@ -1105,11 +1105,10 @@ else cphash = NULL; - if (limit && ++nreceived > limit) - break; + if (! (limit && ++nreceived > limit)) + SVN_ERR(receiver(receiver_baton, cphash, rev, author, date, message, + subpool)); - SVN_ERR(receiver(receiver_baton, cphash, rev, author, date, message, - subpool)); apr_pool_clear(subpool); } apr_pool_destroy(subpool); Modified: branches/ruby/subversion/libsvn_repos/delta.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_repos/delta.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_repos/delta.c&r1=13185&p2=branches/ruby/subversion/libsvn_repos/delta.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_repos/delta.c (original) +++ branches/ruby/subversion/libsvn_repos/delta.c Sun Feb 27 19:19:25 2005 @@ -484,6 +484,7 @@ if (SVN_IS_VALID_REVNUM (committed_rev)) { svn_fs_t *fs = svn_fs_root_fs (c->target_root); + apr_hash_t *r_props; const char *uuid; /* Transmit the committed-rev. */ @@ -492,9 +493,12 @@ SVN_ERR (change_fn (c, object, SVN_PROP_ENTRY_COMMITTED_REV, cr_str, subpool)); + SVN_ERR (svn_fs_revision_proplist (&r_props, fs, committed_rev, + pool)); + /* Transmit the committed-date. */ - SVN_ERR (svn_fs_revision_prop (&committed_date, fs, committed_rev, - SVN_PROP_REVISION_DATE, subpool)); + committed_date = apr_hash_get (r_props, SVN_PROP_REVISION_DATE, + APR_HASH_KEY_STRING); if (committed_date || source_path) { SVN_ERR (change_fn (c, object, SVN_PROP_ENTRY_COMMITTED_DATE, @@ -502,8 +506,8 @@ } /* Transmit the last-author. */ - SVN_ERR (svn_fs_revision_prop (&last_author, fs, committed_rev, - SVN_PROP_REVISION_AUTHOR, subpool)); + last_author = apr_hash_get (r_props, SVN_PROP_REVISION_AUTHOR, + APR_HASH_KEY_STRING); if (last_author || source_path) { SVN_ERR (change_fn (c, object, SVN_PROP_ENTRY_LAST_AUTHOR, Modified: branches/ruby/subversion/libsvn_repos/dump.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_repos/dump.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_repos/dump.c&r1=13185&p2=branches/ruby/subversion/libsvn_repos/dump.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_repos/dump.c (original) +++ branches/ruby/subversion/libsvn_repos/dump.c Sun Feb 27 19:19:25 2005 @@ -1041,8 +1041,10 @@ loop_end: SVN_ERR (svn_stream_printf (feedback_stream, pool, - _("* %s revision %ld.\n"), - dumping ? "Dumped" : "Verified", to_rev)); + dumping + ? _("* Dumped revision %ld.\n") + : _("* Verified revision %ld.\n"), + to_rev)); } svn_pool_destroy (subpool); Modified: branches/ruby/subversion/libsvn_repos/load.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_repos/load.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_repos/load.c&r1=13185&p2=branches/ruby/subversion/libsvn_repos/load.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_repos/load.c (original) +++ branches/ruby/subversion/libsvn_repos/load.c Sun Feb 27 19:19:25 2005 @@ -992,14 +992,14 @@ case svn_node_action_change: { SVN_ERR (svn_stream_printf (pb->outstream, pool, - " * editing path : %s ...", + _(" * editing path : %s ..."), nb->path)); break; } case svn_node_action_delete: { SVN_ERR (svn_stream_printf (pb->outstream, pool, - " * deleting path : %s ...", + _(" * deleting path : %s ..."), nb->path)); SVN_ERR (svn_fs_delete (rb->txn_root, nb->path, pool)); break; @@ -1007,7 +1007,7 @@ case svn_node_action_add: { SVN_ERR (svn_stream_printf (pb->outstream, pool, - " * adding path : %s ...", + _(" * adding path : %s ..."), nb->path)); SVN_ERR (maybe_add_with_history (nb, rb, pool)); @@ -1016,7 +1016,7 @@ case svn_node_action_replace: { SVN_ERR (svn_stream_printf (pb->outstream, pool, - " * replacing path : %s ...", + _(" * replacing path : %s ..."), nb->path)); SVN_ERR (svn_fs_delete (rb->txn_root, nb->path, pool)); @@ -1162,7 +1162,7 @@ struct parse_baton *pb = rb->pb; apr_size_t len = 7; - SVN_ERR (svn_stream_write (pb->outstream, " done.\n", &len)); + SVN_ERR (svn_stream_write (pb->outstream, _(" done.\n"), &len)); return SVN_NO_ERROR; } Modified: branches/ruby/subversion/libsvn_repos/log.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_repos/log.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_repos/log.c&r1=13185&p2=branches/ruby/subversion/libsvn_repos/log.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_repos/log.c (original) +++ branches/ruby/subversion/libsvn_repos/log.c Sun Feb 27 19:19:25 2005 @@ -340,7 +340,7 @@ ((start >= end) ? this_rev-- : this_rev++)) { svn_string_t *author, *date, *message; - apr_hash_t *changed_paths = NULL; + apr_hash_t *r_props, *changed_paths = NULL; svn_pool_clear (subpool); @@ -359,12 +359,13 @@ continue; } - SVN_ERR (svn_fs_revision_prop - (&author, fs, this_rev, SVN_PROP_REVISION_AUTHOR, subpool)); - SVN_ERR (svn_fs_revision_prop - (&date, fs, this_rev, SVN_PROP_REVISION_DATE, subpool)); - SVN_ERR (svn_fs_revision_prop - (&message, fs, this_rev, SVN_PROP_REVISION_LOG, subpool)); + SVN_ERR (svn_fs_revision_proplist (&r_props, fs, this_rev, pool)); + author = apr_hash_get (r_props, SVN_PROP_REVISION_AUTHOR, + APR_HASH_KEY_STRING); + date = apr_hash_get (r_props, SVN_PROP_REVISION_DATE, + APR_HASH_KEY_STRING); + message = apr_hash_get (r_props, SVN_PROP_REVISION_LOG, + APR_HASH_KEY_STRING); /* ### Below, we discover changed paths if the user requested them (i.e., "svn log -v" means `discover_changed_paths' will Modified: branches/ruby/subversion/libsvn_repos/reporter.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_repos/reporter.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_repos/reporter.c&r1=13185&p2=branches/ruby/subversion/libsvn_repos/reporter.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_repos/reporter.c (original) +++ branches/ruby/subversion/libsvn_repos/reporter.c Sun Feb 27 19:19:25 2005 @@ -345,7 +345,7 @@ void *object, apr_pool_t *pool) { svn_fs_root_t *s_root; - apr_hash_t *s_props, *t_props; + apr_hash_t *s_props, *t_props, *r_props; apr_array_header_t *prop_diffs; int i; svn_revnum_t crev; @@ -363,16 +363,18 @@ SVN_ERR (change_fn (b, object, SVN_PROP_ENTRY_COMMITTED_REV, cr_str, pool)); + SVN_ERR (svn_fs_revision_proplist (&r_props, b->repos->fs, crev, pool)); + /* Transmit the committed-date. */ - SVN_ERR (svn_fs_revision_prop (&cdate, b->repos->fs, crev, - SVN_PROP_REVISION_DATE, pool)); + cdate = apr_hash_get (r_props, SVN_PROP_REVISION_DATE, + APR_HASH_KEY_STRING); if (cdate || s_path) SVN_ERR (change_fn (b, object, SVN_PROP_ENTRY_COMMITTED_DATE, cdate, pool)); /* Transmit the last-author. */ - SVN_ERR (svn_fs_revision_prop (&last_author, b->repos->fs, crev, - SVN_PROP_REVISION_AUTHOR, pool)); + last_author = apr_hash_get (r_props, SVN_PROP_REVISION_AUTHOR, + APR_HASH_KEY_STRING); if (last_author || s_path) SVN_ERR (change_fn (b, object, SVN_PROP_ENTRY_LAST_AUTHOR, last_author, pool)); Modified: branches/ruby/subversion/libsvn_repos/rev_hunt.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_repos/rev_hunt.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_repos/rev_hunt.c&r1=13185&p2=branches/ruby/subversion/libsvn_repos/rev_hunt.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_repos/rev_hunt.c (original) +++ branches/ruby/subversion/libsvn_repos/rev_hunt.c Sun Feb 27 19:19:25 2005 @@ -536,7 +536,8 @@ the callback before reporting an uglier error below. */ SVN_ERR (svn_fs_check_path (&kind, root, path, pool)); if (kind != svn_node_file) - return svn_error_create (SVN_ERR_FS_NOT_FILE, NULL, NULL); + return svn_error_createf + (SVN_ERR_FS_NOT_FILE, NULL, _("'%s' is not a file"), path); /* Open a history object. */ SVN_ERR (svn_fs_node_history (&history, root, path, last_pool)); Modified: branches/ruby/subversion/libsvn_subr/cmdline.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_subr/cmdline.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_subr/cmdline.c&r1=13185&p2=branches/ruby/subversion/libsvn_subr/cmdline.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_subr/cmdline.c (original) +++ branches/ruby/subversion/libsvn_subr/cmdline.c Sun Feb 27 19:19:25 2005 @@ -58,7 +58,8 @@ int -svn_cmdline_init (const char *progname, FILE *error_stream) +svn_cmdline_init2 (const char *progname, FILE *error_stream, + svn_boolean_t server_mode) { apr_status_t status; apr_pool_t *pool; @@ -102,12 +103,13 @@ /* C programs default to the "C" locale. But because svn is supposed to be i18n-aware, it should inherit the default locale of its environment. */ - if (!setlocale(LC_ALL, "")) + if (!setlocale(server_mode ? LC_CTYPE : LC_ALL, "")) { if (error_stream) { const char *env_vars[] = { "LC_ALL", "LC_CTYPE", "LANG", NULL }; - const char **env_var = &env_vars[0], *env_val = NULL; + const char **env_var = &env_vars[server_mode ? 1 : 0]; + const char *env_val = NULL; while (*env_var) { env_val = getenv(*env_var); @@ -124,10 +126,11 @@ } fprintf(error_stream, - "%s: error: cannot set LC_ALL locale\n" + "%s: error: cannot set %s locale\n" "%s: error: environment variable %s is %s\n" "%s: error: please check that your locale name is correct\n", - progname, progname, *env_var, env_val, progname); + progname, server_mode ? "LC_CTYPE" : "LC_ALL", + progname, *env_var, env_val, progname); } return EXIT_FAILURE; } @@ -225,6 +228,13 @@ #endif return EXIT_SUCCESS; +} + + +int +svn_cmdline_init (const char *progname, FILE *error_stream) +{ + return svn_cmdline_init2 (progname, error_stream, FALSE); } Modified: branches/ruby/subversion/libsvn_subr/io.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_subr/io.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_subr/io.c&r1=13185&p2=branches/ruby/subversion/libsvn_subr/io.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_subr/io.c (original) +++ branches/ruby/subversion/libsvn_subr/io.c Sun Feb 27 19:19:25 2005 @@ -687,43 +687,33 @@ } else { - const char *src_target, *src_target_utf8, *dst_target_utf8; + const char *src_target, *entryname_utf8; if (cancel_func) SVN_ERR (cancel_func (cancel_baton)); - /* Telescope the entryname onto the source dir. */ - src_target = svn_path_join (src, this_entry.name, subpool); - SVN_ERR (svn_path_cstring_to_utf8 (&src_target_utf8, src_target, - subpool)); + SVN_ERR (svn_path_cstring_to_utf8 (&entryname_utf8, + this_entry.name, subpool)); + src_target = svn_path_join (src, entryname_utf8, subpool); if (this_entry.filetype == APR_REG) /* regular file */ { - const char *dst_target = svn_path_join (dst_path, - this_entry.name, + const char *dst_target = svn_path_join (dst_path, entryname_utf8, subpool); - SVN_ERR (svn_path_cstring_to_utf8 (&dst_target_utf8, dst_target, - subpool)); - SVN_ERR (svn_io_copy_file (src_target_utf8, dst_target_utf8, + SVN_ERR (svn_io_copy_file (src_target, dst_target, copy_perms, subpool)); } else if (this_entry.filetype == APR_LNK) /* symlink */ { - const char *dst_target = svn_path_join (dst_path, - this_entry.name, + const char *dst_target = svn_path_join (dst_path, entryname_utf8, subpool); - SVN_ERR (svn_path_cstring_to_utf8 (&dst_target_utf8, dst_target, - subpool)); - SVN_ERR (svn_io_copy_link (src_target_utf8, dst_target_utf8, + SVN_ERR (svn_io_copy_link (src_target, dst_target, subpool)); } else if (this_entry.filetype == APR_DIR) /* recurse */ { - const char *entryname_utf8; - SVN_ERR (svn_path_cstring_to_utf8 (&entryname_utf8, - this_entry.name, subpool)); SVN_ERR (svn_io_copy_dir_recursively - (src_target_utf8, + (src_target, dst_path, entryname_utf8, copy_perms, Modified: branches/ruby/subversion/libsvn_subr/utf.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_subr/utf.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_subr/utf.c&r1=13185&p2=branches/ruby/subversion/libsvn_subr/utf.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_subr/utf.c (original) +++ branches/ruby/subversion/libsvn_subr/utf.c Sun Feb 27 19:19:25 2005 @@ -490,12 +490,8 @@ return svn_error_createf (APR_EINVAL, NULL, - _("Safe data:\n" - "\"%s\"\n" - "... was followed by non-ASCII byte %d.\n" - "\n" - "Non-ASCII character detected (see above), " - "and unable to convert to/from UTF-8"), + _("Safe data '%s' was followed by non-ASCII byte %d: " + "unable to convert to/from UTF-8"), error_data, *((const unsigned char *) data)); } else Modified: branches/ruby/subversion/libsvn_wc/adm_crawler.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_wc/adm_crawler.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_wc/adm_crawler.c&r1=13185&p2=branches/ruby/subversion/libsvn_wc/adm_crawler.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_wc/adm_crawler.c (original) +++ branches/ruby/subversion/libsvn_wc/adm_crawler.c Sun Feb 27 19:19:25 2005 @@ -101,8 +101,8 @@ SVN_ERR (svn_wc__maybe_set_executable (NULL, file_path, adm_access, pool)); /* Remove any text conflict */ - SVN_ERR (svn_wc_resolved_conflict (file_path, adm_access, TRUE, FALSE, FALSE, - NULL, NULL, pool)); + SVN_ERR (svn_wc_resolved_conflict2 (file_path, adm_access, TRUE, FALSE, + FALSE, NULL, NULL, NULL, NULL, pool)); SVN_ERR (svn_wc_entry (&entry, file_path, adm_access, FALSE, pool)); assert(entry != NULL); Modified: branches/ruby/subversion/libsvn_wc/adm_files.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_wc/adm_files.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_wc/adm_files.c&r1=13185&p2=branches/ruby/subversion/libsvn_wc/adm_files.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_wc/adm_files.c (original) +++ branches/ruby/subversion/libsvn_wc/adm_files.c Sun Feb 27 19:19:25 2005 @@ -883,8 +883,8 @@ svn_wc_adm_access_t *adm_access; const svn_wc_entry_t *entry; - SVN_ERR (svn_wc_adm_open2 (&adm_access, NULL, path, FALSE, 0, - pool)); + SVN_ERR (svn_wc_adm_open3 (&adm_access, NULL, path, FALSE, 0, + NULL, NULL, pool)); SVN_ERR (svn_wc_entry (&entry, path, adm_access, FALSE, pool)); SVN_ERR (svn_wc_adm_close (adm_access)); if (!entry) Modified: branches/ruby/subversion/libsvn_wc/adm_ops.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_wc/adm_ops.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_wc/adm_ops.c&r1=13185&p2=branches/ruby/subversion/libsvn_wc/adm_ops.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_wc/adm_ops.c (original) +++ branches/ruby/subversion/libsvn_wc/adm_ops.c Sun Feb 27 19:19:25 2005 @@ -733,8 +733,8 @@ svn_node_kind_t was_kind; svn_boolean_t was_deleted = FALSE; /* Silence a gcc uninitialized warning */ - SVN_ERR (svn_wc_adm_probe_try2 (&dir_access, adm_access, path, - TRUE, -1, pool)); + SVN_ERR (svn_wc_adm_probe_try3 (&dir_access, adm_access, path, + TRUE, -1, cancel_func, cancel_baton, pool)); if (dir_access) SVN_ERR (svn_wc_entry (&entry, path, dir_access, FALSE, pool)); else @@ -899,9 +899,9 @@ Note that this is one of the few functions that is allowed to see 'deleted' entries; it's totally fine to have an entry that is scheduled for addition and still previously 'deleted'. */ - SVN_ERR (svn_wc_adm_probe_try2 (&adm_access, parent_access, path, + SVN_ERR (svn_wc_adm_probe_try3 (&adm_access, parent_access, path, TRUE, copyfrom_url != NULL ? -1 : 0, - pool)); + cancel_func, cancel_baton, pool)); if (adm_access) SVN_ERR (svn_wc_entry (&orig_entry, path, adm_access, TRUE, pool)); else @@ -1024,8 +1024,9 @@ if (! orig_entry || orig_entry->deleted) { apr_pool_t* access_pool = svn_wc_adm_access_pool (parent_access); - SVN_ERR (svn_wc_adm_open2 (&adm_access, parent_access, path, + SVN_ERR (svn_wc_adm_open3 (&adm_access, parent_access, path, TRUE, copyfrom_url != NULL ? -1 : 0, + cancel_func, cancel_baton, access_pool)); } @@ -2090,6 +2091,25 @@ void *notify_baton, apr_pool_t *pool) { + return svn_wc_resolved_conflict2 (path, adm_access, + resolve_text, resolve_props, recursive, + notify_func, notify_baton, + NULL, NULL, pool); + +} + +svn_error_t * +svn_wc_resolved_conflict2 (const char *path, + svn_wc_adm_access_t *adm_access, + svn_boolean_t resolve_text, + svn_boolean_t resolve_props, + svn_boolean_t recursive, + svn_wc_notify_func_t notify_func, + void *notify_baton, + svn_cancel_func_t cancel_func, + void *cancel_baton, + apr_pool_t *pool) +{ struct resolve_callback_baton *baton = apr_pcalloc (pool, sizeof(*baton)); baton->resolve_text = resolve_text; @@ -2111,9 +2131,9 @@ } else { - SVN_ERR (svn_wc_walk_entries (path, adm_access, - &resolve_walk_callbacks, baton, - FALSE, pool)); + SVN_ERR (svn_wc_walk_entries2 (path, adm_access, + &resolve_walk_callbacks, baton, + FALSE, cancel_func, cancel_baton, pool)); } Modified: branches/ruby/subversion/libsvn_wc/copy.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_wc/copy.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_wc/copy.c&r1=13185&p2=branches/ruby/subversion/libsvn_wc/copy.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_wc/copy.c (original) +++ branches/ruby/subversion/libsvn_wc/copy.c Sun Feb 27 19:19:25 2005 @@ -416,8 +416,8 @@ After the commit, ra_dav should regenerate them and re-store them as an optimization. Note we use the normal locking mechanism here, even though this directory has not yet been added to the parent. */ - SVN_ERR (svn_wc_adm_open2 (&adm_access, NULL, dst_path, TRUE, -1, - pool)); + SVN_ERR (svn_wc_adm_open3 (&adm_access, NULL, dst_path, TRUE, -1, + cancel_func, cancel_baton, pool)); SVN_ERR (svn_wc__remove_wcprops (adm_access, TRUE, pool)); SVN_ERR (convert_deleted_to_schedule_delete (adm_access, pool)); SVN_ERR (svn_wc_adm_close (adm_access)); @@ -467,8 +467,8 @@ _("Cannot copy to '%s' as it is scheduled for deletion"), svn_path_local_style (svn_wc_adm_access_path (dst_parent), pool)); - SVN_ERR (svn_wc_adm_probe_open2 (&adm_access, NULL, src_path, FALSE, -1, - pool)); + SVN_ERR (svn_wc_adm_probe_open3 (&adm_access, NULL, src_path, FALSE, -1, + cancel_func, cancel_baton, pool)); SVN_ERR (svn_io_check_path (src_path, &src_kind, pool)); Modified: branches/ruby/subversion/libsvn_wc/entries.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_wc/entries.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_wc/entries.c&r1=13185&p2=branches/ruby/subversion/libsvn_wc/entries.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_wc/entries.c (original) +++ branches/ruby/subversion/libsvn_wc/entries.c Sun Feb 27 19:19:25 2005 @@ -1721,13 +1721,15 @@ /*** Generic Entry Walker */ -/* A recursive entry-walker, helper for svn_wc_walk_entries */ +/* A recursive entry-walker, helper for svn_wc_walk_entries2 */ static svn_error_t * walker_helper (const char *dirpath, svn_wc_adm_access_t *adm_access, const svn_wc_entry_callbacks_t *walk_callbacks, void *walk_baton, svn_boolean_t show_hidden, + svn_cancel_func_t cancel_func, + void *cancel_baton, apr_pool_t *pool) { apr_pool_t *subpool = svn_pool_create (pool); @@ -1756,6 +1758,10 @@ const svn_wc_entry_t *current_entry; const char *entrypath; + /* See if someone wants to cancel this operation. */ + if (cancel_func) + SVN_ERR (cancel_func (cancel_baton)); + apr_hash_this (hi, &key, &klen, &val); current_entry = val; @@ -1773,7 +1779,8 @@ subpool)); SVN_ERR (walker_helper (entrypath, entry_access, walk_callbacks, walk_baton, - show_hidden, subpool)); + show_hidden, cancel_func, cancel_baton, + subpool)); } svn_pool_clear (subpool); @@ -1793,6 +1800,21 @@ svn_boolean_t show_hidden, apr_pool_t *pool) { + return svn_wc_walk_entries2 (path, adm_access, walk_callbacks, + walk_baton, show_hidden, NULL, NULL, + pool); +} + +svn_error_t * +svn_wc_walk_entries2 (const char *path, + svn_wc_adm_access_t *adm_access, + const svn_wc_entry_callbacks_t *walk_callbacks, + void *walk_baton, + svn_boolean_t show_hidden, + svn_cancel_func_t cancel_func, + void *cancel_baton, + apr_pool_t *pool) +{ const svn_wc_entry_t *entry; SVN_ERR (svn_wc_entry (&entry, path, adm_access, show_hidden, pool)); @@ -1807,7 +1829,7 @@ else if (entry->kind == svn_node_dir) return walker_helper (path, adm_access, walk_callbacks, walk_baton, - show_hidden, pool); + show_hidden, cancel_func, cancel_baton, pool); else return svn_error_createf (SVN_ERR_NODE_UNKNOWN_KIND, NULL, Modified: branches/ruby/subversion/libsvn_wc/lock.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_wc/lock.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_wc/lock.c&r1=13185&p2=branches/ruby/subversion/libsvn_wc/lock.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_wc/lock.c (original) +++ branches/ruby/subversion/libsvn_wc/lock.c Sun Feb 27 19:19:25 2005 @@ -326,7 +326,7 @@ return SVN_NO_ERROR; } -/* This is essentially the guts of svn_wc_adm_open2, with the additional +/* This is essentially the guts of svn_wc_adm_open3, with the additional * parameter UNDER_CONSTRUCTION that gets set TRUE only when locking the * admin directory during initial creation. */ @@ -337,6 +337,8 @@ svn_boolean_t write_lock, int depth, svn_boolean_t under_construction, + svn_cancel_func_t cancel_func, + void *cancel_baton, apr_pool_t *pool) { svn_wc_adm_access_t *lock; @@ -424,6 +426,10 @@ svn_wc_adm_access_t *entry_access; const char *entry_path; + /* See if someone wants to cancel this operation. */ + if (cancel_func) + SVN_ERR (cancel_func (cancel_baton)); + apr_hash_this (hi, NULL, NULL, &val); entry = val; if (entry->kind != svn_node_dir @@ -433,7 +439,7 @@ /* Don't use the subpool pool here, the lock needs to persist */ err = do_open (&entry_access, lock, entry_path, write_lock, depth, - FALSE, lock->pool); + FALSE, cancel_func, cancel_baton, lock->pool); if (err) { if (err->apr_err != SVN_ERR_WC_NOT_DIRECTORY) @@ -508,8 +514,8 @@ svn_boolean_t tree_lock, apr_pool_t *pool) { - return svn_wc_adm_open2 (adm_access, associated, path, write_lock, - (tree_lock ? -1 : 0), pool); + return svn_wc_adm_open3 (adm_access, associated, path, write_lock, + (tree_lock ? -1 : 0), NULL, NULL, pool); } svn_error_t * @@ -520,8 +526,22 @@ int depth, apr_pool_t *pool) { + return svn_wc_adm_open3 (adm_access, associated, path, write_lock, + depth, NULL, NULL, pool); +} + +svn_error_t * +svn_wc_adm_open3 (svn_wc_adm_access_t **adm_access, + svn_wc_adm_access_t *associated, + const char *path, + svn_boolean_t write_lock, + int depth, + svn_cancel_func_t cancel_func, + void *cancel_baton, + apr_pool_t *pool) +{ return do_open (adm_access, associated, path, write_lock, depth, FALSE, - pool); + cancel_func, cancel_baton, pool); } svn_error_t * @@ -529,7 +549,7 @@ const char *path, apr_pool_t *pool) { - return do_open (adm_access, NULL, path, TRUE, 0, TRUE, pool); + return do_open (adm_access, NULL, path, TRUE, 0, TRUE, NULL, NULL, pool); } @@ -542,8 +562,9 @@ svn_boolean_t tree_lock, apr_pool_t *pool) { - return svn_wc_adm_probe_open2 (adm_access, associated, path, - write_lock, (tree_lock ? -1 : 0), pool); + return svn_wc_adm_probe_open3 (adm_access, associated, path, + write_lock, (tree_lock ? -1 : 0), + NULL, NULL, pool); } @@ -555,6 +576,20 @@ int depth, apr_pool_t *pool) { + return svn_wc_adm_probe_open3 (adm_access, associated, path, write_lock, + depth, NULL, NULL, pool); +} + +svn_error_t * +svn_wc_adm_probe_open3 (svn_wc_adm_access_t **adm_access, + svn_wc_adm_access_t *associated, + const char *path, + svn_boolean_t write_lock, + int depth, + svn_cancel_func_t cancel_func, + void *cancel_baton, + apr_pool_t *pool) +{ svn_error_t *err; const char *dir; int wc_format; @@ -568,8 +603,8 @@ if (dir != path) depth = 0; - err = svn_wc_adm_open2 (adm_access, associated, dir, write_lock, - depth, pool); + err = svn_wc_adm_open3 (adm_access, associated, dir, write_lock, + depth, cancel_func, cancel_baton, pool); if (err) { svn_error_t *err2; @@ -675,8 +710,8 @@ svn_boolean_t tree_lock, apr_pool_t *pool) { - return svn_wc_adm_probe_try2 (adm_access, associated, path, write_lock, - (tree_lock ? -1 : 0), pool); + return svn_wc_adm_probe_try3 (adm_access, associated, path, write_lock, + (tree_lock ? -1 : 0), NULL, NULL, pool); } svn_error_t * @@ -687,6 +722,20 @@ int depth, apr_pool_t *pool) { + return svn_wc_adm_probe_try3 (adm_access, associated, path, write_lock, + depth, NULL, NULL, pool); +} + +svn_error_t * +svn_wc_adm_probe_try3 (svn_wc_adm_access_t **adm_access, + svn_wc_adm_access_t *associated, + const char *path, + svn_boolean_t write_lock, + int depth, + svn_cancel_func_t cancel_func, + void *cancel_baton, + apr_pool_t *pool) +{ svn_error_t *err; err = svn_wc_adm_probe_retrieve (adm_access, associated, path, pool); @@ -697,8 +746,9 @@ if (err && (err->apr_err == SVN_ERR_WC_NOT_LOCKED)) { svn_error_clear (err); - err = svn_wc_adm_probe_open2 (adm_access, associated, + err = svn_wc_adm_probe_open3 (adm_access, associated, path, write_lock, depth, + cancel_func, cancel_baton, svn_wc_adm_access_pool (associated)); /* If the path is not a versioned directory, we just return a @@ -756,6 +806,8 @@ const char *path, svn_boolean_t write_lock, int depth, + svn_cancel_func_t cancel_func, + void *cancel_baton, apr_pool_t *pool) { const char *base_name = svn_path_basename (path, pool); @@ -771,7 +823,7 @@ if (svn_path_is_empty (path) || ! strcmp (path, "/")) { SVN_ERR (do_open (anchor_access, NULL, path, write_lock, depth, FALSE, - pool)); + cancel_func, cancel_baton, pool)); *target_access = *anchor_access; *target = ""; } @@ -783,7 +835,8 @@ svn_error_t *p_access_err = SVN_NO_ERROR; /* Try to open parent of PATH to setup P_ACCESS */ - err = do_open (&p_access, NULL, parent, write_lock, 0, FALSE, pool); + err = do_open (&p_access, NULL, parent, write_lock, 0, FALSE, + cancel_func, cancel_baton, pool); if (err) { if (err->apr_err == SVN_ERR_WC_NOT_DIRECTORY) @@ -797,7 +850,8 @@ /* If P_ACCESS isn't to be returned then a read-only baton will do for now, but keep the error in case we need it. */ svn_error_t *err2 = do_open (&p_access, NULL, parent, FALSE, 0, - FALSE, pool); + FALSE, cancel_func, cancel_baton, + pool); if (err2) { svn_error_clear (err2); @@ -810,7 +864,8 @@ } /* Try to open PATH to setup T_ACCESS */ - err = do_open (&t_access, NULL, path, write_lock, depth, FALSE, pool); + err = do_open (&t_access, NULL, path, write_lock, depth, FALSE, + cancel_func, cancel_baton, pool); if (err) { if (! p_access || err->apr_err != SVN_ERR_WC_NOT_DIRECTORY) Modified: branches/ruby/subversion/libsvn_wc/log.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_wc/log.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_wc/log.c&r1=13185&p2=branches/ruby/subversion/libsvn_wc/log.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_wc/log.c (original) +++ branches/ruby/subversion/libsvn_wc/log.c Sun Feb 27 19:19:25 2005 @@ -1117,7 +1117,8 @@ if (err && (err->apr_err == SVN_ERR_WC_NOT_LOCKED)) { svn_error_clear (err); - SVN_ERR (svn_wc_adm_open2 (&paccess, NULL, pdir, TRUE, 0, pool)); + SVN_ERR (svn_wc_adm_open3 (&paccess, NULL, pdir, TRUE, 0, + NULL, NULL, pool)); unassociated = TRUE; } else if (err) Modified: branches/ruby/subversion/libsvn_wc/update_editor.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_wc/update_editor.c?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_wc/update_editor.c&r1=13185&p2=branches/ruby/subversion/libsvn_wc/update_editor.c&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_wc/update_editor.c (original) +++ branches/ruby/subversion/libsvn_wc/update_editor.c Sun Feb 27 19:19:25 2005 @@ -661,8 +661,9 @@ ? svn_wc_adm_access_pool (db->edit_baton->adm_access) : db->edit_baton->pool; - SVN_ERR (svn_wc_adm_open2 (&adm_access, db->edit_baton->adm_access, - db->path, TRUE, 0, adm_access_pool)); + SVN_ERR (svn_wc_adm_open3 (&adm_access, db->edit_baton->adm_access, + db->path, TRUE, 0, NULL, NULL, + adm_access_pool)); if (!db->edit_baton->adm_access) db->edit_baton->adm_access = adm_access; } @@ -2733,7 +2734,8 @@ if (! p_access) /* For historical reasons we cannot rely on the caller having opened the parent, so try it here. I'd like this bit to go away. */ - err = svn_wc_adm_probe_open2 (&p_access, NULL, parent, FALSE, 0, pool); + err = svn_wc_adm_probe_open3 (&p_access, NULL, parent, FALSE, 0, + NULL, NULL, pool); if (! err) err = svn_wc_entry (&p_entry, parent, p_access, FALSE, pool); @@ -2792,8 +2794,8 @@ svn_boolean_t is_wc_root; svn_node_kind_t kind; - SVN_ERR (svn_wc_adm_probe_open2 (&adm_access, NULL, path, FALSE, 0, - pool)); + SVN_ERR (svn_wc_adm_probe_open3 (&adm_access, NULL, path, FALSE, 0, + NULL, NULL, pool)); SVN_ERR (check_wc_root (&is_wc_root, &kind, path, adm_access, pool)); SVN_ERR (svn_wc_adm_close (adm_access)); Modified: branches/ruby/subversion/libsvn_wc/wc.h Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_wc/wc.h?view=diff&rev=13186&p1=branches/ruby/subversion/libsvn_wc/wc.h&r1=13185&p2=branches/ruby/subversion/libsvn_wc/wc.h&r2=13186 ============================================================================== --- branches/ruby/subversion/libsvn_wc/wc.h (original) +++ branches/ruby/subversion/libsvn_wc/wc.h Sun Feb 27 19:19:25 2005 @@ -171,7 +171,7 @@ /* Return an access baton for PATH in *ADM_ACCESS. This function is used to lock the working copy during construction of the admin area, it - necessarily does less checking than svn_wc_adm_open2. */ + necessarily does less checking than svn_wc_adm_open3. */ svn_error_t *svn_wc__adm_pre_open (svn_wc_adm_access_t **adm_access, const char *path, apr_pool_t *pool); Modified: branches/ruby/subversion/mod_dav_svn/file_revs.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/mod_dav_svn/file_revs.c?view=diff&rev=13186&p1=branches/ruby/subversion/mod_dav_svn/file_revs.c&r1=13185&p2=branches/ruby/subversion/mod_dav_svn/file_revs.c&r2=13186 ============================================================================== --- branches/ruby/subversion/mod_dav_svn/file_revs.c (original) +++ branches/ruby/subversion/mod_dav_svn/file_revs.c Sun Feb 27 19:19:25 2005 @@ -273,9 +273,14 @@ if (serr) { - derr = dav_svn_convert_err(serr, HTTP_INTERNAL_SERVER_ERROR, serr->message, - resource->pool); - goto cleanup; + /* We don't 'goto cleanup' because ap_fflush() tells httpd + to write the HTTP headers out, and that includes whatever + r->status is at that particular time. When we call + dav_svn_convert_err(), we don't immediately set r->status + right then, so r->status remains 0, hence HTTP status 200 + would be misleadingly returned. */ + return (dav_svn_convert_err(serr, HTTP_INTERNAL_SERVER_ERROR, + serr->message, resource->pool)); } if ((serr = maybe_send_header(&frb))) Modified: branches/ruby/subversion/po/ja.po Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/po/ja.po?view=diff&rev=13186&p1=branches/ruby/subversion/po/ja.po&r1=13185&p2=branches/ruby/subversion/po/ja.po&r2=13186 ============================================================================== --- branches/ruby/subversion/po/ja.po (original) +++ branches/ruby/subversion/po/ja.po Sun Feb 27 19:19:25 2005 @@ -12,6 +12,7 @@ # BASE BASE # baseline ベースライン # basename ベース名 +# character converter 文字列コンバータ # child 子ノード # cleanup 掃除 # commit コミット @@ -32,7 +33,9 @@ # expected 予想される # export エクスポート # external item 外部項目 +# externals definitions 外部定義 # ... failed 〜に失敗しました / 〜が失敗しました +# FS loader ファイルシステムローダ # HEAD HEAD # help ヘルプ # import インポート @@ -41,11 +44,14 @@ # item 項目 # last changed 最終変更 # last updated 最終更新 +# length line 長さの行 # local ローカル # malformed 不正な # merge マージ # MIME type MIME タイプ # modified 修正された +# native encoding ネイティブのエンコーディング +# no ... available 利用できる〜がありません # node kind ノード種別 # node revision id ノードリビジョン識別番号 # null 空の @@ -57,12 +63,15 @@ # pre-revprop-change hook pre-revprop-change フック # property 属性 # RA layer RA 層 +# RA loader リポジトリアクセスローダ # RA plugin ABI version RA プラグイン ABI バージョン # read-only 読み取り専用 # recode 再エンコードする # recovery 復旧 # remote リモート # remove lock ロックを解除する +# repository リポジトリ +# repository root リポジトリのルート # representation 表現 # revision リビジョン # root of edit 編集用ルートパス @@ -84,8 +93,8 @@ msgstr "" "Project-Id-Version: subversion trunk\n" "Report-Msgid-Bugs-To: dev-lmwclWVctOZK/UuDQWWi7iCwEArCW2h5@xxxxxxxxxxxxxxxx\n" -"POT-Creation-Date: 2005-02-19 16:58+0900\n" -"PO-Revision-Date: 2005-02-19 16:55+0900\n" +"POT-Creation-Date: 2005-02-25 22:17+0900\n" +"PO-Revision-Date: 2005-02-25 22:15+0900\n" "Last-Translator: Subversion <dev-lmwclWVctOZK/UuDQWWi7iCwEArCW2h5@xxxxxxxxxxxxxxxx>\n" "Language-Team: Japanese <dev-lmwclWVctOZK/UuDQWWi7iCwEArCW2h5@xxxxxxxxxxxxxxxx>\n" "MIME-Version: 1.0\n" @@ -97,7 +106,7 @@ msgid "Skipping binary file: '%s'\n" msgstr "blame はバイナリファイルを扱えないので省略します: '%s'\n" -#: clients/cmdline/checkout-cmd.c:120 clients/cmdline/switch-cmd.c:125 +#: clients/cmdline/checkout-cmd.c:124 clients/cmdline/switch-cmd.c:125 #, c-format msgid "'%s' does not appear to be a URL" msgstr "'%s' は URL ではないようです" @@ -114,7 +123,7 @@ msgid "Target lists to diff may not contain both working copy paths and URLs" msgstr "diff の対象に作業コピーのパスと URL を共に含めることはできません" -#: clients/cmdline/export-cmd.c:80 +#: clients/cmdline/export-cmd.c:82 msgid "" "Destination directory exists; please remove the directory or use --force to " "overwrite" @@ -122,7 +131,7 @@ "コピー先 (または移動先) のディレクトリは既に存在します。ディレクトリを削除す" "るか --force を用いて上書きしてください。" -#: clients/cmdline/help-cmd.c:48 +#: clients/cmdline/help-cmd.c:46 #, c-format msgid "" "usage: svn <subcommand> [options] [args]\n" @@ -147,7 +156,7 @@ "\n" "利用可能なサブコマンド:\n" -#: clients/cmdline/help-cmd.c:59 +#: clients/cmdline/help-cmd.c:57 msgid "" "Subversion is a tool for version control.\n" "For additional information, see http://subversion.tigris.org/\n"; @@ -155,7 +164,7 @@ "Subversion はバージョン管理用のツールです。\n" "さらに詳しい情報は、http://subversion.tigris.org/ をご覧ください。\n" -#: clients/cmdline/help-cmd.c:66 +#: clients/cmdline/help-cmd.c:64 msgid "" "The following repository access (RA) modules are available:\n" "\n" @@ -176,131 +185,126 @@ msgid "Invalid URL '%s'" msgstr "'%s' は不正な URL です" -#: clients/cmdline/info-cmd.c:58 +#: clients/cmdline/info-cmd.c:56 #, c-format msgid "Path: %s\n" msgstr "パス: %s\n" -#: clients/cmdline/info-cmd.c:66 svnlook/main.c:740 +#: clients/cmdline/info-cmd.c:62 svnlook/main.c:753 #, c-format msgid "Name: %s\n" msgstr "名前: %s\n" -#: clients/cmdline/info-cmd.c:69 +#: clients/cmdline/info-cmd.c:66 #, c-format msgid "URL: %s\n" msgstr "URL: %s\n" -#: clients/cmdline/info-cmd.c:72 +#: clients/cmdline/info-cmd.c:69 #, c-format -msgid "Repository: %s\n" -msgstr "リポジトリ: %s\n" +msgid "Repository Root: %s\n" +msgstr "リポジトリのルート: %s\n" -#: clients/cmdline/info-cmd.c:75 +#: clients/cmdline/info-cmd.c:73 #, c-format msgid "Repository UUID: %s\n" msgstr "リポジトリ UUID: %s\n" -#: clients/cmdline/info-cmd.c:79 +#: clients/cmdline/info-cmd.c:77 #, c-format msgid "Revision: %ld\n" msgstr "リビジョン: %ld\n" -#: clients/cmdline/info-cmd.c:84 +#: clients/cmdline/info-cmd.c:82 msgid "Node Kind: file\n" msgstr "ノード種別: ファイル\n" -#: clients/cmdline/info-cmd.c:94 +#: clients/cmdline/info-cmd.c:86 msgid "Node Kind: directory\n" msgstr "ノード種別: ディレクトリ\n" -#: clients/cmdline/info-cmd.c:100 +#: clients/cmdline/info-cmd.c:90 msgid "Node Kind: none\n" msgstr "ノード種別: なし\n" -#: clients/cmdline/info-cmd.c:105 +#: clients/cmdline/info-cmd.c:95 msgid "Node Kind: unknown\n" msgstr "ノード種別: 不明\n" -#: clients/cmdline/info-cmd.c:112 +#: clients/cmdline/info-cmd.c:104 msgid "Schedule: normal\n" msgstr "準備中の処理: 特になし\n" -#: clients/cmdline/info-cmd.c:116 +#: clients/cmdline/info-cmd.c:108 msgid "Schedule: add\n" msgstr "準備中の処理: 追加\n" -#: clients/cmdline/info-cmd.c:120 +#: clients/cmdline/info-cmd.c:112 msgid "Schedule: delete\n" msgstr "準備中の処理: 削除\n" -#: clients/cmdline/info-cmd.c:124 +#: clients/cmdline/info-cmd.c:116 msgid "Schedule: replace\n" msgstr "準備中の処理: 置換\n" -#: clients/cmdline/info-cmd.c:134 +#: clients/cmdline/info-cmd.c:124 #, c-format msgid "Copied From URL: %s\n" msgstr "コピー元の URL: %s\n" -#: clients/cmdline/info-cmd.c:138 +#: clients/cmdline/info-cmd.c:128 #, c-format msgid "Copied From Rev: %ld\n" msgstr "コピー元のリビジョン: %ld\n" -#: clients/cmdline/info-cmd.c:143 +#: clients/cmdline/info-cmd.c:133 #, c-format msgid "Last Changed Author: %s\n" msgstr "最終変更者: %s\n" -#: clients/cmdline/info-cmd.c:147 +#: clients/cmdline/info-cmd.c:137 #, c-format msgid "Last Changed Rev: %ld\n" msgstr "最終変更リビジョン: %ld\n" -#: clients/cmdline/info-cmd.c:152 +#: clients/cmdline/info-cmd.c:142 msgid "Last Changed Date" msgstr "最終変更日時" -#: clients/cmdline/info-cmd.c:156 +#: clients/cmdline/info-cmd.c:148 msgid "Text Last Updated" msgstr "テキストの最終更新" -#: clients/cmdline/info-cmd.c:160 +#: clients/cmdline/info-cmd.c:152 msgid "Properties Last Updated" msgstr "属性の最終更新" -#: clients/cmdline/info-cmd.c:163 +#: clients/cmdline/info-cmd.c:155 #, c-format msgid "Checksum: %s\n" msgstr "チェックサム: %s\n" -#: clients/cmdline/info-cmd.c:167 +#: clients/cmdline/info-cmd.c:160 #, c-format msgid "Conflict Previous Base File: %s\n" msgstr "衝突状態にある、以前 BASE だったファイル: %s\n" -#: clients/cmdline/info-cmd.c:173 +#: clients/cmdline/info-cmd.c:166 #, c-format msgid "Conflict Previous Working File: %s\n" msgstr "衝突状態にある、以前作業中だったファイル: %s\n" -#: clients/cmdline/info-cmd.c:177 +#: clients/cmdline/info-cmd.c:171 #, c-format msgid "Conflict Current Base File: %s\n" msgstr "衝突状態にある、現在 BASE であるファイル: %s\n" -#: clients/cmdline/info-cmd.c:182 +#: clients/cmdline/info-cmd.c:176 #, c-format msgid "Conflict Properties File: %s\n" msgstr "衝突に関する属性ファイル: %s\n" #: clients/cmdline/info-cmd.c:248 -msgid "'svn info' only works on working copy paths, not URLs" -msgstr "" -"'svn info' は作業コピーパスに対してのみ使えます。URL に対しては使えません" - -#: clients/cmdline/info-cmd.c:260 #, c-format msgid "" "%s: (Not a versioned resource)\n" @@ -309,40 +313,48 @@ "%s: (バージョン管理されていないリソースです)\n" "\n" -#: clients/cmdline/log-cmd.c:91 include/svn_error_codes.h:223 -#: libsvn_subr/cmdline.c:335 libsvn_subr/cmdline.c:352 -msgid "Write error" -msgstr "書き込みエラーです" - -#: clients/cmdline/log-cmd.c:211 -msgid "No commit for revision 0.\n" -msgstr "リビジョン 0 のコミットはありません。\n" +#: clients/cmdline/info-cmd.c:256 +#, c-format +msgid "" +"%s: (Not a valid URL)\n" +"\n" +msgstr "" +"%s: (有効な URL ではありません)\n" +"\n" -#: clients/cmdline/log-cmd.c:217 +#: clients/cmdline/log-cmd.c:194 msgid "(no author)" msgstr "(変更者の情報がありません)" -#: clients/cmdline/log-cmd.c:228 +#: clients/cmdline/log-cmd.c:205 msgid "(no date)" msgstr "(日付の情報がありません)" -#: clients/cmdline/log-cmd.c:258 +#: clients/cmdline/log-cmd.c:235 msgid "Changed paths:\n" msgstr "変更のあったパス:\n" -#: clients/cmdline/log-cmd.c:273 +#: clients/cmdline/log-cmd.c:250 #, c-format msgid " (from %s:%ld)" msgstr " (%s:%ld より)" -#: clients/cmdline/log-cmd.c:501 +#: clients/cmdline/log-cmd.c:478 msgid "When specifying working copy paths, only one target may be given" msgstr "作業コピーのパスを指定する場合、与えてよい対象は一つだけです" -#: clients/cmdline/log-cmd.c:513 +#: clients/cmdline/log-cmd.c:490 msgid "Only relative paths can be specified after a URL" msgstr "URL の後の引数で指定できるのは相対パスだけです" +#: clients/cmdline/ls-cmd.c:294 +msgid "'verbose' option invalid in XML mode" +msgstr "'verbose' オプションは XML モードでは無効です" + +#: clients/cmdline/ls-cmd.c:306 +msgid "'incremental' option only valid in XML mode" +msgstr "'incremental' オプションは XML モードでのみ有効です" + # * Description for 'svn --force'. # * 29 one-byte characters are displayed on the left. #: clients/cmdline/main.c:62 @@ -357,9 +369,9 @@ # * Description for 'svn{,admin,dumpfilter,look} --help'. # * 29 one-byte characters are displayed on the left. -#: clients/cmdline/main.c:65 clients/cmdline/main.c:66 svnadmin/main.c:222 -#: svnadmin/main.c:225 svndumpfilter/main.c:698 svndumpfilter/main.c:701 -#: svnlook/main.c:87 svnlook/main.c:90 +#: clients/cmdline/main.c:65 clients/cmdline/main.c:66 svnadmin/main.c:224 +#: svnadmin/main.c:227 svndumpfilter/main.c:755 svndumpfilter/main.c:758 +#: svnlook/main.c:89 svnlook/main.c:92 msgid "show help on a subcommand" msgstr "サブコマンドに関するヘルプを表示します" @@ -469,9 +481,9 @@ # * Description for 'svn --extensions'. # * 29 one-byte characters are displayed on the left. #: clients/cmdline/main.c:98 -msgid "pass ARG as bundled options to diff (default: '-u')" +msgid "pass ARG to --diff-cmd as options (default: '-u')" msgstr "" -"ARG をオプションとして diff に渡します\n" +"ARG をオプションとして --diff-cmd に渡します\n" " (デフォルト: '-u')" # * Description for 'svn --targets'. @@ -526,7 +538,7 @@ # * Description for 'svn{,look} --no-diff-deleted'. # * 29 one-byte characters are displayed on the left. -#: clients/cmdline/main.c:114 svnlook/main.c:108 +#: clients/cmdline/main.c:114 svnlook/main.c:110 msgid "do not print differences for deleted files" msgstr "削除されたファイルに関しては差分を表示しません" @@ -542,69 +554,75 @@ msgid "ignore ancestry when calculating merges" msgstr "マージを計算するときに項目の系統情報を無視します" -# * Description for 'svn --diff-cmd'. +# * Description for 'svn --ignore-externals'. # * 29 one-byte characters are displayed on the left. #: clients/cmdline/main.c:120 +msgid "ignore externals definitions" +msgstr "外部定義を無視します" + +# * Description for 'svn --diff-cmd'. +# * 29 one-byte characters are displayed on the left. +#: clients/cmdline/main.c:122 msgid "use ARG as diff command" msgstr "diff コマンドとして ARG を用います" # * Description for 'svn --diff3-cmd'. # * 29 one-byte characters are displayed on the left. -#: clients/cmdline/main.c:122 +#: clients/cmdline/main.c:124 msgid "use ARG as merge command" msgstr "merge コマンドとして ARG を用います" # * Description for 'svn --editor-cmd'. # * 29 one-byte characters are displayed on the left. -#: clients/cmdline/main.c:124 +#: clients/cmdline/main.c:126 msgid "use ARG as external editor" msgstr "外部エディタとして ARG を用います" # * Description for 'svn --old'. # * 29 one-byte characters are displayed on the left. -#: clients/cmdline/main.c:126 +#: clients/cmdline/main.c:128 msgid "use ARG as the older target" msgstr "二者のうち古い方として ARG を用います" # * Description for 'svn --new'. # * 29 one-byte characters are displayed on the left. -#: clients/cmdline/main.c:128 +#: clients/cmdline/main.c:130 msgid "use ARG as the newer target" msgstr "二者のうち新しい方として ARG を用います" # * Description for 'svn --revprop'. # * 29 one-byte characters are displayed on the left. -#: clients/cmdline/main.c:130 +#: clients/cmdline/main.c:132 svnlook/main.c:116 msgid "operate on a revision property (use with -r)" msgstr "リビジョン属性に作用します (-r と共に用います)" # * Description for 'svn --relocate'. # * 29 one-byte characters are displayed on the left. -#: clients/cmdline/main.c:132 +#: clients/cmdline/main.c:134 msgid "relocate via URL-rewriting" msgstr "URL を書き換え、参照するリポジトリを変更します" # * Description for 'svn --config-dir'. # * 29 one-byte characters are displayed on the left. -#: clients/cmdline/main.c:134 svnadmin/main.c:264 +#: clients/cmdline/main.c:136 svnadmin/main.c:266 msgid "read user configuration files from directory ARG" msgstr "ディレクトリ ARG からユーザ設定ファイルを読みます" # * Description for 'svn --auto-props'. # * 29 one-byte characters are displayed on the left. -#: clients/cmdline/main.c:136 +#: clients/cmdline/main.c:138 msgid "enable automatic properties" msgstr "自動的な属性設定を有効にします" # * Description for 'svn --no-auto-props'. # * 29 one-byte characters are displayed on the left. -#: clients/cmdline/main.c:138 +#: clients/cmdline/main.c:140 msgid "disable automatic properties" msgstr "自動的な属性設定を無効にします" # * Description for 'svn --native-eol'. # * 29 one-byte characters are displayed on the left. -#: clients/cmdline/main.c:140 +#: clients/cmdline/main.c:142 msgid "" "use a different EOL marker than the standard\n" " system marker for files with a native svn:eol-" @@ -618,11 +636,11 @@ # * Description for 'svn --limit'. # * 29 one-byte characters are displayed on the left. -#: clients/cmdline/main.c:146 +#: clients/cmdline/main.c:148 msgid "maximum number of log entries" msgstr "表示するログエントリの数の最大値" -#: clients/cmdline/main.c:177 +#: clients/cmdline/main.c:179 msgid "" "Put files and directories under version control, scheduling\n" "them for addition to repository. They will be added in next commit.\n" @@ -633,7 +651,7 @@ "の状態とします。次回のコミットでそれらは追加されます。\n" "使用方法: add <パス>...\n" -#: clients/cmdline/main.c:184 +#: clients/cmdline/main.c:186 msgid "" "Output the content of specified files or\n" "URLs with revision and author information in-line.\n" @@ -642,14 +660,14 @@ " If specified, REV determines in which revision the target is first\n" " looked up.\n" msgstr "" -"指定されたファイルや URL の中身を、リビジョンと変更者の情報を行内に含めて出" +"指定されたファイルや URL の内容を、リビジョンと変更者の情報を行内に含めて出" "力\n" "します。\n" "使用方法: blame <対象>[@<REV>]...\n" "\n" " <REV> を指定すると、リビジョン <REV> での <対象> をまず探します。\n" -#: clients/cmdline/main.c:193 +#: clients/cmdline/main.c:195 msgid "" "Output the content of specified files or URLs.\n" "usage: cat TARGET[@REV]...\n" @@ -657,30 +675,34 @@ " If specified, REV determines in which revision the target is first\n" " looked up.\n" msgstr "" -"指定されたファイルや URL の中身を出力します。\n" +"指定されたファイルや URL の内容を出力します。\n" "使用方法: cat <対象>[@<REV>]...\n" "\n" " <REV> を指定すると、リビジョン <REV> での <対象> をまず探します。\n" -#: clients/cmdline/main.c:201 +#: clients/cmdline/main.c:203 msgid "" "Check out a working copy from a repository.\n" -"usage: checkout URL... [PATH]\n" +"usage: checkout URL[@REV]... [PATH]\n" "\n" -" Note: If PATH is omitted, the basename of the URL will be used as\n" +" If specified, REV determines in which revision the URL is first\n" +" looked up.\n" +"\n" +" If PATH is omitted, the basename of the URL will be used as\n" " the destination. If multiple URLs are given each will be checked\n" " out into a sub-directory of PATH, with the name of the sub-directory\n" " being the basename of the URL.\n" msgstr "" "リポジトリから作業コピーをチェックアウトします。\n" -"使用方法: checkout <URL>... [<パス>]\n" +"使用方法: checkout <URL>[@<REV>]... [<パス>]\n" "\n" -" 注意: <パス> が省略された場合、<URL> のベース名がコピー先として用いられま" -"す。\n" +" <REV> を指定すると、リビジョン <REV> での <URL> をまず探します。\n" +"\n" +" <パス> が省略された場合、<URL> のベース名がコピー先として用いられます。\n" " 複数の <URL> が与えられた場合、各 <URL> のベース名を名前にもつ\n" " サブディレクトリを <パス> の下に作り、各々をそこにチェックアウトします。\n" -#: clients/cmdline/main.c:211 +#: clients/cmdline/main.c:217 msgid "" "Recursively clean up the working copy, removing locks, resuming\n" "unfinished operations, etc.\n" @@ -689,7 +711,7 @@ "作業コピーの掃除・ロックの解除・未完了の操作の再開などを再帰的に行います。\n" "使用方法: cleanup [<パス>...]\n" -#: clients/cmdline/main.c:217 +#: clients/cmdline/main.c:223 msgid "" "Send changes from your working copy to the repository.\n" "usage: commit [PATH...]\n" @@ -704,7 +726,7 @@ "file\n" " オプションによってログメッセージを与えない場合、エディタが起動します。\n" -#: clients/cmdline/main.c:226 +#: clients/cmdline/main.c:232 msgid "" "Duplicate something in working copy or repository, remembering history.\n" "usage: copy SRC DST\n" @@ -726,7 +748,7 @@ " URL -> URL: 完全なサーバサイドのコピーです。ブランチとタグに用いられま" "す\n" -#: clients/cmdline/main.c:239 +#: clients/cmdline/main.c:245 msgid "" "Remove files and directories from version control.\n" "usage: 1. delete PATH...\n" @@ -758,7 +780,7 @@ "ら\n" " 削除されます。\n" -#: clients/cmdline/main.c:255 +#: clients/cmdline/main.c:261 msgid "" "Display the differences between two paths.\n" "usage: 1. diff [-r N[:M]] [TARGET[@REV]...]\n" @@ -824,7 +846,7 @@ " 作業コピーにローカルで加えられた変更を見るには、単に 'svn diff' を使って\n" " ください。\n" -#: clients/cmdline/main.c:295 +#: clients/cmdline/main.c:301 msgid "" "Create an unversioned copy of a tree.\n" "usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n" @@ -871,7 +893,7 @@ "\n" " <PEGREV> を指定すると、リビジョン <PEGREV> での <対象> をまず探します。\n" -#: clients/cmdline/main.c:323 +#: clients/cmdline/main.c:330 msgid "" "Describe the usage of this program or its subcommands.\n" "usage: help [SUBCOMMAND...]\n" @@ -879,7 +901,7 @@ "このプログラムやそのサブコマンドの使用方法を説明します。\n" "使用方法: help [<サブコマンド>...]\n" -#: clients/cmdline/main.c:332 +#: clients/cmdline/main.c:339 msgid "" "Commit an unversioned file or tree into the repository.\n" "usage: import [PATH] URL\n" @@ -897,7 +919,7 @@ " '.' だと仮定されます。リポジトリには、必要に応じて親ディレクトリが作成\n" " されます。\n" -#: clients/cmdline/main.c:342 +#: clients/cmdline/main.c:349 msgid "" "Display information about a file or directory.\n" "usage: info [PATH...]\n" @@ -909,7 +931,7 @@ "\n" " 各 <パス> (デフォルト: '.') に関する情報を表示します。\n" -#: clients/cmdline/main.c:349 +#: clients/cmdline/main.c:356 msgid "" "List directory entries in the repository.\n" "usage: list [TARGET[@REV]...]\n" @@ -948,7 +970,7 @@ " (バイト単位での) サイズ\n" " 最後のコミットの日時\n" -#: clients/cmdline/main.c:372 +#: clients/cmdline/main.c:380 msgid "" "Show the log messages for a set of revision(s) and/or file(s).\n" "usage: 1. log [PATH]\n" @@ -1007,7 +1029,7 @@ " svn log http://www.example.com/repo/project/foo.c\n"; " svn log http://www.example.com/repo/project foo.c bar.c\n" -#: clients/cmdline/main.c:404 +#: clients/cmdline/main.c:412 msgid "" "Apply the differences between two sources to a working copy path.\n" "usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n" @@ -1063,7 +1085,7 @@ "ル\n" " に適用されます。\n" -#: clients/cmdline/main.c:434 +#: clients/cmdline/main.c:442 msgid "" "Create a new directory under version control.\n" "usage: 1. mkdir PATH...\n" @@ -1093,7 +1115,7 @@ "\n" " どちらの場合でも途中のディレクトリはすべて存在していなくてはなりません。\n" -#: clients/cmdline/main.c:454 +#: clients/cmdline/main.c:462 msgid "" "Move and/or rename something in working copy or repository.\n" "usage: move SRC DST\n" @@ -1114,7 +1136,7 @@ " WC -> WC: (履歴をもたせたまま) 移動して追加準備状態にします\n" " URL -> URL: 完全なサーバサイドの名前変更です\n" -#: clients/cmdline/main.c:466 +#: clients/cmdline/main.c:474 msgid "" "Remove PROPNAME from files, dirs, or revisions.\n" "usage: 1. propdel PROPNAME [PATH...]\n" @@ -1131,7 +1153,7 @@ " 2. リポジトリのリビジョンに関する、バージョン管理下にないリモートの属性を\n" " 削除します。\n" -#: clients/cmdline/main.c:476 +#: clients/cmdline/main.c:484 msgid "" "Edit property PROPNAME with an external editor on targets.\n" "usage: 1. propedit PROPNAME PATH...\n" @@ -1148,7 +1170,7 @@ " 2. リポジトリのリビジョンに関する、バージョン管理下にないリモートの属性を\n" " 編集します。\n" -#: clients/cmdline/main.c:487 +#: clients/cmdline/main.c:495 msgid "" "Print value of PROPNAME on files, dirs, or revisions.\n" "usage: 1. propget PROPNAME [TARGET[@REV]...]\n" @@ -1184,7 +1206,7 @@ "の\n" " 属性値をファイルにリダイレクトする際に便利です)。\n" -#: clients/cmdline/main.c:505 +#: clients/cmdline/main.c:513 msgid "" "List all properties on files, dirs, or revisions.\n" "usage: 1. proplist [TARGET[@REV]...]\n" @@ -1204,7 +1226,7 @@ "の\n" " 属性を一覧表示します。\n" -#: clients/cmdline/main.c:516 +#: clients/cmdline/main.c:524 msgid "" "Set PROPNAME to PROPVAL on files, dirs, or revisions.\n" "usage: 1. propset PROPNAME [PROPVAL | -F VALFILE] PATH...\n" @@ -1284,7 +1306,7 @@ " foo http://example.com/repos/zig\n"; " foo/bar -r 1234 http://example.com/repos/zag\n"; -#: clients/cmdline/main.c:560 +#: clients/cmdline/main.c:568 msgid "" "Remove 'conflicted' state on working copy files or directories.\n" "usage: resolved PATH...\n" @@ -1301,7 +1323,7 @@ " するわけではありません。単に、衝突に際して機械的に作り出されたファイルを\n" " 削除し、<パス> を再びコミットできるようにするだけです。\n" -#: clients/cmdline/main.c:569 +#: clients/cmdline/main.c:577 msgid "" "Restore pristine working copy file (undo most local edits).\n" "usage: revert PATH...\n" @@ -1316,7 +1338,7 @@ " あらゆる衝突状態を解消します。しかし削除されたディレクトリの復旧はしませ" "ん。\n" -#: clients/cmdline/main.c:579 +#: clients/cmdline/main.c:587 msgid "" "Print the status of working copy files and directories.\n" "usage: status [PATH...]\n" @@ -1455,7 +1477,7 @@ " 965 687 joe wc/zig.c\n" " Head revision: 981\n" -#: clients/cmdline/main.c:646 +#: clients/cmdline/main.c:654 msgid "" "Update the working copy to a different URL.\n" "usage: 1. switch URL [PATH]\n" @@ -1484,7 +1506,7 @@ " 変更した) が、同じリポジトリ内の同じディレクトリを作業コピーに反映させ\n" " 続けたいときに、これを用います。\n" -#: clients/cmdline/main.c:667 +#: clients/cmdline/main.c:675 msgid "" "Bring changes from the repository into the working copy.\n" "usage: update [PATH...]\n" @@ -1526,45 +1548,45 @@ " 1 列目の文字は、実際のファイルに対する更新を意味します。\n" " これに対し、ファイルの属性に対する更新は 2 列目で示されます。\n" -#: clients/cmdline/main.c:691 +#: clients/cmdline/main.c:699 msgid "Print client version info\n" msgstr "クライアントのバージョン情報を表示します\n" -#: clients/cmdline/main.c:745 svnadmin/main.c:76 +#: clients/cmdline/main.c:753 svnadmin/main.c:76 msgid "Caught signal" msgstr "シグナルを受け取りました" -#: clients/cmdline/main.c:845 svnadmin/main.c:1007 +#: clients/cmdline/main.c:853 svnadmin/main.c:1057 msgid "" "Multiple revision arguments encountered; try '-r M:N' instead of '-r M -r N'" msgstr "" "複数のリビジョン引数が指定されています。'-r M -r N' の代わりに '-r M:N' を\n" "使ってみてください" -#: clients/cmdline/main.c:857 svnadmin/main.c:1024 +#: clients/cmdline/main.c:865 svnadmin/main.c:1074 #, c-format msgid "Syntax error in revision argument '%s'" msgstr "リビジョン引数 '%s' で構文エラーが生じました" -#: clients/cmdline/main.c:1002 clients/cmdline/main.c:1012 +#: clients/cmdline/main.c:1013 clients/cmdline/main.c:1023 msgid "--auto-props and --no-auto-props are mutually exclusive" msgstr "--auto-props と --no-auto-props は互いに排他的です" -#: clients/cmdline/main.c:1028 +#: clients/cmdline/main.c:1039 #, c-format msgid "Syntax error in native-eol argument '%s'" msgstr "native-eol の引数 '%s' 中で構文エラーが生じました" -#: clients/cmdline/main.c:1071 +#: clients/cmdline/main.c:1082 msgid "Subcommand argument required\n" msgstr "サブコマンドに引数が必要です\n" -#: clients/cmdline/main.c:1089 svnadmin/main.c:1144 svnlook/main.c:1966 +#: clients/cmdline/main.c:1100 svnadmin/main.c:1200 svnlook/main.c:2016 #, c-format msgid "Unknown command: '%s'\n" msgstr "未知のコマンドです: '%s'\n" -#: clients/cmdline/main.c:1122 +#: clients/cmdline/main.c:1133 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" @@ -1573,13 +1595,13 @@ "サブコマンド '%s' にはオプション '%s' をつけられません。\n" "使用方法を知りたいときは 'svn help %s' と打ってください。\n" -#: clients/cmdline/main.c:1156 +#: clients/cmdline/main.c:1167 msgid "Log message file is a versioned file; use '--force-log' to override" msgstr "" "ログメッセージファイルはバージョン管理されているファイルです。無効にするには " "'--force-log' を用いてください" -#: clients/cmdline/main.c:1174 +#: clients/cmdline/main.c:1185 msgid "" "The log message is a pathname (was -F intended?); use '--force-log' to " "override" @@ -1587,7 +1609,7 @@ "ログメッセージはパス名です (-F のつもりでしたか?)。無効にするには '--force-" "log' を用いてください" -#: clients/cmdline/main.c:1377 +#: clients/cmdline/main.c:1388 msgid "" "svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for " "details)\n" @@ -1612,7 +1634,7 @@ msgstr "" "代わりに 'svn add' または 'svn add --non-recursive' を試してみてください" -#: clients/cmdline/move-cmd.c:69 libsvn_client/copy.c:1177 +#: clients/cmdline/move-cmd.c:69 libsvn_client/copy.c:1173 msgid "Cannot specify revisions (except HEAD) with move operations" msgstr "移動操作に (HEAD 以外の) リビジョンは指定できません" @@ -1770,7 +1792,7 @@ msgid "Can't read stdin" msgstr "標準入力を読めません" -#: clients/cmdline/prompt.c:153 libsvn_ra_svn/client.c:304 +#: clients/cmdline/prompt.c:153 libsvn_ra_svn/client.c:306 msgid "Can't get password" msgstr "パスワードを取得できません" @@ -1870,17 +1892,17 @@ msgstr "" "バージョン管理された属性 '%s' の削除においてはリビジョンを指定できません" -#: clients/cmdline/propdel-cmd.c:125 +#: clients/cmdline/propdel-cmd.c:129 #, c-format msgid "property '%s' deleted (recursively) from '%s'.\n" msgstr "属性 '%s' が (再帰的に) '%s' から削除されました\n" -#: clients/cmdline/propdel-cmd.c:126 +#: clients/cmdline/propdel-cmd.c:130 #, c-format msgid "property '%s' deleted from '%s'.\n" msgstr "属性 '%s' が '%s' から削除されました\n" -#: clients/cmdline/propedit-cmd.c:117 clients/cmdline/propedit-cmd.c:238 +#: clients/cmdline/propedit-cmd.c:117 clients/cmdline/propedit-cmd.c:245 #: clients/cmdline/propset-cmd.c:85 msgid "Bad encoding option: prop value not stored as UTF8" msgstr "" @@ -1905,22 +1927,22 @@ msgid "Explicit target argument required" msgstr "対象を引数で明示することが必要です" -#: clients/cmdline/propedit-cmd.c:190 +#: clients/cmdline/propedit-cmd.c:191 #, c-format msgid "Editing property on non-local target '%s' not yet supported" msgstr "ローカルにない対象 '%s' の属性の編集はまだサポートされていません" -#: clients/cmdline/propedit-cmd.c:213 clients/cmdline/switch-cmd.c:137 +#: clients/cmdline/propedit-cmd.c:220 clients/cmdline/switch-cmd.c:138 #, c-format msgid "'%s' does not appear to be a working copy path" msgstr "'%s' は作業コピーのパスではないようです" -#: clients/cmdline/propedit-cmd.c:245 +#: clients/cmdline/propedit-cmd.c:252 #, c-format msgid "Set new value for property '%s' on '%s'\n" msgstr "属性 '%s' に新しい値 '%s' を設定しました\n" -#: clients/cmdline/propedit-cmd.c:252 +#: clients/cmdline/propedit-cmd.c:259 #, c-format msgid "No changes to property '%s' on '%s'\n" msgstr "属性 '%s' は '%s' では変更されていません\n" @@ -1950,16 +1972,20 @@ msgid "Explicit target required ('%s' interpreted as prop value)" msgstr "対象の明示的な指定が必要です ('%s' は属性値と解釈されました)" -#: clients/cmdline/propset-cmd.c:194 +#: clients/cmdline/propset-cmd.c:196 #, c-format msgid "property '%s' set (recursively) on '%s'\n" msgstr "属性 '%s' を (再帰的に) '%s' にセットしました\n" -#: clients/cmdline/propset-cmd.c:195 +#: clients/cmdline/propset-cmd.c:197 #, c-format msgid "property '%s' set on '%s'\n" msgstr "属性 '%s' を '%s' にセットしました\n" +#: clients/cmdline/revert-cmd.c:61 +msgid "Try 'svn revert --recursive' instead?" +msgstr "代わりに 'svn revert --recursive' を試してみてください" + #: clients/cmdline/switch-cmd.c:58 #, c-format msgid "'%s' to '%s' is not a valid relocation" @@ -1997,7 +2023,7 @@ msgstr "'%s' に書き込めません" #: clients/cmdline/util.c:204 clients/cmdline/util.c:228 -#: libsvn_fs_fs/fs_fs.c:3347 libsvn_subr/io.c:2162 +#: libsvn_fs_fs/fs_fs.c:990 libsvn_subr/io.c:2166 #, c-format msgid "Can't stat '%s'" msgstr "'%s' に対して stat を実行できません" @@ -2048,6 +2074,11 @@ msgid "Use --force to override this restriction" msgstr "この制限を無効にするには --force を用いてください" +#: clients/cmdline/util.c:654 include/svn_error_codes.h:223 +#: libsvn_subr/cmdline.c:335 libsvn_subr/cmdline.c:352 +msgid "Write error" +msgstr "書き込みエラーです" + # ? parent pool #: include/svn_error_codes.h:150 msgid "Bad parent pool passed to svn_make_pool()" @@ -2765,113 +2796,113 @@ msgid "Can't close directory '%s'" msgstr "ディレクトリ '%s' を閉じることができません" -#: libsvn_client/blame.c:382 libsvn_client/blame.c:774 +#: libsvn_client/blame.c:382 libsvn_client/blame.c:772 #, c-format msgid "Cannot calculate blame information for binary file '%s'" msgstr "" "バイナリファイル '%s' に対しては blame で各行の最終変更者を計算できません" -#: libsvn_client/blame.c:543 +#: libsvn_client/blame.c:541 msgid "Start revision must precede end revision" msgstr "開始リビジョンは終了リビジョンよりも前でなくてはなりません" -#: libsvn_client/blame.c:660 libsvn_client/cat.c:66 +#: libsvn_client/blame.c:657 libsvn_client/cat.c:65 #, c-format msgid "URL '%s' refers to a directory" msgstr "URL '%s' はディレクトリを指しています" # 文字列の引数: lmb.action, lmb.eldest->revision, lmb.eldest -#: libsvn_client/blame.c:732 +#: libsvn_client/blame.c:730 #, c-format msgid "Revision action '%c' for revision %ld of '%s' lacks a prior revision" msgstr "" "リビジョン操作 '%c' (対象: リビジョン '%ld' における項目 '%s') に前のリビジョ" "ンがありません" -#: libsvn_client/cat.c:106 +#: libsvn_client/cat.c:105 #, c-format msgid "Can't seek in '%s'" msgstr "'%s' の中を検索できません" -#: libsvn_client/checkout.c:94 +#: libsvn_client/checkout.c:88 #, c-format msgid "URL '%s' doesn't exist" msgstr "URL '%s' は存在しません" -#: libsvn_client/checkout.c:98 +#: libsvn_client/checkout.c:92 #, c-format msgid "URL '%s' refers to a file, not a directory" msgstr "URL '%s' が参照しているのはファイルです。ディレクトリではありません" -#: libsvn_client/checkout.c:152 +#: libsvn_client/checkout.c:150 #, c-format msgid "'%s' is already a working copy for a different URL" msgstr "'%s' は既に、異なる URL にあるリポジトリ用の作業コピーとなっています" -#: libsvn_client/checkout.c:156 +#: libsvn_client/checkout.c:154 msgid "; run 'svn update' to complete it." msgstr "。完了させるために 'svn update' を実行してください。" -#: libsvn_client/checkout.c:165 +#: libsvn_client/checkout.c:163 #, c-format msgid "'%s' is already a file/something else" msgstr "'%s' は既に、ファイルか何か他のものとなっています" -#: libsvn_client/commit.c:185 +#: libsvn_client/commit.c:187 #, c-format msgid "Unknown or unversionable type for '%s'" msgstr "'%s' は未知またはバージョン管理できない形式です" -#: libsvn_client/commit.c:468 +#: libsvn_client/commit.c:472 msgid "New entry name required when importing a file" msgstr "ファイルのインポートをするときは新しいエントリ名が必要です" -#: libsvn_client/commit.c:495 libsvn_wc/props.c:737 libsvn_wc/questions.c:62 +#: libsvn_client/commit.c:499 libsvn_wc/props.c:737 libsvn_wc/questions.c:62 #, c-format msgid "'%s' does not exist" msgstr "'%s' は存在しません" -#: libsvn_client/commit.c:557 libsvn_client/copy.c:81 svnlook/main.c:1192 +#: libsvn_client/commit.c:554 libsvn_client/copy.c:81 svnlook/main.c:1209 #, c-format msgid "Path '%s' does not exist" msgstr "パス '%s' は存在しません" -#: libsvn_client/commit.c:687 libsvn_client/copy.c:399 +#: libsvn_client/commit.c:683 libsvn_client/copy.c:399 #: libsvn_client/copy.c:415 #, c-format msgid "Path '%s' already exists" msgstr "パス '%s' は既に存在しています" -#: libsvn_client/commit.c:697 +#: libsvn_client/commit.c:693 #, c-format msgid "'%s' is a reserved name and cannot be imported" msgstr "'%s' は予約された名称です。インポートはできません" -#: libsvn_client/commit.c:776 libsvn_client/copy.c:543 +#: libsvn_client/commit.c:772 libsvn_client/copy.c:543 msgid "Commit failed (details follow):" msgstr "コミットに失敗しました (詳しい理由は以下のとおりです):" -#: libsvn_client/commit.c:784 libsvn_client/copy.c:551 +#: libsvn_client/commit.c:780 libsvn_client/copy.c:551 msgid "Commit succeeded, but other errors follow:" msgstr "コミットには成功しましたが、続けて他のエラーが生じました:" -#: libsvn_client/commit.c:791 libsvn_client/copy.c:558 +#: libsvn_client/commit.c:787 libsvn_client/copy.c:558 msgid "Error unlocking locked dirs (details follow):" msgstr "" "ディレクトリのロック解除時にエラーが起きました (詳しい理由は以下のとおりで" "す):" -#: libsvn_client/commit.c:802 +#: libsvn_client/commit.c:798 msgid "Error bumping revisions post-commit (details follow):" msgstr "" "コミット後にリビジョンを上げる際にエラーが起きました (詳しくは以下のとおりで" "す):" -#: libsvn_client/commit.c:813 libsvn_client/copy.c:569 +#: libsvn_client/commit.c:809 libsvn_client/copy.c:569 msgid "Error in post-commit clean-up (details follow):" msgstr "コミット後の掃除中にエラーが起きました (詳しくは以下のとおりです):" -#: libsvn_client/commit.c:1074 +#: libsvn_client/commit.c:1069 #, c-format msgid "'%s' is a URL, but URLs cannot be commit targets" msgstr "'%s' は URL です。しかし URL はコミットの対象ではありません" @@ -2912,16 +2943,15 @@ "りません\n" #: libsvn_client/commit_util.c:612 libsvn_client/commit_util.c:741 -#: libsvn_client/copy.c:1073 libsvn_client/delete.c:67 -#: libsvn_client/diff.c:1380 libsvn_client/diff.c:1993 -#: libsvn_client/diff.c:2469 libsvn_client/diff.c:2576 libsvn_client/log.c:129 -#: libsvn_client/prop_commands.c:187 libsvn_client/prop_commands.c:416 -#: libsvn_client/prop_commands.c:568 libsvn_client/prop_commands.c:926 -#: libsvn_client/ra.c:180 libsvn_client/revisions.c:90 -#: libsvn_client/status.c:128 libsvn_client/switch.c:104 -#: libsvn_client/update.c:82 libsvn_wc/adm_ops.c:2104 libsvn_wc/copy.c:386 -#: libsvn_wc/entries.c:1382 libsvn_wc/entries.c:1801 libsvn_wc/props.c:281 -#: libsvn_wc/questions.c:171 +#: libsvn_client/copy.c:1069 libsvn_client/delete.c:67 +#: libsvn_client/diff.c:1380 libsvn_client/diff.c:1977 +#: libsvn_client/diff.c:2452 libsvn_client/diff.c:2561 libsvn_client/log.c:129 +#: libsvn_client/prop_commands.c:213 libsvn_client/prop_commands.c:446 +#: libsvn_client/prop_commands.c:599 libsvn_client/prop_commands.c:955 +#: libsvn_client/ra.c:180 libsvn_client/revisions.c:89 +#: libsvn_client/status.c:131 libsvn_client/switch.c:104 +#: libsvn_wc/adm_ops.c:2127 libsvn_wc/copy.c:386 libsvn_wc/entries.c:1383 +#: libsvn_wc/entries.c:1824 libsvn_wc/props.c:281 libsvn_wc/questions.c:171 #, c-format msgid "'%s' is not under version control" msgstr "'%s' はバージョン管理下におかれていません" @@ -2931,13 +2961,13 @@ msgid "Entry for '%s' has no URL" msgstr "'%s' に対するエントリに URL はありません" -#: libsvn_client/commit_util.c:647 +#: libsvn_client/commit_util.c:648 #, c-format msgid "'%s' is scheduled for addition within unversioned parent" msgstr "" "'%s' を、バージョン管理下にない親ディレクトリの下に追加準備しようとしました" -#: libsvn_client/commit_util.c:667 +#: libsvn_client/commit_util.c:668 #, c-format msgid "" "Entry for '%s' is marked as 'copied' but is not itself scheduled\n" @@ -2980,22 +3010,22 @@ "コミット対象の項目 '%s' にはコピーフラグがついていますが、リビジョンが不正で" "す" -#: libsvn_client/copy.c:101 libsvn_client/copy.c:648 libsvn_client/copy.c:836 -#: libsvn_ra_dav/commit.c:894 +#: libsvn_client/copy.c:101 libsvn_client/copy.c:644 libsvn_client/copy.c:827 +#: libsvn_ra_dav/commit.c:895 #, c-format msgid "File '%s' already exists" msgstr "ファイル '%s' は既に存在しています" -#: libsvn_client/copy.c:143 +#: libsvn_client/copy.c:144 msgid "Move will not be attempted unless forced" msgstr "強制されないかぎり移動は行われません" -#: libsvn_client/copy.c:326 +#: libsvn_client/copy.c:328 #, c-format msgid "Cannot move URL '%s' into itself" msgstr "URL '%s' は自身には移動できません" -#: libsvn_client/copy.c:355 +#: libsvn_client/copy.c:360 #, c-format msgid "" "Source and dest appear not to be in the same repository (src: '%s'; dst: '%" @@ -3007,55 +3037,55 @@ #: libsvn_client/copy.c:386 #, c-format msgid "Path '%s' does not exist in revision %ld" -msgstr "パス '%s' はリビジョン %ld には存在しません" +msgstr "パス '%s' がリビジョン %ld に存在しません" #: libsvn_client/copy.c:420 #, c-format msgid "Unrecognized node kind of '%s'" msgstr "ノード種別 '%s' を認識できません" -#: libsvn_client/copy.c:794 +#: libsvn_client/copy.c:785 #, c-format msgid "Path '%s' not found in revision %ld" -msgstr "パス '%s' はリビジョン %ld には見つかりません" +msgstr "パス '%s' がリビジョン %ld に見つかりません" -#: libsvn_client/copy.c:799 +#: libsvn_client/copy.c:790 #, c-format msgid "Path '%s' not found in head revision" -msgstr "パス '%s' は HEAD リビジョンには見つかりません" +msgstr "パス '%s' が HEAD リビジョンに見つかりません" -#: libsvn_client/copy.c:845 +#: libsvn_client/copy.c:836 #, c-format msgid "'%s' is in the way" msgstr "'%s' が妨害しています" -#: libsvn_client/copy.c:861 +#: libsvn_client/copy.c:853 #, c-format msgid "Entry for '%s' exists (though the working file is missing)" msgstr "'%s' のエントリが存在します (それなのに作業ファイルがありません)" -#: libsvn_client/copy.c:950 +#: libsvn_client/copy.c:944 #, c-format msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC" msgstr "" "ソース URL '%s' の起源は無関係リポジトリです。混ぜられない作業コピーとしてそ" "のままにしておきます" -#: libsvn_client/copy.c:1030 +#: libsvn_client/copy.c:1024 #, c-format msgid "Cannot copy path '%s' into its own child '%s'" msgstr "パス '%s' は自身の子ノード '%s' にはコピーできません" -#: libsvn_client/copy.c:1041 +#: libsvn_client/copy.c:1035 #, c-format msgid "Cannot move path '%s' into itself" msgstr "パス '%s' は自身には移動できません" -#: libsvn_client/copy.c:1049 +#: libsvn_client/copy.c:1043 msgid "No support for repos <--> working copy moves" msgstr "リポジトリ <--> 作業コピーの移動操作はサポートされていません" -#: libsvn_client/copy.c:1079 +#: libsvn_client/copy.c:1075 #, c-format msgid "'%s' does not seem to have a URL associated with it" msgstr "'%s' に該当する URL は存在しないようです" @@ -3135,18 +3165,18 @@ msgid ".merge-right.r%ld" msgstr ".merge-right.r%ld" -#: libsvn_client/diff.c:1437 libsvn_client/diff.c:2096 -#: libsvn_client/diff.c:2176 +#: libsvn_client/diff.c:1436 libsvn_client/diff.c:2077 +#: libsvn_client/diff.c:2157 msgid "Not all required revisions are specified" msgstr "必要なリビジョンがすべては指定されていません" -#: libsvn_client/diff.c:1720 +#: libsvn_client/diff.c:1706 msgid "Sorry, svn_client_diff2 was called in a way that is not yet supported" msgstr "" "すみません。まだサポートされていないやり方で svn_client_diff2 が呼び出されま" "した" -#: libsvn_client/diff.c:1759 +#: libsvn_client/diff.c:1745 msgid "" "Only diffs between a path's text-base and its working files are supported at " "this time" @@ -3154,25 +3184,25 @@ "今のところ、パスのテキストベースと作業ファイルの差分しかサポートされていませ" "ん" -#: libsvn_client/diff.c:1877 libsvn_client/diff.c:1882 +#: libsvn_client/diff.c:1860 libsvn_client/diff.c:1865 #, c-format msgid "'%s' was not found in the repository at revision %ld" msgstr "'%s' は、リポジトリのリビジョン %ld には見つかりませんでした" -#: libsvn_client/diff.c:1997 libsvn_client/switch.c:108 +#: libsvn_client/diff.c:1981 libsvn_client/switch.c:108 #, c-format msgid "Directory '%s' has no URL" msgstr "ディレクトリ '%s' に URL はありません" # ? pegged diff -#: libsvn_client/diff.c:2187 +#: libsvn_client/diff.c:2168 msgid "At least one revision must be non-local for a pegged diff" msgstr "" "pegged diff を使う場合、少なくとも一方のリビジョンはローカルにあってはいけま" "せん" -#: libsvn_client/diff.c:2444 libsvn_client/diff.c:2450 -#: libsvn_client/diff.c:2563 libsvn_client/ra.c:718 libsvn_client/ra.c:844 +#: libsvn_client/diff.c:2425 libsvn_client/diff.c:2431 +#: libsvn_client/diff.c:2546 libsvn_client/ra.c:714 libsvn_client/ra.c:837 #, c-format msgid "'%s' has no URL" msgstr "'%s' に URL がありません" @@ -3182,75 +3212,86 @@ msgid "'%s' is not a valid EOL value" msgstr "'%s' は不正な EOL 値です" -#: libsvn_client/export.c:145 +#: libsvn_client/export.c:193 +msgid "(local)" +msgstr "(ローカル)" + +#: libsvn_client/export.c:283 msgid "Destination directory exists, and will not be overwritten unless forced" msgstr "" "コピー先 (または移動先) のディレクトリは存在します。強制しないかぎり上書きさ" "れません" -#: libsvn_client/export.c:275 -msgid "(local)" -msgstr "(ローカル)" - -#: libsvn_client/export.c:333 libsvn_client/export.c:477 +#: libsvn_client/export.c:381 libsvn_client/export.c:525 #, c-format msgid "'%s' exists and is not a directory" msgstr "'%s' は存在します。そしてディレクトリではありません" -#: libsvn_client/export.c:337 libsvn_client/export.c:481 +#: libsvn_client/export.c:385 libsvn_client/export.c:529 #, c-format msgid "'%s' already exists" msgstr "'%s' は既に存在します" -#: libsvn_client/export.c:653 libsvn_wc/update_editor.c:1592 -#: libsvn_wc/update_editor.c:2339 +#: libsvn_client/export.c:701 libsvn_wc/update_editor.c:1595 +#: libsvn_wc/update_editor.c:2341 #, c-format msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'" msgstr "'%s' のチェックサムが一致しませんでした。予想: '%s', 実際: '%s'" -#: libsvn_client/log.c:73 +#: libsvn_client/info.c:214 +#, c-format +msgid "Cannot read entry for '%s'" +msgstr "'%s' のエントリが読み込めません" + +#: libsvn_client/info.c:285 +#, c-format +msgid "URL '%s' non-existent in revision '%ld'" +msgstr "URL '%s' は、リビジョン '%ld' には存在しません" + +#: libsvn_client/info.c:310 libsvn_client/ls.c:128 libsvn_client/ls.c:135 +#, c-format +msgid "URL '%s' non-existent in that revision" +msgstr "URL '%s' は、そのリビジョンには存在しません" + +#: libsvn_client/log.c:72 msgid "Missing required revision specification" msgstr "必要なリビジョン指定がなされていません" -#: libsvn_client/log.c:135 libsvn_client/status.c:133 -#: libsvn_client/update.c:86 +#: libsvn_client/log.c:135 libsvn_client/status.c:136 +#: libsvn_client/update.c:85 #, c-format msgid "Entry '%s' has no URL" msgstr "エントリ '%s' に URL がありません" -#: libsvn_client/log.c:300 +#: libsvn_client/log.c:321 msgid "No commits in repository." msgstr "リポジトリにコミット内容がありません。" -#: libsvn_client/ls.c:49 libsvn_client/ls.c:127 -msgid "No get_dir() available for URL schema" -msgstr "URL スキーマに対して利用できる get_dir() がありません" - -#: libsvn_client/ls.c:134 libsvn_client/ls.c:141 +#: libsvn_client/prop_commands.c:104 #, c-format -msgid "URL '%s' non-existent in that revision" -msgstr "この URL '%s' は、そのリビジョンには存在しません" +msgid "'%s' is a wcprop, thus not accessible to clients" +msgstr "'%s' は作業コピーの属性なので、クライアントへのアクセスはできません" -#: libsvn_client/prop_commands.c:164 +#: libsvn_client/prop_commands.c:183 #, c-format msgid "Revision property '%s' not allowed in this context" msgstr "この操作ではリビジョン属性 '%s' を使ってはなりません" -#: libsvn_client/prop_commands.c:174 +#: libsvn_client/prop_commands.c:199 #, c-format -msgid "Setting property on non-local target '%s' not yet supported" -msgstr "ローカルにない対象 '%s' への属性の指定はまだサポートされていません" +msgid "Setting property on non-local target '%s' is not supported" +msgstr "ローカルにない対象 '%s' への属性の設定はサポートされていません" -#: libsvn_client/prop_commands.c:180 libsvn_client/prop_commands.c:248 +#: libsvn_client/prop_commands.c:205 libsvn_client/prop_commands.c:280 #, c-format msgid "Bad property name: '%s'" msgstr "不正な属性名: '%s'" -#: libsvn_client/prop_commands.c:244 +#: libsvn_client/prop_commands.c:276 msgid "Value will not be set unless forced" msgstr "強制されないときは値は設定されません" -#: libsvn_client/prop_commands.c:470 libsvn_client/prop_commands.c:733 +#: libsvn_client/prop_commands.c:499 libsvn_client/prop_commands.c:762 #, c-format msgid "Unknown node kind for '%s'" msgstr "'%s' のノード種別が不明です" @@ -3262,32 +3303,32 @@ "コミットではない操作中に、作業コピーの属性 '%s' を '%s' に設定しようとしてい" "ます" -#: libsvn_client/ra.c:340 +#: libsvn_client/ra.c:336 #, c-format msgid "Can't find entry for '%s'" msgstr "'%s' のエントリが見つかりません" -#: libsvn_client/ra.c:467 +#: libsvn_client/ra.c:463 #, c-format msgid "Missing changed-path information for '%s' in revision %ld" msgstr "'%s' (リビジョン %ld) にはパス変更情報がありません" -#: libsvn_client/ra.c:584 +#: libsvn_client/ra.c:580 #, c-format msgid "path '%s' doesn't exist in revision %ld" msgstr "パス '%s' はリビジョン %ld に存在しません" -#: libsvn_client/ra.c:645 libsvn_client/ra.c:781 +#: libsvn_client/ra.c:641 libsvn_client/ra.c:777 #, c-format msgid "Unable to find repository location for '%s' in revision %ld" msgstr "'%s' (リビジョン %ld) のリポジトリの位置が見つかりません" -#: libsvn_client/ra.c:656 +#: libsvn_client/ra.c:652 #, c-format msgid "'%s' in revision %ld is an unrelated object" msgstr "'%s' (リビジョン %ld) は無関係の対象です" -#: libsvn_client/ra.c:786 +#: libsvn_client/ra.c:782 #, c-format msgid "" "The location for '%s' for revision %ld does not exist in the repository or " @@ -3296,12 +3337,12 @@ "'%s' (リビジョン %ld) の位置は、リポジトリに存在しないか無関係の対象を参照し" "ています" -#: libsvn_client/relocate.c:54 +#: libsvn_client/relocate.c:53 #, c-format msgid "The repository at '%s' has uuid '%s', but the WC has '%s'" msgstr "リポジトリ '%s' の UUID は '%s' ですが、作業コピーのものは '%s' です" -#: libsvn_client/revisions.c:106 +#: libsvn_client/revisions.c:105 #, c-format msgid "Unrecognized revision type requested for '%s'" msgstr "'%s' に要求されたリビジョン形式を認識できません" @@ -3377,7 +3418,8 @@ msgid "Failed to delete mmap '%s'" msgstr "メモリへのマップ '%s' を削除できませんでした" -#: libsvn_fs/fs-loader.c:99 libsvn_ra/ra_loader.c:122 +#: libsvn_fs/fs-loader.c:99 libsvn_ra/ra_loader.c:156 +#: libsvn_ra/ra_loader.c:169 #, c-format msgid "'%s' does not define '%s()'" msgstr "'%s' は '%s()' を定義しません" @@ -3411,30 +3453,30 @@ msgstr "" "ファイルは変更できません: ファイルシステム '%s', リビジョン %ld, パス '%s'" -#: libsvn_fs_base/fs.c:1117 +#: libsvn_fs_base/fs.c:1129 msgid "" "Error copying logfile; the DB_LOG_AUTOREMOVE feature \n" "may be interfering with the hotcopy algorithm. If \n" "the problem persists, try deactivating this feature \n" -"in DB_CONFIG." +"in DB_CONFIG" msgstr "" "ログファイルのコピー中にエラーが発生しました。\n" "DB_LOG_AUTOREMOVE 機能が hotcopy アルゴリズムを妨害しているかもしれません。\n" -"問題が起き続けるようであれば、DB_CONFIG でこの機能を無効にしてみてください。" +"問題が起き続けるようであれば、DB_CONFIG でこの機能を無効にしてみてください" # ? catastrophic recovery -#: libsvn_fs_base/fs.c:1136 +#: libsvn_fs_base/fs.c:1148 msgid "" "Error running catastrophic recovery on hotcopy; the \n" "DB_LOG_AUTOREMOVE feature may be interfering with the \n" "hotcopy algorithm. If the problem persists, try deactivating \n" -"this feature in DB_CONFIG." +"this feature in DB_CONFIG" msgstr "" "hotcopy の catastrophic recovery 実行中にエラーが起きました。\n" "DB_LOG_AUTOREMOVE 機能が hotcopy アルゴリズムを妨害しているかもしれません。\n" -"問題が起き続けるようであれば、DB_CONFIG でこの機能を無効にしてみてください。" +"問題が起き続けるようであれば、DB_CONFIG でこの機能を無効にしてみてください" -#: libsvn_fs_base/fs.c:1273 +#: libsvn_fs_base/fs.c:1285 #, c-format msgid "Unsupported FS loader version (%d) for bdb" msgstr "bdb 用のファイルシステムローダバージョン (%d) はサポートされていません" @@ -3539,218 +3581,221 @@ msgstr "" "fsfs 用のファイルシステムローダバージョン (%d) はサポートされていません" -#: libsvn_fs_fs/fs_fs.c:363 libsvn_fs_fs/fs_fs.c:377 +#: libsvn_fs_fs/fs_fs.c:364 libsvn_fs_fs/fs_fs.c:378 msgid "Found malformed header in revision file" msgstr "リビジョンファイルで不正なヘッダが見つかりました" # ? text rep offset line -#: libsvn_fs_fs/fs_fs.c:479 libsvn_fs_fs/fs_fs.c:493 libsvn_fs_fs/fs_fs.c:500 -#: libsvn_fs_fs/fs_fs.c:507 libsvn_fs_fs/fs_fs.c:515 libsvn_fs_fs/fs_fs.c:523 +#: libsvn_fs_fs/fs_fs.c:480 libsvn_fs_fs/fs_fs.c:494 libsvn_fs_fs/fs_fs.c:501 +#: libsvn_fs_fs/fs_fs.c:508 libsvn_fs_fs/fs_fs.c:516 libsvn_fs_fs/fs_fs.c:524 msgid "Malformed text rep offset line in node-rev" msgstr "node-rev に不正な text rep offset 行があります" -#: libsvn_fs_fs/fs_fs.c:592 +#: libsvn_fs_fs/fs_fs.c:593 msgid "Missing kind field in node-rev" msgstr "node-rev に種別情報がありません" -#: libsvn_fs_fs/fs_fs.c:623 +#: libsvn_fs_fs/fs_fs.c:624 msgid "Missing cpath in node-rev" msgstr "node-rev に cpath がありません" -#: libsvn_fs_fs/fs_fs.c:650 libsvn_fs_fs/fs_fs.c:656 +#: libsvn_fs_fs/fs_fs.c:651 libsvn_fs_fs/fs_fs.c:657 msgid "Malformed copyroot line in node-rev" msgstr "node-rev に不正な 'copyroot' 行があります" -#: libsvn_fs_fs/fs_fs.c:674 libsvn_fs_fs/fs_fs.c:680 +#: libsvn_fs_fs/fs_fs.c:675 libsvn_fs_fs/fs_fs.c:681 msgid "Malformed copyfrom line in node-rev" msgstr "node-rev に不正な 'copyfrom' 行があります" -#: libsvn_fs_fs/fs_fs.c:778 libsvn_fs_fs/fs_fs.c:2936 +#: libsvn_fs_fs/fs_fs.c:779 libsvn_fs_fs/fs_fs.c:3063 msgid "Attempted to write to non-transaction" msgstr "トランザクションでないものに書き込もうとしました" -#: libsvn_fs_fs/fs_fs.c:862 +#: libsvn_fs_fs/fs_fs.c:863 msgid "Malformed representation header" msgstr "不正な表現ヘッダです" -#: libsvn_fs_fs/fs_fs.c:886 +#: libsvn_fs_fs/fs_fs.c:887 msgid "Missing node-id in node-rev" msgstr "node-rev の node-id がありません" -#: libsvn_fs_fs/fs_fs.c:892 +#: libsvn_fs_fs/fs_fs.c:893 msgid "Corrupt node-id in node-rev" msgstr "node-rev の node-id が壊れています" -#: libsvn_fs_fs/fs_fs.c:937 +#: libsvn_fs_fs/fs_fs.c:938 msgid "Revision file lacks trailing newline" msgstr "リビジョンファイルの末尾に改行がありません" # character: byte 単位の処理での文字数 -#: libsvn_fs_fs/fs_fs.c:949 +#: libsvn_fs_fs/fs_fs.c:950 msgid "Final line in revision file longer than 64 characters" msgstr "リビジョンファイルの最終行が 64 bytes 以上です" -#: libsvn_fs_fs/fs_fs.c:962 +#: libsvn_fs_fs/fs_fs.c:963 msgid "Final line in revision file missing space" msgstr "リビジョンファイルの最終行に空白文字がありません" -#: libsvn_fs_fs/fs_fs.c:989 libsvn_fs_fs/fs_fs.c:1041 libsvn_repos/log.c:239 +#: libsvn_fs_fs/fs_fs.c:993 +#, c-format +msgid "Can't chmod '%s'" +msgstr "chmod '%s' はできません" + +#: libsvn_fs_fs/fs_fs.c:1051 libsvn_fs_fs/fs_fs.c:1108 libsvn_repos/log.c:239 #: libsvn_repos/log.c:243 #, c-format msgid "No such revision %ld" msgstr "リビジョン %ld はありません" -#: libsvn_fs_fs/fs_fs.c:1116 +#: libsvn_fs_fs/fs_fs.c:1183 msgid "Malformed svndiff data in representation" msgstr "表現に不正 svndiff データがあります" # ? svndiff window -#: libsvn_fs_fs/fs_fs.c:1232 libsvn_fs_fs/fs_fs.c:1252 -#: libsvn_fs_fs/fs_fs.c:1265 +#: libsvn_fs_fs/fs_fs.c:1294 libsvn_fs_fs/fs_fs.c:1307 +#: libsvn_fs_fs/fs_fs.c:1338 msgid "Reading one svndiff window read beyond the end of the representation" msgstr "表現の終点を越えて 1 つの svndiff window を読んでいます" -#: libsvn_fs_fs/fs_fs.c:1354 +#: libsvn_fs_fs/fs_fs.c:1451 msgid "svndiff data requested non-existent source" msgstr "svndiff データが、存在しないソースを要求しました" -#: libsvn_fs_fs/fs_fs.c:1360 +#: libsvn_fs_fs/fs_fs.c:1457 msgid "svndiff requested position beyond end of stream" msgstr "svndiff がストリームの終点を越えた位置を要求しました" -#: libsvn_fs_fs/fs_fs.c:1382 +#: libsvn_fs_fs/fs_fs.c:1480 libsvn_fs_fs/fs_fs.c:1497 msgid "svndiff window length is corrupt" msgstr "svndiff window の長さが壊れています" -#: libsvn_fs_fs/fs_fs.c:1557 libsvn_fs_fs/fs_fs.c:1570 -#: libsvn_fs_fs/fs_fs.c:1576 +#: libsvn_fs_fs/fs_fs.c:1680 libsvn_fs_fs/fs_fs.c:1693 +#: libsvn_fs_fs/fs_fs.c:1699 msgid "Directory entry corrupt" msgstr "ディレクトリエントリが壊れています" -#: libsvn_fs_fs/fs_fs.c:1743 +#: libsvn_fs_fs/fs_fs.c:1866 msgid "Missing required node revision ID" msgstr "必要なノードリビジョン識別番号がありません" -#: libsvn_fs_fs/fs_fs.c:1753 +#: libsvn_fs_fs/fs_fs.c:1876 msgid "Invalid change ordering: new node revision ID without delete" msgstr "不正な変更順序: ノードリビジョン識別番号を削除せず新しく追加しています" -#: libsvn_fs_fs/fs_fs.c:1764 +#: libsvn_fs_fs/fs_fs.c:1887 msgid "Invalid change ordering: non-add change on deleted path" msgstr "不正な変更順序: 削除したパスに対して、追加ではない変更をしています" -#: libsvn_fs_fs/fs_fs.c:1909 libsvn_fs_fs/fs_fs.c:1917 -#: libsvn_fs_fs/fs_fs.c:1949 libsvn_fs_fs/fs_fs.c:1969 -#: libsvn_fs_fs/fs_fs.c:2003 libsvn_fs_fs/fs_fs.c:2008 +#: libsvn_fs_fs/fs_fs.c:2032 libsvn_fs_fs/fs_fs.c:2040 +#: libsvn_fs_fs/fs_fs.c:2072 libsvn_fs_fs/fs_fs.c:2092 +#: libsvn_fs_fs/fs_fs.c:2126 libsvn_fs_fs/fs_fs.c:2131 msgid "Invalid changes line in rev-file" msgstr "リビジョンファイルに不正な changes 行があります" -#: libsvn_fs_fs/fs_fs.c:1942 +#: libsvn_fs_fs/fs_fs.c:2065 msgid "Invalid change kind in rev file" msgstr "リビジョンファイルに不正な変更種別があります" -#: libsvn_fs_fs/fs_fs.c:1962 +#: libsvn_fs_fs/fs_fs.c:2085 msgid "Invalid text-mod flag in rev-file" msgstr "リビジョンファイルに不正な text-mod フラグがあります" -#: libsvn_fs_fs/fs_fs.c:1982 +#: libsvn_fs_fs/fs_fs.c:2105 msgid "Invalid prop-mod flag in rev-file" msgstr "リビジョンファイルに不正な prop-mod フラグがあります" -#: libsvn_fs_fs/fs_fs.c:2165 +#: libsvn_fs_fs/fs_fs.c:2288 msgid "Copying from transactions not allowed" msgstr "トランザクションからのコピーは許可されません" -#: libsvn_fs_fs/fs_fs.c:2407 libsvn_fs_fs/fs_fs.c:2414 +#: libsvn_fs_fs/fs_fs.c:2533 libsvn_fs_fs/fs_fs.c:2540 msgid "next-id file corrupt" msgstr "next-id ファイルが壊れています" -#: libsvn_fs_fs/fs_fs.c:2640 +#: libsvn_fs_fs/fs_fs.c:2766 msgid "Invalid change type" msgstr "不正な変更形式です" -#: libsvn_fs_fs/fs_fs.c:2955 +#: libsvn_fs_fs/fs_fs.c:3082 msgid "Can't set text contents of a directory" msgstr "ディレクトリの内容にはテキストを設定できません" -#: libsvn_fs_fs/fs_fs.c:3045 libsvn_fs_fs/fs_fs.c:3050 -#: libsvn_fs_fs/fs_fs.c:3057 +#: libsvn_fs_fs/fs_fs.c:3172 libsvn_fs_fs/fs_fs.c:3177 +#: libsvn_fs_fs/fs_fs.c:3184 msgid "Corrupt current file" msgstr "現在のファイルは壊れています" -#: libsvn_fs_fs/fs_fs.c:3350 -#, c-format -msgid "Can't chmod '%s'" -msgstr "chmod '%s' はできません" - -#: libsvn_fs_fs/fs_fs.c:3486 +#: libsvn_fs_fs/fs_fs.c:3552 msgid "Transaction out of date" msgstr "トランザクションはリポジトリ側と比べて古くなっています" -#: libsvn_fs_fs/fs_fs.c:3726 +#: libsvn_fs_fs/fs_fs.c:3792 msgid "No such transaction" msgstr "そのようなトランザクションはありません" -#: libsvn_ra/ra_loader.c:208 +#: libsvn_ra/ra_loader.c:211 #, c-format -msgid "" -"Mismatched RA plugin version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s" +msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s" msgstr "" -"'%s' 用の RA プラグインのバージョンが一致しません: 実際 %d.%d.%d%s, 予想 %d.%" -"d.%d%s" +"'%s' 用 RA のバージョンが一致しません: 実際 %d.%d.%d%s, 予想 %d.%d.%d%s" -#: libsvn_ra/ra_loader.c:224 +#: libsvn_ra/ra_loader.c:261 #, c-format -msgid "Unrecognized URL scheme '%s'" -msgstr "URL スキーマ '%s' を認識できません" +msgid "Unrecognized URL scheme for '%s'" +msgstr "'%s' 用の URL スキームを認識できません" -#: libsvn_ra/ra_loader.c:290 +#: libsvn_ra/ra_loader.c:519 #, c-format msgid " - handles '%s' schema\n" msgstr " - '%s' スキーマを操作します\n" -#: libsvn_ra_dav/commit.c:164 +#: libsvn_ra/ra_loader.c:604 +#, c-format +msgid "Unrecognized URL scheme '%s'" +msgstr "URL スキーム '%s' を認識できません" + +#: libsvn_ra_dav/commit.c:165 #, c-format msgid "Could not create a request (%s '%s')" msgstr "リクエストを作成できませんでした (%s '%s')" -#: libsvn_ra_dav/commit.c:1015 +#: libsvn_ra_dav/commit.c:1016 msgid "Could not write svndiff to temp file" msgstr "svndiff を一時ファイルに書き込めませんでした" -#: libsvn_ra_dav/commit.c:1105 +#: libsvn_ra_dav/commit.c:1106 #, c-format msgid "Could not create a PUT request (%s)" msgstr "PUT リクエストを作成できませんでした (%s)" -#: libsvn_ra_dav/commit.c:1252 +#: libsvn_ra_dav/commit.c:1253 #, c-format msgid "applying log message to %s" msgstr "ログメッセージを %s に適用しています" -#: libsvn_ra_dav/fetch.c:262 +#: libsvn_ra_dav/fetch.c:263 msgid "Could not save the URL of the version resource" msgstr "バージョン管理されたリソースの URL を保存できません" -#: libsvn_ra_dav/fetch.c:407 +#: libsvn_ra_dav/fetch.c:409 #, c-format msgid "Could not create a GET request for '%s'" msgstr "'%s' に対して GET リクエストを作成できませんでした" -#: libsvn_ra_dav/fetch.c:471 +#: libsvn_ra_dav/fetch.c:473 #, c-format msgid "GET request failed for '%s'" msgstr "'%s' に対する GET リクエストが失敗しました" -#: libsvn_ra_dav/fetch.c:594 +#: libsvn_ra_dav/fetch.c:596 msgid "Could not save file" msgstr "ファイルを保存できませんでした" -#: libsvn_ra_dav/fetch.c:643 +#: libsvn_ra_dav/fetch.c:645 msgid "Error writing to stream: unexpected EOF" msgstr "ストリームへの書き込み中にエラーが発生しました: 予想外の EOF です" -#: libsvn_ra_dav/fetch.c:828 libsvn_ra_svn/client.c:851 +#: libsvn_ra_dav/fetch.c:830 libsvn_ra_svn/client.c:873 #, c-format msgid "" "Checksum mismatch for '%s':\n" @@ -3761,19 +3806,19 @@ " 予想されるチェックサム: %s\n" " 実際のチェックサム: %s\n" -#: libsvn_ra_dav/fetch.c:1093 +#: libsvn_ra_dav/fetch.c:1095 msgid "Server does not support date-based operations" msgstr "日時を使った操作をサーバがサポートしていません" -#: libsvn_ra_dav/fetch.c:1100 +#: libsvn_ra_dav/fetch.c:1102 msgid "Invalid server response to dated-rev request" msgstr "dated-rev リクエストへのサーバのレスポンスが不正です" -#: libsvn_ra_dav/fetch.c:1239 +#: libsvn_ra_dav/fetch.c:1241 msgid "get-locations REPORT not implemented" msgstr "get-locations REPORT は実装されていません" -#: libsvn_ra_dav/fetch.c:1307 +#: libsvn_ra_dav/fetch.c:1309 msgid "" "DAV request failed; it's possible that the repository's pre-revprop-change " "hook either failed or is non-existent" @@ -3781,25 +3826,25 @@ "DAV リクエストに失敗しました。リポジトリの pre-revprop-change フックが機能不" "全であるか存在しない可能性があります" -#: libsvn_ra_dav/fetch.c:2025 +#: libsvn_ra_dav/fetch.c:2027 #, c-format msgid "Error writing to '%s': unexpected EOF" msgstr "'%s' への書き込み中にエラーが発生しました: 予想外の EOF です" -#: libsvn_ra_dav/fetch.c:2162 +#: libsvn_ra_dav/fetch.c:2164 #, c-format msgid "Unknown XML encoding: '%s'" msgstr "未知の XML エンコーディングです: '%s'" -#: libsvn_ra_dav/fetch.c:2423 +#: libsvn_ra_dav/fetch.c:2425 msgid "REPORT response handling failed to complete the editor drive" msgstr "REPORT レスポンスの処理はエディタの実行を終えるのに失敗しました" -#: libsvn_ra_dav/file_revs.c:358 +#: libsvn_ra_dav/file_revs.c:359 msgid "get-file-revs REPORT not implemented" msgstr "get-file-revs REPORT は実装されていません" -#: libsvn_ra_dav/file_revs.c:365 +#: libsvn_ra_dav/file_revs.c:366 msgid "The file-revs report didn't contain any revisions" msgstr "file-revs レポートにリビジョンが含まれていません" @@ -3847,106 +3892,112 @@ "OPTIONS レスポンスは、リクエストされた activity-collection-set を含んでいませ" "ん。このことはしばしば、URL が WebDAV 使用可能でないことを意味します" -#: libsvn_ra_dav/props.c:582 +#: libsvn_ra_dav/props.c:583 #, c-format msgid "Failed to find label '%s' for URL '%s'" msgstr "URL '%s' にラベル '%s' は見つかりませんでした" -#: libsvn_ra_dav/props.c:611 +#: libsvn_ra_dav/props.c:612 #, c-format msgid "'%s' was not present on the resource" msgstr "'%s' はリソースに存在しませんでした" -#: libsvn_ra_dav/props.c:673 +#: libsvn_ra_dav/props.c:651 +#, c-format +msgid "Neon was unable to parse URL '%s'" +msgstr "Neon は URL '%s' をパースできません" + +#: libsvn_ra_dav/props.c:680 msgid "The path was not part of a repository" msgstr "パスはリポジトリの一部ではありませんでした" -#: libsvn_ra_dav/props.c:684 +#: libsvn_ra_dav/props.c:691 #, c-format msgid "No part of path '%s' was found in repository HEAD" msgstr "パス '%s' のどの部分も、リポジトリの HEAD には見つかりませんでした" -#: libsvn_ra_dav/props.c:718 libsvn_ra_dav/props.c:773 +#: libsvn_ra_dav/props.c:725 libsvn_ra_dav/props.c:780 msgid "The VCC property was not found on the resource" msgstr "リソースには VCC 属性が見つかりませんでした" -#: libsvn_ra_dav/props.c:786 +#: libsvn_ra_dav/props.c:793 msgid "The relative-path property was not found on the resource" msgstr "relative-path 属性はリソースには存在しません" -#: libsvn_ra_dav/props.c:907 +#: libsvn_ra_dav/props.c:914 msgid "'DAV:baseline-collection' was not present on the baseline resource" msgstr "'DAV:baseline-collection' はベースラインのリソースには存在しません" -#: libsvn_ra_dav/props.c:926 +#: libsvn_ra_dav/props.c:933 msgid "'DAV:version-name' was not present on the baseline resource" msgstr "'DAV:version-name' はベースラインのリソースには存在しません" -#: libsvn_ra_dav/props.c:1079 +#: libsvn_ra_dav/props.c:1086 msgid "At least one property change failed; repository is unchanged" msgstr "" "1 つ以上の属性を変更できませんでした。リポジトリに変更は加えられていません" -#: libsvn_ra_dav/session.c:429 +#: libsvn_ra_dav/session.c:430 msgid "Invalid URL: illegal character in proxy port number" msgstr "不正な URL です: プロキシのポート番号の値が不正な文字です" -#: libsvn_ra_dav/session.c:433 +#: libsvn_ra_dav/session.c:434 msgid "Invalid URL: negative proxy port number" msgstr "不正な URL です: プロキシのポート番号が負です" -#: libsvn_ra_dav/session.c:436 +#: libsvn_ra_dav/session.c:437 msgid "" "Invalid URL: proxy port number greater than maximum TCP port number 65535" msgstr "" "不正な URL です: プロキシのポート番号が TCP のポート番号の最大値 65535 以上で" "す" -#: libsvn_ra_dav/session.c:450 +#: libsvn_ra_dav/session.c:451 msgid "Invalid config: illegal character in timeout value" msgstr "不正な設定です: タイムアウトの値が不正な文字です" -#: libsvn_ra_dav/session.c:454 +#: libsvn_ra_dav/session.c:455 msgid "Invalid config: negative timeout value" msgstr "不正な設定です: タイムアウトの値が負です" -#: libsvn_ra_dav/session.c:467 +#: libsvn_ra_dav/session.c:468 msgid "Invalid config: illegal character in debug mask value" msgstr "不正な設定です: デバッグマスクの値が不正な文字です" -#: libsvn_ra_dav/session.c:557 +#: libsvn_ra_dav/session.c:531 +msgid "Module for accessing a repository via WebDAV (DeltaV) protocol." +msgstr "WebDAV (DeltaV) プロトコルを使ってリポジトリにアクセスするモジュール。" + +#: libsvn_ra_dav/session.c:577 msgid "Malformed URL for repository" msgstr "リポジトリの URL が不正です" -#: libsvn_ra_dav/session.c:565 +#: libsvn_ra_dav/session.c:585 msgid "Network socket initialization failed" msgstr "ネットワークソケットを初期化できませんでした" -#: libsvn_ra_dav/session.c:578 +#: libsvn_ra_dav/session.c:598 msgid "SSL is not supported" msgstr "SSL はサポートされていません" -#: libsvn_ra_dav/session.c:724 +#: libsvn_ra_dav/session.c:744 #, c-format msgid "Invalid config: unable to load certificate file '%s'" msgstr "不正な設定です: 証明書ファイル '%s' をロードできません" -#: libsvn_ra_dav/session.c:812 +#: libsvn_ra_dav/session.c:832 msgid "The UUID property was not found on the resource or any of its parents" msgstr "UUID 属性を、リソースやその親に見つけられませんでした" -#: libsvn_ra_dav/session.c:820 +#: libsvn_ra_dav/session.c:840 msgid "Please upgrade the server to 0.19 or later" msgstr "サーバをバージョン 0.19 以降にアップグレードしてください" -#: libsvn_ra_dav/session.c:836 -msgid "Module for accessing a repository via WebDAV (DeltaV) protocol." -msgstr "WebDAV (DeltaV) プロトコルを使ってリポジトリにアクセスするモジュール。" - -#: libsvn_ra_dav/session.c:875 +#: libsvn_ra_dav/session.c:898 #, c-format -msgid "Unsupported RA plugin ABI version (%d) for ra_dav" -msgstr "ra_dav 用の RA プラグイン ABI バージョン (%d) はサポートされていません" +msgid "Unsupported RA loader version (%d) for ra_dav" +msgstr "" +"ra_dav 用のリポジトリアクセスローダバージョン (%d) はサポートされていません" #: libsvn_ra_dav/util.c:271 msgid "authorization failed" @@ -3964,7 +4015,7 @@ msgid "Can't calculate the request body size" msgstr "リクエストのボディのサイズを計算できません" -#: libsvn_ra_dav/util.c:651 +#: libsvn_ra_dav/util.c:652 #, c-format msgid "'%s' path not found" msgstr "パス '%s' が見つかりません" @@ -3972,23 +4023,23 @@ # * Arguments are (1) method and (2) url. #. We either have a neon error, or some other error #. that we didn't expect. -#: libsvn_ra_dav/util.c:656 libsvn_ra_dav/util.c:799 +#: libsvn_ra_dav/util.c:657 libsvn_ra_dav/util.c:800 #, c-format msgid "%s of '%s'" msgstr "%s (URL: '%s')" -#: libsvn_ra_dav/util.c:667 +#: libsvn_ra_dav/util.c:668 #, c-format msgid "The %s request returned invalid XML in the response: %s (%s)" msgstr "" "%s リクエストに対するレスポンスとして不正な XML が返されました: %s (%s)" -#: libsvn_ra_dav/util.c:681 +#: libsvn_ra_dav/util.c:682 #, c-format msgid "%s request failed on '%s'" msgstr "%s リクエスト (相手: '%s') が失敗しました" -#: libsvn_ra_local/ra_plugin.c:100 libsvn_ra_local/ra_plugin.c:469 +#: libsvn_ra_local/ra_plugin.c:101 libsvn_ra_local/ra_plugin.c:477 #, c-format msgid "" "'%s'\n" @@ -4000,19 +4051,21 @@ "'%s'\n" "は同じリポジトリではありません" -#: libsvn_ra_local/ra_plugin.c:228 -msgid "Unable to open an ra_local session to URL" -msgstr "URL に対し ra_local セッションを開始できません" - -#: libsvn_ra_local/ra_plugin.c:959 +#. ---------------------------------------------------------------- +#. * The RA vtable routines * +#: libsvn_ra_local/ra_plugin.c:207 msgid "Module for accessing a repository on local disk." msgstr "ローカルディスク上のリポジトリにアクセスするモジュール。" -#: libsvn_ra_local/ra_plugin.c:1005 +#: libsvn_ra_local/ra_plugin.c:247 +msgid "Unable to open an ra_local session to URL" +msgstr "URL に対し ra_local セッションを開始できません" + +#: libsvn_ra_local/ra_plugin.c:989 #, c-format -msgid "Unsupported RA plugin ABI version (%d) for ra_local" +msgid "Unsupported RA loader version (%d) for ra_local" msgstr "" -"ra_local 用の RA プラグイン ABI バージョン (%d) はサポートされていません" +"ra_local 用のリポジトリアクセスローダバージョン (%d) はサポートされていません" #: libsvn_ra_local/split_url.c:44 #, c-format @@ -4034,139 +4087,140 @@ msgid "Unable to open repository '%s'" msgstr "リポジトリ '%s' を開けませんでした" -#: libsvn_ra_svn/client.c:137 +#: libsvn_ra_svn/client.c:139 #, c-format msgid "Unknown hostname '%s'" msgstr "ホスト名 '%s' が不明です" -#: libsvn_ra_svn/client.c:148 +#: libsvn_ra_svn/client.c:150 msgid "Can't create socket" msgstr "ソケットを作成できません" -#: libsvn_ra_svn/client.c:152 +#: libsvn_ra_svn/client.c:154 #, c-format msgid "Can't connect to host '%s'" msgstr "ホスト '%s' に接続できません" -#: libsvn_ra_svn/client.c:173 +#: libsvn_ra_svn/client.c:175 msgid "Proplist element not a list" msgstr "proplist 要素がリストではありません" -#: libsvn_ra_svn/client.c:197 +#: libsvn_ra_svn/client.c:199 msgid "Prop diffs element not a list" msgstr "prop diffs 要素がリストではありません" -#: libsvn_ra_svn/client.c:218 +#: libsvn_ra_svn/client.c:220 #, c-format msgid "Unrecognized node kind '%s' from server" msgstr "サーバから送られてきたノード種別 '%s' を認識できません" -#: libsvn_ra_svn/client.c:263 libsvn_ra_svn/client.c:317 +#: libsvn_ra_svn/client.c:265 libsvn_ra_svn/client.c:319 #, c-format msgid "Authentication error from server: %s" msgstr "サーバの認証エラーです: %s" -#: libsvn_ra_svn/client.c:266 libsvn_ra_svn/cram.c:194 +#: libsvn_ra_svn/client.c:268 libsvn_ra_svn/cram.c:194 #: libsvn_ra_svn/cram.c:212 msgid "Unexpected server response to authentication" msgstr "認証に対する予想外のサーバのレスポンスです" -#: libsvn_ra_svn/client.c:324 +#: libsvn_ra_svn/client.c:326 msgid "Cannot negotiate authentication mechanism" msgstr "認証機構と交渉できません" -#: libsvn_ra_svn/client.c:451 +#: libsvn_ra_svn/client.c:454 #, c-format msgid "Undefined tunnel scheme '%s'" msgstr "トンネルスキーマ '%s' は未定義です" -#: libsvn_ra_svn/client.c:468 +#: libsvn_ra_svn/client.c:471 #, c-format msgid "Tunnel scheme %s requires environment variable %s to be defined" msgstr "" "トンネルスキーマ %s を使うには環境変数 %s が定義されている必要があります" -#: libsvn_ra_svn/client.c:479 +#: libsvn_ra_svn/client.c:482 #, c-format msgid "Can't tokenize command '%s'" msgstr "コマンド '%s' をトークン化できません" -#: libsvn_ra_svn/client.c:508 +#: libsvn_ra_svn/client.c:511 #, c-format msgid "Error in child process: %s" msgstr "子プロセスにおけるエラーです: %s" -#: libsvn_ra_svn/client.c:531 +#: libsvn_ra_svn/client.c:534 msgid "Can't create tunnel" msgstr "トンネルを作成できません" -#: libsvn_ra_svn/client.c:575 +#: libsvn_ra_svn/client.c:563 +msgid "Module for accessing a repository using the svn network protocol." +msgstr "svn ネットワークプロトコルを使ってリポジトリにアクセスするモジュール。" + +#: libsvn_ra_svn/client.c:596 #, c-format msgid "Illegal svn repository URL '%s'" msgstr "Subversion リポジトリの URL '%s' が不正です" -#: libsvn_ra_svn/client.c:594 +#: libsvn_ra_svn/client.c:615 #, c-format msgid "Server requires minimum version %d" msgstr "バージョン %d 以上をサーバが必要としています" -#: libsvn_ra_svn/client.c:644 +#: libsvn_ra_svn/client.c:665 msgid "Impossibly long repository root from server" msgstr "サーバから送られてきたリポジトリのルートが長すぎます" -#: libsvn_ra_svn/client.c:710 +#: libsvn_ra_svn/client.c:732 msgid "Server did not send repository root" msgstr "サーバがリポジトリのルートを送信しませんでした" -#: libsvn_ra_svn/client.c:831 +#: libsvn_ra_svn/client.c:853 msgid "Non-string as part of file contents" msgstr "ファイルの一部に文字列以外が含まれています" -#: libsvn_ra_svn/client.c:900 +#: libsvn_ra_svn/client.c:922 msgid "Dirlist element not a list" msgstr "dirlist 要素がリストではありません" -#: libsvn_ra_svn/client.c:1056 +#: libsvn_ra_svn/client.c:1078 msgid "Log entry not a list" msgstr "log エントリがリストではありません" -#: libsvn_ra_svn/client.c:1069 +#: libsvn_ra_svn/client.c:1091 msgid "Changed-path entry not a list" msgstr "changed-path エントリがリストではありません" -#: libsvn_ra_svn/client.c:1165 +#: libsvn_ra_svn/client.c:1174 msgid "get-locations not implemented" msgstr "get-locations は実装されていません" -#: libsvn_ra_svn/client.c:1178 +#: libsvn_ra_svn/client.c:1187 msgid "Location entry not a list" msgstr "location エントリがリストではありません" -#: libsvn_ra_svn/client.c:1231 +#: libsvn_ra_svn/client.c:1241 msgid "get-file-revs not implemented" msgstr "get-file-revs は実装されていません" -#: libsvn_ra_svn/client.c:1245 +#: libsvn_ra_svn/client.c:1255 msgid "Revision entry not a list" msgstr "revision エントリはリストではありません" # ? text delta chunk -#: libsvn_ra_svn/client.c:1258 libsvn_ra_svn/client.c:1283 +#: libsvn_ra_svn/client.c:1268 libsvn_ra_svn/client.c:1293 msgid "Text delta chunk not a string" msgstr "テキスト差分の塊が文字列ではありません" -#: libsvn_ra_svn/client.c:1295 +#: libsvn_ra_svn/client.c:1305 msgid "The get-file-revs command didn't return any revisions" msgstr "コマンド get-file-revs がリビジョンを返しませんでした" -#: libsvn_ra_svn/client.c:1307 -msgid "Module for accessing a repository using the svn network protocol." -msgstr "svn ネットワークプロトコルを使ってリポジトリにアクセスするモジュール。" - -#: libsvn_ra_svn/client.c:1344 +#: libsvn_ra_svn/client.c:1359 #, c-format -msgid "Unsupported RA plugin ABI version (%d) for ra_svn." -msgstr "ra_svn 用の RA プラグイン ABI バージョン (%d) はサポートされていません" +msgid "Unsupported RA loader version (%d) for ra_svn" +msgstr "" +"ra_svn 用のリポジトリアクセスローダバージョン (%d) はサポートされていません" #: libsvn_ra_svn/editor.c:383 libsvn_ra_svn/editorp.c:418 msgid "Invalid file or dir token during edit" @@ -4298,12 +4352,17 @@ msgid "End revision %ld is invalid (youngest revision is %ld)" msgstr "終了リビジョン %ld が不正です (最新のリビジョンは %ld です)" -#: libsvn_repos/dump.c:1044 +#: libsvn_repos/dump.c:1045 #, c-format -msgid "* %s revision %ld.\n" -msgstr "* %s リビジョン %ld。\n" +msgid "* Dumped revision %ld.\n" +msgstr "* リビジョン %ld をダンプしました。\n" -#: libsvn_repos/fs-wrap.c:56 +#: libsvn_repos/dump.c:1046 +#, c-format +msgid "* Verified revision %ld.\n" +msgstr "* リビジョン %ld を検証しました。\n" + +#: libsvn_repos/fs-wrap.c:56 libsvn_repos/load.c:1218 msgid "Commit succeeded, but post-commit hook failed" msgstr "コミットには成功しましたが、post-commit フックに失敗しました" @@ -4343,7 +4402,7 @@ msgid "Failed to run '%s' hook" msgstr "'%s' フックの実行に失敗しました" -#: libsvn_repos/hooks.c:105 +#: libsvn_repos/hooks.c:108 #, c-format msgid "" "'%s' hook failed with error output:\n" @@ -4352,20 +4411,25 @@ "'%s' フックが次のようなエラーを出力して失敗しました:\n" "%s" -#: libsvn_repos/hooks.c:116 +#: libsvn_repos/hooks.c:115 +#, c-format +msgid "'%s' hook failed; no error output available" +msgstr "'%s' フックが失敗しました。利用できるエラー出力はありません" + +#: libsvn_repos/hooks.c:126 msgid "Error closing read end of stderr pipe" msgstr "標準エラー出力パイプの読み込みの終点を閉じる際にエラーが発生しました" -#: libsvn_repos/hooks.c:120 +#: libsvn_repos/hooks.c:130 msgid "Error closing null file" msgstr "空のファイルを閉じる際にエラーが発生しました" -#: libsvn_repos/hooks.c:202 +#: libsvn_repos/hooks.c:212 #, c-format msgid "Failed to run '%s' hook; broken symlink" msgstr "'%s' フックを実行できませんでした。シンボリックリンクが壊れています" -#: libsvn_repos/hooks.c:343 +#: libsvn_repos/hooks.c:353 msgid "" "Repository has not been enabled to accept revision propchanges;\n" "ask the administrator to create a pre-revprop-change hook" @@ -4373,63 +4437,91 @@ "リポジトリが、リビジョン属性を変更できるようにはなっていません。\n" "管理者に pre-revprop-change フックを作成するよう頼んでください" -#: libsvn_repos/load.c:155 libsvn_repos/load.c:167 +#: libsvn_repos/load.c:157 libsvn_repos/load.c:169 msgid "Found malformed header block in dumpfile stream" msgstr "ダンプストリーム中に不正なヘッダブロックが見つかりました" -#: libsvn_repos/load.c:185 +#: libsvn_repos/load.c:187 msgid "Premature end of content data in dumpstream" msgstr "ダンプストリーム中のデータが途中で途切れています" -#: libsvn_repos/load.c:192 +#: libsvn_repos/load.c:194 msgid "Dumpstream data appears to be malformed" msgstr "ダンプストリームデータが不正なようです" -#: libsvn_repos/load.c:227 +#: libsvn_repos/load.c:232 msgid "Incomplete or unterminated property block" msgstr "不完全または未終了の属性ブロックです" -#: libsvn_repos/load.c:420 +#: libsvn_repos/load.c:425 msgid "Unexpected EOF writing contents" msgstr "内容を書き込む際に予想外の EOF がありました" -#: libsvn_repos/load.c:449 +#: libsvn_repos/load.c:454 msgid "Malformed dumpfile header" msgstr "不正なダンプファイルヘッダです" -#: libsvn_repos/load.c:455 libsvn_repos/load.c:497 +#: libsvn_repos/load.c:460 libsvn_repos/load.c:502 #, c-format msgid "Unsupported dumpfile version: %d" msgstr "ダンプファイルのバージョン %d はサポートされていません" -#: libsvn_repos/load.c:595 +#: libsvn_repos/load.c:600 msgid "Unrecognized record type in stream" msgstr "ストリーム中の記録形式を認識できません" -#: libsvn_repos/load.c:827 +#: libsvn_repos/load.c:712 +msgid "Sum of subblock sizes larger than total block content length" +msgstr "サブブロックサイズの和がブロック内容のサイズの合計より大きいです" + +#: libsvn_repos/load.c:891 #, c-format msgid "<<< Started new transaction, based on original revision %ld\n" msgstr "" "<<< オリジナルのリビジョン %ld に基づき、新しいトランザクションを開始しまし" "た\n" -#: libsvn_repos/load.c:872 +#: libsvn_repos/load.c:936 #, c-format msgid "Relative source revision %ld is not available in current repository" msgstr "現在のリポジトリでは、相対ソースリビジョン %ld は利用できません" -#: libsvn_repos/load.c:921 +#: libsvn_repos/load.c:985 msgid "Malformed dumpstream: Revision 0 must not contain node records" msgstr "" "ダンプストリームが不正です。リビジョン 0 にはノードの記録が含まれていてはいけ" "ません" -#: libsvn_repos/load.c:965 +#: libsvn_repos/load.c:995 +#, c-format +msgid " * editing path : %s ..." +msgstr " * パスを編集しています : %s ..." + +#: libsvn_repos/load.c:1002 +#, c-format +msgid " * deleting path : %s ..." +msgstr " * パスを削除しています : %s ..." + +#: libsvn_repos/load.c:1010 +#, c-format +msgid " * adding path : %s ..." +msgstr " * パスを追加しています : %s ..." + +#: libsvn_repos/load.c:1019 +#, c-format +msgid " * replacing path : %s ..." +msgstr " * パスを置換しています : %s ..." + +#: libsvn_repos/load.c:1029 #, c-format msgid "Unrecognized node-action on node '%s'" msgstr "ノード '%s' におけるノードアクションを認識できません" -#: libsvn_repos/load.c:1144 +#: libsvn_repos/load.c:1165 +msgid " done.\n" +msgstr " 完了しました。\n" + +#: libsvn_repos/load.c:1240 #, c-format msgid "" "\n" @@ -4440,7 +4532,7 @@ "------- リビジョン %ld をコミットしました >>>\n" "\n" -#: libsvn_repos/load.c:1150 +#: libsvn_repos/load.c:1246 #, c-format msgid "" "\n" @@ -4463,24 +4555,24 @@ msgid "Filesystem path '%s' is neither a file nor a directory" msgstr "ファイルシステムのパス '%s' はファイルでもディレクトリでもありません" -#: libsvn_repos/reporter.c:624 +#: libsvn_repos/reporter.c:637 #, c-format msgid "Working copy path '%s' does not exist in repository" msgstr "作業コピーパス '%s' がリポジトリに存在しません" -#: libsvn_repos/reporter.c:827 +#: libsvn_repos/reporter.c:855 msgid "Not authorized to open root of edit operation" msgstr "編集用ルートパスを開く操作が認証されていません" -#: libsvn_repos/reporter.c:848 +#: libsvn_repos/reporter.c:876 msgid "Cannot replace a directory from within" msgstr "ディレクトリを内側から置換することはできません" -#: libsvn_repos/reporter.c:891 +#: libsvn_repos/reporter.c:919 msgid "Invalid report for top level of working copy" msgstr "作業コピーのトップレベルについての報告が不正です" -#: libsvn_repos/reporter.c:906 +#: libsvn_repos/reporter.c:934 msgid "Two top-level reports with no target" msgstr "対象がないのにトップレベルの報告が 2 つあります" @@ -4501,65 +4593,65 @@ msgid "Creating lock dir" msgstr "ロック用のディレクトリを作成しています" -#: libsvn_repos/repos.c:223 +#: libsvn_repos/repos.c:237 msgid "Creating hook directory" msgstr "フック用のディレクトリを作成しています" -#: libsvn_repos/repos.c:324 +#: libsvn_repos/repos.c:341 msgid "Creating start-commit hook" msgstr "start-commit フックを作成しています" -#: libsvn_repos/repos.c:456 +#: libsvn_repos/repos.c:476 msgid "Creating pre-commit hook" msgstr "pre-commit フックを作成しています" -#: libsvn_repos/repos.c:583 +#: libsvn_repos/repos.c:606 msgid "Creating pre-revprop-change hook" msgstr "pre-revprop-change フックを作成しています" -#: libsvn_repos/repos.c:679 +#: libsvn_repos/repos.c:705 msgid "Creating post-commit hook" msgstr "post-commit フックを作成しています" -#: libsvn_repos/repos.c:786 +#: libsvn_repos/repos.c:815 msgid "Creating post-revprop-change hook" msgstr "post-revprop-change フックを作成しています" -#: libsvn_repos/repos.c:796 +#: libsvn_repos/repos.c:825 msgid "Creating conf directory" msgstr "設定用のディレクトリを作成しています" -#: libsvn_repos/repos.c:848 +#: libsvn_repos/repos.c:877 msgid "Creating svnserve.conf file" msgstr "svnserve.conf ファイルを作成しています" -#: libsvn_repos/repos.c:873 +#: libsvn_repos/repos.c:902 msgid "Creating passwd file" msgstr "パスワードファイルを作成しています" -#: libsvn_repos/repos.c:899 +#: libsvn_repos/repos.c:928 msgid "Could not create top-level directory" msgstr "トップレベルのディレクトリを作成できませんでした" -#: libsvn_repos/repos.c:903 +#: libsvn_repos/repos.c:932 msgid "Creating DAV sandbox dir" msgstr "DAV サンドボックスディレクトリを作成しています" -#: libsvn_repos/repos.c:946 +#: libsvn_repos/repos.c:975 msgid "Creating readme file" msgstr "readme ファイルを作成しています" -#: libsvn_repos/repos.c:977 +#: libsvn_repos/repos.c:1006 msgid "Repository creation failed" msgstr "リポジトリの作成に失敗しました" -#: libsvn_repos/repos.c:1039 +#: libsvn_repos/repos.c:1068 #, c-format msgid "Expected version '%d' of repository; found version '%d'" msgstr "" "リポジトリの予想されるバージョンは '%d' ですが、実際のバージョンは '%d' です" -#: libsvn_repos/repos.c:1084 +#: libsvn_repos/repos.c:1113 msgid "Error opening db lockfile" msgstr "DB ロックファイルを開く際にエラーが発生しました" @@ -4642,210 +4734,210 @@ msgid "Can't recode error string from APR" msgstr "APR からのエラー文字列を再エンコードできません" -#: libsvn_subr/io.c:127 +#: libsvn_subr/io.c:129 #, c-format msgid "Can't check path '%s'" msgstr "パス '%s' をチェックできません" -#: libsvn_subr/io.c:246 libsvn_subr/io.c:335 +#: libsvn_subr/io.c:248 libsvn_subr/io.c:337 #, c-format msgid "Can't open '%s'" msgstr "'%s' を開けません" -#: libsvn_subr/io.c:260 libsvn_subr/io.c:348 +#: libsvn_subr/io.c:262 libsvn_subr/io.c:350 #, c-format msgid "Unable to make name for '%s'" msgstr "'%s' に名前をつけられません" -#: libsvn_subr/io.c:352 libsvn_subr/io.c:388 libsvn_subr/io.c:416 +#: libsvn_subr/io.c:354 libsvn_subr/io.c:390 libsvn_subr/io.c:418 msgid "Symbolic links are not supported on this platform" msgstr "シンボリックリンクはこのプラットフォームではサポートされていません" -#: libsvn_subr/io.c:375 +#: libsvn_subr/io.c:377 msgid "Can't read contents of link" msgstr "リンクの内容を読めません" -#: libsvn_subr/io.c:517 libsvn_subr/io.c:527 +#: libsvn_subr/io.c:519 libsvn_subr/io.c:529 msgid "Can't find a temporary directory" msgstr "一時ディレクトリが見つかりません" -#: libsvn_subr/io.c:564 +#: libsvn_subr/io.c:566 #, c-format msgid "Can't copy '%s' to '%s'" msgstr "'%s' から '%s' にコピーできません" -#: libsvn_subr/io.c:597 +#: libsvn_subr/io.c:599 #, c-format msgid "Can't set permissions on '%s'" msgstr "'%s' に権限を設定できません" -#: libsvn_subr/io.c:619 +#: libsvn_subr/io.c:621 #, c-format msgid "Can't append '%s' to '%s'" msgstr "'%s' を '%s' に加えられません" -#: libsvn_subr/io.c:653 +#: libsvn_subr/io.c:655 #, c-format msgid "Source '%s' is not a directory" msgstr "コピー元 (もしくは移動元) '%s' はディレクトリではありません" -#: libsvn_subr/io.c:659 +#: libsvn_subr/io.c:661 #, c-format msgid "Destination '%s' is not a directory" msgstr "コピー先 (もしくは移動先) '%s' はディレクトリではありません" -#: libsvn_subr/io.c:665 +#: libsvn_subr/io.c:667 #, c-format msgid "Destination '%s' already exists" msgstr "コピー先 (もしくは移動先) '%s' は既に存在しています" -#: libsvn_subr/io.c:738 libsvn_subr/io.c:1498 libsvn_subr/io.c:1567 +#: libsvn_subr/io.c:730 libsvn_subr/io.c:1490 libsvn_subr/io.c:1559 #, c-format msgid "Can't read directory '%s'" msgstr "ディレクトリ '%s' を読めません" -#: libsvn_subr/io.c:743 libsvn_subr/io.c:1503 libsvn_subr/io.c:1572 -#: libsvn_subr/io.c:2457 +#: libsvn_subr/io.c:735 libsvn_subr/io.c:1495 libsvn_subr/io.c:1564 +#: libsvn_subr/io.c:2463 #, c-format msgid "Error closing directory '%s'" msgstr "ディレクトリ '%s' を閉じる際にエラーが発生しました" -#: libsvn_subr/io.c:769 +#: libsvn_subr/io.c:761 #, c-format msgid "Can't make directory '%s'" msgstr "ディレクトリ '%s' を作成できません" -#: libsvn_subr/io.c:837 +#: libsvn_subr/io.c:829 #, c-format msgid "Can't set access time of '%s'" msgstr "'%s' にアクセス時刻を設定できません" -#: libsvn_subr/io.c:953 +#: libsvn_subr/io.c:945 #, c-format msgid "Can't set file '%s' read-only" msgstr "ファイル '%s' を読み取り専用に設定できません" -#: libsvn_subr/io.c:978 +#: libsvn_subr/io.c:970 #, c-format msgid "Can't set file '%s' read-write" msgstr "ファイル '%s' を読み書き両用に設定できません" -#: libsvn_subr/io.c:1033 libsvn_subr/io.c:1077 libsvn_subr/io.c:1101 +#: libsvn_subr/io.c:1025 libsvn_subr/io.c:1069 libsvn_subr/io.c:1093 #, c-format msgid "Can't change executability of file '%s'" msgstr "ファイル '%s' の実行権限を変更できません" -#: libsvn_subr/io.c:1128 +#: libsvn_subr/io.c:1120 msgid "Error getting UID of process" msgstr "プロセスの UID を取得する際にエラーが発生しました" -#: libsvn_subr/io.c:1209 +#: libsvn_subr/io.c:1201 #, c-format msgid "Can't get shared lock on file '%s'" msgstr "ファイル '%s' で共有ロックを取得できません" -#: libsvn_subr/io.c:1213 +#: libsvn_subr/io.c:1205 #, c-format msgid "Can't get exclusive lock on file '%s'" msgstr "ファイル '%s' に対して排他的なロックを取得できません" -#: libsvn_subr/io.c:1244 +#: libsvn_subr/io.c:1236 #, c-format msgid "Can't flush file '%s'" msgstr "ファイル '%s' をフラッシュできません" -#: libsvn_subr/io.c:1245 +#: libsvn_subr/io.c:1237 msgid "Can't flush stream" msgstr "ストリームをフラッシュできません" -#: libsvn_subr/io.c:1257 libsvn_subr/io.c:1274 +#: libsvn_subr/io.c:1249 libsvn_subr/io.c:1266 msgid "Can't flush file to disk" msgstr "ファイルをディスクにフラッシュできません" -#: libsvn_subr/io.c:1295 +#: libsvn_subr/io.c:1287 msgid "Reading from stdin is currently broken, so disabled" msgstr "標準入力からの読み込みが現在こわれており、使用できません" -#: libsvn_subr/io.c:1316 +#: libsvn_subr/io.c:1308 msgid "Can't get file name" msgstr "ファイル名を取得できません" -#: libsvn_subr/io.c:1384 +#: libsvn_subr/io.c:1376 #, c-format msgid "Can't remove file '%s'" msgstr "ファイル '%s' を削除できません" -#: libsvn_subr/io.c:1413 +#: libsvn_subr/io.c:1405 #, c-format msgid "Can't rewind directory '%s'" msgstr "ディレクトリ '%s' の読み込み位置を先頭に戻せません" -#: libsvn_subr/io.c:1448 libsvn_subr/io.c:2308 libsvn_subr/io.c:2396 +#: libsvn_subr/io.c:1440 libsvn_subr/io.c:2312 libsvn_subr/io.c:2400 #, c-format msgid "Can't open directory '%s'" msgstr "ディレクトリ '%s' を開けません" -#: libsvn_subr/io.c:1487 libsvn_subr/io.c:1509 +#: libsvn_subr/io.c:1479 libsvn_subr/io.c:1501 #, c-format msgid "Can't remove '%s'" msgstr "'%s' を削除できません" -#: libsvn_subr/io.c:1603 +#: libsvn_subr/io.c:1595 #, c-format msgid "Can't create process '%s' attributes" msgstr "プロセス '%s' の属性を作成できません" -#: libsvn_subr/io.c:1609 +#: libsvn_subr/io.c:1601 #, c-format msgid "Can't set process '%s' cmdtype" msgstr "プロセス '%s' に対してコマンドタイプを設定できません" -#: libsvn_subr/io.c:1621 +#: libsvn_subr/io.c:1613 #, c-format msgid "Can't set process '%s' directory" msgstr "プロセス '%s' に対してディレクトリを設定できません" -#: libsvn_subr/io.c:1634 +#: libsvn_subr/io.c:1626 #, c-format msgid "Can't set process '%s' child input" msgstr "プロセス '%s' に対して子の入力を設定できません" -#: libsvn_subr/io.c:1641 +#: libsvn_subr/io.c:1633 #, c-format msgid "Can't set process '%s' child outfile" msgstr "プロセス '%s' に対して子の出力ファイルを設定できません" -#: libsvn_subr/io.c:1648 +#: libsvn_subr/io.c:1640 #, c-format msgid "Can't set process '%s' child errfile" msgstr "プロセス '%s' に対して子のエラー出力ファイルを設定できません" -#: libsvn_subr/io.c:1672 +#: libsvn_subr/io.c:1664 #, c-format msgid "Can't start process '%s'" msgstr "プロセス '%s' を開始できません" -#: libsvn_subr/io.c:1680 +#: libsvn_subr/io.c:1672 #, c-format msgid "Error waiting for process '%s'" msgstr "プロセス '%s' を待っている際にエラーが発生しました" -#: libsvn_subr/io.c:1688 +#: libsvn_subr/io.c:1680 #, c-format msgid "Process '%s' failed (exitwhy %d)" msgstr "プロセス '%s' は失敗しました (終了理由 %d)" -#: libsvn_subr/io.c:1695 +#: libsvn_subr/io.c:1687 #, c-format msgid "Process '%s' returned error exitcode %d" msgstr "プロセス '%s' はエラー終了コード %d を返しました" -#: libsvn_subr/io.c:1783 +#: libsvn_subr/io.c:1775 #, c-format msgid "'%s' returned %d" msgstr "'%s' が %d を返しました" -#: libsvn_subr/io.c:1886 +#: libsvn_subr/io.c:1878 #, c-format msgid "" "Error running '%s': exitcode was %d, args were:\n" @@ -4861,116 +4953,125 @@ "%s\n" "%s" -#: libsvn_subr/io.c:1922 +#: libsvn_subr/io.c:1914 #, c-format msgid "Can't detect MIME type of non-file '%s'" msgstr "ファイルでない '%s' の MIME タイプを検出できません" -#: libsvn_subr/io.c:1989 +#: libsvn_subr/io.c:1981 #, c-format msgid "Can't open file '%s'" msgstr "ファイル '%s' を開けません" -#: libsvn_subr/io.c:2025 +#: libsvn_subr/io.c:2017 #, c-format msgid "Can't close file '%s'" msgstr "ファイル '%s' を閉じられません" -#: libsvn_subr/io.c:2026 +#: libsvn_subr/io.c:2018 msgid "Can't close stream" msgstr "ストリームを閉じられません" -#: libsvn_subr/io.c:2036 libsvn_subr/io.c:2060 libsvn_subr/io.c:2073 +#: libsvn_subr/io.c:2028 libsvn_subr/io.c:2052 libsvn_subr/io.c:2065 #, c-format msgid "Can't read file '%s'" msgstr "ファイル '%s' を読めません" -#: libsvn_subr/io.c:2037 libsvn_subr/io.c:2061 libsvn_subr/io.c:2074 +#: libsvn_subr/io.c:2029 libsvn_subr/io.c:2053 libsvn_subr/io.c:2066 msgid "Can't read stream" msgstr "ストリームを読めません" -#: libsvn_subr/io.c:2048 +#: libsvn_subr/io.c:2040 #, c-format msgid "Can't get attribute information from file '%s'" msgstr "ファイル '%s' から属性情報を取得できません" -#: libsvn_subr/io.c:2049 +#: libsvn_subr/io.c:2041 msgid "Can't get attribute information from stream" msgstr "ストリームから属性情報を取得できません" -#: libsvn_subr/io.c:2085 +#: libsvn_subr/io.c:2077 #, c-format msgid "Can't set position pointer in file '%s'" msgstr "ファイル '%s' 中に位置ポインタを設定できません" -#: libsvn_subr/io.c:2086 +#: libsvn_subr/io.c:2078 msgid "Can't set position pointer in stream" msgstr "ストリーム中に位置ポインタを設定できません" -#: libsvn_subr/io.c:2097 libsvn_subr/io.c:2110 +#: libsvn_subr/io.c:2089 libsvn_subr/io.c:2102 #, c-format msgid "Can't write to file '%s'" msgstr "ファイル '%s' に書き込めません" -#: libsvn_subr/io.c:2098 libsvn_subr/io.c:2111 +#: libsvn_subr/io.c:2090 libsvn_subr/io.c:2103 msgid "Can't write to stream" msgstr "ストリームに書き込めません" -#: libsvn_subr/io.c:2184 +#: libsvn_subr/io.c:2143 +#, c-format +msgid "Can't read length line in file '%s'" +msgstr "ファイル '%s' 中の長さの行を読めません" + +#: libsvn_subr/io.c:2147 +msgid "Can't read length line in stream" +msgstr "ストリーム中の長さの行を読めません" + +#: libsvn_subr/io.c:2188 #, c-format msgid "Can't move '%s' to '%s'" msgstr "'%s' から '%s' にファイル名を変更できません" -#: libsvn_subr/io.c:2224 +#: libsvn_subr/io.c:2228 #, c-format msgid "Can't create directory '%s'" msgstr "ディレクトリ '%s' を作成できません" -#: libsvn_subr/io.c:2235 +#: libsvn_subr/io.c:2239 #, c-format msgid "Can't hide directory '%s'" msgstr "ディレクトリ '%s' を隠せません" -#: libsvn_subr/io.c:2248 +#: libsvn_subr/io.c:2252 #, c-format msgid "Can't stat directory '%s'" msgstr "ディレクトリ '%s' に対して stat を実行できません" -#: libsvn_subr/io.c:2264 +#: libsvn_subr/io.c:2268 #, c-format msgid "Can't stat new directory '%s'" msgstr "新しいディレクトリ '%s' に対して stat を実行できません" -#: libsvn_subr/io.c:2326 +#: libsvn_subr/io.c:2330 #, c-format msgid "Can't remove directory '%s'" msgstr "ディレクトリ '%s' を削除できません" -#: libsvn_subr/io.c:2344 +#: libsvn_subr/io.c:2348 msgid "Can't read directory" msgstr "ディレクトリを読めません" -#: libsvn_subr/io.c:2413 +#: libsvn_subr/io.c:2419 #, c-format msgid "Can't read directory entry in '%s'" msgstr "'%s' 中のディレクトリエントリを読めません" -#: libsvn_subr/io.c:2538 +#: libsvn_subr/io.c:2544 #, c-format msgid "Can't check directory '%s'" msgstr "ディレクトリ '%s' をチェックできません" -#: libsvn_subr/io.c:2560 +#: libsvn_subr/io.c:2566 #, c-format msgid "Version %d is not non-negative" msgstr "バージョン %d が非負の数でありません" -#: libsvn_subr/io.c:2607 +#: libsvn_subr/io.c:2613 #, c-format msgid "Reading '%s'" msgstr "'%s' を読んでいます" -#: libsvn_subr/io.c:2623 +#: libsvn_subr/io.c:2629 #, c-format msgid "First line of '%s' contains non-digit" msgstr "'%s' の 1 行目に数字以外が含まれています" @@ -4996,28 +5097,28 @@ msgid "Too few arguments" msgstr "引数が少なすぎます" -#: libsvn_subr/opt.c:513 +#: libsvn_subr/opt.c:509 #, c-format msgid "Syntax error parsing revision '%s'" msgstr "リビジョン '%s' のパース中に構文エラーが生じました" -#: libsvn_subr/opt.c:590 +#: libsvn_subr/opt.c:586 #, c-format msgid "URL '%s' is not properly URI-encoded" msgstr "URL '%s' は適切に URI エンコードされていません" -#: libsvn_subr/opt.c:596 +#: libsvn_subr/opt.c:592 #, c-format msgid "URL '%s' contains a '..' element" msgstr "URL '%s' に要素 '..' が含まれています" -#: libsvn_subr/opt.c:625 +#: libsvn_subr/opt.c:621 #, c-format msgid "Error resolving case of '%s'" msgstr "'%s' の衝突を解消する際にエラーが発生しました" # c-format arguments: pgm_name, SVN_VERSION, __DATE__, __TIME__ -#: libsvn_subr/opt.c:721 +#: libsvn_subr/opt.c:717 #, c-format msgid "" "%s, version %s\n" @@ -5028,7 +5129,7 @@ " コンパイル日時: %s, %s\n" "\n" -#: libsvn_subr/opt.c:724 +#: libsvn_subr/opt.c:720 msgid "" "Copyright (C) 2000-2004 CollabNet.\n" "Subversion is open source software, see http://subversion.tigris.org/\n"; @@ -5044,72 +5145,87 @@ "が含まれています。\n" "\n" -#: libsvn_subr/opt.c:777 +#: libsvn_subr/opt.c:773 #, c-format msgid "Type '%s help' for usage.\n" msgstr "使用方法を知りたいときは '%s help' と打ってください。\n" -#: libsvn_subr/path.c:1064 +#: libsvn_subr/path.c:1065 #, c-format msgid "Couldn't determine absolute path of '%s'" msgstr "'%s' の絶対パスを決定できませんでした" -#: libsvn_subr/path.c:1103 +#: libsvn_subr/path.c:1104 #, c-format msgid "'%s' is neither a file nor a directory name" msgstr "'%s' はファイル名でもディレクトリ名でもありません" -#: libsvn_subr/path.c:1209 +#: libsvn_subr/path.c:1210 msgid "Can't determine the native path encoding" -msgstr "ネイティブパスのエンコーディングを決定できません" +msgstr "ネイティブのパスエンコーディングを決定できません" + +#: libsvn_subr/path.c:1264 +#, c-format +msgid "Invalid control character '0x%02x' in path '%s'" +msgstr "不正な制御文字 '0x%02x' がパス '%s' にあります" -#: libsvn_subr/subst.c:985 libsvn_wc/props.c:980 +#: libsvn_subr/subst.c:982 libsvn_wc/props.c:980 #, c-format msgid "File '%s' has inconsistent newlines" msgstr "ファイル '%s' は改行文字が一貫していません" # ? charset translation mutex -#: libsvn_subr/utf.c:147 +#: libsvn_subr/utf.c:149 msgid "Can't lock charset translation mutex" msgstr "文字コード変換ミューテックスにロックをかけられません" # ? charset translation mutex -#: libsvn_subr/utf.c:165 libsvn_subr/utf.c:215 +#: libsvn_subr/utf.c:167 libsvn_subr/utf.c:226 msgid "Can't unlock charset translation mutex" msgstr "文字コード変換ミューテックスのロックを解除できません" -#: libsvn_subr/utf.c:228 +#: libsvn_subr/utf.c:242 +#, c-format +msgid "Can't create a character converter from native encoding to '%s'" +msgstr "" +"ネイティブのエンコーディングから '%s' への文字列コンバータを作成できません" + +#: libsvn_subr/utf.c:246 #, c-format -msgid "Can't create a converter from '%s' to '%s'" -msgstr "'%s' から '%s' へのコンバータを作成できません" +msgid "Can't create a character converter from '%s' to native encoding" +msgstr "" +"'%s' からネイティブのエンコーディングへの文字列コンバータを作成できません" + +#: libsvn_subr/utf.c:250 +#, c-format +msgid "Can't create a character converter from '%s' to '%s'" +msgstr "'%s' から '%s' への文字列コンバータを作成できません" + +#: libsvn_subr/utf.c:441 +#, c-format +msgid "Can't convert string from native encoding to '%s':" +msgstr "ネイティブのエンコーディングから '%s' に文字列を変換できません:" -#: libsvn_subr/utf.c:229 libsvn_subr/utf.c:230 -msgid "native" -msgstr "ネイティブ" +#: libsvn_subr/utf.c:445 +#, c-format +msgid "Can't convert string from '%s' to native encoding:" +msgstr "'%s' からネイティブのエンコーディングに文字列を変換できません:" -#. Can't use svn_error_wrap_apr here because it calls functions in -#. this file, leading to infinite recursion. -#: libsvn_subr/utf.c:361 -msgid "Can't recode string" -msgstr "文字列を再エンコードできません" +#: libsvn_subr/utf.c:449 +#, c-format +msgid "Can't convert string from '%s' to '%s':" +msgstr "'%s' から '%s' に文字列を変換できません:" -#: libsvn_subr/utf.c:401 +#: libsvn_subr/utf.c:493 #, c-format msgid "" -"Safe data:\n" -"\"%s\"\n" -"... was followed by non-ASCII byte %d.\n" -"\n" -"Non-ASCII character detected (see above), and unable to convert to/from UTF-8" +"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from " +"UTF-8" msgstr "" -"安全なデータ:\n" -"\"%s\"\n" -"... の後に ASCII 以外のバイト %d があります。\n" -"\n" -"ASCII 以外の文字が検出されました (上記を参照してください)。この文字は UTF-8\n" -"へは、あるいは UTF-8 からは、変換できません" +"安全なデータ '%s' の後に ASCII 以外のバイト %d があります。UTF-8 へは、あるい" +"は UTF-8 からは、変換できません" -#: libsvn_subr/utf.c:413 +#: libsvn_subr/utf.c:501 #, c-format msgid "" "Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8" @@ -5117,19 +5233,12 @@ "ASCII 以外の文字 (コード %d) が検出されました。この文字は UTF-8 へは、\n" "あるいは UTF-8 からは、変換できません" -#: libsvn_subr/utf.c:455 +#: libsvn_subr/utf.c:543 #, c-format -msgid "" -"Valid UTF-8 data\n" -"(hex:%s)\n" -"followed by invalid UTF-8 sequence\n" -"(hex:%s)" -msgstr "" -"正しい UTF-8 のデータ\n" -"(16 進数:%s)\n" -"の後に不正な UTF-8 文字列\n" -"(16 進数:%s)\n" -"があります" +msgid "Valid UTF-8 data (hex:%s)followed by invalid UTF-8 sequence (hex:%s)" +msgstr "" +"有効な UTF-8 のデータ (16 進数:%s) の後に無効な UTF-8 文字列 (16 進数:%s) が" +"あります" #: libsvn_subr/validate.c:48 #, c-format @@ -5151,7 +5260,7 @@ msgid "Version mismatch in '%s': found %d.%d.%d%s, expected %d.%d.%d%s" msgstr "'%s' のバージョンが一致しません: 実際 %d.%d.%d%s, 予想 %d.%d.%d%s" -#: libsvn_subr/xml.c:367 +#: libsvn_subr/xml.c:420 #, c-format msgid "Malformed XML: %s at line %d" msgstr "異常な XML です: %s (行 %d)" @@ -5164,16 +5273,16 @@ "エントリ '%s' はもはやディレクトリではありません。update を実行する前にエント" "リを削除してください" -#: libsvn_wc/adm_crawler.c:615 +#: libsvn_wc/adm_crawler.c:616 msgid "Error aborting report" msgstr "報告を中止する際にエラーが発生しました" -#: libsvn_wc/adm_crawler.c:712 +#: libsvn_wc/adm_crawler.c:713 #, c-format msgid "Checksum mismatch for '%s'; expected '%s', actual: '%s'" msgstr "'%s' のチェックサムが一致しませんでした。予想: '%s', 実際: '%s'" -#: libsvn_wc/adm_crawler.c:738 +#: libsvn_wc/adm_crawler.c:739 msgid "Error opening local file" msgstr "ローカルのファイルを開く際にエラーが発生しました" @@ -5193,8 +5302,8 @@ ".svn/tmp ディレクトリが欠落しているか壊れています。'svn cleanup' を実行してか" "らもう一度試してみてください" -#: libsvn_wc/adm_files.c:622 libsvn_wc/adm_files.c:698 libsvn_wc/lock.c:375 -#: libsvn_wc/lock.c:595 +#: libsvn_wc/adm_files.c:622 libsvn_wc/adm_files.c:698 libsvn_wc/lock.c:377 +#: libsvn_wc/lock.c:630 #, c-format msgid "'%s' is not a working copy" msgstr "'%s' は作業コピーではありません" @@ -5231,28 +5340,28 @@ msgid "Unrecognized node kind: '%s'" msgstr "認識できないノード種別です: '%s'" -#: libsvn_wc/adm_ops.c:378 libsvn_wc/update_editor.c:915 -#: libsvn_wc/update_editor.c:1305 +#: libsvn_wc/adm_ops.c:378 libsvn_wc/update_editor.c:918 +#: libsvn_wc/update_editor.c:1308 #, c-format msgid "Error writing log file for '%s'" msgstr "'%s' のログファイルを書いている最中にエラーが生じました" -#: libsvn_wc/adm_ops.c:887 +#: libsvn_wc/adm_ops.c:889 #, c-format msgid "'%s' not found" msgstr "'%s' が見つかりません" -#: libsvn_wc/adm_ops.c:891 +#: libsvn_wc/adm_ops.c:893 #, c-format msgid "Unsupported node kind for path '%s'" msgstr "パス '%s' のノード種別はサポートされていません" -#: libsvn_wc/adm_ops.c:921 +#: libsvn_wc/adm_ops.c:923 #, c-format msgid "'%s' is already under version control" msgstr "'%s' は既にバージョン管理下におかれています" -#: libsvn_wc/adm_ops.c:933 +#: libsvn_wc/adm_ops.c:935 #, c-format msgid "" "Can't replace '%s' with a node of a differing type; commit the deletion, " @@ -5261,48 +5370,48 @@ "'%s' は、異なる形式のノードに置換できません。削除をコミットし親ディレクトリ" "で update を実行してから、'%s' を追加してください" -#: libsvn_wc/adm_ops.c:949 +#: libsvn_wc/adm_ops.c:951 #, c-format msgid "Can't find parent directory's entry while trying to add '%s'" msgstr "" "'%s' を追加しようとしましたが、親ディレクトリのエントリが見つかりませんでした" -#: libsvn_wc/adm_ops.c:954 +#: libsvn_wc/adm_ops.c:956 #, c-format msgid "Can't add '%s' to a parent directory scheduled for deletion" msgstr "削除準備中の親ディレクトリに '%s' を加えることはできません" -#: libsvn_wc/adm_ops.c:1212 libsvn_wc/adm_ops.c:1217 libsvn_wc/adm_ops.c:1253 +#: libsvn_wc/adm_ops.c:1215 libsvn_wc/adm_ops.c:1220 libsvn_wc/adm_ops.c:1256 #, c-format msgid "Error restoring props for '%s'" msgstr "'%s' の属性を元に戻す際にエラーが発生しました" -#: libsvn_wc/adm_ops.c:1227 +#: libsvn_wc/adm_ops.c:1230 #, c-format msgid "Error removing props for '%s'" msgstr "'%s' の属性を削除する際にエラーが発生しました" -#: libsvn_wc/adm_ops.c:1299 +#: libsvn_wc/adm_ops.c:1302 #, c-format msgid "Error restoring text for '%s'" msgstr "'%s' のテキストを元に戻す際にエラーが発生しました" -#: libsvn_wc/adm_ops.c:1400 +#: libsvn_wc/adm_ops.c:1403 #, c-format msgid "Cannot revert: '%s' is not under version control" msgstr "元に戻せません: '%s' はバージョン管理下におかれていません" -#: libsvn_wc/adm_ops.c:1432 +#: libsvn_wc/adm_ops.c:1435 #, c-format msgid "Cannot revert '%s': unsupported entry node kind" msgstr "'%s' を元に戻せません: エントリのノード種別がサポートされていません" -#: libsvn_wc/adm_ops.c:1443 +#: libsvn_wc/adm_ops.c:1446 #, c-format msgid "Cannot revert '%s': unsupported node kind in working copy" msgstr "'%s' を元に戻せません: 作業コピーのノード種別がサポートされていません" -#: libsvn_wc/adm_ops.c:1491 +#: libsvn_wc/adm_ops.c:1494 msgid "" "Cannot revert addition of current directory; please try again from the " "parent directory" @@ -5310,12 +5419,12 @@ "カレントディレクトリの追加は元に戻せません。親ディレクトリでもう一度試してみ" "てください" -#: libsvn_wc/adm_ops.c:1513 +#: libsvn_wc/adm_ops.c:1516 #, c-format msgid "Unknown or unexpected kind for path '%s'" msgstr "パス '%s' の種別が不明または予想外です" -#: libsvn_wc/adm_ops.c:1699 +#: libsvn_wc/adm_ops.c:1702 #, c-format msgid "File '%s' has local modifications" msgstr "ファイル '%s' にはローカルでの変更が加えられています" @@ -5446,12 +5555,12 @@ msgid "No default entry in directory '%s'" msgstr "ディレクトリ '%s' にデフォルトのエントリはありません" -#: libsvn_wc/entries.c:1169 +#: libsvn_wc/entries.c:1170 #, c-format msgid "Error writing to '%s'" msgstr "'%s' に書き込み中にエラーが発生しました" -#: libsvn_wc/entries.c:1409 +#: libsvn_wc/entries.c:1410 #, c-format msgid "" "Can't add '%s' to deleted directory; try undeleting its parent directory " @@ -5460,7 +5569,7 @@ "削除されたディレクトリに '%s' を追加できません。まず親ディレクトリの削除を無" "効にしてみてください" -#: libsvn_wc/entries.c:1415 +#: libsvn_wc/entries.c:1416 #, c-format msgid "" "Can't replace '%s' in deleted directory; try undeleting its parent directory " @@ -5469,69 +5578,69 @@ "削除されたディレクトリの '%s' を置換できません。まず親ディレクトリの削除を無" "効にしてみてください" -#: libsvn_wc/entries.c:1424 +#: libsvn_wc/entries.c:1425 #, c-format msgid "'%s' is marked as absent, so it cannot be scheduled for addition" msgstr "'%s' には「欠如」マークがついているので追加準備できません" -#: libsvn_wc/entries.c:1453 +#: libsvn_wc/entries.c:1454 #, c-format msgid "Entry '%s' is already under version control" msgstr "エントリ '%s' は既にバージョン管理下におかれています" -#: libsvn_wc/entries.c:1545 +#: libsvn_wc/entries.c:1546 #, c-format msgid "Entry '%s' has illegal schedule" msgstr "エントリ '%s' は準備中の処理が不正です" -#: libsvn_wc/entries.c:1678 +#: libsvn_wc/entries.c:1679 #, c-format msgid "No such entry: '%s'" msgstr "そのようなエントリはありません: '%s'" -#: libsvn_wc/entries.c:1744 +#: libsvn_wc/entries.c:1747 #, c-format msgid "Directory '%s' has no THIS_DIR entry" msgstr "ディレクトリ '%s' には THIS_DIR エントリがありません" -#: libsvn_wc/entries.c:1813 +#: libsvn_wc/entries.c:1836 #, c-format msgid "'%s' has an unrecognized node kind" msgstr "'%s' には認識できないノード種別があります" -#: libsvn_wc/entries.c:1849 +#: libsvn_wc/entries.c:1872 #, c-format msgid "Unexpectedly found '%s': path is marked 'missing'" msgstr "" "思いがけず '%s' を見つけました: パスには「行方不明」マークがついています" -#: libsvn_wc/lock.c:158 libsvn_wc/lock.c:357 +#: libsvn_wc/lock.c:158 libsvn_wc/lock.c:359 #, c-format msgid "Working copy '%s' locked" msgstr "作業コピー '%s' はロックされています" -#: libsvn_wc/lock.c:279 libsvn_wc/lock.c:768 +#: libsvn_wc/lock.c:279 libsvn_wc/lock.c:820 #, c-format msgid "Path '%s' ends in '%s', which is unsupported for this operation" msgstr "" "パス '%s' は '%s' で終わっています。これはこの操作ではサポートされていません" -#: libsvn_wc/lock.c:643 +#: libsvn_wc/lock.c:678 #, c-format -msgid "Working copy '%s' not locked" -msgstr "作業コピー '%s' はロックされていません" +msgid "Working copy '%s' is missing or not locked" +msgstr "作業コピー '%s' がないか、ロックされていません" -#: libsvn_wc/lock.c:1030 +#: libsvn_wc/lock.c:1085 #, c-format msgid "Write-lock stolen in '%s'" msgstr "'%s' への書き込み用のロックが盗まれました" -#: libsvn_wc/lock.c:1038 +#: libsvn_wc/lock.c:1093 #, c-format msgid "No write-lock in '%s'" msgstr "'%s' には書き込み用のロックがかけられていません" -#: libsvn_wc/lock.c:1060 +#: libsvn_wc/lock.c:1115 #, c-format msgid "Lock file '%s' is not a regular file" msgstr "ロック用のファイル '%s' は正常なファイルではありません" @@ -5615,37 +5724,37 @@ msgid "Error replacing text-base of '%s'" msgstr "'%s' のテキストベースを置換している際にエラーが発生しました" -#: libsvn_wc/log.c:1088 libsvn_wc/log.c:1136 +#: libsvn_wc/log.c:1088 libsvn_wc/log.c:1137 #, c-format msgid "Error modifying entry of '%s'" msgstr "'%s' のエントリを変更している際にエラーが発生しました" -#: libsvn_wc/log.c:1195 +#: libsvn_wc/log.c:1196 #, c-format msgid "Log entry missing 'name' attribute (entry '%s' for directory '%s')" msgstr "" "ログエントリに「名前」属性がありません (エントリ: '%s', ディレクトリ: '%s')" -#: libsvn_wc/log.c:1251 +#: libsvn_wc/log.c:1252 #, c-format msgid "Unrecognized logfile element '%s' in '%s'" msgstr "ログファイルの要素 '%s' を '%s' において認識できません" -#: libsvn_wc/log.c:1262 +#: libsvn_wc/log.c:1263 #, c-format msgid "Error processing command '%s' in '%s'" msgstr "コマンド '%s' を '%s' 内で処理しているときにエラーが生じました" -#: libsvn_wc/log.c:1384 +#: libsvn_wc/log.c:1385 msgid "Couldn't open log" msgstr "ログを開けません" -#: libsvn_wc/log.c:1395 +#: libsvn_wc/log.c:1396 #, c-format msgid "Error reading administrative log file in '%s'" msgstr "管理用のログファイルを '%s' で読んでいるときにエラーが生じました" -#: libsvn_wc/log.c:1487 +#: libsvn_wc/log.c:1490 #, c-format msgid "'%s' is not a working copy directory" msgstr "'%s' は作業コピーのディレクトリではありません" @@ -5691,7 +5800,7 @@ msgid "Can't find entry '%s' in '%s'" msgstr "エントリ '%s' が '%s' で見つかりません" -#: libsvn_wc/props.c:318 libsvn_wc/update_editor.c:2275 +#: libsvn_wc/props.c:318 libsvn_wc/update_editor.c:2277 #, c-format msgid "Error writing log for '%s'" msgstr "'%s' のログを書いている際にエラーが発生しました" @@ -5789,18 +5898,18 @@ msgid "No '.' entry in: '%s'" msgstr "'.' エントリはありません: '%s'" -#: libsvn_wc/update_editor.c:832 +#: libsvn_wc/update_editor.c:835 #, c-format msgid "Won't delete locally modified directory '%s'" msgstr "ローカルで変更されたディレクトリ '%s' は削除できません" -#: libsvn_wc/update_editor.c:1022 +#: libsvn_wc/update_editor.c:1025 #, c-format msgid "Failed to add directory '%s': object of the same name already exists" msgstr "" "ディレクトリ '%s' を追加できませんでした: 同名のオブジェクトが既にあります" -#: libsvn_wc/update_editor.c:1030 +#: libsvn_wc/update_editor.c:1033 #, c-format msgid "" "Failed to add directory '%s': object of the same name as the administrative " @@ -5809,14 +5918,14 @@ "ディレクトリ '%s' を追加できませんでした: 同名の管理用ディレクトリと同じ名前" "のオブジェクトです" -#: libsvn_wc/update_editor.c:1044 +#: libsvn_wc/update_editor.c:1047 #, c-format msgid "Failed to add directory '%s': copyfrom arguments not yet supported" msgstr "" "ディレクトリ '%s' を追加できませんでした: コピー元の引数がサポートされていま" "せん" -#: libsvn_wc/update_editor.c:1065 +#: libsvn_wc/update_editor.c:1068 #, c-format msgid "" "Failed to add directory '%s': object of the same name is already scheduled " @@ -5825,11 +5934,11 @@ "ディレクトリ '%s' を追加できませんでした: 同名のオブジェクトが既に追加準備さ" "れています" -#: libsvn_wc/update_editor.c:1274 +#: libsvn_wc/update_editor.c:1277 msgid "Couldn't do property merge" msgstr "属性のマージはできません" -#: libsvn_wc/update_editor.c:1367 +#: libsvn_wc/update_editor.c:1370 #, c-format msgid "" "Failed to mark '%s' absent: item of the same name is already scheduled for " @@ -5838,13 +5947,13 @@ "'%s' に「欠如」マークをつけられませんでした: 同名の項目が既に追加準備されてい" "ます" -#: libsvn_wc/update_editor.c:1459 +#: libsvn_wc/update_editor.c:1462 #, c-format msgid "Failed to add file '%s': object of the same name already exists" msgstr "" "ファイル '%s' を追加できませんでした: 同名のオブジェクトが既に存在します" -#: libsvn_wc/update_editor.c:1480 +#: libsvn_wc/update_editor.c:1483 #, c-format msgid "" "Failed to add file '%s': object of the same name is already scheduled for " @@ -5853,23 +5962,23 @@ "ファイル '%s' を追加できませんでした: 同名のオブジェクトが既に追加準備されて" "います" -#: libsvn_wc/update_editor.c:1488 +#: libsvn_wc/update_editor.c:1491 #, c-format msgid "File '%s' in directory '%s' is not a versioned resource" msgstr "" "ファイル '%s' (ディレクトリ '%s' 内のもの) はバージョン管理されていないリソー" "スです" -#: libsvn_wc/update_editor.c:1609 +#: libsvn_wc/update_editor.c:1612 #, c-format msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'" msgstr "'%s' のチェックサムが一致しませんでした。記録: '%s', 実際: '%s'" -#: libsvn_wc/update_editor.c:1905 +#: libsvn_wc/update_editor.c:1908 msgid "Move failed" msgstr "移動できませんでした" -#: libsvn_wc/update_editor.c:2751 +#: libsvn_wc/update_editor.c:2754 #, c-format msgid "'%s' has no ancestry information" msgstr "'%s' には系統情報がありません" @@ -5893,68 +6002,68 @@ # * Description for 'svn{admin,dumpfilter,look,version} --revision'. # * 29 one-byte characters are displayed on the left. -#: svnadmin/main.c:228 svndumpfilter/main.c:704 svnlook/main.c:93 -#: svnserve/main.c:111 svnversion/main.c:200 +#: svnadmin/main.c:230 svndumpfilter/main.c:761 svnlook/main.c:95 +#: svnserve/main.c:111 svnversion/main.c:212 msgid "show version information" msgstr "バージョン情報を表示します" # * Description for 'svnadmin --revision'. # * 29 one-byte characters are displayed on the left. -#: svnadmin/main.c:231 +#: svnadmin/main.c:233 msgid "specify revision number ARG (or X:Y range)" msgstr "リビジョン番号を ARG (または範囲 X:Y) と指定します" # * Description for 'svnadmin --incremental'. # * 29 one-byte characters are displayed on the left. -#: svnadmin/main.c:234 +#: svnadmin/main.c:236 msgid "dump incrementally" msgstr "増分のみをダンプします" # * Description for 'svnadmin --deltas'. # * 29 one-byte characters are displayed on the left. -#: svnadmin/main.c:237 +#: svnadmin/main.c:239 msgid "use deltas in dump output" msgstr "ダンプの出力として差分を用います" # * Description for 'svnadmin --bypass-hooks'. # * 29 one-byte characters are displayed on the left. -#: svnadmin/main.c:240 +#: svnadmin/main.c:242 msgid "bypass the repository hook system" msgstr "リポジトリフックシステムを回避します" # * Description for 'svnadmin --quiet'. # * 29 one-byte characters are displayed on the left. -#: svnadmin/main.c:243 +#: svnadmin/main.c:245 msgid "no progress (only errors) to stderr" msgstr "エラー以外、標準エラー出力に進行状況を出力しません" # * Description for 'svnadmin --ignore--uuid'. # * 29 one-byte characters are displayed on the left. -#: svnadmin/main.c:246 +#: svnadmin/main.c:248 msgid "ignore any repos UUID found in the stream" msgstr "ストリーム中にリポジトリ UUID があっても無視します" # * Description for 'svnadmin --force--uuid'. # * 29 one-byte characters are displayed on the left. -#: svnadmin/main.c:249 +#: svnadmin/main.c:251 msgid "set repos UUID to that found in stream, if any" msgstr "ストリーム中に UUID があればリポジトリに設定します" # * Description for 'svnadmin --fs-type'. # * 29 one-byte characters are displayed on the left. -#: svnadmin/main.c:252 +#: svnadmin/main.c:254 msgid "type of repository: 'bdb' or 'fsfs'" msgstr "リポジトリの形式: 'bdb' もしくは 'fsfs'" # * Description for 'svnadmin --parent-dir'. # * 29 one-byte characters are displayed on the left. -#: svnadmin/main.c:255 +#: svnadmin/main.c:257 msgid "load at specified directory in repository" msgstr "リポジトリ内の指定したディレクトリでロードします" # * Description for 'svnadmin --bdb-txn-nosync'. # * 29 one-byte characters are displayed on the left. -#: svnadmin/main.c:258 +#: svnadmin/main.c:260 msgid "disable fsync at transaction commit [Berkeley DB]" msgstr "" "トランザクションコミット時の fsync を無効にします\n" @@ -5962,19 +6071,35 @@ # * Description for 'svnadmin --bdb-log-keep'. # * 29 one-byte characters are displayed on the left. -#: svnadmin/main.c:261 +#: svnadmin/main.c:263 msgid "disable automatic log file removal [Berkeley DB]" msgstr "ログファイルの自動削除を無効にします [Berkeley DB]" # * Description for 'svnadmin --clean-logs'. # * 29 one-byte characters are displayed on the left. -#: svnadmin/main.c:267 +#: svnadmin/main.c:269 msgid "remove redundant log files from source repository" msgstr "ソースリポジトリから不要なログファイルを削除します" +# * Description for 'svnadmin --use-pre-commit-hook'. +# * 29 one-byte characters are displayed on the left. +#: svnadmin/main.c:272 +msgid "call pre-commit hook before committing revisions" +msgstr "" +"リビジョンをコミットする前に pre-commit フックを\n" +" 呼び出します" + +# * Description for 'svnadmin --use-post-commit-hook'. +# * 29 one-byte characters are displayed on the left. +#: svnadmin/main.c:275 +msgid "call post-commit hook after committing revisions" +msgstr "" +"リビジョンをコミットした後に post-commit フックを\n" +" 呼び出します" + # * Description for 'svnadmin --wait' # * 29 one-byte characters are displayed on the left. -#: svnadmin/main.c:270 +#: svnadmin/main.c:278 msgid "" "wait instead of exit if the repository is in\n" " use by another process" @@ -5982,7 +6107,7 @@ "リポジトリを他のプロセスが利用中の場合、終了する\n" " 代わりに待ちます" -#: svnadmin/main.c:283 +#: svnadmin/main.c:291 msgid "" "usage: svnadmin create REPOS_PATH\n" "\n" @@ -5992,7 +6117,7 @@ "\n" "空のリポジトリを <リポジトリパス> に新規に作成します。\n" -#: svnadmin/main.c:289 +#: svnadmin/main.c:297 msgid "" "usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n" "\n" @@ -6011,7 +6136,7 @@ "が\n" "指定されていない場合は、単に HEAD リビジョンを差分化します。\n" -#: svnadmin/main.c:298 +#: svnadmin/main.c:306 msgid "" "usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER]] [--incremental]\n" "\n" @@ -6035,7 +6160,7 @@ "リビジョンは、通常の場合のような全文とはならず、直前のリビジョンとの差分と\n" "なります。\n" -#: svnadmin/main.c:309 +#: svnadmin/main.c:317 msgid "" "usage: svnadmin help [SUBCOMMAND...]\n" "\n" @@ -6045,7 +6170,7 @@ "\n" "このプログラムやそのサブコマンドの使用方法を説明します。\n" -#: svnadmin/main.c:314 +#: svnadmin/main.c:322 msgid "" "usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n" "\n" @@ -6055,7 +6180,7 @@ "\n" "リポジトリの優れたコピーを作成します\n" -#: svnadmin/main.c:319 +#: svnadmin/main.c:327 msgid "" "usage: svnadmin list-dblogs REPOS_PATH\n" "\n" @@ -6071,7 +6196,7 @@ "警告: まだ使用されるログファイルの変更や削除は、リポジトリを壊す原因と\n" "なります。\n" -#: svnadmin/main.c:326 +#: svnadmin/main.c:334 msgid "" "usage: svnadmin list-unused-dblogs REPOS_PATH\n" "\n" @@ -6082,7 +6207,7 @@ "\n" "使われていない Berkeley DB ログファイルの一覧を表示します。\n" -#: svnadmin/main.c:331 +#: svnadmin/main.c:339 msgid "" "usage: svnadmin load REPOS_PATH\n" "\n" @@ -6100,7 +6225,7 @@ "す。\n" "進行状況のフィードバックは標準出力に送られます。\n" -#: svnadmin/main.c:341 +#: svnadmin/main.c:350 msgid "" "usage: svnadmin lstxns REPOS_PATH\n" "\n" @@ -6110,7 +6235,7 @@ "\n" "コミットされていないトランザクションの名前をすべて表示します。\n" -#: svnadmin/main.c:346 +#: svnadmin/main.c:355 msgid "" "usage: svnadmin recover REPOS_PATH\n" "\n" @@ -6127,7 +6252,7 @@ "な\n" "ので、リポジトリが他のプロセスで利用されている場合は終了します。\n" -#: svnadmin/main.c:354 +#: svnadmin/main.c:363 msgid "" "usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n" "\n" @@ -6137,7 +6262,7 @@ "\n" "指定されたトランザクションを削除します。\n" -#: svnadmin/main.c:359 +#: svnadmin/main.c:368 msgid "" "usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n" "\n" @@ -6164,7 +6289,7 @@ "注意: リビジョン属性の履歴は管理されません。したがってこのコマンドを使うと\n" "以前のログメッセージを永久に上書きします。\n" -#: svnadmin/main.c:373 +#: svnadmin/main.c:382 msgid "" "usage: svnadmin verify REPOS_PATH\n" "\n" @@ -6174,20 +6299,20 @@ "\n" "リポジトリに格納されたデータを検証します。\n" -#: svnadmin/main.c:497 svnadmin/main.c:552 +#: svnadmin/main.c:508 svnadmin/main.c:589 msgid "First revision cannot be higher than second" msgstr "最初のリビジョンが 2 以上であることはありません" -#: svnadmin/main.c:506 +#: svnadmin/main.c:517 #, c-format msgid "Deltifying revision %ld..." msgstr "リビジョン %ld を差分化しています..." -#: svnadmin/main.c:510 +#: svnadmin/main.c:521 msgid "done.\n" msgstr "完了しました。\n" -#: svnadmin/main.c:579 +#: svnadmin/main.c:620 msgid "" "general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" "Type 'svnadmin help <subcommand>' for help on a specific subcommand.\n" @@ -6202,7 +6327,7 @@ "\n" "利用可能なサブコマンド:\n" -#: svnadmin/main.c:654 +#: svnadmin/main.c:702 msgid "" "Repository lock acquired.\n" "Please wait; recovering the repository may take some time...\n" @@ -6210,7 +6335,7 @@ "リポジトリのロックを取得しました。\n" "お待ちください。リポジトリの復旧にはいくらか時間がかかります...\n" -#: svnadmin/main.c:689 +#: svnadmin/main.c:737 msgid "" "Failed to get exclusive repository access; perhaps another process\n" "such as httpd, svnserve or svn has it open?" @@ -6219,13 +6344,13 @@ "svnserve,\n" "svn などといった他のプロセスがリポジトリを開いてしまったのでしょう。" -#: svnadmin/main.c:694 +#: svnadmin/main.c:742 msgid "Waiting on repository lock; perhaps another process has it open?\n" msgstr "" "リポジトリにロックがかかるのを待ち続けています。おそらく別のプロセスが\n" "リポジトリを開いてしまったのでしょう。\n" -#: svnadmin/main.c:701 +#: svnadmin/main.c:749 msgid "" "\n" "Recovery completed.\n" @@ -6233,33 +6358,33 @@ "\n" "復旧が終わりました。\n" -#: svnadmin/main.c:708 +#: svnadmin/main.c:756 #, c-format msgid "The latest repos revision is %ld.\n" msgstr "リポジトリの最新のリビジョンは %ld です。\n" -#: svnadmin/main.c:816 +#: svnadmin/main.c:866 #, c-format msgid "Transaction '%s' removed.\n" msgstr "トランザクション '%s' が削除されました。\n" -#: svnadmin/main.c:840 +#: svnadmin/main.c:890 msgid "Missing revision" msgstr "リビジョンが欠落しています" -#: svnadmin/main.c:843 +#: svnadmin/main.c:893 msgid "Only one revision allowed" msgstr "リビジョンの指定は 1 つだけしかできません" -#: svnadmin/main.c:849 +#: svnadmin/main.c:899 msgid "Exactly one file argument required" msgstr "ファイルの引数が 1 つだけ必要です" -#: svnadmin/main.c:1122 svndumpfilter/main.c:1109 svnlook/main.c:1943 +#: svnadmin/main.c:1178 svndumpfilter/main.c:1166 svnlook/main.c:1993 msgid "subcommand argument required\n" msgstr "サブコマンドに引数が必要です\n" -#: svnadmin/main.c:1212 +#: svnadmin/main.c:1268 #, c-format msgid "" "subcommand '%s' doesn't accept option '%s'\n" @@ -6268,39 +6393,44 @@ "サブコマンド '%s' にはオプション '%s' をつけられません。\n" "使用方法を知りたいときは 'svnadmin help %s' と打ってください。\n" -#: svndumpfilter/main.c:362 -#, c-format -msgid "Invalid copy source path '%s'" -msgstr "コピー元のパス '%s' が不正です。" - -#: svndumpfilter/main.c:413 -msgid "Node with dropped parent sneaked in" -msgstr "親が取り除かれたノードが入ってしまっています" - # * Each empty revision only contains date and this log message. -#: svndumpfilter/main.c:585 +#: svndumpfilter/main.c:324 msgid "This is an empty revision for padding." msgstr "単に番号が飛ばないようにするための空のリビジョンです。" -#: svndumpfilter/main.c:640 +#: svndumpfilter/main.c:377 #, c-format msgid "Revision %ld committed as %ld.\n" msgstr "リビジョン %ld は %ld としてコミットされました。\n" -#: svndumpfilter/main.c:648 +#: svndumpfilter/main.c:385 #, c-format msgid "Revision %ld skipped.\n" msgstr "リビジョン %ld は飛ばされました。\n" +#: svndumpfilter/main.c:488 +#, c-format +msgid "Invalid copy source path '%s'" +msgstr "コピー元のパス '%s' が不正です。" + +#: svndumpfilter/main.c:531 +msgid "Node with dropped parent sneaked in" +msgstr "親が取り除かれたノードが入ってしまっています" + +#: svndumpfilter/main.c:637 +msgid "Delta property block detected - not supported by svndumpfilter" +msgstr "" +"delta 属性ブロックが検出されました - svndumpfilter ではサポートされません" + # * Description for 'svndumpfilter --quiet'. # * 29 one-byte characters are displayed on the left. -#: svndumpfilter/main.c:706 +#: svndumpfilter/main.c:763 msgid "Do not display filtering statistics." msgstr "フィルタリングを行うときに統計を表示しません。" # * Description for 'svndumpfilter --drop-empty-revs'. # * 29 one-byte characters are displayed on the left. -#: svndumpfilter/main.c:708 +#: svndumpfilter/main.c:765 msgid "Remove revisions emptied by filtering." msgstr "" "フィルタをかけたために空になったリビジョンを取り除\n" @@ -6308,7 +6438,7 @@ # * Description for 'svndumpfilter --renumber-revs'. # * 29 one-byte characters are displayed on the left. -#: svndumpfilter/main.c:710 +#: svndumpfilter/main.c:767 msgid "Renumber revisions left after filtering." msgstr "" "フィルタをかけた後に残ったリビジョンに番号をふりな\n" @@ -6316,11 +6446,11 @@ # * Description for 'svndumpfilter --preserve-revprops'. # * 29 one-byte characters are displayed on the left. -#: svndumpfilter/main.c:712 +#: svndumpfilter/main.c:769 msgid "Don't filter revision properties." msgstr "リビジョン属性にはフィルタをかけません。" -#: svndumpfilter/main.c:723 +#: svndumpfilter/main.c:780 msgid "" "Filter out nodes with given prefixes from dumpstream.\n" "usage: svndumpfilter exclude PATH_PREFIX...\n" @@ -6328,7 +6458,7 @@ "指定されたプレフィックスをもつノードをダンプストリームから取り除きます。\n" "使用方法: svndumpfilter exclude <パスのプレフィックス>...\n" -#: svndumpfilter/main.c:729 +#: svndumpfilter/main.c:786 msgid "" "Filter out nodes without given prefixes from dumpstream.\n" "usage: svndumpfilter include PATH_PREFIX...\n" @@ -6337,7 +6467,7 @@ "す。\n" "使用方法: svndumpfilter include <パスのプレフィックス>...\n" -#: svndumpfilter/main.c:735 +#: svndumpfilter/main.c:792 msgid "" "Describe the usage of this program or its subcommands.\n" "usage: svndumpfilter help [SUBCOMMAND...]\n" @@ -6345,7 +6475,7 @@ "このプログラムやそのサブコマンドの使用方法を説明します。\n" "使用方法: svndumpfilter help [<サブコマンド>...]\n" -#: svndumpfilter/main.c:805 +#: svndumpfilter/main.c:862 msgid "" "general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n" "Type 'svndumpfilter help <subcommand>' for help on a specific subcommand.\n" @@ -6358,27 +6488,27 @@ "\n" "利用可能なサブコマンド:\n" -#: svndumpfilter/main.c:860 +#: svndumpfilter/main.c:917 msgid "Excluding (and dropping empty revisions for) prefixes:\n" msgstr "" "次のプレフィックスをもつノードを取り除きます (空になったリビジョンは落としま" "す):\n" -#: svndumpfilter/main.c:862 +#: svndumpfilter/main.c:919 msgid "Excluding prefixes:\n" msgstr "次のプレフィックスをもつノードを取り除きます:\n" -#: svndumpfilter/main.c:864 +#: svndumpfilter/main.c:921 msgid "Including (and dropping empty revisions for) prefixes:\n" msgstr "" "次のプレフィックスをもつノードを残します (空になったリビジョンは落としま" "す):\n" -#: svndumpfilter/main.c:866 +#: svndumpfilter/main.c:923 msgid "Including prefixes:\n" msgstr "次のプレフィックスをもつノードを残します:\n" -#: svndumpfilter/main.c:893 +#: svndumpfilter/main.c:950 #, c-format msgid "" "Dropped %d revision(s).\n" @@ -6387,26 +6517,26 @@ "%d 個のリビジョンを取り除きました。\n" "\n" -#: svndumpfilter/main.c:899 +#: svndumpfilter/main.c:956 msgid "Revisions renumbered as follows:\n" msgstr "以下のようにリビジョン番号がふりなおされました:\n" -#: svndumpfilter/main.c:927 +#: svndumpfilter/main.c:984 #, c-format msgid " %ld => (dropped)\n" msgstr " %ld => (取り除かれました)\n" -#: svndumpfilter/main.c:942 +#: svndumpfilter/main.c:999 #, c-format msgid "Dropped %d node(s):\n" msgstr "%d 個のノードを取り除きました:\n" -#: svndumpfilter/main.c:1131 +#: svndumpfilter/main.c:1188 #, c-format msgid "unknown command: '%s'\n" msgstr "未知のコマンドです: '%s'\n" -#: svndumpfilter/main.c:1150 +#: svndumpfilter/main.c:1207 msgid "" "\n" "Error: no prefixes supplied.\n" @@ -6414,7 +6544,7 @@ "\n" "プレフィックスが与えられていません。\n" -#: svndumpfilter/main.c:1193 +#: svndumpfilter/main.c:1250 #, c-format msgid "" "subcommand '%s' doesn't accept option '%s'\n" @@ -6425,29 +6555,35 @@ # * Description for 'svnlook --revision'. # * 29 one-byte characters are displayed on the left. -#: svnlook/main.c:96 +#: svnlook/main.c:98 msgid "specify revision number ARG" msgstr "リビジョン番号を ARG と指定します" # * Description for 'svnlook --transaction'. # * 29 one-byte characters are displayed on the left. -#: svnlook/main.c:99 +#: svnlook/main.c:101 msgid "specify transaction name ARG" msgstr "トランザクション名を ARG と指定します" # * Description for 'svnlook --verbose'. # * 29 one-byte characters are displayed on the left. -#: svnlook/main.c:102 +#: svnlook/main.c:104 msgid "be verbose" msgstr "冗長モードになります" # * Description for 'svnlook --show-ids'. # * 29 one-byte characters are displayed on the left. -#: svnlook/main.c:105 +#: svnlook/main.c:107 msgid "show node revision ids for each path" msgstr "各パスについてノードのリビジョン ID を表示します" -#: svnlook/main.c:120 +# * Description for 'svnlook --no-diff-added'. +# * 29 one-byte characters are displayed on the left. +#: svnlook/main.c:113 +msgid "do not print differences for added files" +msgstr "追加されたファイルに関しては差分を表示しません" + +#: svnlook/main.c:128 msgid "" "usage: svnlook author REPOS_PATH\n" "\n" @@ -6457,7 +6593,7 @@ "\n" "変更者を表示します。\n" -#: svnlook/main.c:125 +#: svnlook/main.c:133 msgid "" "usage: svnlook cat REPOS_PATH FILE_PATH\n" "\n" @@ -6467,7 +6603,7 @@ "\n" "ファイルの内容を表示します。<ファイルパス> を '/' で始めるかは任意です。\n" -#: svnlook/main.c:131 +#: svnlook/main.c:139 msgid "" "usage: svnlook changed REPOS_PATH\n" "\n" @@ -6477,7 +6613,7 @@ "\n" "変更のあったパスを表示します。\n" -#: svnlook/main.c:136 +#: svnlook/main.c:144 msgid "" "usage: svnlook date REPOS_PATH\n" "\n" @@ -6487,7 +6623,7 @@ "\n" "タイムスタンプを表示します。\n" -#: svnlook/main.c:141 +#: svnlook/main.c:149 msgid "" "usage: svnlook diff REPOS_PATH\n" "\n" @@ -6497,7 +6633,7 @@ "\n" "変更されたファイルや属性について、GNU スタイルの差分を表示します。\n" -#: svnlook/main.c:146 +#: svnlook/main.c:154 msgid "" "usage: svnlook dirs-changed REPOS_PATH\n" "\n" @@ -6510,7 +6646,7 @@ "た\n" "ディレクトリを表示します。\n" -#: svnlook/main.c:152 +#: svnlook/main.c:160 msgid "" "usage: svnlook help [SUBCOMMAND...]\n" "\n" @@ -6520,7 +6656,7 @@ "\n" "このプログラムやそのサブコマンドの使用方法を説明します。\n" -#: svnlook/main.c:157 +#: svnlook/main.c:165 msgid "" "usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n" "\n" @@ -6533,7 +6669,7 @@ "リ)\n" "の履歴に関する情報を表示します。\n" -#: svnlook/main.c:163 +#: svnlook/main.c:171 msgid "" "usage: svnlook info REPOS_PATH\n" "\n" @@ -6543,7 +6679,7 @@ "\n" "変更者・タイムスタンプ・ログメッセージの長さ・ログメッセージを表示します。\n" -#: svnlook/main.c:168 +#: svnlook/main.c:176 msgid "" "usage: svnlook log REPOS_PATH\n" "\n" @@ -6553,29 +6689,32 @@ "\n" "ログメッセージを表示します。\n" -#: svnlook/main.c:173 +#: svnlook/main.c:181 msgid "" -"usage: svnlook propget REPOS_PATH PROPNAME PATH_IN_REPOS\n" +"usage: svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n" "\n" "Print the raw value of a property on a path in the repository.\n" +"With --revprop, prints the raw value of a revision property.\n" msgstr "" -"使用方法: svnlook propget <リポジトリパス> <属性名> <リポジトリ内パス>\n" +"使用方法: svnlook propget <リポジトリパス> <属性名> [<リポジトリ内パス>]\n" "\n" "<リポジトリ内パス> に設定された属性の生の値を表示します。\n" +"--revprop をつけると、リビジョン属性の生の値を表示します。\n" -#: svnlook/main.c:178 +#: svnlook/main.c:187 msgid "" -"usage: svnlook proplist REPOS_PATH PATH_IN_REPOS\n" +"usage: svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n" "\n" -"List the properties of a path in the repository.\n" +"List the properties of a path in the repository, or\n" +"with the --revprop option, revision properties.\n" "With -v, show the property values too.\n" msgstr "" -"使用方法: svnlook proplist <リポジトリパス> <リポジトリ内パス>\n" +"使用方法: svnlook proplist <リポジトリパス> [<リポジトリ内パス>]\n" "\n" -"<リポジトリ内パス> の属性を一覧表示します。\n" -"-v をつけると属性値も一緒に表示します。\n" +"<リポジトリ内パス> の属性、あるいは --revprop オプションをつけた場合には\n" +"リビジョン属性を、一覧表示します。-v をつけると属性値も一緒に表示します。\n" -#: svnlook/main.c:184 +#: svnlook/main.c:194 msgid "" "usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n" "\n" @@ -6589,7 +6728,7 @@ "始めてツリーを表示します。オプションを使うとノードのリビジョン ID も表示\n" "できます。\n" -#: svnlook/main.c:190 +#: svnlook/main.c:200 msgid "" "usage: svnlook uuid REPOS_PATH\n" "\n" @@ -6599,7 +6738,7 @@ "\n" "リポジトリの UUID を表示します。\n" -#: svnlook/main.c:195 +#: svnlook/main.c:205 msgid "" "usage: svnlook youngest REPOS_PATH\n" "\n" @@ -6611,63 +6750,63 @@ # * This message replaces 'Index: ...' in the header of each diff in the output # from 'svnlook diff'. -#: svnlook/main.c:819 +#: svnlook/main.c:833 #, c-format msgid "Copied: %s (from rev %ld, %s)\n" msgstr "コピーによる追加: %s (コピー元: リビジョン %ld, %s)\n" # * This message replaces 'Index' in the header of each diff in the output from # 'svnlook diff'. -#: svnlook/main.c:883 +#: svnlook/main.c:897 msgid "Added" msgstr "追加" # * This message replaces 'Index' in the header of each diff in the output from # 'svnlook diff'. -#: svnlook/main.c:884 +#: svnlook/main.c:898 msgid "Deleted" msgstr "削除" # * This message replaces 'Index' in the header of each diff in the output from # 'svnlook diff'. -#: svnlook/main.c:885 +#: svnlook/main.c:899 msgid "Modified" msgstr "変更" # * This message replaces 'Index' in the header of each diff in the output from # 'svnlook diff'. -#: svnlook/main.c:886 +#: svnlook/main.c:900 msgid "Index" msgstr "見出し" -#: svnlook/main.c:899 +#: svnlook/main.c:914 msgid "(Binary files differ)\n" msgstr "(バイナリファイルが異なっています)\n" -#: svnlook/main.c:1035 +#: svnlook/main.c:1052 msgid "unknown" msgstr "不明です" -#: svnlook/main.c:1159 svnlook/main.c:1252 svnlook/main.c:1316 +#: svnlook/main.c:1176 svnlook/main.c:1269 svnlook/main.c:1333 #, c-format msgid "Transaction '%s' is not based on a revision; how odd" msgstr "トランザクション '%s' はリビジョンに基づいていません。おかしいですね" -#: svnlook/main.c:1189 +#: svnlook/main.c:1206 #, c-format msgid "'%s' is a URL, probably should be a path" msgstr "'%s' は URL です。おそらくそこはパスで指定するべきです" -#: svnlook/main.c:1216 +#: svnlook/main.c:1233 #, c-format msgid "Path '%s' is not a file" msgstr "パス '%s' はファイルではありません" -#: svnlook/main.c:1296 +#: svnlook/main.c:1313 msgid "Can't create temporary directory" msgstr "一時ディレクトリを作成できません" -#: svnlook/main.c:1396 +#: svnlook/main.c:1414 msgid "" "REVISION PATH <ID>\n" "-------- ---------\n" @@ -6675,7 +6814,7 @@ "リビジョン パス <ID>\n" "-------- ---------\n" -#: svnlook/main.c:1401 +#: svnlook/main.c:1419 msgid "" "REVISION PATH\n" "-------- ----\n" @@ -6683,16 +6822,21 @@ "リビジョン パス\n" "-------- ----\n" -#: svnlook/main.c:1438 +#: svnlook/main.c:1464 +#, c-format +msgid "Property '%s' not found on revision %ld" +msgstr "属性 '%s' がリビジョン %ld に見つかりません" + +#: svnlook/main.c:1468 #, c-format -msgid "Property '%s' not found on path '%s'" -msgstr "属性 '%s' がパス '%s' に見つかりません" +msgid "Property '%s' not found on path '%s' in revision %ld" +msgstr "属性 '%s' がパス '%s' に見つかりません (リビジョン: %ld)" -#: svnlook/main.c:1594 svnlook/main.c:1749 +#: svnlook/main.c:1633 svnlook/main.c:1790 msgid "Missing repository path argument" msgstr "リポジトリパスの引数が指定されていません" -#: svnlook/main.c:1655 +#: svnlook/main.c:1694 msgid "" "general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" "Note: any subcommand which takes the '--revision' and '--transaction'\n" @@ -6715,33 +6859,37 @@ "\n" "利用可能なサブコマンド:\n" -#: svnlook/main.c:1725 +#: svnlook/main.c:1764 +msgid "Missing propname argument" +msgstr "属性名の引数が指定されていません" + +#: svnlook/main.c:1765 msgid "Missing propname and repository path arguments" msgstr "引数に属性名とリポジトリパスがありません" -#: svnlook/main.c:1731 +#: svnlook/main.c:1771 msgid "Missing propname or repository path argument" msgstr "引数に属性名かリポジトリパスがありません" -#: svnlook/main.c:1883 +#: svnlook/main.c:1925 msgid "Invalid revision number supplied" msgstr "与えられたリビジョン番号が不正です" -#: svnlook/main.c:1925 +#: svnlook/main.c:1975 msgid "" "The '--transaction' (-t) and '--revision' (-r) arguments can not co-exist" msgstr "'--transaction' (-t) と '--revision' (-r) の引数は一緒に指定できません" -#: svnlook/main.c:1999 +#: svnlook/main.c:2049 msgid "repository argument required\n" msgstr "リポジトリの引数が必要です\n" -#: svnlook/main.c:2008 +#: svnlook/main.c:2058 #, c-format msgid "'%s' is a URL when it should be a path\n" msgstr "'%s' は URL です。そこはパスで指定するべきです\n" -#: svnlook/main.c:2056 +#: svnlook/main.c:2106 #, c-format msgid "" "subcommand '%s' doesn't accept option '%s'\n" @@ -6778,9 +6926,9 @@ msgid "run in foreground (useful for debugging)" msgstr "フォアグラウンドで実行します (デバッグに便利です)" -# * Description for 'svnserve --help'. +# * Description for 'svn{serve,version} --help'. # * 29 one-byte characters are displayed on the left. -#: svnserve/main.c:109 +#: svnserve/main.c:109 svnversion/main.c:211 msgid "display this help" msgstr "このヘルプを表示します" @@ -6886,7 +7034,11 @@ msgid "Can't bind server socket: %s\n" msgstr "サーバソケットをバインドできません: %s\n" -#: svnversion/main.c:125 +#: svnversion/main.c:123 +msgid "Type 'svnversion --help' for usage.\n" +msgstr "使用方法を知りたいときは 'svnversion --help' と打ってください。\n" + +#: svnversion/main.c:134 msgid "" "usage: svnversion [OPTIONS] WC_PATH [TRAIL_URL]\n" "\n" @@ -6946,28 +7098,160 @@ # * Description for 'svnversion -n'. # * 29 one-byte characters are displayed on the left. -#: svnversion/main.c:198 +#: svnversion/main.c:209 msgid "do not output the trailing newline" msgstr "出力の末尾に改行をつけません" # * Description for 'svnversion -c'. # * 29 one-byte characters are displayed on the left -#: svnversion/main.c:199 +#: svnversion/main.c:210 msgid "last changed rather than current revisions" msgstr "" "現在のリビジョンの代わりに、最後に変更が加えられた\n" " リビジョンを表示します" -#: svnversion/main.c:286 +#: svnversion/main.c:301 #, c-format msgid "exported%s" msgstr "エクスポートされたものです%s" -#: svnversion/main.c:295 +#: svnversion/main.c:310 #, c-format msgid "'%s' not versioned, and not exported\n" msgstr "'%s' はバージョン管理下になく、エクスポートされたものでもありません\n" +#~ msgid "'svn info' only works on working copy paths, not URLs" +#~ msgstr "" +#~ "'svn info' は作業コピーパスに対してのみ使えます。URL に対しては使えません" + +#~ msgid "" +#~ "Valid UTF-8 data\n" +#~ "(hex:%s)\n" +#~ "followed by invalid UTF-8 sequence\n" +#~ "(hex:%s)" +#~ msgstr "" +#~ "有効な UTF-8 のデータ\n" +#~ "(16 進数:%s)\n" +#~ "の後に無効な UTF-8 文字列\n" +#~ "(16 進数:%s)\n" +#~ "があります" + +#~ msgid "" +#~ "Safe data:\n" +#~ "\"%s\"\n" +#~ "... was followed by non-ASCII byte %d.\n" +#~ "\n" +#~ "Non-ASCII character detected (see above), and unable to convert to/from " +#~ "UTF-8" +#~ msgstr "" +#~ "安全なデータ:\n" +#~ "\"%s\"\n" +#~ "... の後に ASCII 以外のバイト %d があります。\n" +#~ "\n" +#~ "ASCII 以外の文字が検出されました (上記を参照してください)。この文字は UTF-" +#~ "8\n" +#~ "へは、あるいは UTF-8 からは、変換できません" + +#~ msgid "" +#~ "Error copying logfile; the DB_LOG_AUTOREMOVE feature \n" +#~ "may be interfering with the hotcopy algorithm. If \n" +#~ "the problem persists, try deactivating this feature \n" +#~ "in DB_CONFIG." +#~ msgstr "" +#~ "ログファイルのコピー中にエラーが発生しました。\n" +#~ "DB_LOG_AUTOREMOVE 機能が hotcopy アルゴリズムを妨害しているかもしれませ" +#~ "ん。\n" +#~ "問題が起き続けるようであれば、DB_CONFIG でこの機能を無効にしてみてくださ" +#~ "い。" + +#~ msgid "Setting property on non-local target '%s' not yet supported" +#~ msgstr "ローカルにない対象 '%s' への属性の設定はまだサポートされていません" + +#~ msgid "Can't create a converter from '%s' to '%s'" +#~ msgstr "'%s' から '%s' へのコンバータを作成できません" + +#~ msgid "Can't recode string" +#~ msgstr "文字列を再エンコードできません" + +#~ msgid "native" +#~ msgstr "ネイティブ" + +#~ msgid "" +#~ "Mismatched RA plugin version for '%s': found %d.%d.%d%s, expected %d.%d.%d" +#~ "%s" +#~ msgstr "" +#~ "'%s' 用 RA プラグインのバージョンが一致しません: 実際 %d.%d.%d%s, 予想 %d." +#~ "%d.%d%s" + +#~ msgid "Property '%s' not found on path '%s'" +#~ msgstr "属性 '%s' がパス '%s' に見つかりません" + +#~ msgid "" +#~ "usage: svnlook proplist REPOS_PATH PATH_IN_REPOS\n" +#~ "\n" +#~ "List the properties of a path in the repository.\n" +#~ "With -v, show the property values too.\n" +#~ msgstr "" +#~ "使用方法: svnlook proplist <リポジトリパス> <リポジトリ内パス>\n" +#~ "\n" +#~ "<リポジトリ内パス> の属性を一覧表示します。\n" +#~ "-v をつけると属性値も一緒に表示します。\n" + +#~ msgid "" +#~ "usage: svnlook propget REPOS_PATH PROPNAME PATH_IN_REPOS\n" +#~ "\n" +#~ "Print the raw value of a property on a path in the repository.\n" +#~ msgstr "" +#~ "使用方法: svnlook propget <リポジトリパス> <属性名> <リポジトリ内パス>\n" +#~ "\n" +#~ "<リポジトリ内パス> に設定された属性の生の値を表示します。\n" + +#~ msgid "Unsupported RA plugin ABI version (%d) for ra_local" +#~ msgstr "" +#~ "ra_local 用の RA プラグイン ABI バージョン (%d) はサポートされていません" + +#~ msgid "Unsupported RA plugin ABI version (%d) for ra_svn." +#~ msgstr "" +#~ "ra_svn 用の RA プラグイン ABI バージョン (%d) はサポートされていません" + +#~ msgid "Unsupported RA plugin ABI version (%d) for ra_dav" +#~ msgstr "" +#~ "ra_dav 用の RA プラグイン ABI バージョン (%d) はサポートされていません" + +#~ msgid "No get_dir() available for URL schema" +#~ msgstr "URL スキーマに対して利用できる get_dir() がありません" + +#~ msgid "No commit for revision 0.\n" +#~ msgstr "リビジョン 0 のコミットはありません。\n" + +#~ msgid "Working copy '%s' not locked" +#~ msgstr "作業コピー '%s' はロックされていません" + +#~ msgid "" +#~ "Check out a working copy from a repository.\n" +#~ "usage: checkout URL... [PATH]\n" +#~ "\n" +#~ " Note: If PATH is omitted, the basename of the URL will be used as\n" +#~ " the destination. If multiple URLs are given each will be checked\n" +#~ " out into a sub-directory of PATH, with the name of the sub-directory\n" +#~ " being the basename of the URL.\n" +#~ msgstr "" +#~ "リポジトリから作業コピーをチェックアウトします。\n" +#~ "使用方法: checkout <URL>... [<パス>]\n" +#~ "\n" +#~ " 注意: <パス> が省略された場合、<URL> のベース名がコピー先として用いられ" +#~ "ます。\n" +#~ " 複数の <URL> が与えられた場合、各 <URL> のベース名を名前にもつ\n" +#~ " サブディレクトリを <パス> の下に作り、各々をそこにチェックアウトしま" +#~ "す。\n" + +# * Description for 'svn --extensions'. +# * 29 one-byte characters are displayed on the left. +#~ msgid "pass ARG as bundled options to diff (default: '-u')" +#~ msgstr "" +#~ "ARG をオプションとして diff に渡します\n" +#~ " (デフォルト: '-u')" + #~ msgid ")" #~ msgstr "" #~ ")\n" @@ -7144,7 +7428,7 @@ #~ "Output the content of specified files or URLs.\n" #~ "usage: cat TARGET...\n" #~ msgstr "" -#~ "指定されたファイルや URL の中身を出力します。\n" +#~ "指定されたファイルや URL の内容を出力します。\n" #~ "使用方法: cat <対象>...\n" #~ msgid "" @@ -7152,7 +7436,7 @@ #~ "URLs with revision and author information in-line.\n" #~ "usage: blame TARGET...\n" #~ msgstr "" -#~ "指定されたファイルや URL の中身を、リビジョンと変更者の情報を行内に含めて" +#~ "指定されたファイルや URL の内容を、リビジョンと変更者の情報を行内に含めて" #~ "出力\n" #~ "します。\n" #~ "使用方法: blame <対象>...\n" @@ -7374,3 +7658,22 @@ #~ msgstr "" #~ "リポジトリを他のプロセスが利用中の場合、終了する\n" #~ " 代わりに待ちます" + +# ? catastrophic recovery +#~ msgid "" +#~ "Error running catastrophic recovery on hotcopy; the \n" +#~ "DB_LOG_AUTOREMOVE feature may be interfering with the \n" +#~ "hotcopy algorithm. If the problem persists, try deactivating \n" +#~ "this feature in DB_CONFIG." +#~ msgstr "" +#~ "hotcopy の catastrophic recovery 実行中にエラーが起きました。\n" +#~ "DB_LOG_AUTOREMOVE 機能が hotcopy アルゴリズムを妨害しているかもしれませ" +#~ "ん。\n" +#~ "問題が起き続けるようであれば、DB_CONFIG でこの機能を無効にしてみてくださ" +#~ "い。" + +#~ msgid "Repository: %s\n" +#~ msgstr "リポジトリ: %s\n" + +#~ msgid "* %s revision %ld.\n" +#~ msgstr "* %s リビジョン %ld。\n" Modified: branches/ruby/subversion/po/nb.po Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/po/nb.po?view=diff&rev=13186&p1=branches/ruby/subversion/po/nb.po&r1=13185&p2=branches/ruby/subversion/po/nb.po&r2=13186 ============================================================================== --- branches/ruby/subversion/po/nb.po (original) +++ branches/ruby/subversion/po/nb.po Sun Feb 27 19:19:25 2005 @@ -12,6 +12,7 @@ # deprecated - avlegs # destination - mål # directory - katalog +# entry - post # hook - påhakning # item - element # merge - flette @@ -38,7 +39,7 @@ msgstr "" "Project-Id-Version: subversion 1.1.0\n" "Report-Msgid-Bugs-To: dev-lmwclWVctOZK/UuDQWWi7iCwEArCW2h5@xxxxxxxxxxxxxxxx\n" -"POT-Creation-Date: 2005-02-13 23:58+0100\n" +"POT-Creation-Date: 2005-02-27 10:44+0100\n" "PO-Revision-Date: 2004-07-13 11:59+0200\n" "Last-Translator: Subversion Developers <dev-lmwclWVctOZK/UuDQWWi7iCwEArCW2h5@xxxxxxxxxxxxxxxx>\n" "Language-Team: Norwegian <dev-lmwclWVctOZK/UuDQWWi7iCwEArCW2h5@xxxxxxxxxxxxxxxx>\n" @@ -69,14 +70,14 @@ msgstr "" "Mållistene for diff kan ikke inneholde både arbeidskopi-stier og URL-er" -#: clients/cmdline/export-cmd.c:81 +#: clients/cmdline/export-cmd.c:82 msgid "" "Destination directory exists; please remove the directory or use --force to " "overwrite" msgstr "" "Målkatalogen finnes allerede. Flytt den eller bruk --force for å overskrive" -#: clients/cmdline/help-cmd.c:48 +#: clients/cmdline/help-cmd.c:46 #, c-format msgid "" "usage: svn <subcommand> [options] [args]\n" @@ -101,7 +102,7 @@ "\n" "Tilgjengelige delkommandoer:\n" -#: clients/cmdline/help-cmd.c:59 +#: clients/cmdline/help-cmd.c:57 msgid "" "Subversion is a tool for version control.\n" "For additional information, see http://subversion.tigris.org/\n"; @@ -109,7 +110,7 @@ "Subversion er et verktøy for versjonshåndtering\n" "Se http://subversion.tigris.org/ for mer informasjon\n" -#: clients/cmdline/help-cmd.c:66 +#: clients/cmdline/help-cmd.c:64 msgid "" "The following repository access (RA) modules are available:\n" "\n" @@ -130,130 +131,126 @@ msgid "Invalid URL '%s'" msgstr "Ugyldig URL «%s»" -#: clients/cmdline/info-cmd.c:58 +#: clients/cmdline/info-cmd.c:56 #, c-format msgid "Path: %s\n" msgstr "Filsti: %s\n" -#: clients/cmdline/info-cmd.c:66 svnlook/main.c:753 +#: clients/cmdline/info-cmd.c:62 svnlook/main.c:753 #, c-format msgid "Name: %s\n" msgstr "Navn: %s\n" -#: clients/cmdline/info-cmd.c:69 +#: clients/cmdline/info-cmd.c:66 #, c-format msgid "URL: %s\n" msgstr "Nettadresse: %s\n" -#: clients/cmdline/info-cmd.c:72 +#: clients/cmdline/info-cmd.c:69 #, c-format -msgid "Repository: %s\n" -msgstr "Depot: %s\n" +msgid "Repository Root: %s\n" +msgstr "Depotrot: %s\n" -#: clients/cmdline/info-cmd.c:75 +#: clients/cmdline/info-cmd.c:73 #, c-format msgid "Repository UUID: %s\n" msgstr "Depotets UUID: %s\n" -#: clients/cmdline/info-cmd.c:79 +#: clients/cmdline/info-cmd.c:77 #, c-format msgid "Revision: %ld\n" msgstr "Revisjon: %ld\n" -#: clients/cmdline/info-cmd.c:84 +#: clients/cmdline/info-cmd.c:82 msgid "Node Kind: file\n" msgstr "Nodetype: Fil\n" -#: clients/cmdline/info-cmd.c:94 +#: clients/cmdline/info-cmd.c:86 msgid "Node Kind: directory\n" msgstr "Nodetype: Katalog\n" -#: clients/cmdline/info-cmd.c:100 +#: clients/cmdline/info-cmd.c:90 msgid "Node Kind: none\n" msgstr "Nodetype: Ingen\n" -#: clients/cmdline/info-cmd.c:105 +#: clients/cmdline/info-cmd.c:95 msgid "Node Kind: unknown\n" msgstr "Nodetype: Ukjent\n" -#: clients/cmdline/info-cmd.c:112 +#: clients/cmdline/info-cmd.c:104 msgid "Schedule: normal\n" msgstr "Oppgave: Normal\n" -#: clients/cmdline/info-cmd.c:116 +#: clients/cmdline/info-cmd.c:108 msgid "Schedule: add\n" msgstr "Oppgave: Legg til\n" -#: clients/cmdline/info-cmd.c:120 +#: clients/cmdline/info-cmd.c:112 msgid "Schedule: delete\n" msgstr "Oppgave: Slett\n" -#: clients/cmdline/info-cmd.c:124 +#: clients/cmdline/info-cmd.c:116 msgid "Schedule: replace\n" msgstr "Oppgave: Erstatt\n" -#: clients/cmdline/info-cmd.c:134 +#: clients/cmdline/info-cmd.c:124 #, c-format msgid "Copied From URL: %s\n" msgstr "Kopiert fra nettadresse: %s\n" -#: clients/cmdline/info-cmd.c:138 +#: clients/cmdline/info-cmd.c:128 #, c-format msgid "Copied From Rev: %ld\n" msgstr "Kopiert fra revisjon: %ld\n" -#: clients/cmdline/info-cmd.c:143 +#: clients/cmdline/info-cmd.c:133 #, c-format msgid "Last Changed Author: %s\n" msgstr "Sist endret av: %s\n" -#: clients/cmdline/info-cmd.c:147 +#: clients/cmdline/info-cmd.c:137 #, c-format msgid "Last Changed Rev: %ld\n" msgstr "Sist endret revisjon: %ld\n" -#: clients/cmdline/info-cmd.c:152 +#: clients/cmdline/info-cmd.c:142 msgid "Last Changed Date" msgstr "Dato for siste endring" -#: clients/cmdline/info-cmd.c:156 +#: clients/cmdline/info-cmd.c:148 msgid "Text Last Updated" msgstr "Teksten er sist oppdatert" -#: clients/cmdline/info-cmd.c:160 +#: clients/cmdline/info-cmd.c:152 msgid "Properties Last Updated" msgstr "Egenskaper er sist oppdatert" -#: clients/cmdline/info-cmd.c:163 +#: clients/cmdline/info-cmd.c:155 #, c-format msgid "Checksum: %s\n" msgstr "Kontrollsum: %s\n" -#: clients/cmdline/info-cmd.c:167 +#: clients/cmdline/info-cmd.c:160 #, c-format msgid "Conflict Previous Base File: %s\n" msgstr "Konflikt: Forrige basefil: %s\n" -#: clients/cmdline/info-cmd.c:173 +#: clients/cmdline/info-cmd.c:166 #, c-format msgid "Conflict Previous Working File: %s\n" msgstr "Konflikt: Forrige arbeidsfil: %s\n" -#: clients/cmdline/info-cmd.c:177 +#: clients/cmdline/info-cmd.c:171 #, c-format msgid "Conflict Current Base File: %s\n" msgstr "Konflikt: Nåværende basefil: %s\n" -#: clients/cmdline/info-cmd.c:182 +#: clients/cmdline/info-cmd.c:176 #, c-format msgid "Conflict Properties File: %s\n" msgstr "Konflikt: Egenskapsfil: %s\n" #: clients/cmdline/info-cmd.c:248 -msgid "'svn info' only works on working copy paths, not URLs" -msgstr "«svn info» virker bare på arbeidskopistier, ikke URL-er" - -#: clients/cmdline/info-cmd.c:260 #, c-format msgid "" "%s: (Not a versioned resource)\n" @@ -262,6 +259,15 @@ "%s: (Ikke en versjonert ressurs)\n" "\n" +#: clients/cmdline/info-cmd.c:256 +#, c-format +msgid "" +"%s: (Not a valid URL)\n" +"\n" +msgstr "" +"%s: (Ikke en gyldig URL)\n" +"\n" + #: clients/cmdline/log-cmd.c:194 msgid "(no author)" msgstr "(mangler forfatter)" @@ -1371,11 +1377,12 @@ msgid "Syntax error in native-eol argument '%s'" msgstr "Syntaksfeil i «native-eol»-argumentet «%s»" -#: clients/cmdline/main.c:1082 +#: clients/cmdline/main.c:1082 svndumpfilter/main.c:1166 svnlook/main.c:1993 msgid "Subcommand argument required\n" msgstr "Delkommandoen må ha et argument\n" -#: clients/cmdline/main.c:1100 svnadmin/main.c:1200 svnlook/main.c:2016 +#: clients/cmdline/main.c:1100 svnadmin/main.c:1200 svndumpfilter/main.c:1188 +#: svnlook/main.c:2016 #, c-format msgid "Unknown command: '%s'\n" msgstr "Ukjent kommando: «%s»\n" @@ -1427,7 +1434,7 @@ msgid "Try 'svn add' or 'svn add --non-recursive' instead?" msgstr "Prøve «svn add» eller «svn add --non-recursive» i stedet?" -#: clients/cmdline/move-cmd.c:69 libsvn_client/copy.c:1167 +#: clients/cmdline/move-cmd.c:69 libsvn_client/copy.c:1173 msgid "Cannot specify revisions (except HEAD) with move operations" msgstr "Kan ikke angi revisjoner (unntatt HEAD) ved flytteoperasjoner" @@ -1694,7 +1701,7 @@ msgid "property '%s' deleted from '%s'.\n" msgstr "Egenskapen «%s» slettet fra «%s».\n" -#: clients/cmdline/propedit-cmd.c:117 clients/cmdline/propedit-cmd.c:244 +#: clients/cmdline/propedit-cmd.c:117 clients/cmdline/propedit-cmd.c:245 #: clients/cmdline/propset-cmd.c:85 msgid "Bad encoding option: prop value not stored as UTF8" msgstr "Feil kodingsparameter: Egenskapsverdi er ikke lagret som UTF8" @@ -1724,17 +1731,17 @@ msgstr "" "Redigering av egenskap på ikke-lokalt mål «%s» er foreløpig ikke støttet" -#: clients/cmdline/propedit-cmd.c:219 clients/cmdline/switch-cmd.c:137 +#: clients/cmdline/propedit-cmd.c:220 clients/cmdline/switch-cmd.c:138 #, c-format msgid "'%s' does not appear to be a working copy path" msgstr "«%s» ser ikke ut som en arbeidskopi-sti" -#: clients/cmdline/propedit-cmd.c:251 +#: clients/cmdline/propedit-cmd.c:252 #, c-format msgid "Set new value for property '%s' on '%s'\n" msgstr "Satte ny verdi for egenskap «%s» på «%s»\n" -#: clients/cmdline/propedit-cmd.c:258 +#: clients/cmdline/propedit-cmd.c:259 #, c-format msgid "No changes to property '%s' on '%s'\n" msgstr "Ingen endring for egenskap «%s» på «%s»\n" @@ -1814,7 +1821,7 @@ msgstr "Kan ikke skrive til «%s»" #: clients/cmdline/util.c:204 clients/cmdline/util.c:228 -#: libsvn_fs_fs/fs_fs.c:989 libsvn_subr/io.c:2164 +#: libsvn_fs_fs/fs_fs.c:990 libsvn_subr/io.c:2166 #, c-format msgid "Can't stat '%s'" msgstr "Finner ikke status for «%s»" @@ -2613,16 +2620,16 @@ msgid "URL '%s' refers to a file, not a directory" msgstr "URL-en «%s» refererer til en fil, ikke en katalog" -#: libsvn_client/checkout.c:149 +#: libsvn_client/checkout.c:150 #, c-format msgid "'%s' is already a working copy for a different URL" msgstr "«%s» er allerede en arbeidskopi, for en annen URL" -#: libsvn_client/checkout.c:153 +#: libsvn_client/checkout.c:154 msgid "; run 'svn update' to complete it." msgstr "; kjør «svn update» for å fullføre den." -#: libsvn_client/checkout.c:162 +#: libsvn_client/checkout.c:163 #, c-format msgid "'%s' is already a file/something else" msgstr "«%s» er allerede en fil eller noe annet" @@ -2646,8 +2653,8 @@ msgid "Path '%s' does not exist" msgstr "Filstien «%s» finnes ikke" -#: libsvn_client/commit.c:683 libsvn_client/copy.c:398 -#: libsvn_client/copy.c:414 +#: libsvn_client/commit.c:683 libsvn_client/copy.c:399 +#: libsvn_client/copy.c:415 #, c-format msgid "Path '%s' already exists" msgstr "Filstien «%s» finnes allerede" @@ -2657,15 +2664,15 @@ msgid "'%s' is a reserved name and cannot be imported" msgstr "«%s» er et reservert navn og kan ikke importeres" -#: libsvn_client/commit.c:772 libsvn_client/copy.c:542 +#: libsvn_client/commit.c:772 libsvn_client/copy.c:543 msgid "Commit failed (details follow):" msgstr "Innsending feilet (detaljer følger):" -#: libsvn_client/commit.c:780 libsvn_client/copy.c:550 +#: libsvn_client/commit.c:780 libsvn_client/copy.c:551 msgid "Commit succeeded, but other errors follow:" msgstr "Innsending var vellykket, men andre feil følger:" -#: libsvn_client/commit.c:787 libsvn_client/copy.c:557 +#: libsvn_client/commit.c:787 libsvn_client/copy.c:558 msgid "Error unlocking locked dirs (details follow):" msgstr "Feil ved opplåsing av låste kataloger (detaljer følger):" @@ -2673,7 +2680,7 @@ msgid "Error bumping revisions post-commit (details follow):" msgstr "Feil ved økning av revisjoner etter innsending (detaljer følger):" -#: libsvn_client/commit.c:809 libsvn_client/copy.c:568 +#: libsvn_client/commit.c:809 libsvn_client/copy.c:569 msgid "Error in post-commit clean-up (details follow):" msgstr "Feil i opprydding etter innsending (detaljer følger):" @@ -2682,11 +2689,11 @@ msgid "'%s' is a URL, but URLs cannot be commit targets" msgstr "«%s» er en URL, men URL-er kan ikke være mål for innsending" -#: libsvn_client/commit.c:1257 +#: libsvn_client/commit.c:1262 msgid "Are all the targets part of the same working copy?" msgstr "Er alle målene del av samme arbeidskopi?" -#: libsvn_client/commit.c:1272 +#: libsvn_client/commit.c:1277 msgid "Cannot non-recursively commit a directory deletion" msgstr "Kan ikke sende inn ikke-rekursiv sletting av en katalog" @@ -2715,16 +2722,16 @@ msgid "Commit item '%s' has copy flag but no copyfrom URL\n" msgstr "Objekt «%s» for innsending har kopimerke, men ingen copyfrom-URL\n" -#: libsvn_client/commit_util.c:612 libsvn_client/commit_util.c:740 -#: libsvn_client/copy.c:1063 libsvn_client/delete.c:67 -#: libsvn_client/diff.c:1380 libsvn_client/diff.c:1973 -#: libsvn_client/diff.c:2446 libsvn_client/diff.c:2553 libsvn_client/log.c:128 -#: libsvn_client/prop_commands.c:211 libsvn_client/prop_commands.c:437 -#: libsvn_client/prop_commands.c:588 libsvn_client/prop_commands.c:940 +#: libsvn_client/commit_util.c:612 libsvn_client/commit_util.c:741 +#: libsvn_client/copy.c:1069 libsvn_client/delete.c:67 +#: libsvn_client/diff.c:1380 libsvn_client/diff.c:1977 +#: libsvn_client/diff.c:2452 libsvn_client/diff.c:2561 libsvn_client/log.c:129 +#: libsvn_client/prop_commands.c:213 libsvn_client/prop_commands.c:446 +#: libsvn_client/prop_commands.c:599 libsvn_client/prop_commands.c:955 #: libsvn_client/ra.c:180 libsvn_client/revisions.c:89 -#: libsvn_client/status.c:129 libsvn_client/switch.c:103 -#: libsvn_wc/adm_ops.c:2107 libsvn_wc/copy.c:386 libsvn_wc/entries.c:1383 -#: libsvn_wc/entries.c:1802 libsvn_wc/props.c:281 libsvn_wc/questions.c:171 +#: libsvn_client/status.c:131 libsvn_client/switch.c:104 +#: libsvn_wc/adm_ops.c:2127 libsvn_wc/copy.c:386 libsvn_wc/entries.c:1383 +#: libsvn_wc/entries.c:1824 libsvn_wc/props.c:281 libsvn_wc/questions.c:171 #, c-format msgid "'%s' is not under version control" msgstr "«%s» er ikke under versjonskontroll" @@ -2734,12 +2741,12 @@ msgid "Entry for '%s' has no URL" msgstr "Innslaget for «%s» mangler URL" -#: libsvn_client/commit_util.c:647 +#: libsvn_client/commit_util.c:648 #, c-format msgid "'%s' is scheduled for addition within unversioned parent" msgstr "«%s» er klarert for å legges til i en ikke-versjonert forelder" -#: libsvn_client/commit_util.c:667 +#: libsvn_client/commit_util.c:668 #, c-format msgid "" "Entry for '%s' is marked as 'copied' but is not itself scheduled\n" @@ -2750,7 +2757,7 @@ "skulle legges til. Kanskje du prøver å sende inn et mål som ligger i\n" "en ikke-versjonert (eller ikke enda versjonert) katalog?" -#: libsvn_client/commit_util.c:706 +#: libsvn_client/commit_util.c:707 #, c-format msgid "" "'%s' is not under version control and is not part of the commit, yet its " @@ -2759,38 +2766,38 @@ "«%s» er ikke under versjonskontroll og er ikke en del av innsendingen,\n" "men dens barn «%s» er del av innsendingen" -#: libsvn_client/commit_util.c:789 +#: libsvn_client/commit_util.c:790 #, c-format msgid "Cannot commit both '%s' and '%s' as they refer to the same URL" msgstr "Kan ikke sende inn både «%s» og «%s» siden de refererer til samme URL" -#: libsvn_client/commit_util.c:934 +#: libsvn_client/commit_util.c:935 #, c-format msgid "Commit item '%s' has copy flag but no copyfrom URL" msgstr "Objekt «%s» for innsending har kopimerke satt, men ingen copyfrom-URL" -#: libsvn_client/commit_util.c:939 +#: libsvn_client/commit_util.c:940 #, c-format msgid "Commit item '%s' has copy flag but an invalid revision" msgstr "" "Objekt «%s» for innsending har kopimerke satt, men har en ugyldig revisjon" -#: libsvn_client/copy.c:101 libsvn_client/copy.c:642 libsvn_client/copy.c:825 +#: libsvn_client/copy.c:101 libsvn_client/copy.c:644 libsvn_client/copy.c:827 #: libsvn_ra_dav/commit.c:895 #, c-format msgid "File '%s' already exists" msgstr "Filen «%s» finnes allerede" -#: libsvn_client/copy.c:143 +#: libsvn_client/copy.c:144 msgid "Move will not be attempted unless forced" msgstr "Flytting vil ikke bli forsøkt uten tvang" -#: libsvn_client/copy.c:327 +#: libsvn_client/copy.c:328 #, c-format msgid "Cannot move URL '%s' into itself" msgstr "Kan ikke flytte URL «%s» inn i seg selv" -#: libsvn_client/copy.c:359 +#: libsvn_client/copy.c:360 #, c-format msgid "" "Source and dest appear not to be in the same repository (src: '%s'; dst: '%" @@ -2798,57 +2805,57 @@ msgstr "" "Kilde og mål ser ut til å ikke være i samme depot (kilde: «%s»; mål: «%s»)" -#: libsvn_client/copy.c:385 +#: libsvn_client/copy.c:386 #, c-format msgid "Path '%s' does not exist in revision %ld" msgstr "Filstien «%s» finnes ikke i revisjon %ld" -#: libsvn_client/copy.c:419 +#: libsvn_client/copy.c:420 #, c-format msgid "Unrecognized node kind of '%s'" msgstr "Ukjent nodetype: «%s»" -#: libsvn_client/copy.c:783 +#: libsvn_client/copy.c:785 #, c-format msgid "Path '%s' not found in revision %ld" msgstr "Filstien «%s» ble ikke funnet i revisjon %ld" -#: libsvn_client/copy.c:788 +#: libsvn_client/copy.c:790 #, c-format msgid "Path '%s' not found in head revision" msgstr "Filstien «%s» ble ikke funnet i hode-revisjonen" -#: libsvn_client/copy.c:834 +#: libsvn_client/copy.c:836 #, c-format msgid "'%s' is in the way" msgstr "«%s» er i veien" -#: libsvn_client/copy.c:850 +#: libsvn_client/copy.c:853 #, c-format msgid "Entry for '%s' exists (though the working file is missing)" msgstr "Innslag for «%s» finnes (men arbeidskopi-filen mangler)" -#: libsvn_client/copy.c:940 +#: libsvn_client/copy.c:944 #, c-format msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC" msgstr "" "Kilde-URL «%s» er fra et fremmed depot; beholder det som adskilt arbeidskopi" -#: libsvn_client/copy.c:1020 +#: libsvn_client/copy.c:1024 #, c-format msgid "Cannot copy path '%s' into its own child '%s'" msgstr "Kan ikke kopiere filsti «%s» inn i dens eget barn «%s»" -#: libsvn_client/copy.c:1031 +#: libsvn_client/copy.c:1035 #, c-format msgid "Cannot move path '%s' into itself" msgstr "Kan ikke flytte «%s» inn i seg selv" -#: libsvn_client/copy.c:1039 +#: libsvn_client/copy.c:1043 msgid "No support for repos <--> working copy moves" msgstr "Ingen støtte for flytting mellom et depot og en arbeidskopi" -#: libsvn_client/copy.c:1069 +#: libsvn_client/copy.c:1075 #, c-format msgid "'%s' does not seem to have a URL associated with it" msgstr "«%s» ser ikke ut til å ha en URL tilknyttet seg" @@ -2924,8 +2931,8 @@ msgid ".merge-right.r%ld" msgstr ".merge-right.r%ld" -#: libsvn_client/diff.c:1436 libsvn_client/diff.c:2073 -#: libsvn_client/diff.c:2153 +#: libsvn_client/diff.c:1436 libsvn_client/diff.c:2077 +#: libsvn_client/diff.c:2157 msgid "Not all required revisions are specified" msgstr "Noen nødvendige revisjoner er ikke spesifisert" @@ -2941,22 +2948,22 @@ "For øyeblikket støttes kun forskjeller mellom filstiers tekstbase og deres " "arbeidsfiler" -#: libsvn_client/diff.c:1858 libsvn_client/diff.c:1863 +#: libsvn_client/diff.c:1860 libsvn_client/diff.c:1865 #, c-format msgid "'%s' was not found in the repository at revision %ld" msgstr "«%s» ble ikke funnet i depotet ved revisjon %ld" -#: libsvn_client/diff.c:1977 libsvn_client/switch.c:107 +#: libsvn_client/diff.c:1981 libsvn_client/switch.c:108 #, c-format msgid "Directory '%s' has no URL" msgstr "Katalogen «%s» mangler adresse" -#: libsvn_client/diff.c:2164 +#: libsvn_client/diff.c:2168 msgid "At least one revision must be non-local for a pegged diff" msgstr "Minst én revisjon må være ikke-lokal for en bundet diff" -#: libsvn_client/diff.c:2421 libsvn_client/diff.c:2427 -#: libsvn_client/diff.c:2540 libsvn_client/ra.c:712 libsvn_client/ra.c:835 +#: libsvn_client/diff.c:2425 libsvn_client/diff.c:2431 +#: libsvn_client/diff.c:2546 libsvn_client/ra.c:714 libsvn_client/ra.c:837 #, c-format msgid "'%s' has no URL" msgstr "«%s» har ingen nettadresse" @@ -2966,49 +2973,59 @@ msgid "'%s' is not a valid EOL value" msgstr "«%s» er ikke en gyldig EOL-verdi" -#: libsvn_client/export.c:184 +#: libsvn_client/export.c:193 msgid "(local)" msgstr "(lokal)" -#: libsvn_client/export.c:266 +#: libsvn_client/export.c:283 msgid "Destination directory exists, and will not be overwritten unless forced" msgstr "Målkatalogen finnes allerede og vil ikke bli overskrevet uten tvang" -#: libsvn_client/export.c:359 libsvn_client/export.c:503 +#: libsvn_client/export.c:381 libsvn_client/export.c:525 #, c-format msgid "'%s' exists and is not a directory" msgstr "«%s» finnes og er ikke en katalog" -#: libsvn_client/export.c:363 libsvn_client/export.c:507 +#: libsvn_client/export.c:385 libsvn_client/export.c:529 #, c-format msgid "'%s' already exists" msgstr "«%s» finnes allerede" -#: libsvn_client/export.c:679 libsvn_wc/update_editor.c:1594 -#: libsvn_wc/update_editor.c:2340 +#: libsvn_client/export.c:701 libsvn_wc/update_editor.c:1595 +#: libsvn_wc/update_editor.c:2341 #, c-format msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'" msgstr "Kontrollsum for «%s» er feil. Forventet: «%s», gjeldende: «%s»" +#: libsvn_client/info.c:214 +#, c-format +msgid "Cannot read entry for '%s'" +msgstr "Kan ikke lese post for «%s»" + +#: libsvn_client/info.c:285 +#, c-format +msgid "URL '%s' non-existent in revision '%ld'" +msgstr "URLen «%s» finnes ikke i revisjon «%ld»" + +#: libsvn_client/info.c:310 libsvn_client/ls.c:128 libsvn_client/ls.c:135 +#, c-format +msgid "URL '%s' non-existent in that revision" +msgstr "URL-en «%s» finnes ikke i den revisjonen" + #: libsvn_client/log.c:72 msgid "Missing required revision specification" msgstr "Mangler påkrevet revisjonsspesifikasjon" -#: libsvn_client/log.c:134 libsvn_client/status.c:134 -#: libsvn_client/update.c:83 +#: libsvn_client/log.c:135 libsvn_client/status.c:136 +#: libsvn_client/update.c:85 #, c-format msgid "Entry '%s' has no URL" msgstr "Posten «%s» mangler nettadresse" -#: libsvn_client/log.c:320 +#: libsvn_client/log.c:321 msgid "No commits in repository." msgstr "Ingen innsendinger i depotet" -#: libsvn_client/ls.c:128 libsvn_client/ls.c:135 -#, c-format -msgid "URL '%s' non-existent in that revision" -msgstr "URL-en «%s» finnes ikke i den revisjonen" - #: libsvn_client/prop_commands.c:104 #, c-format msgid "'%s' is a wcprop, thus not accessible to clients" @@ -3016,26 +3033,26 @@ "«%s» er en arbeidskopiegenskap (wcprop), og er derfor ikke tilgjengelig for " "klienter" -#: libsvn_client/prop_commands.c:182 +#: libsvn_client/prop_commands.c:183 #, c-format msgid "Revision property '%s' not allowed in this context" msgstr "Revisjonsegenskapen «%s» er ikke tillatt i denne sammenhengen." -#: libsvn_client/prop_commands.c:198 +#: libsvn_client/prop_commands.c:199 #, c-format msgid "Setting property on non-local target '%s' is not supported" msgstr "Setting av egenskap på ikke-lokalt mål «%s» er ikke støttet" -#: libsvn_client/prop_commands.c:204 libsvn_client/prop_commands.c:271 +#: libsvn_client/prop_commands.c:205 libsvn_client/prop_commands.c:280 #, c-format msgid "Bad property name: '%s'" msgstr "Ugyldig navn på egenskap: «%s»" -#: libsvn_client/prop_commands.c:267 +#: libsvn_client/prop_commands.c:276 msgid "Value will not be set unless forced" msgstr "Verdien blir ikke satt uten tvang" -#: libsvn_client/prop_commands.c:490 libsvn_client/prop_commands.c:749 +#: libsvn_client/prop_commands.c:499 libsvn_client/prop_commands.c:762 #, c-format msgid "Unknown node kind for '%s'" msgstr "Ukjent nodetype for «%s»" @@ -3047,32 +3064,32 @@ "Forsøk på å sette arbeidskopi-egenskap «%s» på «%s» under en operasjon som " "ikke er innsending" -#: libsvn_client/ra.c:335 +#: libsvn_client/ra.c:336 #, c-format msgid "Can't find entry for '%s'" msgstr "Kan ikke finne post for «%s»" -#: libsvn_client/ra.c:462 +#: libsvn_client/ra.c:463 #, c-format msgid "Missing changed-path information for '%s' in revision %ld" msgstr "Manglende sti-endringsinformasjon for «%s» i revisjon %ld" -#: libsvn_client/ra.c:579 +#: libsvn_client/ra.c:580 #, c-format msgid "path '%s' doesn't exist in revision %ld" msgstr "Filstien «%s» finnes ikke i revisjon %ld" -#: libsvn_client/ra.c:640 libsvn_client/ra.c:775 +#: libsvn_client/ra.c:641 libsvn_client/ra.c:777 #, c-format msgid "Unable to find repository location for '%s' in revision %ld" msgstr "Kan ikke finne depotplassering for «%s» i revisjon %ld" -#: libsvn_client/ra.c:651 +#: libsvn_client/ra.c:652 #, c-format msgid "'%s' in revision %ld is an unrelated object" msgstr "«%s» i revisjon %ld er et urelatert objekt" -#: libsvn_client/ra.c:780 +#: libsvn_client/ra.c:782 #, c-format msgid "" "The location for '%s' for revision %ld does not exist in the repository or " @@ -3155,8 +3172,8 @@ msgid "Failed to delete mmap '%s'" msgstr "Klarte ikke slette mmap «%s»" -#: libsvn_fs/fs-loader.c:99 libsvn_ra/ra_loader.c:147 -#: libsvn_ra/ra_loader.c:160 +#: libsvn_fs/fs-loader.c:99 libsvn_ra/ra_loader.c:156 +#: libsvn_ra/ra_loader.c:169 #, c-format msgid "'%s' does not define '%s()'" msgstr "«%s» definerer ikke «%s()»" @@ -3189,29 +3206,29 @@ msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'" msgstr "Uforanderlig fil: Filsystem «%s», revisjon %ld, sti «%s»" -#: libsvn_fs_base/fs.c:1122 +#: libsvn_fs_base/fs.c:1129 msgid "" "Error copying logfile; the DB_LOG_AUTOREMOVE feature \n" "may be interfering with the hotcopy algorithm. If \n" "the problem persists, try deactivating this feature \n" -"in DB_CONFIG." +"in DB_CONFIG" msgstr "" "Feil ved kopiering av loggfil; bruken av DB_LOG_AUTOREMOVE kan \n" "skape problemer for hotcopy-algoritmen. Hvis problemet vedvarer, \n" -"prøv å deaktivere det i DB_CONFIG." +"prøv å deaktivere det i DB_CONFIG" -#: libsvn_fs_base/fs.c:1141 +#: libsvn_fs_base/fs.c:1148 msgid "" "Error running catastrophic recovery on hotcopy; the \n" "DB_LOG_AUTOREMOVE feature may be interfering with the \n" "hotcopy algorithm. If the problem persists, try deactivating \n" -"this feature in DB_CONFIG." +"this feature in DB_CONFIG" msgstr "" "Feil ved katastrofe-gjenoppretting på hotcopy; bruken av \n" "DB_LOG_AUTOREMOVE kan skape problemer for hotcopy-algoritmen.\n" -"Hvis problemet vedvarer, prøv å deaktivere det i DB_CONFIG." +"Hvis problemet vedvarer, prøv å deaktivere det i DB_CONFIG" -#: libsvn_fs_base/fs.c:1278 +#: libsvn_fs_base/fs.c:1285 #, c-format msgid "Unsupported FS loader version (%d) for bdb" msgstr "Ustøttet versjon av filsystemlaster (%d) for bdb" @@ -3300,182 +3317,174 @@ msgid "Unsupported FS loader version (%d) for fsfs" msgstr "Ustøttet versjon av filsystemlaster (%d) for fsfs" -#: libsvn_fs_fs/fs_fs.c:363 libsvn_fs_fs/fs_fs.c:377 +#: libsvn_fs_fs/fs_fs.c:364 libsvn_fs_fs/fs_fs.c:378 msgid "Found malformed header in revision file" msgstr "Fant misformet hodefelt i revisjonsfil" -#: libsvn_fs_fs/fs_fs.c:479 libsvn_fs_fs/fs_fs.c:493 libsvn_fs_fs/fs_fs.c:500 -#: libsvn_fs_fs/fs_fs.c:507 libsvn_fs_fs/fs_fs.c:515 libsvn_fs_fs/fs_fs.c:523 +#: libsvn_fs_fs/fs_fs.c:480 libsvn_fs_fs/fs_fs.c:494 libsvn_fs_fs/fs_fs.c:501 +#: libsvn_fs_fs/fs_fs.c:508 libsvn_fs_fs/fs_fs.c:516 libsvn_fs_fs/fs_fs.c:524 msgid "Malformed text rep offset line in node-rev" msgstr "Misformet angivelse i node-rev av tekstrepresentasjonens forskyving" -#: libsvn_fs_fs/fs_fs.c:592 +#: libsvn_fs_fs/fs_fs.c:593 msgid "Missing kind field in node-rev" msgstr "Mangler typefelt i node-rev" -#: libsvn_fs_fs/fs_fs.c:623 +#: libsvn_fs_fs/fs_fs.c:624 msgid "Missing cpath in node-rev" msgstr "Mangler cpath i node-rev" -#: libsvn_fs_fs/fs_fs.c:650 libsvn_fs_fs/fs_fs.c:656 +#: libsvn_fs_fs/fs_fs.c:651 libsvn_fs_fs/fs_fs.c:657 msgid "Malformed copyroot line in node-rev" msgstr "Misformet copyroot-linje i node-rev" -#: libsvn_fs_fs/fs_fs.c:674 libsvn_fs_fs/fs_fs.c:680 +#: libsvn_fs_fs/fs_fs.c:675 libsvn_fs_fs/fs_fs.c:681 msgid "Malformed copyfrom line in node-rev" msgstr "Misformet copyfrom-linje i node-rev" -#: libsvn_fs_fs/fs_fs.c:778 libsvn_fs_fs/fs_fs.c:3006 +#: libsvn_fs_fs/fs_fs.c:779 libsvn_fs_fs/fs_fs.c:3063 msgid "Attempted to write to non-transaction" msgstr "Forsøk på å skrive til en ikke-transaksjon" -#: libsvn_fs_fs/fs_fs.c:862 +#: libsvn_fs_fs/fs_fs.c:863 msgid "Malformed representation header" msgstr "Ugyldig hodedata for representasjon" -#: libsvn_fs_fs/fs_fs.c:886 +#: libsvn_fs_fs/fs_fs.c:887 msgid "Missing node-id in node-rev" msgstr "Manglende node-id i node-rev" -#: libsvn_fs_fs/fs_fs.c:892 +#: libsvn_fs_fs/fs_fs.c:893 msgid "Corrupt node-id in node-rev" msgstr "Korrupt node-id i node-rev" -#: libsvn_fs_fs/fs_fs.c:937 +#: libsvn_fs_fs/fs_fs.c:938 msgid "Revision file lacks trailing newline" msgstr "Revisjonsfil mangler avsluttende linjeskift" -#: libsvn_fs_fs/fs_fs.c:949 +#: libsvn_fs_fs/fs_fs.c:950 msgid "Final line in revision file longer than 64 characters" msgstr "Siste linje i revisjonsfil er lengre enn 64 tegn" -#: libsvn_fs_fs/fs_fs.c:962 +#: libsvn_fs_fs/fs_fs.c:963 msgid "Final line in revision file missing space" msgstr "Siste linje i revisjonsfil mangler mellomrom" -#: libsvn_fs_fs/fs_fs.c:992 +#: libsvn_fs_fs/fs_fs.c:993 #, c-format msgid "Can't chmod '%s'" msgstr "Kan ikke endre filrettigheter på «%s»" -#: libsvn_fs_fs/fs_fs.c:1050 libsvn_fs_fs/fs_fs.c:1107 libsvn_repos/log.c:239 +#: libsvn_fs_fs/fs_fs.c:1051 libsvn_fs_fs/fs_fs.c:1108 libsvn_repos/log.c:239 #: libsvn_repos/log.c:243 #, c-format msgid "No such revision %ld" msgstr "Ingen slik revisjon %ld" -#: libsvn_fs_fs/fs_fs.c:1182 +#: libsvn_fs_fs/fs_fs.c:1183 msgid "Malformed svndiff data in representation" msgstr "Misformet svndiff-data i fremstillingen" -#: libsvn_fs_fs/fs_fs.c:1298 libsvn_fs_fs/fs_fs.c:1318 -#: libsvn_fs_fs/fs_fs.c:1331 +#: libsvn_fs_fs/fs_fs.c:1294 libsvn_fs_fs/fs_fs.c:1307 +#: libsvn_fs_fs/fs_fs.c:1338 msgid "Reading one svndiff window read beyond the end of the representation" msgstr "" "Lesing av et svndiff-vindu førte til lesing forbi slutten av fremstillingen" -#: libsvn_fs_fs/fs_fs.c:1420 +#: libsvn_fs_fs/fs_fs.c:1451 msgid "svndiff data requested non-existent source" msgstr "svndiff-data forespurte ikke-eksisterende kilde" -#: libsvn_fs_fs/fs_fs.c:1426 +#: libsvn_fs_fs/fs_fs.c:1457 msgid "svndiff requested position beyond end of stream" msgstr "svndiff forespurte posisjon forbi slutten av datastrømmen" -#: libsvn_fs_fs/fs_fs.c:1448 +#: libsvn_fs_fs/fs_fs.c:1480 libsvn_fs_fs/fs_fs.c:1497 msgid "svndiff window length is corrupt" msgstr "Korrupt vindulengde for svndiff" -#: libsvn_fs_fs/fs_fs.c:1623 libsvn_fs_fs/fs_fs.c:1636 -#: libsvn_fs_fs/fs_fs.c:1642 +#: libsvn_fs_fs/fs_fs.c:1680 libsvn_fs_fs/fs_fs.c:1693 +#: libsvn_fs_fs/fs_fs.c:1699 msgid "Directory entry corrupt" msgstr "Kataloginnslag er korrupt" -#: libsvn_fs_fs/fs_fs.c:1809 +#: libsvn_fs_fs/fs_fs.c:1866 msgid "Missing required node revision ID" msgstr "Mangler påkrevet noderevisjonsidentifikator" -#: libsvn_fs_fs/fs_fs.c:1819 +#: libsvn_fs_fs/fs_fs.c:1876 msgid "Invalid change ordering: new node revision ID without delete" msgstr "Ugyldig endringsrekkefølge: Ny node-revisjons-ID uten sletting" -#: libsvn_fs_fs/fs_fs.c:1830 +#: libsvn_fs_fs/fs_fs.c:1887 msgid "Invalid change ordering: non-add change on deleted path" msgstr "" "Ugyldig endringsrekkefølge: Annen endring enn tillegg på slettet filsti" -#: libsvn_fs_fs/fs_fs.c:1975 libsvn_fs_fs/fs_fs.c:1983 -#: libsvn_fs_fs/fs_fs.c:2015 libsvn_fs_fs/fs_fs.c:2035 -#: libsvn_fs_fs/fs_fs.c:2069 libsvn_fs_fs/fs_fs.c:2074 +#: libsvn_fs_fs/fs_fs.c:2032 libsvn_fs_fs/fs_fs.c:2040 +#: libsvn_fs_fs/fs_fs.c:2072 libsvn_fs_fs/fs_fs.c:2092 +#: libsvn_fs_fs/fs_fs.c:2126 libsvn_fs_fs/fs_fs.c:2131 msgid "Invalid changes line in rev-file" msgstr "Ugyldig endringslinje i rev-file" -#: libsvn_fs_fs/fs_fs.c:2008 +#: libsvn_fs_fs/fs_fs.c:2065 msgid "Invalid change kind in rev file" msgstr "Ugyldig type endring i revisjonsfil" -#: libsvn_fs_fs/fs_fs.c:2028 +#: libsvn_fs_fs/fs_fs.c:2085 msgid "Invalid text-mod flag in rev-file" msgstr "Ugyldig text-mod-merke i rev-file" -#: libsvn_fs_fs/fs_fs.c:2048 +#: libsvn_fs_fs/fs_fs.c:2105 msgid "Invalid prop-mod flag in rev-file" msgstr "Ugyldig prop-mod-merke i rev-file" -#: libsvn_fs_fs/fs_fs.c:2231 +#: libsvn_fs_fs/fs_fs.c:2288 msgid "Copying from transactions not allowed" msgstr "Kopiering fra transaksjoner er ikke tillatt" -#: libsvn_fs_fs/fs_fs.c:2476 libsvn_fs_fs/fs_fs.c:2483 +#: libsvn_fs_fs/fs_fs.c:2533 libsvn_fs_fs/fs_fs.c:2540 msgid "next-id file corrupt" msgstr "next-id-fil er korrupt" -#: libsvn_fs_fs/fs_fs.c:2709 +#: libsvn_fs_fs/fs_fs.c:2766 msgid "Invalid change type" msgstr "Ugyldig endringstype" -#: libsvn_fs_fs/fs_fs.c:3025 +#: libsvn_fs_fs/fs_fs.c:3082 msgid "Can't set text contents of a directory" msgstr "Kan ikke sette tekstinnholdet til en katalog" -#: libsvn_fs_fs/fs_fs.c:3115 libsvn_fs_fs/fs_fs.c:3120 -#: libsvn_fs_fs/fs_fs.c:3127 +#: libsvn_fs_fs/fs_fs.c:3172 libsvn_fs_fs/fs_fs.c:3177 +#: libsvn_fs_fs/fs_fs.c:3184 msgid "Corrupt current file" msgstr "Gjeldende fil er korrupt" -#: libsvn_fs_fs/fs_fs.c:3495 +#: libsvn_fs_fs/fs_fs.c:3552 msgid "Transaction out of date" msgstr "Transaksjonen er foreldet" -#: libsvn_fs_fs/fs_fs.c:3735 +#: libsvn_fs_fs/fs_fs.c:3792 msgid "No such transaction" msgstr "Ingen slik transaksjon" -#: libsvn_ra/ra_loader.c:232 +#: libsvn_ra/ra_loader.c:211 #, c-format msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s" msgstr "" "Usamsvarende RA-versjon for «%s»: Fant %d.%d.%d%s, forventet %d.%d.%d%s" -#: libsvn_ra/ra_loader.c:246 +#: libsvn_ra/ra_loader.c:261 #, c-format msgid "Unrecognized URL scheme for '%s'" msgstr "Ukjent URL-skjema for «%s»" -#: libsvn_ra/ra_loader.c:505 +#: libsvn_ra/ra_loader.c:519 #, c-format msgid " - handles '%s' schema\n" msgstr " - håndterer skjemaet «%s»\n" -#: libsvn_ra/ra_loader.c:574 -#, c-format -msgid "" -"Mismatched RA plugin version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s" -msgstr "" -"Usamsvarende RA-programtilleggsversjon for «%s»: Fant %d.%d.%d%s, forventet %" -"d.%d.%d%s" - -#: libsvn_ra/ra_loader.c:590 +#: libsvn_ra/ra_loader.c:604 #, c-format msgid "Unrecognized URL scheme '%s'" msgstr "Adresseskjemaet «%s» er ukjent" @@ -3521,7 +3530,7 @@ msgid "Error writing to stream: unexpected EOF" msgstr "Feil under skriving til strøm, forventet EOF" -#: libsvn_ra_dav/fetch.c:830 libsvn_ra_svn/client.c:872 +#: libsvn_ra_dav/fetch.c:830 libsvn_ra_svn/client.c:873 #, c-format msgid "" "Checksum mismatch for '%s':\n" @@ -3721,7 +3730,7 @@ msgid "Please upgrade the server to 0.19 or later" msgstr "Oppgrader tjeneren til versjon 0.19 eller senere" -#: libsvn_ra_dav/session.c:896 +#: libsvn_ra_dav/session.c:898 #, c-format msgid "Unsupported RA loader version (%d) for ra_dav" msgstr "Ustøttet versjon av RA-laster (%d) for ra_dav" @@ -3764,7 +3773,7 @@ msgid "%s request failed on '%s'" msgstr "Forespørselen %s feilet på «%s»" -#: libsvn_ra_local/ra_plugin.c:101 libsvn_ra_local/ra_plugin.c:478 +#: libsvn_ra_local/ra_plugin.c:101 libsvn_ra_local/ra_plugin.c:477 #, c-format msgid "" "'%s'\n" @@ -3781,11 +3790,11 @@ msgid "Module for accessing a repository on local disk." msgstr "Modul for tilgang til et depot på lokal disk" -#: libsvn_ra_local/ra_plugin.c:248 +#: libsvn_ra_local/ra_plugin.c:247 msgid "Unable to open an ra_local session to URL" msgstr "Klarer ikke åpne en ra_local-økt til URL" -#: libsvn_ra_local/ra_plugin.c:990 +#: libsvn_ra_local/ra_plugin.c:989 #, c-format msgid "Unsupported RA loader version (%d) for ra_local" msgstr "Ustøttet versjon av RA-laster (%d) for ra_local" @@ -3851,65 +3860,65 @@ msgid "Cannot negotiate authentication mechanism" msgstr "Kan ikke utveksle autentiseringsmekanisme" -#: libsvn_ra_svn/client.c:453 +#: libsvn_ra_svn/client.c:454 #, c-format msgid "Undefined tunnel scheme '%s'" msgstr "Udefinert tunnelskjema «%s»" -#: libsvn_ra_svn/client.c:470 +#: libsvn_ra_svn/client.c:471 #, c-format msgid "Tunnel scheme %s requires environment variable %s to be defined" msgstr "Tunnelskjema %s krever at miljøvariabelen %s er definert" -#: libsvn_ra_svn/client.c:481 +#: libsvn_ra_svn/client.c:482 #, c-format msgid "Can't tokenize command '%s'" msgstr "Kan ikke dele opp kommandoen «%s»" -#: libsvn_ra_svn/client.c:510 +#: libsvn_ra_svn/client.c:511 #, c-format msgid "Error in child process: %s" msgstr "Feil i barneprosess: %s" -#: libsvn_ra_svn/client.c:533 +#: libsvn_ra_svn/client.c:534 msgid "Can't create tunnel" msgstr "Kan ikke opprette tunnel" -#: libsvn_ra_svn/client.c:562 +#: libsvn_ra_svn/client.c:563 msgid "Module for accessing a repository using the svn network protocol." msgstr "Modul for tilgang til depot ved bruk av svn-nettverksprotokollen." -#: libsvn_ra_svn/client.c:595 +#: libsvn_ra_svn/client.c:596 #, c-format msgid "Illegal svn repository URL '%s'" msgstr "Ulovlig svn-depotURL «%s»" -#: libsvn_ra_svn/client.c:614 +#: libsvn_ra_svn/client.c:615 #, c-format msgid "Server requires minimum version %d" msgstr "Tjeneren krever minst versjon %d" -#: libsvn_ra_svn/client.c:664 +#: libsvn_ra_svn/client.c:665 msgid "Impossibly long repository root from server" msgstr "Umulig lang depotrot fra tjener" -#: libsvn_ra_svn/client.c:731 +#: libsvn_ra_svn/client.c:732 msgid "Server did not send repository root" msgstr "Tjeneren sendte ikke rot av depot" -#: libsvn_ra_svn/client.c:852 +#: libsvn_ra_svn/client.c:853 msgid "Non-string as part of file contents" msgstr "Ikke-streng som del av filinnhold" -#: libsvn_ra_svn/client.c:921 +#: libsvn_ra_svn/client.c:922 msgid "Dirlist element not a list" msgstr "Element i katalogliste er ikke en liste" -#: libsvn_ra_svn/client.c:1077 +#: libsvn_ra_svn/client.c:1078 msgid "Log entry not a list" msgstr "Loggpost er ikke en liste" -#: libsvn_ra_svn/client.c:1090 +#: libsvn_ra_svn/client.c:1091 msgid "Changed-path entry not a list" msgstr "Post med stiforandring er ikke en liste" @@ -3937,7 +3946,7 @@ msgid "The get-file-revs command didn't return any revisions" msgstr "«get-file-revs»-kommandoen returnerte ingen revisjoner" -#: libsvn_ra_svn/client.c:1356 +#: libsvn_ra_svn/client.c:1358 #, c-format msgid "Unsupported RA loader version (%d) for ra_svn" msgstr "Ustøttet versjon av RA-laster (%d) for ra_svn" @@ -4069,10 +4078,15 @@ msgid "End revision %ld is invalid (youngest revision is %ld)" msgstr "Sluttrevisjon %ld er ugyldig (yngste revisjon er %ld)" -#: libsvn_repos/dump.c:1044 +#: libsvn_repos/dump.c:1045 +#, c-format +msgid "* Dumped revision %ld.\n" +msgstr "* Dumpet revisjon %ld.\n" + +#: libsvn_repos/dump.c:1046 #, c-format -msgid "* %s revision %ld.\n" -msgstr "* %s revisjon %ld.\n" +msgid "* Verified revision %ld.\n" +msgstr "* Kontrollerte revisjon %ld.\n" #: libsvn_repos/fs-wrap.c:56 libsvn_repos/load.c:1218 msgid "Commit succeeded, but post-commit hook failed" @@ -4198,11 +4212,35 @@ msgid "Malformed dumpstream: Revision 0 must not contain node records" msgstr "Misdannet dumpstrøm: Revisjon 0 kan ikke inneholde nodeposter" +#: libsvn_repos/load.c:995 +#, c-format +msgid " * editing path : %s ..." +msgstr " * redigererer sti : %s ..." + +#: libsvn_repos/load.c:1002 +#, c-format +msgid " * deleting path : %s ..." +msgstr " * sletter sti : %s ..." + +#: libsvn_repos/load.c:1010 +#, c-format +msgid " * adding path : %s ..." +msgstr " * legger til sti : %s ..." + +#: libsvn_repos/load.c:1019 +#, c-format +msgid " * replacing path : %s ..." +msgstr " * erstatter sti : %s ..." + #: libsvn_repos/load.c:1029 #, c-format msgid "Unrecognized node-action on node '%s'" msgstr "Ukjent nodehendelse i node «%s»" +#: libsvn_repos/load.c:1165 +msgid " done.\n" +msgstr " ferdig.\n" + #: libsvn_repos/load.c:1240 #, c-format msgid "" @@ -4353,6 +4391,11 @@ msgid "Unreadable path encountered; access denied." msgstr "Uleselig sti funnet; tilgang nektes." +#: libsvn_repos/rev_hunt.c:540 +#, c-format +msgid "'%s' is not a file" +msgstr "«%s» er ikke en fil" + #: libsvn_subr/config.c:632 #, c-format msgid "Config error: invalid boolean value '%s'" @@ -4468,154 +4511,154 @@ msgid "Destination '%s' already exists" msgstr "Målet «%s» finnes allerede" -#: libsvn_subr/io.c:740 libsvn_subr/io.c:1500 libsvn_subr/io.c:1569 +#: libsvn_subr/io.c:730 libsvn_subr/io.c:1490 libsvn_subr/io.c:1559 #, c-format msgid "Can't read directory '%s'" msgstr "Kan ikke lese katalogen «%s»" -#: libsvn_subr/io.c:745 libsvn_subr/io.c:1505 libsvn_subr/io.c:1574 -#: libsvn_subr/io.c:2461 +#: libsvn_subr/io.c:735 libsvn_subr/io.c:1495 libsvn_subr/io.c:1564 +#: libsvn_subr/io.c:2463 #, c-format msgid "Error closing directory '%s'" msgstr "Feil under lukking av katalogen «%s»" -#: libsvn_subr/io.c:771 +#: libsvn_subr/io.c:761 #, c-format msgid "Can't make directory '%s'" msgstr "Kan ikke opprette katalogen «%s»" -#: libsvn_subr/io.c:839 +#: libsvn_subr/io.c:829 #, c-format msgid "Can't set access time of '%s'" msgstr "Kan ikke sette aksesstid for «%s»" -#: libsvn_subr/io.c:955 +#: libsvn_subr/io.c:945 #, c-format msgid "Can't set file '%s' read-only" msgstr "Kan ikke skrivebeskytte filen «%s»" -#: libsvn_subr/io.c:980 +#: libsvn_subr/io.c:970 #, c-format msgid "Can't set file '%s' read-write" msgstr "Kan ikke gjøre «%s» skrivbar" -#: libsvn_subr/io.c:1035 libsvn_subr/io.c:1079 libsvn_subr/io.c:1103 +#: libsvn_subr/io.c:1025 libsvn_subr/io.c:1069 libsvn_subr/io.c:1093 #, c-format msgid "Can't change executability of file '%s'" msgstr "Kan ikke forandre kjørbarhet for filen «%s»" -#: libsvn_subr/io.c:1130 +#: libsvn_subr/io.c:1120 msgid "Error getting UID of process" msgstr "Fant ikke bruker-ID for prosess" -#: libsvn_subr/io.c:1211 +#: libsvn_subr/io.c:1201 #, c-format msgid "Can't get shared lock on file '%s'" msgstr "Klarte ikke få delt lås på filen «%s»" -#: libsvn_subr/io.c:1215 +#: libsvn_subr/io.c:1205 #, c-format msgid "Can't get exclusive lock on file '%s'" msgstr "Klarte ikke få eksklusiv lås på filen «%s»" -#: libsvn_subr/io.c:1246 +#: libsvn_subr/io.c:1236 #, c-format msgid "Can't flush file '%s'" msgstr "Kan ikke tømme filen «%s»" -#: libsvn_subr/io.c:1247 +#: libsvn_subr/io.c:1237 msgid "Can't flush stream" msgstr "Kan ikke tømme strømmen" -#: libsvn_subr/io.c:1259 libsvn_subr/io.c:1276 +#: libsvn_subr/io.c:1249 libsvn_subr/io.c:1266 msgid "Can't flush file to disk" msgstr "Kan ikke tømme filen til disk" -#: libsvn_subr/io.c:1297 +#: libsvn_subr/io.c:1287 msgid "Reading from stdin is currently broken, so disabled" msgstr "" "Lesing fra standard inn virker ikke for øyeblikket, så det er koblet ut" -#: libsvn_subr/io.c:1318 +#: libsvn_subr/io.c:1308 msgid "Can't get file name" msgstr "Kan ikke få tak i filnavn" -#: libsvn_subr/io.c:1386 +#: libsvn_subr/io.c:1376 #, c-format msgid "Can't remove file '%s'" msgstr "Kan ikke fjerne filen «%s»" -#: libsvn_subr/io.c:1415 +#: libsvn_subr/io.c:1405 #, c-format msgid "Can't rewind directory '%s'" msgstr "Kan ikke spole tilbake katalogen «%s»" -#: libsvn_subr/io.c:1450 libsvn_subr/io.c:2310 libsvn_subr/io.c:2398 +#: libsvn_subr/io.c:1440 libsvn_subr/io.c:2312 libsvn_subr/io.c:2400 #, c-format msgid "Can't open directory '%s'" msgstr "Kan ikke åpne katalogen «%s»" -#: libsvn_subr/io.c:1489 libsvn_subr/io.c:1511 +#: libsvn_subr/io.c:1479 libsvn_subr/io.c:1501 #, c-format msgid "Can't remove '%s'" msgstr "Kan ikke fjerne «%s»" -#: libsvn_subr/io.c:1605 +#: libsvn_subr/io.c:1595 #, c-format msgid "Can't create process '%s' attributes" msgstr "Kan ikke opprette «%s»-attributter for prosess" -#: libsvn_subr/io.c:1611 +#: libsvn_subr/io.c:1601 #, c-format msgid "Can't set process '%s' cmdtype" msgstr "Kan ikke sette «%s»-kommandotype for prosess" -#: libsvn_subr/io.c:1623 +#: libsvn_subr/io.c:1613 #, c-format msgid "Can't set process '%s' directory" msgstr "Kan ikke sette prosessens «%s»-katalog" -#: libsvn_subr/io.c:1636 +#: libsvn_subr/io.c:1626 #, c-format msgid "Can't set process '%s' child input" msgstr "Kan ikke sette «%s»-inndata for barneprosess" -#: libsvn_subr/io.c:1643 +#: libsvn_subr/io.c:1633 #, c-format msgid "Can't set process '%s' child outfile" msgstr "Kan ikke sette «%s»-utfil for barneprosess" -#: libsvn_subr/io.c:1650 +#: libsvn_subr/io.c:1640 #, c-format msgid "Can't set process '%s' child errfile" msgstr "Kan ikke sette «%s»-feilfil for barneprosess" -#: libsvn_subr/io.c:1674 +#: libsvn_subr/io.c:1664 #, c-format msgid "Can't start process '%s'" msgstr "Kan ikke starte prosess «%s»" -#: libsvn_subr/io.c:1682 +#: libsvn_subr/io.c:1672 #, c-format msgid "Error waiting for process '%s'" msgstr "Feil under venting for prosess «%s»" -#: libsvn_subr/io.c:1690 +#: libsvn_subr/io.c:1680 #, c-format msgid "Process '%s' failed (exitwhy %d)" msgstr "Prosessen «%s» feilet (exitwhy %d)" -#: libsvn_subr/io.c:1697 +#: libsvn_subr/io.c:1687 #, c-format msgid "Process '%s' returned error exitcode %d" msgstr "Prosessen «%s» returnerte feilavslutningskoden %d" -#: libsvn_subr/io.c:1785 +#: libsvn_subr/io.c:1775 #, c-format msgid "'%s' returned %d" msgstr "«%s» returnerte %d" -#: libsvn_subr/io.c:1888 +#: libsvn_subr/io.c:1878 #, c-format msgid "" "Error running '%s': exitcode was %d, args were:\n" @@ -4630,116 +4673,125 @@ "%s\n" "%s" -#: libsvn_subr/io.c:1924 +#: libsvn_subr/io.c:1914 #, c-format msgid "Can't detect MIME type of non-file '%s'" msgstr "Kan ikke detektere MIME-type for ikke-fil «%s»" -#: libsvn_subr/io.c:1991 +#: libsvn_subr/io.c:1981 #, c-format msgid "Can't open file '%s'" msgstr "Kan ikke åpne filen «%s»" -#: libsvn_subr/io.c:2027 +#: libsvn_subr/io.c:2017 #, c-format msgid "Can't close file '%s'" msgstr "Kan ikke lukke filen «%s»" -#: libsvn_subr/io.c:2028 +#: libsvn_subr/io.c:2018 msgid "Can't close stream" msgstr "Kan ikke lukke strøm" -#: libsvn_subr/io.c:2038 libsvn_subr/io.c:2062 libsvn_subr/io.c:2075 +#: libsvn_subr/io.c:2028 libsvn_subr/io.c:2052 libsvn_subr/io.c:2065 #, c-format msgid "Can't read file '%s'" msgstr "Kan ikke lese filen «%s»" -#: libsvn_subr/io.c:2039 libsvn_subr/io.c:2063 libsvn_subr/io.c:2076 +#: libsvn_subr/io.c:2029 libsvn_subr/io.c:2053 libsvn_subr/io.c:2066 msgid "Can't read stream" msgstr "Kan ikke lese strøm" -#: libsvn_subr/io.c:2050 +#: libsvn_subr/io.c:2040 #, c-format msgid "Can't get attribute information from file '%s'" msgstr "Kan ikke få tak i attributtinformasjon fra filen «%s»" -#: libsvn_subr/io.c:2051 +#: libsvn_subr/io.c:2041 msgid "Can't get attribute information from stream" msgstr "Kan ikke få tak i attributtinformasjon fra strøm" -#: libsvn_subr/io.c:2087 +#: libsvn_subr/io.c:2077 #, c-format msgid "Can't set position pointer in file '%s'" msgstr "Kan ikke sette posisjonspeker i filen «%s»" -#: libsvn_subr/io.c:2088 +#: libsvn_subr/io.c:2078 msgid "Can't set position pointer in stream" msgstr "Kan ikke sette posisjonspeker i strøm" -#: libsvn_subr/io.c:2099 libsvn_subr/io.c:2112 +#: libsvn_subr/io.c:2089 libsvn_subr/io.c:2102 #, c-format msgid "Can't write to file '%s'" msgstr "Kan ikke skrive til filen «%s»" -#: libsvn_subr/io.c:2100 libsvn_subr/io.c:2113 +#: libsvn_subr/io.c:2090 libsvn_subr/io.c:2103 msgid "Can't write to stream" msgstr "Kan ikke skrive til strøm" -#: libsvn_subr/io.c:2186 +#: libsvn_subr/io.c:2143 +#, c-format +msgid "Can't read length line in file '%s'" +msgstr "Kan ikke lese lengdelinje i filen «%s»" + +#: libsvn_subr/io.c:2147 +msgid "Can't read length line in stream" +msgstr "Kan ikke lese lengdelinje i strøm" + +#: libsvn_subr/io.c:2188 #, c-format msgid "Can't move '%s' to '%s'" msgstr "Kan ikke flytte «%s» til «%s»" -#: libsvn_subr/io.c:2226 +#: libsvn_subr/io.c:2228 #, c-format msgid "Can't create directory '%s'" msgstr "Kan ikke opprette katalogen «%s»" -#: libsvn_subr/io.c:2237 +#: libsvn_subr/io.c:2239 #, c-format msgid "Can't hide directory '%s'" msgstr "Kan ikke skjule katalogen «%s»" -#: libsvn_subr/io.c:2250 +#: libsvn_subr/io.c:2252 #, c-format msgid "Can't stat directory '%s'" msgstr "Kan ikke lese status fra katalogen «%s»" -#: libsvn_subr/io.c:2266 +#: libsvn_subr/io.c:2268 #, c-format msgid "Can't stat new directory '%s'" msgstr "Kan ikke lese status fra den nye katalogen «%s»" -#: libsvn_subr/io.c:2328 +#: libsvn_subr/io.c:2330 #, c-format msgid "Can't remove directory '%s'" msgstr "Kan ikke fjerne katalogen «%s»" -#: libsvn_subr/io.c:2346 +#: libsvn_subr/io.c:2348 msgid "Can't read directory" msgstr "Kan ikke lese katalog" -#: libsvn_subr/io.c:2417 +#: libsvn_subr/io.c:2419 #, c-format msgid "Can't read directory entry in '%s'" msgstr "Kan ikke lese katalogpost i «%s»" -#: libsvn_subr/io.c:2542 +#: libsvn_subr/io.c:2544 #, c-format msgid "Can't check directory '%s'" msgstr "Kan ikke sjekke katalogen «%s»" -#: libsvn_subr/io.c:2564 +#: libsvn_subr/io.c:2566 #, c-format msgid "Version %d is not non-negative" msgstr "Versjon %d er ikke ikke-negativ" -#: libsvn_subr/io.c:2611 +#: libsvn_subr/io.c:2613 #, c-format msgid "Reading '%s'" msgstr "Leser «%s»" -#: libsvn_subr/io.c:2627 +#: libsvn_subr/io.c:2629 #, c-format msgid "First line of '%s' contains non-digit" msgstr "Første linje av «%s» inneholder ikke-siffer" @@ -4880,27 +4932,20 @@ #: libsvn_subr/utf.c:493 #, c-format msgid "" -"Safe data:\n" -"\"%s\"\n" -"... was followed by non-ASCII byte %d.\n" -"\n" -"Non-ASCII character detected (see above), and unable to convert to/from UTF-8" +"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from " +"UTF-8" msgstr "" -"Trygge data:\n" -"\"%s\"\n" -"... ble etterfulgt av ikke-ASCII-byte %d.\n" -"\n" -"Ikke-ASCII-tegn funnet (se ovenfor), og klarer ikke å konvertere til/fra UTF-" -"8" +"Trygge data «%s» ble etterfulgt av ikke-ASCII-byte %d: Klarer ikke å " +"konvertere til/fra UTF-8" -#: libsvn_subr/utf.c:505 +#: libsvn_subr/utf.c:501 #, c-format msgid "" "Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8" msgstr "" "Ikke-ASCII-tegn (kode %d) funnet, og klarer ikke å konvertere til/fra UTF-8" -#: libsvn_subr/utf.c:547 +#: libsvn_subr/utf.c:543 #, c-format msgid "" "Valid UTF-8 data\n" @@ -4973,8 +5018,8 @@ "Din .svn/tmp-katalog mangler kanskje eller er ødelagt. Kjør «svn cleanup» " "og prøv igjen" -#: libsvn_wc/adm_files.c:622 libsvn_wc/adm_files.c:698 libsvn_wc/lock.c:375 -#: libsvn_wc/lock.c:595 +#: libsvn_wc/adm_files.c:622 libsvn_wc/adm_files.c:698 libsvn_wc/lock.c:377 +#: libsvn_wc/lock.c:630 #, c-format msgid "'%s' is not a working copy" msgstr "«%s» er ikke en arbeidskopi" @@ -5009,8 +5054,8 @@ msgid "Unrecognized node kind: '%s'" msgstr "Ukjent nodetype: «%s»" -#: libsvn_wc/adm_ops.c:378 libsvn_wc/update_editor.c:917 -#: libsvn_wc/update_editor.c:1307 +#: libsvn_wc/adm_ops.c:378 libsvn_wc/update_editor.c:918 +#: libsvn_wc/update_editor.c:1308 #, c-format msgid "Error writing log file for '%s'" msgstr "Feil under skriving av loggfil for «%s»" @@ -5050,37 +5095,37 @@ msgid "Can't add '%s' to a parent directory scheduled for deletion" msgstr "Kan ikke legge til «%s» når foreldrekatalogen er klarert for sletting" -#: libsvn_wc/adm_ops.c:1214 libsvn_wc/adm_ops.c:1219 libsvn_wc/adm_ops.c:1255 +#: libsvn_wc/adm_ops.c:1215 libsvn_wc/adm_ops.c:1220 libsvn_wc/adm_ops.c:1256 #, c-format msgid "Error restoring props for '%s'" msgstr "Feil ved gjenoppretting av egenskaper for «%s»" -#: libsvn_wc/adm_ops.c:1229 +#: libsvn_wc/adm_ops.c:1230 #, c-format msgid "Error removing props for '%s'" msgstr "Feil ved sletting av egenskaper for «%s»" -#: libsvn_wc/adm_ops.c:1301 +#: libsvn_wc/adm_ops.c:1302 #, c-format msgid "Error restoring text for '%s'" msgstr "Feil ved gjenoppretting av tekst for «%s»" -#: libsvn_wc/adm_ops.c:1402 +#: libsvn_wc/adm_ops.c:1403 #, c-format msgid "Cannot revert: '%s' is not under version control" msgstr "Kan ikke tilbakestille: «%s» er ikke under versjonskontroll" -#: libsvn_wc/adm_ops.c:1434 +#: libsvn_wc/adm_ops.c:1435 #, c-format msgid "Cannot revert '%s': unsupported entry node kind" msgstr "Kan ikke tilbakestille «%s»: Nodetypen er ikke støttet" -#: libsvn_wc/adm_ops.c:1445 +#: libsvn_wc/adm_ops.c:1446 #, c-format msgid "Cannot revert '%s': unsupported node kind in working copy" msgstr "Kan ikke tilbakestille «%s»: Nodetypen i arbeidskopien er ikke støttet" -#: libsvn_wc/adm_ops.c:1493 +#: libsvn_wc/adm_ops.c:1494 msgid "" "Cannot revert addition of current directory; please try again from the " "parent directory" @@ -5088,12 +5133,12 @@ "Kan ikke tilbakestille tillegging av gjeldende katalog. Prøv igjen med " "foreldrekatalogen" -#: libsvn_wc/adm_ops.c:1515 +#: libsvn_wc/adm_ops.c:1516 #, c-format msgid "Unknown or unexpected kind for path '%s'" msgstr "Ukjent eller uventet type av filstien «%s»:" -#: libsvn_wc/adm_ops.c:1701 +#: libsvn_wc/adm_ops.c:1702 #, c-format msgid "File '%s' has local modifications" msgstr "Filen «%s» har lokale endringer" @@ -5269,48 +5314,48 @@ msgid "No such entry: '%s'" msgstr "Ingen slik oppføring: «%s»" -#: libsvn_wc/entries.c:1745 +#: libsvn_wc/entries.c:1747 #, c-format msgid "Directory '%s' has no THIS_DIR entry" msgstr "Katalogen «%s» har ingen THIS_DIR-oppføring" -#: libsvn_wc/entries.c:1814 +#: libsvn_wc/entries.c:1836 #, c-format msgid "'%s' has an unrecognized node kind" msgstr "«%s» har en ukjent nodetype" -#: libsvn_wc/entries.c:1850 +#: libsvn_wc/entries.c:1872 #, c-format msgid "Unexpectedly found '%s': path is marked 'missing'" msgstr "Fant «%s» uventet: Filstien er merket som savnet" -#: libsvn_wc/lock.c:158 libsvn_wc/lock.c:357 +#: libsvn_wc/lock.c:158 libsvn_wc/lock.c:359 #, c-format msgid "Working copy '%s' locked" msgstr "Arbeidskopien «%s» er låst" -#: libsvn_wc/lock.c:279 libsvn_wc/lock.c:768 +#: libsvn_wc/lock.c:279 libsvn_wc/lock.c:820 #, c-format msgid "Path '%s' ends in '%s', which is unsupported for this operation" msgstr "" "Filstien «%s» slutter på «%s» som ikke er støttet til denne operasjonen" -#: libsvn_wc/lock.c:643 +#: libsvn_wc/lock.c:678 #, c-format msgid "Working copy '%s' is missing or not locked" msgstr "Arbeidskopien «%s» mangler eller er ikke låst" -#: libsvn_wc/lock.c:1030 +#: libsvn_wc/lock.c:1085 #, c-format msgid "Write-lock stolen in '%s'" msgstr "Skrivelåsen er stjålet i «%s»" -#: libsvn_wc/lock.c:1038 +#: libsvn_wc/lock.c:1093 #, c-format msgid "No write-lock in '%s'" msgstr "Ingen skrivelås i «%s»" -#: libsvn_wc/lock.c:1060 +#: libsvn_wc/lock.c:1115 #, c-format msgid "Lock file '%s' is not a regular file" msgstr "Låsfilen «%s» er ikke en vanlig fil" @@ -5394,38 +5439,38 @@ msgid "Error replacing text-base of '%s'" msgstr "Feil under bytting av tekstbasen for «%s»" -#: libsvn_wc/log.c:1088 libsvn_wc/log.c:1136 +#: libsvn_wc/log.c:1088 libsvn_wc/log.c:1137 #, c-format msgid "Error modifying entry of '%s'" msgstr "Feil under endring av oppføringen på «%s»" -#: libsvn_wc/log.c:1195 +#: libsvn_wc/log.c:1196 #, c-format msgid "Log entry missing 'name' attribute (entry '%s' for directory '%s')" msgstr "" "Loggoppføringen mangler attributten «name» (oppføring «%s» for katalogen «%" "s»)" -#: libsvn_wc/log.c:1251 +#: libsvn_wc/log.c:1252 #, c-format msgid "Unrecognized logfile element '%s' in '%s'" msgstr "Ukjent element i loggfilen, «%s» i «%s»" -#: libsvn_wc/log.c:1262 +#: libsvn_wc/log.c:1263 #, c-format msgid "Error processing command '%s' in '%s'" msgstr "Feil under behandling av kommandoen «%s» i «%s»" -#: libsvn_wc/log.c:1384 +#: libsvn_wc/log.c:1385 msgid "Couldn't open log" msgstr "Kunne ikke åpne loggen" -#: libsvn_wc/log.c:1395 +#: libsvn_wc/log.c:1396 #, c-format msgid "Error reading administrative log file in '%s'" msgstr "Feil under lesing av administrativ loggfil i «%s»" -#: libsvn_wc/log.c:1489 +#: libsvn_wc/log.c:1490 #, c-format msgid "'%s' is not a working copy directory" msgstr "«%s» er ikke en katalog i en arbeidskopi" @@ -5468,7 +5513,7 @@ msgid "Can't find entry '%s' in '%s'" msgstr "Finner ikke oppføringen «%s» i «%s»" -#: libsvn_wc/props.c:318 libsvn_wc/update_editor.c:2276 +#: libsvn_wc/props.c:318 libsvn_wc/update_editor.c:2277 #, c-format msgid "Error writing log for '%s'" msgstr "Feil under skriving av loggfil for «%s»" @@ -5565,19 +5610,19 @@ msgid "No '.' entry in: '%s'" msgstr "Ingen «.»-oppføring i: «%s»" -#: libsvn_wc/update_editor.c:834 +#: libsvn_wc/update_editor.c:835 #, c-format msgid "Won't delete locally modified directory '%s'" msgstr "Den lokalt endrede katalogen «%s» blir ikke slettet" -#: libsvn_wc/update_editor.c:1024 +#: libsvn_wc/update_editor.c:1025 #, c-format msgid "Failed to add directory '%s': object of the same name already exists" msgstr "" "Kunne ikke legge til katalogen «%s»: En oppføring med samme navn finnes " "allerede" -#: libsvn_wc/update_editor.c:1032 +#: libsvn_wc/update_editor.c:1033 #, c-format msgid "" "Failed to add directory '%s': object of the same name as the administrative " @@ -5586,14 +5631,14 @@ "Kunne ikke legge til katalogen «%s»: Oppføring med det samme navnet som den " "administrative katalogen" -#: libsvn_wc/update_editor.c:1046 +#: libsvn_wc/update_editor.c:1047 #, c-format msgid "Failed to add directory '%s': copyfrom arguments not yet supported" msgstr "" "Kunne ikke legge til katalogen «%s»: «copyfrom»-argumenter er foreløpig ikke " "støttet" -#: libsvn_wc/update_editor.c:1067 +#: libsvn_wc/update_editor.c:1068 #, c-format msgid "" "Failed to add directory '%s': object of the same name is already scheduled " @@ -5602,11 +5647,11 @@ "Kunne ikke legge til katalogen «%s»: En oppføring med samme navn er allerede " "forberedt for å bli lagt til" -#: libsvn_wc/update_editor.c:1276 +#: libsvn_wc/update_editor.c:1277 msgid "Couldn't do property merge" msgstr "Kunne ikke flette sammen egenskaper" -#: libsvn_wc/update_editor.c:1369 +#: libsvn_wc/update_editor.c:1370 #, c-format msgid "" "Failed to mark '%s' absent: item of the same name is already scheduled for " @@ -5615,13 +5660,13 @@ "Kunne ikke merke «%s» som fraværende: Oppføring med samme navn er allerede " "forberedt for å bli lagt til" -#: libsvn_wc/update_editor.c:1461 +#: libsvn_wc/update_editor.c:1462 #, c-format msgid "Failed to add file '%s': object of the same name already exists" msgstr "" "Kunne ikke legge til filen «%s»: En oppføring med samme navn finnes allerede" -#: libsvn_wc/update_editor.c:1482 +#: libsvn_wc/update_editor.c:1483 #, c-format msgid "" "Failed to add file '%s': object of the same name is already scheduled for " @@ -5630,21 +5675,21 @@ "Kunne ikke legge til filen «%s»: En oppføring med samme navn er allerede " "forberedt for å bli lagt til" -#: libsvn_wc/update_editor.c:1490 +#: libsvn_wc/update_editor.c:1491 #, c-format msgid "File '%s' in directory '%s' is not a versioned resource" msgstr "Filen «%s» i katalogen «%s» er ikke en versjonert ressurs" -#: libsvn_wc/update_editor.c:1611 +#: libsvn_wc/update_editor.c:1612 #, c-format msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'" msgstr "Feil kontrollsum for «%s». Lagret: «%s», gjeldende: «%s»" -#: libsvn_wc/update_editor.c:1907 +#: libsvn_wc/update_editor.c:1908 msgid "Move failed" msgstr "Flytting feilet" -#: libsvn_wc/update_editor.c:2752 +#: libsvn_wc/update_editor.c:2754 #, c-format msgid "'%s' has no ancestry information" msgstr "«%s» mangler informasjon om opprinnelse" @@ -5667,7 +5712,7 @@ msgstr "«%s» er en nettadresse men skulle vært en filsti" #: svnadmin/main.c:230 svndumpfilter/main.c:761 svnlook/main.c:95 -#: svnserve/main.c:111 svnversion/main.c:200 +#: svnserve/main.c:111 svnversion/main.c:212 msgid "show version information" msgstr "vis versjonsinformasjon" @@ -5927,6 +5972,15 @@ "\n" "Kontrollerer data lagret i depotet.\n" +#: svnadmin/main.c:435 +msgid "Invalid revision specifier" +msgstr "Ugyldig revisjonsspesifikator" + +#: svnadmin/main.c:440 +#, c-format +msgid "Revisions must not be greater than the youngest revision (%ld)" +msgstr "Revisjoner kan ikke være større enn den yngste revisjonen (%ld)" + #: svnadmin/main.c:508 svnadmin/main.c:589 msgid "First revision cannot be higher than second" msgstr "Den første revisjonen kan ikke være høyere enn den andre" @@ -6002,7 +6056,7 @@ msgid "Exactly one file argument required" msgstr "Kun ett filargument behøves" -#: svnadmin/main.c:1178 svndumpfilter/main.c:1166 svnlook/main.c:1993 +#: svnadmin/main.c:1178 msgid "subcommand argument required\n" msgstr "Delkommandoen må ha et argument\n" @@ -6136,11 +6190,6 @@ msgid "Dropped %d node(s):\n" msgstr "Droppet %d node(r):\n" -#: svndumpfilter/main.c:1188 -#, c-format -msgid "unknown command: '%s'\n" -msgstr "ukjent kommando: «%s»\n" - #: svndumpfilter/main.c:1207 msgid "" "\n" @@ -6152,10 +6201,10 @@ #: svndumpfilter/main.c:1250 #, c-format msgid "" -"subcommand '%s' doesn't accept option '%s'\n" +"Subcommand '%s' doesn't accept option '%s'\n" "Type 'svndumpfilter help %s' for usage.\n" msgstr "" -"delkommandoen «%s» tar ikke argumentet «%s»\n" +"Delkommandoen «%s» tar ikke argumentet «%s»\n" "Skriv «svndumpfilter help %s» for bruk.\n" #: svnlook/main.c:98 @@ -6459,8 +6508,8 @@ "Argumentene «--transaction» (-t) og «--revision» (-r) kan ikke brukes sammen" #: svnlook/main.c:2049 -msgid "repository argument required\n" -msgstr "Det er påkrevet med argument for depot\n" +msgid "Repository argument required\n" +msgstr "Depot-argument påkrevd\n" #: svnlook/main.c:2058 #, c-format @@ -6470,7 +6519,7 @@ #: svnlook/main.c:2106 #, c-format msgid "" -"subcommand '%s' doesn't accept option '%s'\n" +"Subcommand '%s' doesn't accept option '%s'\n" "Type 'svnlook help %s' for usage.\n" msgstr "" "Delkommandoen «%s» tar ikke valget «%s»\n" @@ -6492,7 +6541,7 @@ msgid "run in foreground (useful for debugging)" msgstr "kjør i forgrunnen (nyttig for avlusing)" -#: svnserve/main.c:109 +#: svnserve/main.c:109 svnversion/main.c:211 msgid "display this help" msgstr "vis denne hjelpen" @@ -6580,7 +6629,15 @@ msgid "Can't bind server socket: %s\n" msgstr "Kan ikke binde tjenersokkel: %s\n" -#: svnversion/main.c:125 +#: svnversion/main.c:108 +msgid "Finished" +msgstr "Ferdig" + +#: svnversion/main.c:123 +msgid "Type 'svnversion --help' for usage.\n" +msgstr "Skriv «svnversion --help» for bruksanvisning.\n" + +#: svnversion/main.c:134 msgid "" "usage: svnversion [OPTIONS] WC_PATH [TRAIL_URL]\n" "\n" @@ -6634,20 +6691,20 @@ "\n" "Valg:\n" -#: svnversion/main.c:198 +#: svnversion/main.c:209 msgid "do not output the trailing newline" msgstr "ikke skriv ut avsluttende linjeskift" -#: svnversion/main.c:199 +#: svnversion/main.c:210 msgid "last changed rather than current revisions" msgstr "sist endrede i stedet for aktuelle revisjoner" -#: svnversion/main.c:286 +#: svnversion/main.c:301 #, c-format msgid "exported%s" msgstr "eksportert%s" -#: svnversion/main.c:295 +#: svnversion/main.c:310 #, c-format msgid "'%s' not versioned, and not exported\n" msgstr "«%s» er verken versjonert eller eksportert\n" Modified: branches/ruby/subversion/po/pl.po Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/po/pl.po?view=diff&rev=13186&p1=branches/ruby/subversion/po/pl.po&r1=13185&p2=branches/ruby/subversion/po/pl.po&r2=13186 ============================================================================== --- branches/ruby/subversion/po/pl.po (original) +++ branches/ruby/subversion/po/pl.po Sun Feb 27 19:19:25 2005 @@ -34,8 +34,8 @@ msgstr "" "Project-Id-Version: subversion 1.1.0\n" "Report-Msgid-Bugs-To: dev-lmwclWVctOZK/UuDQWWi7iCwEArCW2h5@xxxxxxxxxxxxxxxx\n" -"POT-Creation-Date: 2005-01-31 19:10+0100\n" -"PO-Revision-Date: 2005-01-31 23:52+0100\n" +"POT-Creation-Date: 2005-02-25 16:03+0100\n" +"PO-Revision-Date: 2005-02-25 16:07+0100\n" "Last-Translator: Subversion Developers <dev-lmwclWVctOZK/UuDQWWi7iCwEArCW2h5@xxxxxxxxxxxxxxxx>\n" "Language-Team: Polish <dev-lmwclWVctOZK/UuDQWWi7iCwEArCW2h5@xxxxxxxxxxxxxxxx>\n" "MIME-Version: 1.0\n" @@ -49,7 +49,7 @@ msgid "Skipping binary file: '%s'\n" msgstr "Pomijanie binarnego pliku: '%s'\n" -#: clients/cmdline/checkout-cmd.c:122 clients/cmdline/switch-cmd.c:125 +#: clients/cmdline/checkout-cmd.c:124 clients/cmdline/switch-cmd.c:125 #, c-format msgid "'%s' does not appear to be a URL" msgstr "'%s' nie wygląda na URL" @@ -68,7 +68,7 @@ "Listy plików do porównania nie mogą zawierać jednocześnie ścieżek\n" "z kopii roboczej i URLi" -#: clients/cmdline/export-cmd.c:81 +#: clients/cmdline/export-cmd.c:82 msgid "" "Destination directory exists; please remove the directory or use --force to " "overwrite" @@ -76,7 +76,7 @@ "Docelowy katalog już istnieje, usuń go lub podaj opcję --force by\n" "został nadpisany" -#: clients/cmdline/help-cmd.c:48 +#: clients/cmdline/help-cmd.c:46 #, c-format msgid "" "usage: svn <subcommand> [options] [args]\n" @@ -101,7 +101,7 @@ "\n" "Dostępne są następujące polecenia:\n" -#: clients/cmdline/help-cmd.c:59 +#: clients/cmdline/help-cmd.c:57 msgid "" "Subversion is a tool for version control.\n" "For additional information, see http://subversion.tigris.org/\n"; @@ -109,7 +109,7 @@ "Subversion jest narzędziem zarządzania wersjami.\n" "Szczegółowe informacje - patrz http://subversion.tigris.org/\n"; -#: clients/cmdline/help-cmd.c:66 +#: clients/cmdline/help-cmd.c:64 msgid "" "The following repository access (RA) modules are available:\n" "\n" @@ -130,133 +130,127 @@ msgid "Invalid URL '%s'" msgstr "Niewłaściwy URL '%s'" -#: clients/cmdline/info-cmd.c:58 +#: clients/cmdline/info-cmd.c:56 #, c-format msgid "Path: %s\n" msgstr "Ścieżka: %s\n" -#: clients/cmdline/info-cmd.c:66 svnlook/main.c:753 +#: clients/cmdline/info-cmd.c:62 svnlook/main.c:753 #, c-format msgid "Name: %s\n" msgstr "Nazwa: %s\n" -#: clients/cmdline/info-cmd.c:69 +#: clients/cmdline/info-cmd.c:66 #, c-format msgid "URL: %s\n" msgstr "URL: %s\n" -#: clients/cmdline/info-cmd.c:72 -#, c-format -msgid "Repository: %s\n" +#: clients/cmdline/info-cmd.c:69 +#, fuzzy, c-format +msgid "Repository Root: %s\n" msgstr "Repozytorium: %s\n" -#: clients/cmdline/info-cmd.c:75 +#: clients/cmdline/info-cmd.c:73 #, c-format msgid "Repository UUID: %s\n" msgstr "UUID repozytorium: %s\n" -#: clients/cmdline/info-cmd.c:79 +#: clients/cmdline/info-cmd.c:77 #, c-format msgid "Revision: %ld\n" msgstr "Wersja: %ld\n" -#: clients/cmdline/info-cmd.c:84 +#: clients/cmdline/info-cmd.c:82 msgid "Node Kind: file\n" msgstr "Rodzaj obiektu: plik\n" -#: clients/cmdline/info-cmd.c:94 +#: clients/cmdline/info-cmd.c:86 msgid "Node Kind: directory\n" msgstr "Rodzaj obiektu: katalog\n" -#: clients/cmdline/info-cmd.c:100 +#: clients/cmdline/info-cmd.c:90 msgid "Node Kind: none\n" msgstr "Rodzaj obiektu: brak\n" -#: clients/cmdline/info-cmd.c:105 +#: clients/cmdline/info-cmd.c:95 msgid "Node Kind: unknown\n" msgstr "Rodzaj obiektu: nieznany\n" -#: clients/cmdline/info-cmd.c:112 +#: clients/cmdline/info-cmd.c:104 msgid "Schedule: normal\n" msgstr "Zlecenie: normalne\n" -#: clients/cmdline/info-cmd.c:116 +#: clients/cmdline/info-cmd.c:108 msgid "Schedule: add\n" msgstr "Zlecenie: dodaj\n" -#: clients/cmdline/info-cmd.c:120 +#: clients/cmdline/info-cmd.c:112 msgid "Schedule: delete\n" msgstr "Zlecenie: skasuj\n" -#: clients/cmdline/info-cmd.c:124 +#: clients/cmdline/info-cmd.c:116 msgid "Schedule: replace\n" msgstr "Zlecenie: zastąp\n" -#: clients/cmdline/info-cmd.c:134 +#: clients/cmdline/info-cmd.c:124 #, c-format msgid "Copied From URL: %s\n" msgstr "Skopiowane z URL: %s\n" -#: clients/cmdline/info-cmd.c:138 +#: clients/cmdline/info-cmd.c:128 #, c-format msgid "Copied From Rev: %ld\n" msgstr "Skopiowane z wersji: %ld\n" -#: clients/cmdline/info-cmd.c:143 +#: clients/cmdline/info-cmd.c:133 #, c-format msgid "Last Changed Author: %s\n" msgstr "Autor ostatniej zmiany: %s\n" -#: clients/cmdline/info-cmd.c:147 +#: clients/cmdline/info-cmd.c:137 #, c-format msgid "Last Changed Rev: %ld\n" msgstr "Ostatnia zmiana w wersji: %ld\n" -#: clients/cmdline/info-cmd.c:152 +#: clients/cmdline/info-cmd.c:142 msgid "Last Changed Date" msgstr "Data ostatniej zmiany" -#: clients/cmdline/info-cmd.c:156 +#: clients/cmdline/info-cmd.c:148 msgid "Text Last Updated" msgstr "Treść ostatnio aktualizowana" -#: clients/cmdline/info-cmd.c:160 +#: clients/cmdline/info-cmd.c:152 msgid "Properties Last Updated" msgstr "Atrybuty ostatnio aktualizowane" -#: clients/cmdline/info-cmd.c:163 +#: clients/cmdline/info-cmd.c:155 #, c-format msgid "Checksum: %s\n" msgstr "Suma kontrolna: %s\n" -#: clients/cmdline/info-cmd.c:167 +#: clients/cmdline/info-cmd.c:160 #, c-format msgid "Conflict Previous Base File: %s\n" msgstr "Wersja bazowa pliku w chwili wystąpienia konfliktu: %s\n" -#: clients/cmdline/info-cmd.c:173 +#: clients/cmdline/info-cmd.c:166 #, c-format msgid "Conflict Previous Working File: %s\n" msgstr "Wersja robocza pliku w chwili wystąpienia konfliktu: %s\n" -#: clients/cmdline/info-cmd.c:177 +#: clients/cmdline/info-cmd.c:171 #, c-format msgid "Conflict Current Base File: %s\n" msgstr "" "Wersja bieżąca (repozytorium) pliku w chwili wystąpienia konfliktu: %s\n" -#: clients/cmdline/info-cmd.c:182 +#: clients/cmdline/info-cmd.c:176 #, c-format msgid "Conflict Properties File: %s\n" msgstr "Plik z opisem konfliktu atrybutów: %s\n" #: clients/cmdline/info-cmd.c:248 -msgid "'svn info' only works on working copy paths, not URLs" -msgstr "" -"'svn info' działa tylko na ścieżkach kopii roboczej, \n" -"a nie na URLach" - -#: clients/cmdline/info-cmd.c:260 #, c-format msgid "" "%s: (Not a versioned resource)\n" @@ -265,6 +259,15 @@ "%s: (nie podlega zarządzaniu wersjami)\n" "\n" +#: clients/cmdline/info-cmd.c:256 +#, fuzzy, c-format +msgid "" +"%s: (Not a valid URL)\n" +"\n" +msgstr "" +"%s: (nie podlega zarządzaniu wersjami)\n" +"\n" + #: clients/cmdline/log-cmd.c:194 msgid "(no author)" msgstr "(brak autora)" @@ -308,8 +311,8 @@ msgid "force validity of log message source" msgstr "wymuś uznanie opisu zmian za poprawny" -#: clients/cmdline/main.c:65 clients/cmdline/main.c:66 svnadmin/main.c:222 -#: svnadmin/main.c:225 svndumpfilter/main.c:755 svndumpfilter/main.c:758 +#: clients/cmdline/main.c:65 clients/cmdline/main.c:66 svnadmin/main.c:224 +#: svnadmin/main.c:227 svndumpfilter/main.c:755 svndumpfilter/main.c:758 #: svnlook/main.c:89 svnlook/main.c:92 msgid "show help on a subcommand" msgstr "wyświetl tekst pomocy dla polecenia" @@ -443,7 +446,7 @@ #: clients/cmdline/main.c:120 msgid "ignore externals definitions" -msgstr "" +msgstr "nie uwzględniaj zewnętrznych definicji" #: clients/cmdline/main.c:122 msgid "use ARG as diff command" @@ -473,7 +476,7 @@ msgid "relocate via URL-rewriting" msgstr "zmień URL repozytorium" -#: clients/cmdline/main.c:136 svnadmin/main.c:264 +#: clients/cmdline/main.c:136 svnadmin/main.c:266 msgid "read user configuration files from directory ARG" msgstr "pobierz konfigurację użytkownika z katalogu ARG" @@ -1425,13 +1428,13 @@ msgid "Caught signal" msgstr "Złapano sygnał" -#: clients/cmdline/main.c:853 svnadmin/main.c:1042 +#: clients/cmdline/main.c:853 svnadmin/main.c:1057 msgid "" "Multiple revision arguments encountered; try '-r M:N' instead of '-r M -r N'" msgstr "" "Wielokrotnie podano opcję numeru wersji; spróbuj '-r M:N' zamiast '-r M -r N'" -#: clients/cmdline/main.c:865 svnadmin/main.c:1059 +#: clients/cmdline/main.c:865 svnadmin/main.c:1074 #, c-format msgid "Syntax error in revision argument '%s'" msgstr "Błąd składniowy w numerze wersji '%s'" @@ -1449,7 +1452,7 @@ msgid "Subcommand argument required\n" msgstr "Polecenie wymaga podania parametru\n" -#: clients/cmdline/main.c:1100 svnadmin/main.c:1179 svnlook/main.c:2016 +#: clients/cmdline/main.c:1100 svnadmin/main.c:1200 svnlook/main.c:2016 #, c-format msgid "Unknown command: '%s'\n" msgstr "Nieznane polecenie: '%s'\n" @@ -1501,7 +1504,7 @@ msgid "Try 'svn add' or 'svn add --non-recursive' instead?" msgstr "Zamiast tego spróbuj wykonać 'svn add' lub 'svn add --non-recursive'." -#: clients/cmdline/move-cmd.c:69 libsvn_client/copy.c:1167 +#: clients/cmdline/move-cmd.c:69 libsvn_client/copy.c:1173 msgid "Cannot specify revisions (except HEAD) with move operations" msgstr "" "Nie można określić wersji (z wyjątkiem HEAD) dla operacji przeniesienia" @@ -1769,7 +1772,7 @@ msgid "property '%s' deleted from '%s'.\n" msgstr "atrybut '%s' usunięty z '%s'.\n" -#: clients/cmdline/propedit-cmd.c:117 clients/cmdline/propedit-cmd.c:244 +#: clients/cmdline/propedit-cmd.c:117 clients/cmdline/propedit-cmd.c:245 #: clients/cmdline/propset-cmd.c:85 msgid "Bad encoding option: prop value not stored as UTF8" msgstr "Nieprawidłowe kodowanie: wartość atrybutu nie jest w UTF8" @@ -1798,17 +1801,17 @@ msgid "Editing property on non-local target '%s' not yet supported" msgstr "Zmiana atrybutu na zdalnym obiekcie '%s' nie jest jeszcze obsługiwana" -#: clients/cmdline/propedit-cmd.c:219 clients/cmdline/switch-cmd.c:137 +#: clients/cmdline/propedit-cmd.c:220 clients/cmdline/switch-cmd.c:138 #, c-format msgid "'%s' does not appear to be a working copy path" msgstr "'%s' nie wygląda na ścieżkę kopii roboczej" -#: clients/cmdline/propedit-cmd.c:251 +#: clients/cmdline/propedit-cmd.c:252 #, c-format msgid "Set new value for property '%s' on '%s'\n" msgstr "Ustaw nową wartość atrybutu '%s' dla '%s'\n" -#: clients/cmdline/propedit-cmd.c:258 +#: clients/cmdline/propedit-cmd.c:259 #, c-format msgid "No changes to property '%s' on '%s'\n" msgstr "Bez zmian atrybutu %s dla '%s'\n" @@ -1888,7 +1891,7 @@ msgstr "Nie można pisać do '%s'" #: clients/cmdline/util.c:204 clients/cmdline/util.c:228 -#: libsvn_fs_fs/fs_fs.c:989 libsvn_subr/io.c:2162 +#: libsvn_fs_fs/fs_fs.c:990 libsvn_subr/io.c:2166 #, c-format msgid "Can't stat '%s'" msgstr "Nie można pobrać informacji o '%s'" @@ -2689,16 +2692,16 @@ msgid "URL '%s' refers to a file, not a directory" msgstr "URL '%s' odnosi się do pliku, nie do katalogu" -#: libsvn_client/checkout.c:149 +#: libsvn_client/checkout.c:150 #, c-format msgid "'%s' is already a working copy for a different URL" msgstr "'%s' jest już kopią roboczą innego URL" -#: libsvn_client/checkout.c:153 +#: libsvn_client/checkout.c:154 msgid "; run 'svn update' to complete it." msgstr "; uruchom 'svn update' aby zakończyć." -#: libsvn_client/checkout.c:162 +#: libsvn_client/checkout.c:163 #, c-format msgid "'%s' is already a file/something else" msgstr "'%s' już podlega zarządzaniu wersjami" @@ -2723,8 +2726,8 @@ msgid "Path '%s' does not exist" msgstr "Ścieżka '%s' nie istnieje" -#: libsvn_client/commit.c:683 libsvn_client/copy.c:398 -#: libsvn_client/copy.c:414 +#: libsvn_client/commit.c:683 libsvn_client/copy.c:399 +#: libsvn_client/copy.c:415 #, c-format msgid "Path '%s' already exists" msgstr "Ścieżka '%s' już istnieje" @@ -2734,15 +2737,15 @@ msgid "'%s' is a reserved name and cannot be imported" msgstr "'%s' to nazwa zastrzeżona i nie może zostać zaimportowana" -#: libsvn_client/commit.c:772 libsvn_client/copy.c:542 +#: libsvn_client/commit.c:772 libsvn_client/copy.c:543 msgid "Commit failed (details follow):" msgstr "Zatwierdzenie nie powiodło się (szczegóły poniżej):" -#: libsvn_client/commit.c:780 libsvn_client/copy.c:550 +#: libsvn_client/commit.c:780 libsvn_client/copy.c:551 msgid "Commit succeeded, but other errors follow:" msgstr "Zatwierdzenie powiodło się, lecz wystąpiły inne błędy:" -#: libsvn_client/commit.c:787 libsvn_client/copy.c:557 +#: libsvn_client/commit.c:787 libsvn_client/copy.c:558 msgid "Error unlocking locked dirs (details follow):" msgstr "Nie udało się odblokowanie katalogów (szczegóły poniżej):" @@ -2750,7 +2753,7 @@ msgid "Error bumping revisions post-commit (details follow):" msgstr "Błąd operacji post-commit (szczegóły poniżej):" -#: libsvn_client/commit.c:809 libsvn_client/copy.c:568 +#: libsvn_client/commit.c:809 libsvn_client/copy.c:569 msgid "Error in post-commit clean-up (details follow):" msgstr "Błąd oczyszczania post-commit (szczegóły poniżej):" @@ -2759,11 +2762,11 @@ msgid "'%s' is a URL, but URLs cannot be commit targets" msgstr "'%s' to URL, a URL nie może być obiektem zatwierdzenia" -#: libsvn_client/commit.c:1257 +#: libsvn_client/commit.c:1262 msgid "Are all the targets part of the same working copy?" msgstr "Czy wszystkie obiekty docelowe należą do tej samej kopii roboczej?" -#: libsvn_client/commit.c:1272 +#: libsvn_client/commit.c:1277 msgid "Cannot non-recursively commit a directory deletion" msgstr "Zatwierdzenie usunięcia katalogu musi być wykonane rekursywnie" @@ -2794,15 +2797,15 @@ "Obiekt '%s' jest zaznaczony do skopiowania, lecz nie podano źródłowego URL\n" #: libsvn_client/commit_util.c:612 libsvn_client/commit_util.c:741 -#: libsvn_client/copy.c:1063 libsvn_client/delete.c:67 -#: libsvn_client/diff.c:1380 libsvn_client/diff.c:1973 -#: libsvn_client/diff.c:2446 libsvn_client/diff.c:2553 libsvn_client/log.c:128 -#: libsvn_client/prop_commands.c:211 libsvn_client/prop_commands.c:437 -#: libsvn_client/prop_commands.c:588 libsvn_client/prop_commands.c:940 +#: libsvn_client/copy.c:1069 libsvn_client/delete.c:67 +#: libsvn_client/diff.c:1380 libsvn_client/diff.c:1977 +#: libsvn_client/diff.c:2452 libsvn_client/diff.c:2561 libsvn_client/log.c:129 +#: libsvn_client/prop_commands.c:213 libsvn_client/prop_commands.c:446 +#: libsvn_client/prop_commands.c:599 libsvn_client/prop_commands.c:955 #: libsvn_client/ra.c:180 libsvn_client/revisions.c:89 -#: libsvn_client/status.c:129 libsvn_client/switch.c:103 -#: libsvn_wc/adm_ops.c:2106 libsvn_wc/copy.c:386 libsvn_wc/entries.c:1382 -#: libsvn_wc/entries.c:1801 libsvn_wc/props.c:281 libsvn_wc/questions.c:171 +#: libsvn_client/status.c:131 libsvn_client/switch.c:104 +#: libsvn_wc/adm_ops.c:2127 libsvn_wc/copy.c:386 libsvn_wc/entries.c:1383 +#: libsvn_wc/entries.c:1824 libsvn_wc/props.c:281 libsvn_wc/questions.c:171 #, c-format msgid "'%s' is not under version control" msgstr "'%s' nie podlega zarządzaniu wersjami" @@ -2812,13 +2815,13 @@ msgid "Entry for '%s' has no URL" msgstr "Element '%s' nie ma URL" -#: libsvn_client/commit_util.c:647 +#: libsvn_client/commit_util.c:648 #, c-format msgid "'%s' is scheduled for addition within unversioned parent" msgstr "" "'%s' przeznaczony do dodania w katalogu nie podlegającym kontroli wersji" -#: libsvn_client/commit_util.c:667 +#: libsvn_client/commit_util.c:668 #, c-format msgid "" "Entry for '%s' is marked as 'copied' but is not itself scheduled\n" @@ -2854,22 +2857,22 @@ msgid "Commit item '%s' has copy flag but an invalid revision" msgstr "Element '%s' zaznaczony do skopiowania, lecz wersja jest niewłaściwa" -#: libsvn_client/copy.c:101 libsvn_client/copy.c:642 libsvn_client/copy.c:825 +#: libsvn_client/copy.c:101 libsvn_client/copy.c:644 libsvn_client/copy.c:827 #: libsvn_ra_dav/commit.c:895 #, c-format msgid "File '%s' already exists" msgstr "Plik '%s' już istnieje" -#: libsvn_client/copy.c:143 +#: libsvn_client/copy.c:144 msgid "Move will not be attempted unless forced" msgstr "Przeniesienie się nie odbędzie o ile nie zostanie to wymuszone" -#: libsvn_client/copy.c:327 +#: libsvn_client/copy.c:328 #, c-format msgid "Cannot move URL '%s' into itself" msgstr "Nie można przenieść URL '%s' do samego siebie" -#: libsvn_client/copy.c:359 +#: libsvn_client/copy.c:360 #, c-format msgid "" "Source and dest appear not to be in the same repository (src: '%s'; dst: '%" @@ -2878,58 +2881,58 @@ "Obiekty źródłowy i docelowy nie znajdują się w tym samym repozytorium" "(źródło: '%s'; cel: '%s')" -#: libsvn_client/copy.c:385 +#: libsvn_client/copy.c:386 #, c-format msgid "Path '%s' does not exist in revision %ld" msgstr "Ścieżka '%s' nie istnieje w wersji %ld" -#: libsvn_client/copy.c:419 +#: libsvn_client/copy.c:420 #, c-format msgid "Unrecognized node kind of '%s'" msgstr "Nieznany rodzaj obiektu: '%s'" -#: libsvn_client/copy.c:783 +#: libsvn_client/copy.c:785 #, c-format msgid "Path '%s' not found in revision %ld" msgstr "Ścieżka '%s' nie znaleziona w wersji '%ld'" -#: libsvn_client/copy.c:788 +#: libsvn_client/copy.c:790 #, c-format msgid "Path '%s' not found in head revision" msgstr "Ścieżki '%s' nie znaleziono w wersji HEAD" -#: libsvn_client/copy.c:834 +#: libsvn_client/copy.c:836 #, c-format msgid "'%s' is in the way" msgstr "'%s' już istnieje i znajduje się w wskazanym miejscu" -#: libsvn_client/copy.c:850 +#: libsvn_client/copy.c:853 #, c-format msgid "Entry for '%s' exists (though the working file is missing)" msgstr "Element '%s' istnieje, choć nie znaleziono kopii roboczej pliku" -#: libsvn_client/copy.c:940 +#: libsvn_client/copy.c:944 #, c-format msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC" msgstr "" "Źródłowy URL '%s' pochodzi z zewnętrznego repozytorium; pozostaje jako kopia " "rozłączona" -#: libsvn_client/copy.c:1020 +#: libsvn_client/copy.c:1024 #, c-format msgid "Cannot copy path '%s' into its own child '%s'" msgstr "Nie można skopiować ścieżki '%s' do własnej podrzędnej '%s'" -#: libsvn_client/copy.c:1031 +#: libsvn_client/copy.c:1035 #, c-format msgid "Cannot move path '%s' into itself" msgstr "Nie można przenieść ścieżki '%s' do siebie samej" -#: libsvn_client/copy.c:1039 +#: libsvn_client/copy.c:1043 msgid "No support for repos <--> working copy moves" msgstr "Przenoszenie repozytorium <--> kopia robocza nie jest obsługiwane" -#: libsvn_client/copy.c:1069 +#: libsvn_client/copy.c:1075 #, c-format msgid "'%s' does not seem to have a URL associated with it" msgstr "obiekt '%s' nie posiada związanego z nim URL" @@ -3005,8 +3008,8 @@ msgid ".merge-right.r%ld" msgstr ".merge-prawo.w%ld" -#: libsvn_client/diff.c:1436 libsvn_client/diff.c:2073 -#: libsvn_client/diff.c:2153 +#: libsvn_client/diff.c:1436 libsvn_client/diff.c:2077 +#: libsvn_client/diff.c:2157 msgid "Not all required revisions are specified" msgstr "Nie wszystkie wymagane wersje zostały podane" @@ -3024,22 +3027,22 @@ "Jedynie porównania między wersją bazową i jej plikiem roboczym są obecnie " "obsługiwane" -#: libsvn_client/diff.c:1858 libsvn_client/diff.c:1863 +#: libsvn_client/diff.c:1860 libsvn_client/diff.c:1865 #, c-format msgid "'%s' was not found in the repository at revision %ld" msgstr "'%s' nie występuje w repozytorium w wersji %ld" -#: libsvn_client/diff.c:1977 libsvn_client/switch.c:107 +#: libsvn_client/diff.c:1981 libsvn_client/switch.c:108 #, c-format msgid "Directory '%s' has no URL" msgstr "Katalog '%s' nie ma URL" -#: libsvn_client/diff.c:2164 +#: libsvn_client/diff.c:2168 msgid "At least one revision must be non-local for a pegged diff" msgstr "Przynajmniej jedna wersja musi być zdalna aby wykonać pegged diff" -#: libsvn_client/diff.c:2421 libsvn_client/diff.c:2427 -#: libsvn_client/diff.c:2540 libsvn_client/ra.c:712 libsvn_client/ra.c:835 +#: libsvn_client/diff.c:2425 libsvn_client/diff.c:2431 +#: libsvn_client/diff.c:2546 libsvn_client/ra.c:714 libsvn_client/ra.c:837 #, c-format msgid "'%s' has no URL" msgstr "'%s' nie ma URL" @@ -3053,72 +3056,82 @@ msgid "(local)" msgstr "(lokalny)" -#: libsvn_client/export.c:266 +#: libsvn_client/export.c:268 msgid "Destination directory exists, and will not be overwritten unless forced" msgstr "" "Katalog docelowy już istnieje i nie zostanie nadpisany o ile nie zostanie to " "wymuszone." -#: libsvn_client/export.c:359 libsvn_client/export.c:503 +#: libsvn_client/export.c:366 libsvn_client/export.c:510 #, c-format msgid "'%s' exists and is not a directory" msgstr "'%s' istnieje i nie jest katalogiem" -#: libsvn_client/export.c:363 libsvn_client/export.c:507 +#: libsvn_client/export.c:370 libsvn_client/export.c:514 #, c-format msgid "'%s' already exists" msgstr "'%s' już istnieje" -#: libsvn_client/export.c:679 libsvn_wc/update_editor.c:1592 -#: libsvn_wc/update_editor.c:2339 +#: libsvn_client/export.c:686 libsvn_wc/update_editor.c:1595 +#: libsvn_wc/update_editor.c:2341 #, c-format msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'" msgstr "Błąd sumy kontrolnej dla '%s'; oczekiwana: '%s', faktyczna: '%s'" +#: libsvn_client/info.c:214 +#, fuzzy, c-format +msgid "Cannot read entry for '%s'" +msgstr "Nie można znaleźć elementu dla '%s'" + +#: libsvn_client/info.c:285 +#, fuzzy, c-format +msgid "URL '%s' non-existent in revision '%ld'" +msgstr "URL '%s' nie istnieje w tej wersji" + +#: libsvn_client/info.c:310 libsvn_client/ls.c:128 libsvn_client/ls.c:135 +#, c-format +msgid "URL '%s' non-existent in that revision" +msgstr "URL '%s' nie istnieje w tej wersji" + #: libsvn_client/log.c:72 msgid "Missing required revision specification" msgstr "Nie podano wymaganej specyfikacji wersji" -#: libsvn_client/log.c:134 libsvn_client/status.c:134 -#: libsvn_client/update.c:83 +#: libsvn_client/log.c:135 libsvn_client/status.c:136 +#: libsvn_client/update.c:85 #, c-format msgid "Entry '%s' has no URL" msgstr "Element '%s' nie ma URL" -#: libsvn_client/log.c:320 +#: libsvn_client/log.c:321 msgid "No commits in repository." msgstr "Brak zapisów w repozytorium" -#: libsvn_client/ls.c:128 libsvn_client/ls.c:135 -#, c-format -msgid "URL '%s' non-existent in that revision" -msgstr "URL '%s' nie istnieje w tej wersji" - #: libsvn_client/prop_commands.c:104 #, c-format msgid "'%s' is a wcprop, thus not accessible to clients" msgstr "'%s' jest atryputem wcprop, tak więc nie jest dostępny dla klientów" -#: libsvn_client/prop_commands.c:182 +#: libsvn_client/prop_commands.c:183 #, c-format msgid "Revision property '%s' not allowed in this context" msgstr "Atrybut wersji '%s' jest niedozwolony w tym kontekście" -#: libsvn_client/prop_commands.c:198 +#: libsvn_client/prop_commands.c:199 #, c-format msgid "Setting property on non-local target '%s' is not supported" msgstr "Ustawianie atrybutu na zdalnym obiekcie '%s' nie jest obsługiwane" -#: libsvn_client/prop_commands.c:204 libsvn_client/prop_commands.c:271 +#: libsvn_client/prop_commands.c:205 libsvn_client/prop_commands.c:280 #, c-format msgid "Bad property name: '%s'" msgstr "Niepoprawna nazwa atrybutu: '%s'" -#: libsvn_client/prop_commands.c:267 +#: libsvn_client/prop_commands.c:276 msgid "Value will not be set unless forced" msgstr "Wartość nie zostanie ustawiona o ile nie zostanie to wymuszone" -#: libsvn_client/prop_commands.c:490 libsvn_client/prop_commands.c:749 +#: libsvn_client/prop_commands.c:499 libsvn_client/prop_commands.c:762 #, c-format msgid "Unknown node kind for '%s'" msgstr "Nieznany rodzaj obiektu dla '%s'" @@ -3130,32 +3143,32 @@ "Próba ustawienia atrybutu kopii roboczej '%s' na '%s' w operacji innej, niż " "zatwierdzanie." -#: libsvn_client/ra.c:335 +#: libsvn_client/ra.c:336 #, c-format msgid "Can't find entry for '%s'" msgstr "Nie można znaleźć elementu dla '%s'" -#: libsvn_client/ra.c:462 +#: libsvn_client/ra.c:463 #, c-format msgid "Missing changed-path information for '%s' in revision %ld" msgstr "Brak informacji o zmianie ścieżki dla '%s' w wersji %ld" -#: libsvn_client/ra.c:579 +#: libsvn_client/ra.c:580 #, c-format msgid "path '%s' doesn't exist in revision %ld" msgstr "ścieżka '%s' nie istnieje w wersji %ld" -#: libsvn_client/ra.c:640 libsvn_client/ra.c:775 +#: libsvn_client/ra.c:641 libsvn_client/ra.c:777 #, c-format msgid "Unable to find repository location for '%s' in revision %ld" msgstr "Nie odnaleziono lokalizacji repozytorium dla '%s' w wersji %ld" -#: libsvn_client/ra.c:651 +#: libsvn_client/ra.c:652 #, c-format msgid "'%s' in revision %ld is an unrelated object" msgstr "'%s' w wersji %ld jest obiektem niezwiązanym" -#: libsvn_client/ra.c:780 +#: libsvn_client/ra.c:782 #, c-format msgid "" "The location for '%s' for revision %ld does not exist in the repository or " @@ -3207,11 +3220,11 @@ #: libsvn_delta/svndiff.c:391 msgid "Delta does not fill the target window" -msgstr "" +msgstr "Delta nie wypełnia docelowego okna danych" #: libsvn_delta/svndiff.c:394 msgid "Delta does not contain enough new data" -msgstr "" +msgstr "Delta nie zawiera nowych danych w wystarczającej ilości" #: libsvn_delta/svndiff.c:471 msgid "Svndiff has invalid header" @@ -3228,17 +3241,16 @@ #: libsvn_delta/svndiff.c:583 libsvn_delta/svndiff.c:630 #: libsvn_delta/svndiff.c:703 -#, fuzzy msgid "Unexpected end of svndiff input" -msgstr "Nieoczekiwany rodzaj obiektu." +msgstr "Nieoczekiwany koniec danych wejściowych svndiff" #: libsvn_diff/diff_file.c:1169 #, c-format msgid "Failed to delete mmap '%s'" msgstr "Nie powiodło się usunięcie mmap '%s'" -#: libsvn_fs/fs-loader.c:99 libsvn_ra/ra_loader.c:147 -#: libsvn_ra/ra_loader.c:160 +#: libsvn_fs/fs-loader.c:99 libsvn_ra/ra_loader.c:156 +#: libsvn_ra/ra_loader.c:169 #, c-format msgid "'%s' does not define '%s()'" msgstr "'%s' nie definiuje '%s()'" @@ -3271,31 +3283,33 @@ msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'" msgstr "Plik niezmienny: system plików '%s', wersja %ld, ścieżka '%s'" -#: libsvn_fs_base/fs.c:1122 +#: libsvn_fs_base/fs.c:1129 +#, fuzzy msgid "" "Error copying logfile; the DB_LOG_AUTOREMOVE feature \n" "may be interfering with the hotcopy algorithm. If \n" "the problem persists, try deactivating this feature \n" -"in DB_CONFIG." +"in DB_CONFIG" msgstr "" "Błąd podczas kopiowania logu; właściwość DB_LOG_AUTOREMOVE \n" "może wpływać na algorytm hotcopy. Jeżeli problem\n" " będzie się powtarzał, spróbuj wyłączyć tę właściwość \n" "w DB_CONFIG." -#: libsvn_fs_base/fs.c:1141 +#: libsvn_fs_base/fs.c:1148 +#, fuzzy msgid "" "Error running catastrophic recovery on hotcopy; the \n" "DB_LOG_AUTOREMOVE feature may be interfering with the \n" "hotcopy algorithm. If the problem persists, try deactivating \n" -"this feature in DB_CONFIG." +"this feature in DB_CONFIG" msgstr "" "Błąd odtwarzania po załamaniu na kopii na gorąco; właściwość \n" "DB_LOG_AUTOREMOVE może wpływać na algorytm hotcopy. Jeżeli \n" "problem będzie się powtarzał, spróbuj wyłączyć tę właściwość \n" "w DB_CONFIG." -#: libsvn_fs_base/fs.c:1278 +#: libsvn_fs_base/fs.c:1285 #, c-format msgid "Unsupported FS loader version (%d) for bdb" msgstr "Nieobsługiwana wersja loadera systemu plików (%d) dla bdb" @@ -3385,187 +3399,179 @@ msgid "Unsupported FS loader version (%d) for fsfs" msgstr "Nieobsługiwana wersja loadera systemu plików (%d) dla fsfs" -#: libsvn_fs_fs/fs_fs.c:363 libsvn_fs_fs/fs_fs.c:377 +#: libsvn_fs_fs/fs_fs.c:364 libsvn_fs_fs/fs_fs.c:378 msgid "Found malformed header in revision file" msgstr "Błędny nagłówek w pliku wersji" -#: libsvn_fs_fs/fs_fs.c:479 libsvn_fs_fs/fs_fs.c:493 libsvn_fs_fs/fs_fs.c:500 -#: libsvn_fs_fs/fs_fs.c:507 libsvn_fs_fs/fs_fs.c:515 libsvn_fs_fs/fs_fs.c:523 +#: libsvn_fs_fs/fs_fs.c:480 libsvn_fs_fs/fs_fs.c:494 libsvn_fs_fs/fs_fs.c:501 +#: libsvn_fs_fs/fs_fs.c:508 libsvn_fs_fs/fs_fs.c:516 libsvn_fs_fs/fs_fs.c:524 msgid "Malformed text rep offset line in node-rev" msgstr "Błędny offset reprezentacji w node-rev" -#: libsvn_fs_fs/fs_fs.c:592 +#: libsvn_fs_fs/fs_fs.c:593 msgid "Missing kind field in node-rev" msgstr "Brak pola kind w node-rev" -#: libsvn_fs_fs/fs_fs.c:623 +#: libsvn_fs_fs/fs_fs.c:624 msgid "Missing cpath in node-rev" msgstr "Brak cpath w node-rev" -#: libsvn_fs_fs/fs_fs.c:650 libsvn_fs_fs/fs_fs.c:656 +#: libsvn_fs_fs/fs_fs.c:651 libsvn_fs_fs/fs_fs.c:657 msgid "Malformed copyroot line in node-rev" msgstr "Błędna linia copyroot w node-rev" -#: libsvn_fs_fs/fs_fs.c:674 libsvn_fs_fs/fs_fs.c:680 +#: libsvn_fs_fs/fs_fs.c:675 libsvn_fs_fs/fs_fs.c:681 msgid "Malformed copyfrom line in node-rev" msgstr "Błędna linia copyfrom w node-rev" -#: libsvn_fs_fs/fs_fs.c:778 libsvn_fs_fs/fs_fs.c:3002 +#: libsvn_fs_fs/fs_fs.c:779 libsvn_fs_fs/fs_fs.c:3063 msgid "Attempted to write to non-transaction" msgstr "Próba zapisu node-rev o stałym ID" -#: libsvn_fs_fs/fs_fs.c:862 +#: libsvn_fs_fs/fs_fs.c:863 msgid "Malformed representation header" msgstr "Błędny nagłówek tablicy reprezentacji" -#: libsvn_fs_fs/fs_fs.c:886 +#: libsvn_fs_fs/fs_fs.c:887 msgid "Missing node-id in node-rev" msgstr "Brak node-id w node-rev" -#: libsvn_fs_fs/fs_fs.c:892 +#: libsvn_fs_fs/fs_fs.c:893 msgid "Corrupt node-id in node-rev" msgstr "Błędny node-id w node-rev" -#: libsvn_fs_fs/fs_fs.c:937 +#: libsvn_fs_fs/fs_fs.c:938 msgid "Revision file lacks trailing newline" msgstr "W pliku wersji brak końcowego znaku końca wiersza" -#: libsvn_fs_fs/fs_fs.c:949 +#: libsvn_fs_fs/fs_fs.c:950 msgid "Final line in revision file longer than 64 characters" msgstr "Ostatnia linia w pliku wersji dłuższa niż 64 znaki" -#: libsvn_fs_fs/fs_fs.c:962 +#: libsvn_fs_fs/fs_fs.c:963 msgid "Final line in revision file missing space" msgstr "Brak spacji w ostatniej linii pliku wersji" -#: libsvn_fs_fs/fs_fs.c:992 +#: libsvn_fs_fs/fs_fs.c:993 #, c-format msgid "Can't chmod '%s'" msgstr "Nie można wykonać chmod '%s'" -#: libsvn_fs_fs/fs_fs.c:1050 libsvn_fs_fs/fs_fs.c:1107 libsvn_repos/log.c:239 +#: libsvn_fs_fs/fs_fs.c:1051 libsvn_fs_fs/fs_fs.c:1108 libsvn_repos/log.c:239 #: libsvn_repos/log.c:243 #, c-format msgid "No such revision %ld" msgstr "Nie ma takiej wersji %ld" -#: libsvn_fs_fs/fs_fs.c:1182 +#: libsvn_fs_fs/fs_fs.c:1183 msgid "Malformed svndiff data in representation" msgstr "Błędne dane svndiff w tablicy reprezentacji" -#: libsvn_fs_fs/fs_fs.c:1298 libsvn_fs_fs/fs_fs.c:1318 -#: libsvn_fs_fs/fs_fs.c:1331 +#: libsvn_fs_fs/fs_fs.c:1294 libsvn_fs_fs/fs_fs.c:1307 +#: libsvn_fs_fs/fs_fs.c:1338 msgid "Reading one svndiff window read beyond the end of the representation" msgstr "" "Podczas czytania danych okna svndiff przekroczono koniec \n" "tablicy reprezentacji" -#: libsvn_fs_fs/fs_fs.c:1420 +#: libsvn_fs_fs/fs_fs.c:1451 msgid "svndiff data requested non-existent source" msgstr "Żądane dane svndiff wskazują na nieistniejące źródło" -#: libsvn_fs_fs/fs_fs.c:1426 +#: libsvn_fs_fs/fs_fs.c:1457 msgid "svndiff requested position beyond end of stream" msgstr "Żądana pozycja svndiff jest poza końcem strumienia" -#: libsvn_fs_fs/fs_fs.c:1448 +#: libsvn_fs_fs/fs_fs.c:1480 libsvn_fs_fs/fs_fs.c:1497 msgid "svndiff window length is corrupt" msgstr "Błędne okno danych svndiff" -#: libsvn_fs_fs/fs_fs.c:1623 libsvn_fs_fs/fs_fs.c:1636 -#: libsvn_fs_fs/fs_fs.c:1642 +#: libsvn_fs_fs/fs_fs.c:1680 libsvn_fs_fs/fs_fs.c:1693 +#: libsvn_fs_fs/fs_fs.c:1699 msgid "Directory entry corrupt" msgstr "Uszkodzony wpis w katalogu" -#: libsvn_fs_fs/fs_fs.c:1809 +#: libsvn_fs_fs/fs_fs.c:1866 msgid "Missing required node revision ID" msgstr "Brak wymaganego ID wersji obiektu" -#: libsvn_fs_fs/fs_fs.c:1819 +#: libsvn_fs_fs/fs_fs.c:1876 msgid "Invalid change ordering: new node revision ID without delete" msgstr "" "Niewłaściwy porządek zmian: ID nowego węzła wersji nie jest\n" "zmianą typu usunięcie ścieżki" -#: libsvn_fs_fs/fs_fs.c:1830 +#: libsvn_fs_fs/fs_fs.c:1887 msgid "Invalid change ordering: non-add change on deleted path" msgstr "" "Niewłaściwy porządek zmian: zmiana typu non-add poprzedza\n" "usunięcie ścieżki" -#: libsvn_fs_fs/fs_fs.c:1975 libsvn_fs_fs/fs_fs.c:1983 -#: libsvn_fs_fs/fs_fs.c:2015 libsvn_fs_fs/fs_fs.c:2035 -#: libsvn_fs_fs/fs_fs.c:2069 libsvn_fs_fs/fs_fs.c:2074 +#: libsvn_fs_fs/fs_fs.c:2032 libsvn_fs_fs/fs_fs.c:2040 +#: libsvn_fs_fs/fs_fs.c:2072 libsvn_fs_fs/fs_fs.c:2092 +#: libsvn_fs_fs/fs_fs.c:2126 libsvn_fs_fs/fs_fs.c:2131 msgid "Invalid changes line in rev-file" msgstr "Niewłaściwe zmiany w pliku wersji" -#: libsvn_fs_fs/fs_fs.c:2008 +#: libsvn_fs_fs/fs_fs.c:2065 msgid "Invalid change kind in rev file" msgstr "Niewłaściwy rodzaj modyfikacji w pliku wersji" -#: libsvn_fs_fs/fs_fs.c:2028 +#: libsvn_fs_fs/fs_fs.c:2085 msgid "Invalid text-mod flag in rev-file" msgstr "Niewłaściwa flaga text-mod w pliku wersji" -#: libsvn_fs_fs/fs_fs.c:2048 +#: libsvn_fs_fs/fs_fs.c:2105 msgid "Invalid prop-mod flag in rev-file" msgstr "Niewłaściwa flaga prop-mod w pliku wersji" -#: libsvn_fs_fs/fs_fs.c:2231 +#: libsvn_fs_fs/fs_fs.c:2288 msgid "Copying from transactions not allowed" msgstr "Kopiowanie z transakcji niedozwolone" -#: libsvn_fs_fs/fs_fs.c:2473 libsvn_fs_fs/fs_fs.c:2480 +#: libsvn_fs_fs/fs_fs.c:2533 libsvn_fs_fs/fs_fs.c:2540 msgid "next-id file corrupt" msgstr "Plik next-id jest uszkodzony" -#: libsvn_fs_fs/fs_fs.c:2706 +#: libsvn_fs_fs/fs_fs.c:2766 msgid "Invalid change type" msgstr "Niewłaściwy typ zmiany" -#: libsvn_fs_fs/fs_fs.c:3021 +#: libsvn_fs_fs/fs_fs.c:3082 msgid "Can't set text contents of a directory" msgstr "Nie można ustawić zawartości katalogu" -#: libsvn_fs_fs/fs_fs.c:3111 libsvn_fs_fs/fs_fs.c:3116 -#: libsvn_fs_fs/fs_fs.c:3123 +#: libsvn_fs_fs/fs_fs.c:3172 libsvn_fs_fs/fs_fs.c:3177 +#: libsvn_fs_fs/fs_fs.c:3184 msgid "Corrupt current file" msgstr "Bieżący plik jest uszkodzony" -#: libsvn_fs_fs/fs_fs.c:3491 +#: libsvn_fs_fs/fs_fs.c:3552 msgid "Transaction out of date" msgstr "Transakcja jest nieaktualna" -#: libsvn_fs_fs/fs_fs.c:3731 +#: libsvn_fs_fs/fs_fs.c:3792 msgid "No such transaction" msgstr "Brak takiej transakcji" -#: libsvn_ra/ra_loader.c:232 +#: libsvn_ra/ra_loader.c:211 #, c-format msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s" msgstr "" "Niewłaściwa wersja wtyczki RA dla '%s': znaleziona %d.%d.%d%s, oczekiwana %d." "%d.%d%s" -#: libsvn_ra/ra_loader.c:246 +#: libsvn_ra/ra_loader.c:261 #, c-format msgid "Unrecognized URL scheme for '%s'" msgstr "Nieznany schemat URL: '%s'" -#: libsvn_ra/ra_loader.c:505 +#: libsvn_ra/ra_loader.c:519 #, c-format msgid " - handles '%s' schema\n" msgstr " - obsługuje schemat '%s'\n" -#: libsvn_ra/ra_loader.c:574 -#, c-format -msgid "" -"Mismatched RA plugin version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s" -msgstr "" -"Niewłaściwa wersja wtyczki RA dla '%s': znaleziona %d.%d.%d%s, oczekiwana %d." -"%d.%d%s" - -#: libsvn_ra/ra_loader.c:590 +#: libsvn_ra/ra_loader.c:604 #, c-format msgid "Unrecognized URL scheme '%s'" msgstr "Nieznany schemat URL: '%s'" @@ -3611,7 +3617,7 @@ msgid "Error writing to stream: unexpected EOF" msgstr "Błąd zapisu do '%s': nieoczekiwany koniec pliku" -#: libsvn_ra_dav/fetch.c:830 libsvn_ra_svn/client.c:872 +#: libsvn_ra_dav/fetch.c:830 libsvn_ra_svn/client.c:873 #, c-format msgid "" "Checksum mismatch for '%s':\n" @@ -3719,33 +3725,38 @@ msgid "'%s' was not present on the resource" msgstr "'%s' nie występuje w obiekcie" -#: libsvn_ra_dav/props.c:674 +#: libsvn_ra_dav/props.c:651 +#, c-format +msgid "Neon was unable to parse URL '%s'" +msgstr "Biblioteka neon nie potrafi sparsować URLa: '%s'" + +#: libsvn_ra_dav/props.c:680 msgid "The path was not part of a repository" msgstr "Ścieżka nie wskazuje na repozytorium" -#: libsvn_ra_dav/props.c:685 +#: libsvn_ra_dav/props.c:691 #, c-format msgid "No part of path '%s' was found in repository HEAD" msgstr "" "Żaden element ścieżki '%s' nie został znaleziony w wersji HEAD repozytorium" -#: libsvn_ra_dav/props.c:719 libsvn_ra_dav/props.c:774 +#: libsvn_ra_dav/props.c:725 libsvn_ra_dav/props.c:780 msgid "The VCC property was not found on the resource" msgstr "Atrybut VCC nie został znaleziony" -#: libsvn_ra_dav/props.c:787 +#: libsvn_ra_dav/props.c:793 msgid "The relative-path property was not found on the resource" msgstr "Atrybut relative-path (względna ścieżka) nie został znaleziony" -#: libsvn_ra_dav/props.c:908 +#: libsvn_ra_dav/props.c:914 msgid "'DAV:baseline-collection' was not present on the baseline resource" msgstr "Brak DAV:baseline-collection w bazowym obiekcie" -#: libsvn_ra_dav/props.c:927 +#: libsvn_ra_dav/props.c:933 msgid "'DAV:version-name' was not present on the baseline resource" msgstr "Brak DAV:version-name w bazowym obiekcie" -#: libsvn_ra_dav/props.c:1080 +#: libsvn_ra_dav/props.c:1086 msgid "At least one property change failed; repository is unchanged" msgstr "" "Co najmniej jedna zmiana atrybutu nie powiodła się. Repozytorium nie\n" @@ -3811,7 +3822,7 @@ msgid "Please upgrade the server to 0.19 or later" msgstr "Zaktualizuj serwer do wersji 0.19 lub nowszej." -#: libsvn_ra_dav/session.c:896 +#: libsvn_ra_dav/session.c:898 #, c-format msgid "Unsupported RA loader version (%d) for ra_dav" msgstr "Nieobsługiwana wersja loadera RA (%d) dla ra_dav" @@ -3854,7 +3865,7 @@ msgid "%s request failed on '%s'" msgstr "żądanie %s nie powiodło się dla '%s'" -#: libsvn_ra_local/ra_plugin.c:101 libsvn_ra_local/ra_plugin.c:478 +#: libsvn_ra_local/ra_plugin.c:101 libsvn_ra_local/ra_plugin.c:477 #, c-format msgid "" "'%s'\n" @@ -3871,7 +3882,7 @@ msgid "Module for accessing a repository on local disk." msgstr "Moduł umożliwiający dostęp do repozytorium na lokalnym dysku." -#: libsvn_ra_local/ra_plugin.c:248 +#: libsvn_ra_local/ra_plugin.c:247 msgid "Unable to open an ra_local session to URL" msgstr "Nie można utworzyć połączenia w sesji ra_local do URL" @@ -3941,93 +3952,93 @@ msgid "Cannot negotiate authentication mechanism" msgstr "Nie można określić sposobu autoryzacji" -#: libsvn_ra_svn/client.c:453 +#: libsvn_ra_svn/client.c:454 #, c-format msgid "Undefined tunnel scheme '%s'" msgstr "Nieznany tunel '%s'" -#: libsvn_ra_svn/client.c:470 +#: libsvn_ra_svn/client.c:471 #, c-format msgid "Tunnel scheme %s requires environment variable %s to be defined" msgstr "Tunel %s wymaga zdefiniowania zmiennej środowiskowej %s" -#: libsvn_ra_svn/client.c:481 +#: libsvn_ra_svn/client.c:482 #, c-format msgid "Can't tokenize command '%s'" msgstr "Nieznane polecenie '%s'" -#: libsvn_ra_svn/client.c:510 +#: libsvn_ra_svn/client.c:511 #, c-format msgid "Error in child process: %s" msgstr "Błąd procesu potomnego: %s" -#: libsvn_ra_svn/client.c:533 +#: libsvn_ra_svn/client.c:534 msgid "Can't create tunnel" msgstr "Nie udało się utworzyć tunelu" -#: libsvn_ra_svn/client.c:562 +#: libsvn_ra_svn/client.c:563 msgid "Module for accessing a repository using the svn network protocol." msgstr "Moduł umożliwiający dostęp do repozytorium przy pomocy protokołu svn." -#: libsvn_ra_svn/client.c:595 +#: libsvn_ra_svn/client.c:596 #, c-format msgid "Illegal svn repository URL '%s'" msgstr "Nieprawidłowy URL '%s' repozytorium svn" -#: libsvn_ra_svn/client.c:614 +#: libsvn_ra_svn/client.c:615 #, c-format msgid "Server requires minimum version %d" msgstr "Serwer wymaga co najmniej wersji %d" -#: libsvn_ra_svn/client.c:664 +#: libsvn_ra_svn/client.c:665 msgid "Impossibly long repository root from server" msgstr "Ścieżka katalogu głównego repozytorium jest zbyt długa" -#: libsvn_ra_svn/client.c:731 +#: libsvn_ra_svn/client.c:732 msgid "Server did not send repository root" msgstr "Serwer nie przesłał głównego katalogu repozytorium" -#: libsvn_ra_svn/client.c:852 +#: libsvn_ra_svn/client.c:853 msgid "Non-string as part of file contents" msgstr "Plik zawiera dane, nie będące tekstem" -#: libsvn_ra_svn/client.c:921 +#: libsvn_ra_svn/client.c:922 msgid "Dirlist element not a list" msgstr "Element dirlist nie jest listą" -#: libsvn_ra_svn/client.c:1077 +#: libsvn_ra_svn/client.c:1078 msgid "Log entry not a list" msgstr "Element log nie jest listą" -#: libsvn_ra_svn/client.c:1090 +#: libsvn_ra_svn/client.c:1091 msgid "Changed-path entry not a list" msgstr "Wpis w liście zmienionych ścieżek nie jest listą" -#: libsvn_ra_svn/client.c:1173 +#: libsvn_ra_svn/client.c:1174 msgid "get-locations not implemented" msgstr "Nie zaimplementowane polecenie get-locations" -#: libsvn_ra_svn/client.c:1186 +#: libsvn_ra_svn/client.c:1187 msgid "Location entry not a list" msgstr "Wpis w lokalizacjach nie jest listą" -#: libsvn_ra_svn/client.c:1240 +#: libsvn_ra_svn/client.c:1241 msgid "get-file-revs not implemented" msgstr "Nie zaimplementowane polecenie get-file-revs" -#: libsvn_ra_svn/client.c:1254 +#: libsvn_ra_svn/client.c:1255 msgid "Revision entry not a list" msgstr "Wpis w Revision nie jest listą" -#: libsvn_ra_svn/client.c:1267 libsvn_ra_svn/client.c:1292 +#: libsvn_ra_svn/client.c:1268 libsvn_ra_svn/client.c:1293 msgid "Text delta chunk not a string" msgstr "Fragment różnic w tekście nie jest listą" -#: libsvn_ra_svn/client.c:1304 +#: libsvn_ra_svn/client.c:1305 msgid "The get-file-revs command didn't return any revisions" msgstr "polecenie get-file-revs nie zwróciło żadnych wersji" -#: libsvn_ra_svn/client.c:1356 +#: libsvn_ra_svn/client.c:1359 #, c-format msgid "Unsupported RA loader version (%d) for ra_svn" msgstr "Nieobsługiwana wersja loadera RA (%d) dla ra_svn" @@ -4102,7 +4113,7 @@ #: libsvn_repos/commit.c:224 libsvn_repos/commit.c:356 #, c-format msgid "Got source path but no source revision for '%s'" -msgstr "" +msgstr "Otrzymana ścieżka źródłowa nie posiada numeru wersji dla '%s'" #: libsvn_repos/commit.c:248 libsvn_repos/commit.c:380 #, c-format @@ -4157,12 +4168,17 @@ msgid "End revision %ld is invalid (youngest revision is %ld)" msgstr "Końcowa wersja %ld jest niewłaściwa (najmłodszą wersją jest %ld)" -#: libsvn_repos/dump.c:1044 -#, c-format -msgid "* %s revision %ld.\n" +#: libsvn_repos/dump.c:1045 +#, fuzzy, c-format +msgid "* Dumped revision %ld.\n" msgstr "* %s wersja %ld.\n" -#: libsvn_repos/fs-wrap.c:56 +#: libsvn_repos/dump.c:1046 +#, fuzzy, c-format +msgid "* Verified revision %ld.\n" +msgstr "* %s wersja %ld.\n" + +#: libsvn_repos/fs-wrap.c:56 libsvn_repos/load.c:1218 msgid "Commit succeeded, but post-commit hook failed" msgstr "" "Zatwierdzenie powiodło się, lecz nie powiodło się wykonanie skryptu hook\n" @@ -4174,11 +4190,14 @@ "Storage of non-regular property '%s' is disallowed through the repository " "interface, and could indicate a bug in your client" msgstr "" +"Przechowywanie nieregularnego atrybutu '%s' przez repozytorium \n" +"jest niedozwolone, może to oznaczać występowanie błędu w \n" +"Twoim kliencie svn" #: libsvn_repos/fs-wrap.c:294 -#, c-format +#, fuzzy, c-format msgid "Write denied: not authorized to read all of revision %ld." -msgstr "" +msgstr "Zapis zabroniony: nieautoryzowana próba odczytu wersji %ld." #: libsvn_repos/hooks.c:65 #, c-format @@ -4186,21 +4205,21 @@ msgstr "Nie można stworzyć potoku dla skryptu hook '%s'" #: libsvn_repos/hooks.c:72 -#, fuzzy, c-format +#, c-format msgid "Can't create null stdout for hook '%s'" -msgstr "Nie można utworzyć katalogu '%s'" +msgstr "" +"Nie można utworzyć pustego strumienia wyjściowego dla skryptu hook '%s'" #: libsvn_repos/hooks.c:84 -#, fuzzy msgid "Error closing write end of stderr pipe" -msgstr "Błąd w trakcie zamykania systemu plików" +msgstr "Błąd w trakcie zamykania strumienia błędów potoku otwartego do zapisu" #: libsvn_repos/hooks.c:90 #, c-format msgid "Failed to run '%s' hook" msgstr "Nie powiodło się uruchomienie skryptu hook '%s'" -#: libsvn_repos/hooks.c:105 +#: libsvn_repos/hooks.c:108 #, c-format msgid "" "'%s' hook failed with error output:\n" @@ -4209,86 +4228,94 @@ "'%s' skrypt hook zakończył się z następującym komunikatem błędów:\n" "'%s'" -#: libsvn_repos/hooks.c:116 -msgid "Error closing read end of stderr pipe" +#: libsvn_repos/hooks.c:115 +#, fuzzy, c-format +msgid "'%s' hook failed; no error output available" msgstr "" +"'%s' skrypt hook zakończył się z następującym komunikatem błędów:\n" +"'%s'" + +#: libsvn_repos/hooks.c:126 +msgid "Error closing read end of stderr pipe" +msgstr "Błąd podczas zamykania strumienia błędu potoku otwartego do odczytu" -#: libsvn_repos/hooks.c:120 +#: libsvn_repos/hooks.c:130 msgid "Error closing null file" msgstr "Błąd podczas zamykania pliku null" -#: libsvn_repos/hooks.c:202 +#: libsvn_repos/hooks.c:212 #, c-format msgid "Failed to run '%s' hook; broken symlink" msgstr "" "Niepowiodło się uruchomienie skryptu hook '%s'; uszkodzony link symboliczny" -#: libsvn_repos/hooks.c:343 +#: libsvn_repos/hooks.c:353 msgid "" "Repository has not been enabled to accept revision propchanges;\n" "ask the administrator to create a pre-revprop-change hook" msgstr "" +"Repozytorium nie ma włączone możliwości zmieniania atrybutów;\n" +"poproś administratora o utworzenie skryptu hook pre-revprop-change" -#: libsvn_repos/load.c:155 libsvn_repos/load.c:167 -#, fuzzy +#: libsvn_repos/load.c:157 libsvn_repos/load.c:169 msgid "Found malformed header block in dumpfile stream" -msgstr "Błędny nagłówek w pliku wersji" +msgstr "Błędny nagłówek w strumieniu pliku zrzutu" -#: libsvn_repos/load.c:185 +#: libsvn_repos/load.c:187 msgid "Premature end of content data in dumpstream" -msgstr "" +msgstr "Nieoczekiwany koniec danych zrzutu" -#: libsvn_repos/load.c:192 +#: libsvn_repos/load.c:194 msgid "Dumpstream data appears to be malformed" msgstr "Dane zrzutu prawdopodobnie jest uszkodzone" -#: libsvn_repos/load.c:230 -#, fuzzy +#: libsvn_repos/load.c:232 msgid "Incomplete or unterminated property block" -msgstr "Nieoczekiwany lub nieznany typ atrybutu" +msgstr "Niekompletny lub niepoprawnie zakończony blok atrybutu" -#: libsvn_repos/load.c:423 +#: libsvn_repos/load.c:425 msgid "Unexpected EOF writing contents" msgstr "Nieoczekiwany koniec strumienia zapisu" -#: libsvn_repos/load.c:452 +#: libsvn_repos/load.c:454 msgid "Malformed dumpfile header" msgstr "Błędny nagłówek pliku zrzutu" -#: libsvn_repos/load.c:458 libsvn_repos/load.c:500 +#: libsvn_repos/load.c:460 libsvn_repos/load.c:502 #, c-format msgid "Unsupported dumpfile version: %d" msgstr "Wersja repozytorium: %d jest nieobsługiwana" -#: libsvn_repos/load.c:598 +#: libsvn_repos/load.c:600 msgid "Unrecognized record type in stream" msgstr "Nieznany typ rekordu w strumieniu" -#: libsvn_repos/load.c:710 +#: libsvn_repos/load.c:712 msgid "Sum of subblock sizes larger than total block content length" msgstr "" +"Suma rozmiarów poszczególnych podbloków jest większa niż długość całego bloku" -#: libsvn_repos/load.c:889 +#: libsvn_repos/load.c:891 #, c-format msgid "<<< Started new transaction, based on original revision %ld\n" msgstr "<<< Nowa transakcja, na bazie oryginalnej wersji %ld\n" -#: libsvn_repos/load.c:934 +#: libsvn_repos/load.c:936 #, c-format msgid "Relative source revision %ld is not available in current repository" msgstr "" "Odpowiednia źródłowa wersja %ld nie jest dostępna w bieżącym repozytorium" -#: libsvn_repos/load.c:983 +#: libsvn_repos/load.c:985 msgid "Malformed dumpstream: Revision 0 must not contain node records" msgstr "Uszkodzony zrzut: wersja 0 nie może zawierać węzła rekordów" -#: libsvn_repos/load.c:1027 -#, fuzzy, c-format +#: libsvn_repos/load.c:1029 +#, c-format msgid "Unrecognized node-action on node '%s'" -msgstr "Nieznany rodzaj obiektu: '%s'" +msgstr "Nieznany typ node-action dla obiektu '%s'" -#: libsvn_repos/load.c:1216 +#: libsvn_repos/load.c:1240 #, c-format msgid "" "\n" @@ -4299,7 +4326,7 @@ "------- Zatwierdzona wersja %ld >>>\n" "\n" -#: libsvn_repos/load.c:1222 +#: libsvn_repos/load.c:1246 #, c-format msgid "" "\n" @@ -4349,7 +4376,6 @@ msgstr "'%s' istnieje i jest nie pusty" #: libsvn_repos/repos.c:172 -#, fuzzy msgid "Creating db logs lock file" msgstr "Tworzenie pliku blokad dla logów bazy danych" @@ -4501,212 +4527,212 @@ msgid "Can't recode error string from APR" msgstr "Nie umiem zdekodować komunikatu błędu z APR" -#: libsvn_subr/io.c:127 +#: libsvn_subr/io.c:129 #, c-format msgid "Can't check path '%s'" msgstr "Nie można sprawdzić ścieżki '%s'" -#: libsvn_subr/io.c:246 libsvn_subr/io.c:335 +#: libsvn_subr/io.c:248 libsvn_subr/io.c:337 #, c-format msgid "Can't open '%s'" msgstr "Nie mozna otworzyć '%s'" -#: libsvn_subr/io.c:260 libsvn_subr/io.c:348 +#: libsvn_subr/io.c:262 libsvn_subr/io.c:350 #, c-format msgid "Unable to make name for '%s'" msgstr "Nie zdołano przydzielić nazwy dla '%s'" -#: libsvn_subr/io.c:352 libsvn_subr/io.c:388 libsvn_subr/io.c:416 +#: libsvn_subr/io.c:354 libsvn_subr/io.c:390 libsvn_subr/io.c:418 msgid "Symbolic links are not supported on this platform" msgstr "Na tej platformie nie są wspierane dowiązania symboliczne" -#: libsvn_subr/io.c:375 +#: libsvn_subr/io.c:377 msgid "Can't read contents of link" msgstr "Nie można przeczytać zawartości wskazywanej przez odniesienie" -#: libsvn_subr/io.c:517 libsvn_subr/io.c:527 +#: libsvn_subr/io.c:519 libsvn_subr/io.c:529 msgid "Can't find a temporary directory" msgstr "Nie można znaleźć katalogu tymczasowego" -#: libsvn_subr/io.c:564 +#: libsvn_subr/io.c:566 #, c-format msgid "Can't copy '%s' to '%s'" msgstr "Nie można skopiować '%s' do '%s'" -#: libsvn_subr/io.c:597 +#: libsvn_subr/io.c:599 #, c-format msgid "Can't set permissions on '%s'" msgstr "Nie można przypisać praw dla '%s'" -#: libsvn_subr/io.c:619 +#: libsvn_subr/io.c:621 #, c-format msgid "Can't append '%s' to '%s'" msgstr "Nie można dodać '%s' do '%s'" -#: libsvn_subr/io.c:653 +#: libsvn_subr/io.c:655 #, c-format msgid "Source '%s' is not a directory" msgstr "Źródło '%s' nie jest katalogiem" -#: libsvn_subr/io.c:659 +#: libsvn_subr/io.c:661 #, c-format msgid "Destination '%s' is not a directory" msgstr "Obiekt docelowy '%s' nie jest katalogiem" -#: libsvn_subr/io.c:665 +#: libsvn_subr/io.c:667 #, c-format msgid "Destination '%s' already exists" msgstr "Ścieżka docelowa '%s' już istnieje" -#: libsvn_subr/io.c:738 libsvn_subr/io.c:1498 libsvn_subr/io.c:1567 +#: libsvn_subr/io.c:730 libsvn_subr/io.c:1490 libsvn_subr/io.c:1559 #, c-format msgid "Can't read directory '%s'" msgstr "Nie można odczytać katalogu '%s'" -#: libsvn_subr/io.c:743 libsvn_subr/io.c:1503 libsvn_subr/io.c:1572 -#: libsvn_subr/io.c:2457 +#: libsvn_subr/io.c:735 libsvn_subr/io.c:1495 libsvn_subr/io.c:1564 +#: libsvn_subr/io.c:2463 #, c-format msgid "Error closing directory '%s'" msgstr "Błąd zamykania katalogu '%s'" -#: libsvn_subr/io.c:769 +#: libsvn_subr/io.c:761 #, c-format msgid "Can't make directory '%s'" msgstr "Nie można stworzyć katalogu '%s'" -#: libsvn_subr/io.c:837 +#: libsvn_subr/io.c:829 #, c-format msgid "Can't set access time of '%s'" msgstr "Nie można ustawić informacji o czasie dostępu do '%s'" -#: libsvn_subr/io.c:953 +#: libsvn_subr/io.c:945 #, c-format msgid "Can't set file '%s' read-only" msgstr "Nie można ustawić atrybutu 'tylko do odczytu' dla pliku '%s'" -#: libsvn_subr/io.c:978 +#: libsvn_subr/io.c:970 #, c-format msgid "Can't set file '%s' read-write" msgstr "Nie można ustawić atrybutu 'do zapisu i odczytu' dla pliku '%s'" -#: libsvn_subr/io.c:1033 libsvn_subr/io.c:1077 libsvn_subr/io.c:1101 +#: libsvn_subr/io.c:1025 libsvn_subr/io.c:1069 libsvn_subr/io.c:1093 #, fuzzy, c-format msgid "Can't change executability of file '%s'" msgstr "Nie można założyć blokady na pliku '%s'" -#: libsvn_subr/io.c:1128 +#: libsvn_subr/io.c:1120 msgid "Error getting UID of process" msgstr "Błąd pobierania UID procesu" -#: libsvn_subr/io.c:1209 +#: libsvn_subr/io.c:1201 #, c-format msgid "Can't get shared lock on file '%s'" msgstr "Nie można założyć dzielonej blokady dla pliku '%s'" -#: libsvn_subr/io.c:1213 +#: libsvn_subr/io.c:1205 #, c-format msgid "Can't get exclusive lock on file '%s'" msgstr "Nie można założyć blokady na pliku '%s'" -#: libsvn_subr/io.c:1244 +#: libsvn_subr/io.c:1236 #, c-format msgid "Can't flush file '%s'" msgstr "Nie można opróżnić pliku '%s'" -#: libsvn_subr/io.c:1245 +#: libsvn_subr/io.c:1237 msgid "Can't flush stream" msgstr "Nie można opróżnić strumienia" -#: libsvn_subr/io.c:1257 libsvn_subr/io.c:1274 +#: libsvn_subr/io.c:1249 libsvn_subr/io.c:1266 msgid "Can't flush file to disk" msgstr "Nie można opróżnić pliku na dysk" -#: libsvn_subr/io.c:1295 +#: libsvn_subr/io.c:1287 msgid "Reading from stdin is currently broken, so disabled" msgstr "" "Czytanie z standardowego wejścia jest aktualnie uszkodzone,\n" "tak więc zostanie wyłączone" -#: libsvn_subr/io.c:1316 +#: libsvn_subr/io.c:1308 msgid "Can't get file name" msgstr "Nie można dostać nazwy pliku" -#: libsvn_subr/io.c:1384 +#: libsvn_subr/io.c:1376 #, c-format msgid "Can't remove file '%s'" msgstr "Nie można usunąć pliku '%s'" -#: libsvn_subr/io.c:1413 +#: libsvn_subr/io.c:1405 #, c-format msgid "Can't rewind directory '%s'" msgstr "Nie można przejść do pierwszego elementu katalogu '%s'" -#: libsvn_subr/io.c:1448 libsvn_subr/io.c:2308 libsvn_subr/io.c:2396 +#: libsvn_subr/io.c:1440 libsvn_subr/io.c:2312 libsvn_subr/io.c:2400 #, c-format msgid "Can't open directory '%s'" msgstr "Nie można otworzyć katalogu '%s'" -#: libsvn_subr/io.c:1487 libsvn_subr/io.c:1509 +#: libsvn_subr/io.c:1479 libsvn_subr/io.c:1501 #, c-format msgid "Can't remove '%s'" msgstr "Nie można usunąć '%s'" -#: libsvn_subr/io.c:1603 +#: libsvn_subr/io.c:1595 #, c-format msgid "Can't create process '%s' attributes" msgstr "Nie można utworzyć atrybutów procesu '%s'" -#: libsvn_subr/io.c:1609 +#: libsvn_subr/io.c:1601 #, c-format msgid "Can't set process '%s' cmdtype" msgstr "Nie można ustalić sposobu wywołania procesu '%s'" -#: libsvn_subr/io.c:1621 +#: libsvn_subr/io.c:1613 #, c-format msgid "Can't set process '%s' directory" msgstr "Nie można ustawić katalogu dla procesu '%s'" -#: libsvn_subr/io.c:1634 +#: libsvn_subr/io.c:1626 #, c-format msgid "Can't set process '%s' child input" msgstr "Nie można przydzielić procesowi '%s' strumienia wejściowego" -#: libsvn_subr/io.c:1641 +#: libsvn_subr/io.c:1633 #, c-format msgid "Can't set process '%s' child outfile" msgstr "Nie można przydzielić procesowi '%s' strumienia wyjściowego" -#: libsvn_subr/io.c:1648 +#: libsvn_subr/io.c:1640 #, c-format msgid "Can't set process '%s' child errfile" msgstr "Nie można przydzielić procesowi '%s' strumienia błędów" -#: libsvn_subr/io.c:1672 +#: libsvn_subr/io.c:1664 #, c-format msgid "Can't start process '%s'" msgstr "Nie można uruchomić procesu '%s'" -#: libsvn_subr/io.c:1680 +#: libsvn_subr/io.c:1672 #, c-format msgid "Error waiting for process '%s'" msgstr "Błąd podczas czekania na proces '%s'" -#: libsvn_subr/io.c:1688 +#: libsvn_subr/io.c:1680 #, c-format msgid "Process '%s' failed (exitwhy %d)" msgstr "Proces '%s' zakończył się niepowodzeniem ( kod błędu: %d )" -#: libsvn_subr/io.c:1695 +#: libsvn_subr/io.c:1687 #, c-format msgid "Process '%s' returned error exitcode %d" msgstr "Proces '%s' zwrócił kod błędu %d" -#: libsvn_subr/io.c:1783 +#: libsvn_subr/io.c:1775 #, c-format msgid "'%s' returned %d" msgstr "'%s' zwrócił kod błędu %d" -#: libsvn_subr/io.c:1886 +#: libsvn_subr/io.c:1878 #, c-format msgid "" "Error running '%s': exitcode was %d, args were:\n" @@ -4721,116 +4747,126 @@ "%s\n" "%s" -#: libsvn_subr/io.c:1922 +#: libsvn_subr/io.c:1914 #, c-format msgid "Can't detect MIME type of non-file '%s'" msgstr "Nie można określić typu MIME dla obiektu '%s'" -#: libsvn_subr/io.c:1989 +#: libsvn_subr/io.c:1981 #, c-format msgid "Can't open file '%s'" msgstr "Nie można otworzyć pliku '%s'" -#: libsvn_subr/io.c:2025 +#: libsvn_subr/io.c:2017 #, c-format msgid "Can't close file '%s'" msgstr "Nie można zamknąć katalogu '%s'" -#: libsvn_subr/io.c:2026 +#: libsvn_subr/io.c:2018 msgid "Can't close stream" msgstr "Nie można zamknąć strumienia" -#: libsvn_subr/io.c:2036 libsvn_subr/io.c:2060 libsvn_subr/io.c:2073 +#: libsvn_subr/io.c:2028 libsvn_subr/io.c:2052 libsvn_subr/io.c:2065 #, c-format msgid "Can't read file '%s'" msgstr "Nie można czytać z pliku '%s'" -#: libsvn_subr/io.c:2037 libsvn_subr/io.c:2061 libsvn_subr/io.c:2074 +#: libsvn_subr/io.c:2029 libsvn_subr/io.c:2053 libsvn_subr/io.c:2066 msgid "Can't read stream" msgstr "Nie można czytać z strumienia" -#: libsvn_subr/io.c:2048 +#: libsvn_subr/io.c:2040 #, c-format msgid "Can't get attribute information from file '%s'" msgstr "Nie można uzyskać z pliku '%s' informacji o atrybutach" -#: libsvn_subr/io.c:2049 +#: libsvn_subr/io.c:2041 msgid "Can't get attribute information from stream" msgstr "Nie mogę uzyskać ze strumienia informacji o atrybutach" -#: libsvn_subr/io.c:2085 +#: libsvn_subr/io.c:2077 #, c-format msgid "Can't set position pointer in file '%s'" msgstr "Nie można ustawić wskaźnika pozycji w pliku '%s'" -#: libsvn_subr/io.c:2086 +#: libsvn_subr/io.c:2078 msgid "Can't set position pointer in stream" msgstr "Nie można ustawić wskaźnika pozycji strumienia" -#: libsvn_subr/io.c:2097 libsvn_subr/io.c:2110 +#: libsvn_subr/io.c:2089 libsvn_subr/io.c:2102 #, c-format msgid "Can't write to file '%s'" msgstr "Nie można pisać do pliku '%s'" -#: libsvn_subr/io.c:2098 libsvn_subr/io.c:2111 +#: libsvn_subr/io.c:2090 libsvn_subr/io.c:2103 msgid "Can't write to stream" msgstr "Nie można pisać do strumienia '%s'" -#: libsvn_subr/io.c:2184 +#: libsvn_subr/io.c:2143 +#, fuzzy, c-format +msgid "Can't read length line in file '%s'" +msgstr "Nie można czytać z pliku '%s'" + +#: libsvn_subr/io.c:2147 +#, fuzzy +msgid "Can't read length line in stream" +msgstr "Nie można czytać z strumienia" + +#: libsvn_subr/io.c:2188 #, c-format msgid "Can't move '%s' to '%s'" msgstr "Nie można przenieść '%s' do '%s'" -#: libsvn_subr/io.c:2224 +#: libsvn_subr/io.c:2228 #, c-format msgid "Can't create directory '%s'" msgstr "Nie można utworzyć katalogu '%s'" -#: libsvn_subr/io.c:2235 +#: libsvn_subr/io.c:2239 #, c-format msgid "Can't hide directory '%s'" msgstr "Nie można ukryć katalogu '%s'" -#: libsvn_subr/io.c:2248 +#: libsvn_subr/io.c:2252 #, c-format msgid "Can't stat directory '%s'" msgstr "Nie można pobrać informacji o katalogu '%s'" -#: libsvn_subr/io.c:2264 +#: libsvn_subr/io.c:2268 #, c-format msgid "Can't stat new directory '%s'" msgstr "Nie można pobrać informacji o nowym katalogu '%s'" -#: libsvn_subr/io.c:2326 +#: libsvn_subr/io.c:2330 #, c-format msgid "Can't remove directory '%s'" msgstr "Nie można usunąć katalogu '%s'" -#: libsvn_subr/io.c:2344 +#: libsvn_subr/io.c:2348 msgid "Can't read directory" msgstr "Nie można czytać z katalogu '%s'" -#: libsvn_subr/io.c:2413 +#: libsvn_subr/io.c:2419 #, c-format msgid "Can't read directory entry in '%s'" msgstr "Nie można czytać kolejnego elementu katalogu '%s'" -#: libsvn_subr/io.c:2538 +#: libsvn_subr/io.c:2544 #, c-format msgid "Can't check directory '%s'" msgstr "Nie można sprawdzić katalogu '%s'" -#: libsvn_subr/io.c:2560 +#: libsvn_subr/io.c:2566 #, c-format msgid "Version %d is not non-negative" msgstr "Numer wersji %d nie jest nieujemny" -#: libsvn_subr/io.c:2607 +#: libsvn_subr/io.c:2613 #, c-format msgid "Reading '%s'" msgstr "Czytanie '%s'" -#: libsvn_subr/io.c:2623 +#: libsvn_subr/io.c:2629 #, c-format msgid "First line of '%s' contains non-digit" msgstr "Pierwsza linia '%s' nie jest cyfrą" @@ -4906,21 +4942,21 @@ msgid "Type '%s help' for usage.\n" msgstr "Użyj '%s help' by otrzymać podstawowe instrukcje.\n" -#: libsvn_subr/path.c:1070 +#: libsvn_subr/path.c:1065 #, c-format msgid "Couldn't determine absolute path of '%s'" msgstr "Nie można ustalić absolutnej ścieżki '%s'" -#: libsvn_subr/path.c:1109 +#: libsvn_subr/path.c:1104 #, c-format msgid "'%s' is neither a file nor a directory name" msgstr "'%s' nie jest ani nazwą pliku ani katalogu" -#: libsvn_subr/path.c:1215 +#: libsvn_subr/path.c:1210 msgid "Can't determine the native path encoding" msgstr "Nie można ustalić natywnego kodowania dla ścieżki" -#: libsvn_subr/path.c:1269 +#: libsvn_subr/path.c:1264 #, fuzzy, c-format msgid "Invalid control character '0x%02x' in path '%s'" msgstr "Błędna składnia ścieżki '%s'" @@ -4930,53 +4966,71 @@ msgid "File '%s' has inconsistent newlines" msgstr "Plik '%s' ma niejednolite znaki końca wiersza" -#: libsvn_subr/utf.c:147 +#: libsvn_subr/utf.c:149 msgid "Can't lock charset translation mutex" -msgstr "" +msgstr "Nie można zablokować tablicy znaków tłumaczeń" -#: libsvn_subr/utf.c:165 libsvn_subr/utf.c:215 +#: libsvn_subr/utf.c:167 libsvn_subr/utf.c:226 msgid "Can't unlock charset translation mutex" -msgstr "" +msgstr "Nie można odblokować tablicy znaków tłumaczeń" -#: libsvn_subr/utf.c:228 -#, c-format -msgid "Can't create a converter from '%s' to '%s'" +#: libsvn_subr/utf.c:242 +#, fuzzy, c-format +msgid "Can't create a character converter from native encoding to '%s'" +msgstr "Nie można stworzyć konwertera z '%s' do '%s'" + +#: libsvn_subr/utf.c:246 +#, fuzzy, c-format +msgid "Can't create a character converter from '%s' to native encoding" msgstr "Nie można stworzyć konwertera z '%s' do '%s'" -#: libsvn_subr/utf.c:229 libsvn_subr/utf.c:230 -msgid "native" -msgstr "natywny" +#: libsvn_subr/utf.c:250 +#, fuzzy, c-format +msgid "Can't create a character converter from '%s' to '%s'" +msgstr "Nie można stworzyć konwertera z '%s' do '%s'" -#. Can't use svn_error_wrap_apr here because it calls functions in -#. this file, leading to infinite recursion. -#: libsvn_subr/utf.c:361 -msgid "Can't recode string" -msgstr "Nie można zdekodować napisu" +#: libsvn_subr/utf.c:441 +#, fuzzy, c-format +msgid "Can't convert string from native encoding to '%s':" +msgstr "Nie można ustalić natywnego kodowania dla ścieżki" -#: libsvn_subr/utf.c:401 -#, c-format +#: libsvn_subr/utf.c:445 +#, fuzzy, c-format +msgid "Can't convert string from '%s' to native encoding:" +msgstr "Nie można ustalić natywnego kodowania dla ścieżki" + +#: libsvn_subr/utf.c:449 +#, fuzzy, c-format +msgid "Can't convert string from '%s' to '%s':" +msgstr "Nie można stworzyć konwertera z '%s' do '%s'" + +#: libsvn_subr/utf.c:493 +#, fuzzy, c-format msgid "" -"Safe data:\n" -"\"%s\"\n" -"... was followed by non-ASCII byte %d.\n" -"\n" -"Non-ASCII character detected (see above), and unable to convert to/from UTF-8" +"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from " +"UTF-8" msgstr "" +"Bezpieczne dane:\n" +"\"%s\"\n" +"... następują po znaku nie ASCII %d.\n" +"Wykryto znak nie ASCII i nie mozna go skonwertować do/z UTF-8" -#: libsvn_subr/utf.c:413 +#: libsvn_subr/utf.c:501 #, c-format msgid "" "Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8" msgstr "" +"Wykryto znak nie ASCII o kodzie %d, nie można przeprowadzić konwersji do/z " +"UTF-8" -#: libsvn_subr/utf.c:455 -#, c-format -msgid "" -"Valid UTF-8 data\n" -"(hex:%s)\n" -"followed by invalid UTF-8 sequence\n" -"(hex:%s)" +#: libsvn_subr/utf.c:543 +#, fuzzy, c-format +msgid "Valid UTF-8 data (hex:%s)followed by invalid UTF-8 sequence (hex:%s)" msgstr "" +"Właściwe dane UTF-8\n" +"(hex: %s)\n" +"z poniższą niewłaściwą sekwencją znaków UTF-8\n" +"(hex: %s)" #: libsvn_subr/validate.c:48 #, c-format @@ -4998,7 +5052,7 @@ msgid "Version mismatch in '%s': found %d.%d.%d%s, expected %d.%d.%d%s" msgstr "Konflikt wersji w '%s': znaleziona %d.%d.%d%s, oczekiwana %d.%d.%d%s\"" -#: libsvn_subr/xml.c:367 +#: libsvn_subr/xml.c:420 #, c-format msgid "Malformed XML: %s at line %d" msgstr "Uszkodzony XML: %s w linii %d" @@ -5040,8 +5094,8 @@ "Katalog .svn/tmp nie istnieje lub jest uszkodzony, uruchom 'svn cleanup'\n" "i spróbuj ponownie" -#: libsvn_wc/adm_files.c:622 libsvn_wc/adm_files.c:698 libsvn_wc/lock.c:375 -#: libsvn_wc/lock.c:595 +#: libsvn_wc/adm_files.c:622 libsvn_wc/adm_files.c:698 libsvn_wc/lock.c:377 +#: libsvn_wc/lock.c:630 #, c-format msgid "'%s' is not a working copy" msgstr "'%s' nie jest kopią roboczą" @@ -5076,8 +5130,8 @@ msgid "Unrecognized node kind: '%s'" msgstr "Nieznany rodzaj obiektu: '%s'" -#: libsvn_wc/adm_ops.c:378 libsvn_wc/update_editor.c:915 -#: libsvn_wc/update_editor.c:1305 +#: libsvn_wc/adm_ops.c:378 libsvn_wc/update_editor.c:918 +#: libsvn_wc/update_editor.c:1308 #, c-format msgid "Error writing log file for '%s'" msgstr "Błąd w trakcie zapisu do pliku logu dla '%s'" @@ -5118,39 +5172,39 @@ msgid "Can't add '%s' to a parent directory scheduled for deletion" msgstr "Nie można dodać '%s' - katalog nadrzędny ma zostać skasowany" -#: libsvn_wc/adm_ops.c:1214 libsvn_wc/adm_ops.c:1219 libsvn_wc/adm_ops.c:1255 +#: libsvn_wc/adm_ops.c:1215 libsvn_wc/adm_ops.c:1220 libsvn_wc/adm_ops.c:1256 #, c-format msgid "Error restoring props for '%s'" msgstr "Błąd podczas odtwarzania atrybutów '%s'" -#: libsvn_wc/adm_ops.c:1229 +#: libsvn_wc/adm_ops.c:1230 #, c-format msgid "Error removing props for '%s'" msgstr "Błąd podczas usuwania atrybutów '%s'" -#: libsvn_wc/adm_ops.c:1301 +#: libsvn_wc/adm_ops.c:1302 #, c-format msgid "Error restoring text for '%s'" msgstr "Błąd podczas przywracania zawartości '%s'" -#: libsvn_wc/adm_ops.c:1402 +#: libsvn_wc/adm_ops.c:1403 #, c-format msgid "Cannot revert: '%s' is not under version control" msgstr "Nie można wycofać zmian: '%s' nie podlega zarządzaniu wersjami" -#: libsvn_wc/adm_ops.c:1434 +#: libsvn_wc/adm_ops.c:1435 #, c-format msgid "Cannot revert '%s': unsupported entry node kind" msgstr "Nie można wycofać zmian w '%s': nie znany rodzaj obiektu" -#: libsvn_wc/adm_ops.c:1445 +#: libsvn_wc/adm_ops.c:1446 #, c-format msgid "Cannot revert '%s': unsupported node kind in working copy" msgstr "" "Nie można wycofać zmian w '%s': obiekt znajdujący się w kopii roboczej\n" "jest nieznanego rodzaju " -#: libsvn_wc/adm_ops.c:1493 +#: libsvn_wc/adm_ops.c:1494 msgid "" "Cannot revert addition of current directory; please try again from the " "parent directory" @@ -5158,12 +5212,12 @@ "Nie można wycofać operacji dodania bieżącego katalogu, spróbuj\n" "ponownie wykonać to polecenie znajdując się w katalogu nadrzędnym" -#: libsvn_wc/adm_ops.c:1515 +#: libsvn_wc/adm_ops.c:1516 #, c-format msgid "Unknown or unexpected kind for path '%s'" msgstr "Nie znany lub niedopuszczalny rodzaj obiektu dla ścieżki '%s'" -#: libsvn_wc/adm_ops.c:1701 +#: libsvn_wc/adm_ops.c:1702 #, c-format msgid "File '%s' has local modifications" msgstr "Plik '%s' zawiera lokalne zmiany" @@ -5303,12 +5357,12 @@ msgid "No default entry in directory '%s'" msgstr "Brak domyślnego obiektu w katalogu '%s'" -#: libsvn_wc/entries.c:1169 +#: libsvn_wc/entries.c:1170 #, c-format msgid "Error writing to '%s'" msgstr "Błąd zapisu do '%s'" -#: libsvn_wc/entries.c:1409 +#: libsvn_wc/entries.c:1410 #, c-format msgid "" "Can't add '%s' to deleted directory; try undeleting its parent directory " @@ -5317,7 +5371,7 @@ "Nie można dodać '%s' do skasowanego katalogu, spróbuj cofnąć kasowanie\n" "katalogu nadrzędnego" -#: libsvn_wc/entries.c:1415 +#: libsvn_wc/entries.c:1416 #, c-format msgid "" "Can't replace '%s' in deleted directory; try undeleting its parent directory " @@ -5326,69 +5380,69 @@ "Nie można zastąpić '%s' w skasowanym katalogu, spróbuj cofnąć kasowanie\n" "katalogu nadrzędnego" -#: libsvn_wc/entries.c:1424 +#: libsvn_wc/entries.c:1425 #, c-format msgid "'%s' is marked as absent, so it cannot be scheduled for addition" msgstr "" "'%s' jest oznaczony jako nieobecny, nie może zostać zlecone jego\n" "skasowanie" -#: libsvn_wc/entries.c:1453 +#: libsvn_wc/entries.c:1454 #, c-format msgid "Entry '%s' is already under version control" msgstr "Obiekt '%s' już podlega zarządzaniu wersjami" -#: libsvn_wc/entries.c:1545 +#: libsvn_wc/entries.c:1546 #, c-format msgid "Entry '%s' has illegal schedule" msgstr "Obiekt '%s' ma niepoprawne operacje oczekujące na zatwierdzenie" -#: libsvn_wc/entries.c:1678 +#: libsvn_wc/entries.c:1679 #, c-format msgid "No such entry: '%s'" msgstr "Nie ma takiego obiektu: '%s'" -#: libsvn_wc/entries.c:1744 +#: libsvn_wc/entries.c:1747 #, c-format msgid "Directory '%s' has no THIS_DIR entry" msgstr "Katalog '%s' nie zawiera elementu THIS_DIR" -#: libsvn_wc/entries.c:1813 +#: libsvn_wc/entries.c:1836 #, c-format msgid "'%s' has an unrecognized node kind" msgstr "'%s' jest nieznanego rodzaju" -#: libsvn_wc/entries.c:1849 +#: libsvn_wc/entries.c:1872 #, c-format msgid "Unexpectedly found '%s': path is marked 'missing'" msgstr "Nieoczekiwanie znaleziono '%s': ścieżka jest oznaczona jako brakująca" -#: libsvn_wc/lock.c:158 libsvn_wc/lock.c:357 +#: libsvn_wc/lock.c:158 libsvn_wc/lock.c:359 #, c-format msgid "Working copy '%s' locked" msgstr "Kopia robocza '%s' jest zablokowana" -#: libsvn_wc/lock.c:279 libsvn_wc/lock.c:768 +#: libsvn_wc/lock.c:279 libsvn_wc/lock.c:820 #, c-format msgid "Path '%s' ends in '%s', which is unsupported for this operation" msgstr "Ścieżka '%s' kończy się '%s', co nie jest dozwolone dla tej operacji" -#: libsvn_wc/lock.c:643 +#: libsvn_wc/lock.c:678 #, c-format msgid "Working copy '%s' is missing or not locked" msgstr "Brakuje kopii roboczej '%s' lub nie została zablokowana" -#: libsvn_wc/lock.c:1030 +#: libsvn_wc/lock.c:1085 #, c-format msgid "Write-lock stolen in '%s'" msgstr "Blokada zapisu '%s' została przejęta" -#: libsvn_wc/lock.c:1038 +#: libsvn_wc/lock.c:1093 #, c-format msgid "No write-lock in '%s'" msgstr "Brak blokady zapisu na '%s'" -#: libsvn_wc/lock.c:1060 +#: libsvn_wc/lock.c:1115 #, c-format msgid "Lock file '%s' is not a regular file" msgstr "Plik blokady '%s' nie jest normalnym plikiem" @@ -5472,37 +5526,37 @@ msgid "Error replacing text-base of '%s'" msgstr "Błąd aktualizowania wersji bazowej '%s'" -#: libsvn_wc/log.c:1088 libsvn_wc/log.c:1136 +#: libsvn_wc/log.c:1088 libsvn_wc/log.c:1137 #, c-format msgid "Error modifying entry of '%s'" msgstr "Błąd modyfikacji '%s'" -#: libsvn_wc/log.c:1195 +#: libsvn_wc/log.c:1196 #, c-format msgid "Log entry missing 'name' attribute (entry '%s' for directory '%s')" msgstr "" "Zapis w logu nie zawiera atrybutu 'name' (element '%s' w katalogu '%s')" -#: libsvn_wc/log.c:1251 +#: libsvn_wc/log.c:1252 #, c-format msgid "Unrecognized logfile element '%s' in '%s'" msgstr "Nieznany rodzaj obiektu w logu: '%s' w '%s'" -#: libsvn_wc/log.c:1262 +#: libsvn_wc/log.c:1263 #, c-format msgid "Error processing command '%s' in '%s'" msgstr "Błąd wykonania polecenia '%s' w '%s'" -#: libsvn_wc/log.c:1384 +#: libsvn_wc/log.c:1385 msgid "Couldn't open log" msgstr "Błąd otwarcia logu" -#: libsvn_wc/log.c:1395 +#: libsvn_wc/log.c:1396 #, c-format msgid "Error reading administrative log file in '%s'" msgstr "Błąd zapisu logu administracyjnego '%s'" -#: libsvn_wc/log.c:1487 +#: libsvn_wc/log.c:1490 #, c-format msgid "'%s' is not a working copy directory" msgstr "'%s' nie jest kopią roboczą" @@ -5548,7 +5602,7 @@ msgid "Can't find entry '%s' in '%s'" msgstr "Nie znaleziono '%s' w ramach '%s'" -#: libsvn_wc/props.c:318 libsvn_wc/update_editor.c:2275 +#: libsvn_wc/props.c:318 libsvn_wc/update_editor.c:2277 #, c-format msgid "Error writing log for '%s'" msgstr "Nie udany zapis logu dla '%s'" @@ -5646,17 +5700,17 @@ msgid "No '.' entry in: '%s'" msgstr "Brak elementu '.' w '%s'" -#: libsvn_wc/update_editor.c:832 +#: libsvn_wc/update_editor.c:835 #, c-format msgid "Won't delete locally modified directory '%s'" msgstr "Nie można skasować lokalnie zmodyfikowanego katalogu '%s'" -#: libsvn_wc/update_editor.c:1022 +#: libsvn_wc/update_editor.c:1025 #, c-format msgid "Failed to add directory '%s': object of the same name already exists" msgstr "Błąd dodawania katalogu '%s': obiekt o tej samej nazwie już istnieje" -#: libsvn_wc/update_editor.c:1030 +#: libsvn_wc/update_editor.c:1033 #, c-format msgid "" "Failed to add directory '%s': object of the same name as the administrative " @@ -5665,14 +5719,14 @@ "Błąd dodawania katalogu '%s': tą samą nazwę nosi katalog\n" "administracyjny" -#: libsvn_wc/update_editor.c:1044 +#: libsvn_wc/update_editor.c:1047 #, c-format msgid "Failed to add directory '%s': copyfrom arguments not yet supported" msgstr "" "Błąd dodawania katalogu '%s': parametry copyfrom nie są jeszcze\n" "obsługiwane" -#: libsvn_wc/update_editor.c:1065 +#: libsvn_wc/update_editor.c:1068 #, c-format msgid "" "Failed to add directory '%s': object of the same name is already scheduled " @@ -5681,11 +5735,11 @@ "Błąd dodawania katalogu '%s': obiekt o tej samej nazwie już oczekuje\n" "na dodanie" -#: libsvn_wc/update_editor.c:1274 +#: libsvn_wc/update_editor.c:1277 msgid "Couldn't do property merge" msgstr "Nie udało się łączenie zmian atrybutu" -#: libsvn_wc/update_editor.c:1367 +#: libsvn_wc/update_editor.c:1370 #, c-format msgid "" "Failed to mark '%s' absent: item of the same name is already scheduled for " @@ -5694,12 +5748,12 @@ "Nie udało się oznaczanie '%s' jako brakującego: element o tej samej\n" "nazwie oczekuje na dodanie" -#: libsvn_wc/update_editor.c:1459 +#: libsvn_wc/update_editor.c:1462 #, c-format msgid "Failed to add file '%s': object of the same name already exists" msgstr "Błąd dodawania pliku '%s': obiekt o tej samej nazwie już istnieje" -#: libsvn_wc/update_editor.c:1480 +#: libsvn_wc/update_editor.c:1483 #, c-format msgid "" "Failed to add file '%s': object of the same name is already scheduled for " @@ -5708,21 +5762,21 @@ "Błąd dodawania pliku '%s': obiekt o tej samej nazwie już oczekuje na\n" "dodanie" -#: libsvn_wc/update_editor.c:1488 +#: libsvn_wc/update_editor.c:1491 #, c-format msgid "File '%s' in directory '%s' is not a versioned resource" msgstr "Plik '%s' w katalogu '%s' nie podlega zarządzaniu wersjami" -#: libsvn_wc/update_editor.c:1609 +#: libsvn_wc/update_editor.c:1612 #, c-format msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'" msgstr "Błąd sumy kontrolnej dla '%s'; zapisana: '%s', faktyczna: '%s'<" -#: libsvn_wc/update_editor.c:1905 +#: libsvn_wc/update_editor.c:1908 msgid "Move failed" msgstr "Przesunięcie nie powiodło się" -#: libsvn_wc/update_editor.c:2751 +#: libsvn_wc/update_editor.c:2754 #, c-format msgid "'%s' has no ancestry information" msgstr "Brak informacji o pochodzeniu '%s'" @@ -5744,62 +5798,70 @@ msgid "'%s' is an URL when it should be a path" msgstr "'%s' jest URLem a powinien być ścieżką" -#: svnadmin/main.c:228 svndumpfilter/main.c:761 svnlook/main.c:95 -#: svnserve/main.c:111 svnversion/main.c:200 +#: svnadmin/main.c:230 svndumpfilter/main.c:761 svnlook/main.c:95 +#: svnserve/main.c:111 svnversion/main.c:212 msgid "show version information" msgstr "podaj informację o wersji" -#: svnadmin/main.c:231 +#: svnadmin/main.c:233 msgid "specify revision number ARG (or X:Y range)" msgstr "podaj informację o wersji (lub zakres X:Y)" -#: svnadmin/main.c:234 +#: svnadmin/main.c:236 msgid "dump incrementally" msgstr "dump inkrementalny" -#: svnadmin/main.c:237 +#: svnadmin/main.c:239 msgid "use deltas in dump output" msgstr "używaj delt w wyniku dump" -#: svnadmin/main.c:240 +#: svnadmin/main.c:242 msgid "bypass the repository hook system" msgstr "pomiń skrypty repozytorium" -#: svnadmin/main.c:243 +#: svnadmin/main.c:245 msgid "no progress (only errors) to stderr" msgstr "nie informuj o postępie prac, podawaj jedynie informacje o błędach" -#: svnadmin/main.c:246 +#: svnadmin/main.c:248 msgid "ignore any repos UUID found in the stream" msgstr "ignoruj jakiekolwiek UUID repozytorium" -#: svnadmin/main.c:249 +#: svnadmin/main.c:251 msgid "set repos UUID to that found in stream, if any" msgstr "ustal UUID repozytorium na obecne w pliku dump i ile tylko jest zadane" -#: svnadmin/main.c:252 +#: svnadmin/main.c:254 msgid "type of repository: 'bdb' or 'fsfs'" msgstr "rodzaj repozytorium: 'bdb' lub 'fsfs'" -#: svnadmin/main.c:255 +#: svnadmin/main.c:257 msgid "load at specified directory in repository" msgstr "ładuj w podanym katalogu repozytorium" -#: svnadmin/main.c:258 +#: svnadmin/main.c:260 msgid "disable fsync at transaction commit [Berkeley DB]" msgstr "" "wyłącz synchronizację zapisu na dysk przy zatwierdzaniu transakcji\n" "[Berkeley DB]" -#: svnadmin/main.c:261 +#: svnadmin/main.c:263 msgid "disable automatic log file removal [Berkeley DB]" msgstr "wyłącz automatyczne usuwanie zbędnych logów [Berkeley DB]" -#: svnadmin/main.c:267 +#: svnadmin/main.c:269 msgid "remove redundant log files from source repository" msgstr "usuń zbędne logi z repozytorium" -#: svnadmin/main.c:270 +#: svnadmin/main.c:272 +msgid "call pre-commit hook before committing revisions" +msgstr "woła skrypt pre-commit przed zatwierdzaniem wersji" + +#: svnadmin/main.c:275 +msgid "call post-commit hook after committing revisions" +msgstr "woła skrypt post-commit po zatwierdzaniu wersji" + +#: svnadmin/main.c:278 msgid "" "wait instead of exit if the repository is in\n" " use by another process" @@ -5807,7 +5869,7 @@ "zamiast wyjść czekaj jeśli repozytorium jest w\n" " użyciu przez inny proces" -#: svnadmin/main.c:283 +#: svnadmin/main.c:291 msgid "" "usage: svnadmin create REPOS_PATH\n" "\n" @@ -5817,7 +5879,7 @@ "\n" "Stwórz nowe, puste repozytorium w podanym katalogu\n" -#: svnadmin/main.c:289 +#: svnadmin/main.c:297 msgid "" "usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n" "\n" @@ -5835,7 +5897,7 @@ "wersjami. W razie braku parametru -r polecenie domyślnie działa na\n" "wersji HEAD (najnowszej).\n" -#: svnadmin/main.c:298 +#: svnadmin/main.c:306 msgid "" "usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER]] [--incremental]\n" "\n" @@ -5857,7 +5919,7 @@ "obejmował różnicę między nią a wersją wcześniejszą a nie pełny zrzut\n" "tej wersji.\n" -#: svnadmin/main.c:309 +#: svnadmin/main.c:317 msgid "" "usage: svnadmin help [SUBCOMMAND...]\n" "\n" @@ -5867,7 +5929,7 @@ "\n" "Opisuje działanie podanego polecenia.\n" -#: svnadmin/main.c:314 +#: svnadmin/main.c:322 msgid "" "usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n" "\n" @@ -5878,7 +5940,7 @@ "Tworzy kopię repozytorium w nowym katalogu - bez konieczności\n" "zatrzymywania repozytorium lub wstrzymywania obsługi klientów.\n" -#: svnadmin/main.c:319 +#: svnadmin/main.c:327 msgid "" "usage: svnadmin list-dblogs REPOS_PATH\n" "\n" @@ -5894,7 +5956,7 @@ "UWAGA: zmodyfikowanie lub skasowanie logów będących jeszcze w użyciu\n" "spowoduje uszkodzenie repozytorium.\n" -#: svnadmin/main.c:326 +#: svnadmin/main.c:334 msgid "" "usage: svnadmin list-unused-dblogs REPOS_PATH\n" "\n" @@ -5906,7 +5968,7 @@ "Wypisuje listę logów Berkeley DB które nie są już używane.\n" "\n" -#: svnadmin/main.c:331 +#: svnadmin/main.c:339 msgid "" "usage: svnadmin load REPOS_PATH\n" "\n" @@ -5923,7 +5985,7 @@ "na podane w wczytywanym zrzucie. Informacja o postępie prac jest\n" "wypisywana na wyjściu błędów.\n" -#: svnadmin/main.c:341 +#: svnadmin/main.c:350 msgid "" "usage: svnadmin lstxns REPOS_PATH\n" "\n" @@ -5933,7 +5995,7 @@ "\n" "Wypisuje nazwy wszystkich nie zatwierdzonych transakcji.\n" -#: svnadmin/main.c:346 +#: svnadmin/main.c:355 msgid "" "usage: svnadmin recover REPOS_PATH\n" "\n" @@ -5949,7 +6011,7 @@ "wymagany jest wyłączny dostęp do repozytorium. Naprawa nie zostanie \n" "rozpoczęta w przypadku gdy repozytorium jest zajęte przez inny proces.\n" -#: svnadmin/main.c:354 +#: svnadmin/main.c:363 msgid "" "usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n" "\n" @@ -5959,7 +6021,7 @@ "\n" "Usuwa podaną transakcję/transakcje.\n" -#: svnadmin/main.c:359 +#: svnadmin/main.c:368 msgid "" "usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n" "\n" @@ -5986,7 +6048,7 @@ "UWAGA: historia zmian atrybutów wersji nie jest przechowywana, to\n" "polecenie spowoduje nieodwracalne zastąpienie starego opisu nowym.\n" -#: svnadmin/main.c:373 +#: svnadmin/main.c:382 msgid "" "usage: svnadmin verify REPOS_PATH\n" "\n" @@ -5996,20 +6058,20 @@ "\n" "Weryfikuje poprawność danych znajdujących się w repozytorium.\n" -#: svnadmin/main.c:497 svnadmin/main.c:578 +#: svnadmin/main.c:508 svnadmin/main.c:589 msgid "First revision cannot be higher than second" msgstr "Pierwsza wersja nie może być wyższa niż druga" -#: svnadmin/main.c:506 +#: svnadmin/main.c:517 #, c-format msgid "Deltifying revision %ld..." msgstr "Wyliczanie różnic dla wersji %ld..." -#: svnadmin/main.c:510 +#: svnadmin/main.c:521 msgid "done.\n" msgstr "zrobione.\n" -#: svnadmin/main.c:609 +#: svnadmin/main.c:620 msgid "" "general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" "Type 'svnadmin help <subcommand>' for help on a specific subcommand.\n" @@ -6022,7 +6084,7 @@ "\n" "Dostępne polecenia:\n" -#: svnadmin/main.c:689 +#: svnadmin/main.c:702 msgid "" "Repository lock acquired.\n" "Please wait; recovering the repository may take some time...\n" @@ -6030,7 +6092,7 @@ "Uzyskano blokadę repozytorium.\n" "Proszę czekać; odtwarzanie repozytorium może trwać długo...\n" -#: svnadmin/main.c:724 +#: svnadmin/main.c:737 msgid "" "Failed to get exclusive repository access; perhaps another process\n" "such as httpd, svnserve or svn has it open?" @@ -6038,12 +6100,12 @@ "Nie powiodło się założenie blokady na repozytorium; możliwe, że \n" "procesy takie jak httpd, svnserver lub svn blokują dostęp." -#: svnadmin/main.c:729 +#: svnadmin/main.c:742 msgid "Waiting on repository lock; perhaps another process has it open?\n" msgstr "" "Oczekiwanie na blokadę repozytorium; możliwe, że inny proces blokuje dostęp\n" -#: svnadmin/main.c:736 +#: svnadmin/main.c:749 msgid "" "\n" "Recovery completed.\n" @@ -6051,33 +6113,33 @@ "\n" "Odtwarzanie zakończone.\n" -#: svnadmin/main.c:743 +#: svnadmin/main.c:756 #, c-format msgid "The latest repos revision is %ld.\n" msgstr "Najnowsza wersja repozytorium to %ld.\n" -#: svnadmin/main.c:851 +#: svnadmin/main.c:866 #, c-format msgid "Transaction '%s' removed.\n" msgstr "Usunięto transakcję '%s'.\n" -#: svnadmin/main.c:875 +#: svnadmin/main.c:890 msgid "Missing revision" msgstr "Brak wersji" -#: svnadmin/main.c:878 +#: svnadmin/main.c:893 msgid "Only one revision allowed" msgstr "Tylko jedna wersja jest dozwolona" -#: svnadmin/main.c:884 +#: svnadmin/main.c:899 msgid "Exactly one file argument required" msgstr "Wymagany dokładnie jeden parametr - plik" -#: svnadmin/main.c:1157 svndumpfilter/main.c:1166 svnlook/main.c:1993 +#: svnadmin/main.c:1178 svndumpfilter/main.c:1166 svnlook/main.c:1993 msgid "subcommand argument required\n" msgstr "polecenie wymaga parametrów\n" -#: svnadmin/main.c:1247 +#: svnadmin/main.c:1268 #, c-format msgid "" "subcommand '%s' doesn't accept option '%s'\n" @@ -6112,6 +6174,7 @@ #: svndumpfilter/main.c:637 msgid "Delta property block detected - not supported by svndumpfilter" msgstr "" +"Wykryto blok delta atrybutu - nie jest to wspomagane przez svndumpfilter" #: svndumpfilter/main.c:763 msgid "Do not display filtering statistics." @@ -6568,7 +6631,7 @@ msgstr "" "uruchom jako zadanie pierwszoplanowe (użyteczne przy poszukiwaniu błędów)" -#: svnserve/main.c:109 +#: svnserve/main.c:109 svnversion/main.c:211 msgid "display this help" msgstr "wyświetl tekst pomocy" @@ -6658,7 +6721,12 @@ msgid "Can't bind server socket: %s\n" msgstr "Nie można znaleźć elementu dla '%s'" -#: svnversion/main.c:125 +#: svnversion/main.c:123 +#, fuzzy +msgid "Type 'svnversion --help' for usage.\n" +msgstr "Użyj '%s --help' by otrzymać podstawowe instrukcje.\n" + +#: svnversion/main.c:134 msgid "" "usage: svnversion [OPTIONS] WC_PATH [TRAIL_URL]\n" "\n" @@ -6714,38 +6782,56 @@ "\n" "Obsługiwane opcje:\n" -#: svnversion/main.c:198 +#: svnversion/main.c:209 msgid "do not output the trailing newline" msgstr "nie wypisuj końcowego znaku nowego wiersza" -#: svnversion/main.c:199 +#: svnversion/main.c:210 msgid "last changed rather than current revisions" msgstr "ostatnia zmieniona a nie aktualna wersja" -#: svnversion/main.c:286 +#: svnversion/main.c:301 #, c-format msgid "exported%s" msgstr "wyeksportowano%s" -#: svnversion/main.c:295 +#: svnversion/main.c:310 #, c-format msgid "'%s' not versioned, and not exported\n" msgstr "%s' nie podlegające zarządzaniu wersjami i nie eksportowane\n" -#~ msgid "Unsupported RA plugin ABI version (%d) for ra_svn." -#~ msgstr "Nieobsługiwana wersja interfejsu modułu RA (%d) dla ra_svn." +#~ msgid "Cannot cleanup '%s': not a directory" +#~ msgstr "Nie można oczyścić '%s': nie jest katalogiem" -#~ msgid "Unsupported RA plugin ABI version (%d) for ra_dav" -#~ msgstr "Nieobsługiwana wersja interfejsu modułu RA (%d) dla ra_dav." +#~ msgid " %ld => %ld\n" +#~ msgstr " %ld => %ld\n" + +#~ msgid "No commit for revision 0.\n" +#~ msgstr "Brak zatwierdzeń dla wersji 0.\n" #~ msgid "No get_dir() available for URL schema" #~ msgstr "Schemat URL nie obsługuje get_dir()" -#~ msgid "No commit for revision 0.\n" -#~ msgstr "Brak zatwierdzeń dla wersji 0.\n" +#~ msgid "Unsupported RA plugin ABI version (%d) for ra_dav" +#~ msgstr "Nieobsługiwana wersja interfejsu modułu RA (%d) dla ra_dav." -#~ msgid " %ld => %ld\n" -#~ msgstr " %ld => %ld\n" +#~ msgid "Unsupported RA plugin ABI version (%d) for ra_svn." +#~ msgstr "Nieobsługiwana wersja interfejsu modułu RA (%d) dla ra_svn." -#~ msgid "Cannot cleanup '%s': not a directory" -#~ msgstr "Nie można oczyścić '%s': nie jest katalogiem" +#~ msgid "'svn info' only works on working copy paths, not URLs" +#~ msgstr "" +#~ "'svn info' działa tylko na ścieżkach kopii roboczej, \n" +#~ "a nie na URLach" + +#~ msgid "" +#~ "Mismatched RA plugin version for '%s': found %d.%d.%d%s, expected %d.%d.%d" +#~ "%s" +#~ msgstr "" +#~ "Niewłaściwa wersja wtyczki RA dla '%s': znaleziona %d.%d.%d%s, oczekiwana " +#~ "%d.%d.%d%s" + +#~ msgid "native" +#~ msgstr "natywny" + +#~ msgid "Can't recode string" +#~ msgstr "Nie można zdekodować napisu" Modified: branches/ruby/subversion/po/pt_BR.po Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/po/pt_BR.po?view=diff&rev=13186&p1=branches/ruby/subversion/po/pt_BR.po&r1=13185&p2=branches/ruby/subversion/po/pt_BR.po&r2=13186 ============================================================================== --- branches/ruby/subversion/po/pt_BR.po (original) +++ branches/ruby/subversion/po/pt_BR.po Sun Feb 27 19:19:25 2005 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: subversion 1.1.0\n" "Report-Msgid-Bugs-To: dev-lmwclWVctOZK/UuDQWWi7iCwEArCW2h5@xxxxxxxxxxxxxxxx\n" -"POT-Creation-Date: 2005-02-08 21:47-0200\n" +"POT-Creation-Date: 2005-02-19 13:31-0200\n" "PO-Revision-Date: 2004-07-26 19:19-300\n" "Last-Translator: dev-lmwclWVctOZK/UuDQWWi7iCwEArCW2h5@xxxxxxxxxxxxxxxx\n" "Language-Team: Brazilian Portuguese <dev-lmwclWVctOZK/UuDQWWi7iCwEArCW2h5@xxxxxxxxxxxxxxxx>\n" @@ -19,7 +19,7 @@ msgid "Skipping binary file: '%s'\n" msgstr "Omitindo arquivo binário: '%s'\n" -#: clients/cmdline/checkout-cmd.c:122 clients/cmdline/switch-cmd.c:125 +#: clients/cmdline/checkout-cmd.c:124 clients/cmdline/switch-cmd.c:125 #, c-format msgid "'%s' does not appear to be a URL" msgstr "'%s' não parece ser uma URL" @@ -46,7 +46,7 @@ "Diretório de destino existe; por favor remova o diretório ou use --force " "para sobrescrever" -#: clients/cmdline/help-cmd.c:48 +#: clients/cmdline/help-cmd.c:46 #, c-format msgid "" "usage: svn <subcommand> [options] [args]\n" @@ -70,7 +70,7 @@ "\n" "Sub-comandos disponíveis:\n" -#: clients/cmdline/help-cmd.c:59 +#: clients/cmdline/help-cmd.c:57 msgid "" "Subversion is a tool for version control.\n" "For additional information, see http://subversion.tigris.org/\n"; @@ -78,7 +78,7 @@ "Subversion é uma ferramenta para controle de versão.\n" "Para mais informações, veja http://subversion.tigris.org/\n"; -#: clients/cmdline/help-cmd.c:66 +#: clients/cmdline/help-cmd.c:64 msgid "" "The following repository access (RA) modules are available:\n" "\n" @@ -272,8 +272,8 @@ msgid "force validity of log message source" msgstr "força a validade da fonte de mensagem de log" -#: clients/cmdline/main.c:65 clients/cmdline/main.c:66 svnadmin/main.c:222 -#: svnadmin/main.c:225 svndumpfilter/main.c:755 svndumpfilter/main.c:758 +#: clients/cmdline/main.c:65 clients/cmdline/main.c:66 svnadmin/main.c:224 +#: svnadmin/main.c:227 svndumpfilter/main.c:755 svndumpfilter/main.c:758 #: svnlook/main.c:89 svnlook/main.c:92 msgid "show help on a subcommand" msgstr "mostra ajuda em um sub-comando" @@ -432,7 +432,7 @@ msgid "relocate via URL-rewriting" msgstr "relocar via regravação de URL" -#: clients/cmdline/main.c:136 svnadmin/main.c:264 +#: clients/cmdline/main.c:136 svnadmin/main.c:266 msgid "read user configuration files from directory ARG" msgstr "lê arquivos de configuração do usuário do diretório ARG" @@ -1328,14 +1328,14 @@ msgid "Caught signal" msgstr "Sinal pego" -#: clients/cmdline/main.c:853 svnadmin/main.c:1042 +#: clients/cmdline/main.c:853 svnadmin/main.c:1057 msgid "" "Multiple revision arguments encountered; try '-r M:N' instead of '-r M -r N'" msgstr "" "Múltiplos argumentos de revisão encontrados; tente '-r M:N' ao invés de\n" "'-r M -r N'" -#: clients/cmdline/main.c:865 svnadmin/main.c:1059 +#: clients/cmdline/main.c:865 svnadmin/main.c:1074 #, c-format msgid "Syntax error in revision argument '%s'" msgstr "Erro de sintaxe no argumento de revisão '%s'" @@ -1353,7 +1353,7 @@ msgid "Subcommand argument required\n" msgstr "Argumento do sub-comando requerido\n" -#: clients/cmdline/main.c:1100 svnadmin/main.c:1179 svnlook/main.c:2016 +#: clients/cmdline/main.c:1100 svnadmin/main.c:1200 svnlook/main.c:2016 #, c-format msgid "Unknown command: '%s'\n" msgstr "Comando desconhecido: '%s'\n" @@ -1800,7 +1800,7 @@ msgstr "Não é possível escrever em '%s'" #: clients/cmdline/util.c:204 clients/cmdline/util.c:228 -#: libsvn_fs_fs/fs_fs.c:989 libsvn_subr/io.c:2162 +#: libsvn_fs_fs/fs_fs.c:990 libsvn_subr/io.c:2176 #, c-format msgid "Can't stat '%s'" msgstr "Não é possível executar stat '%s'" @@ -2700,7 +2700,7 @@ msgid "Commit item '%s' has copy flag but no copyfrom URL\n" msgstr "Ítem de commit '%s' possui flag de cópia mas não copyfrom URL\n" -#: libsvn_client/commit_util.c:612 libsvn_client/commit_util.c:741 +#: libsvn_client/commit_util.c:612 libsvn_client/commit_util.c:740 #: libsvn_client/copy.c:1063 libsvn_client/delete.c:67 #: libsvn_client/diff.c:1380 libsvn_client/diff.c:1973 #: libsvn_client/diff.c:2446 libsvn_client/diff.c:2553 libsvn_client/log.c:128 @@ -2708,8 +2708,8 @@ #: libsvn_client/prop_commands.c:588 libsvn_client/prop_commands.c:940 #: libsvn_client/ra.c:180 libsvn_client/revisions.c:89 #: libsvn_client/status.c:129 libsvn_client/switch.c:103 -#: libsvn_wc/adm_ops.c:2106 libsvn_wc/copy.c:386 libsvn_wc/entries.c:1382 -#: libsvn_wc/entries.c:1801 libsvn_wc/props.c:281 libsvn_wc/questions.c:171 +#: libsvn_wc/adm_ops.c:2107 libsvn_wc/copy.c:386 libsvn_wc/entries.c:1383 +#: libsvn_wc/entries.c:1802 libsvn_wc/props.c:281 libsvn_wc/questions.c:171 #, c-format msgid "'%s' is not under version control" msgstr "'%s' não está sobre controle de versão" @@ -2736,7 +2736,7 @@ "que\n" "está dentro de um diretório não versionado (ou não ainda versionado)?" -#: libsvn_client/commit_util.c:707 +#: libsvn_client/commit_util.c:706 #, c-format msgid "" "'%s' is not under version control and is not part of the commit, yet its " @@ -2745,19 +2745,19 @@ "'%s' não está sobre controle de versão e não é parte do commit, porém seu " "filho '%s' é parte do commit" -#: libsvn_client/commit_util.c:790 +#: libsvn_client/commit_util.c:789 #, c-format msgid "Cannot commit both '%s' and '%s' as they refer to the same URL" msgstr "" "Não é possível executar commit em '%s' e '%s' porque ambos referem ao mesmo " "URL" -#: libsvn_client/commit_util.c:935 +#: libsvn_client/commit_util.c:934 #, c-format msgid "Commit item '%s' has copy flag but no copyfrom URL" msgstr "Ítem de commit '%s' possui flag de cópia mas não copyfrom URL" -#: libsvn_client/commit_util.c:940 +#: libsvn_client/commit_util.c:939 #, c-format msgid "Commit item '%s' has copy flag but an invalid revision" msgstr "Ítem de commit '%s' possui flag de cópia mas uma revisão inválida" @@ -2977,8 +2977,8 @@ msgid "'%s' already exists" msgstr "'%s' já existe" -#: libsvn_client/export.c:679 libsvn_wc/update_editor.c:1592 -#: libsvn_wc/update_editor.c:2338 +#: libsvn_client/export.c:679 libsvn_wc/update_editor.c:1594 +#: libsvn_wc/update_editor.c:2340 #, c-format msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'" msgstr "Checksum não bate para '%s'; esperado: '%s', obtido: '%s'" @@ -3145,8 +3145,8 @@ msgid "Failed to delete mmap '%s'" msgstr "Falhou ao apagar mmap '%s'" -#: libsvn_fs/fs-loader.c:99 libsvn_ra/ra_loader.c:147 -#: libsvn_ra/ra_loader.c:160 +#: libsvn_fs/fs-loader.c:99 libsvn_ra/ra_loader.c:156 +#: libsvn_ra/ra_loader.c:169 #, c-format msgid "'%s' does not define '%s()'" msgstr "'%s' não define '%s()'" @@ -3180,7 +3180,7 @@ msgstr "" "Arquivo é imutável: sistema de arquivos '%s', revisão %ld, caminho '%s'" -#: libsvn_fs_base/fs.c:1122 +#: libsvn_fs_base/fs.c:1129 msgid "" "Error copying logfile; the DB_LOG_AUTOREMOVE feature \n" "may be interfering with the hotcopy algorithm. If \n" @@ -3191,7 +3191,7 @@ "pode estar interferindo com o algorítmo hotcopy. Se o problema\n" "persistir, tente desativar esta característica em DB_CONFIG." -#: libsvn_fs_base/fs.c:1141 +#: libsvn_fs_base/fs.c:1148 msgid "" "Error running catastrophic recovery on hotcopy; the \n" "DB_LOG_AUTOREMOVE feature may be interfering with the \n" @@ -3203,7 +3203,7 @@ "algorítmo hotcopy. Se o problema persistir, tente desativar esta\n" "característica em DB_CONFIG." -#: libsvn_fs_base/fs.c:1278 +#: libsvn_fs_base/fs.c:1285 #, c-format msgid "Unsupported FS loader version (%d) for bdb" msgstr "Versão de FS loader (%d) não suportada para bdb" @@ -3302,180 +3302,172 @@ msgid "Unsupported FS loader version (%d) for fsfs" msgstr "Versão (%d) de FS loader não suportada para fsfs" -#: libsvn_fs_fs/fs_fs.c:363 libsvn_fs_fs/fs_fs.c:377 +#: libsvn_fs_fs/fs_fs.c:364 libsvn_fs_fs/fs_fs.c:378 msgid "Found malformed header in revision file" msgstr "Cabeçalho mal formado encontrado em arquivo de revisão" -#: libsvn_fs_fs/fs_fs.c:479 libsvn_fs_fs/fs_fs.c:493 libsvn_fs_fs/fs_fs.c:500 -#: libsvn_fs_fs/fs_fs.c:507 libsvn_fs_fs/fs_fs.c:515 libsvn_fs_fs/fs_fs.c:523 +#: libsvn_fs_fs/fs_fs.c:480 libsvn_fs_fs/fs_fs.c:494 libsvn_fs_fs/fs_fs.c:501 +#: libsvn_fs_fs/fs_fs.c:508 libsvn_fs_fs/fs_fs.c:516 libsvn_fs_fs/fs_fs.c:524 msgid "Malformed text rep offset line in node-rev" msgstr "Linha de texto de rep mal formada em node-rev" -#: libsvn_fs_fs/fs_fs.c:592 +#: libsvn_fs_fs/fs_fs.c:593 msgid "Missing kind field in node-rev" msgstr "Faltando o campo kind em node-rev" -#: libsvn_fs_fs/fs_fs.c:623 +#: libsvn_fs_fs/fs_fs.c:624 msgid "Missing cpath in node-rev" msgstr "Faltando cpath em node-rev" -#: libsvn_fs_fs/fs_fs.c:650 libsvn_fs_fs/fs_fs.c:656 +#: libsvn_fs_fs/fs_fs.c:651 libsvn_fs_fs/fs_fs.c:657 msgid "Malformed copyroot line in node-rev" msgstr "copyroot mal formada em linha node-rev" -#: libsvn_fs_fs/fs_fs.c:674 libsvn_fs_fs/fs_fs.c:680 +#: libsvn_fs_fs/fs_fs.c:675 libsvn_fs_fs/fs_fs.c:681 msgid "Malformed copyfrom line in node-rev" msgstr "copyfrom mal formada em linha node-rev" -#: libsvn_fs_fs/fs_fs.c:778 libsvn_fs_fs/fs_fs.c:3006 +#: libsvn_fs_fs/fs_fs.c:779 libsvn_fs_fs/fs_fs.c:3063 msgid "Attempted to write to non-transaction" msgstr "Tentativa de escrever em não transacional" -#: libsvn_fs_fs/fs_fs.c:862 +#: libsvn_fs_fs/fs_fs.c:863 msgid "Malformed representation header" msgstr "Cabeçalho de representação mal formado" -#: libsvn_fs_fs/fs_fs.c:886 +#: libsvn_fs_fs/fs_fs.c:887 msgid "Missing node-id in node-rev" msgstr "Faltando node-id em node-rev" -#: libsvn_fs_fs/fs_fs.c:892 +#: libsvn_fs_fs/fs_fs.c:893 msgid "Corrupt node-id in node-rev" msgstr "node-id corrompido em node-rev" -#: libsvn_fs_fs/fs_fs.c:937 +#: libsvn_fs_fs/fs_fs.c:938 msgid "Revision file lacks trailing newline" msgstr "Arquivo de revisão não possui 'newline' final" -#: libsvn_fs_fs/fs_fs.c:949 +#: libsvn_fs_fs/fs_fs.c:950 msgid "Final line in revision file longer than 64 characters" msgstr "Linha final em arquivo de revisão possui mais de 64 caracteres" -#: libsvn_fs_fs/fs_fs.c:962 +#: libsvn_fs_fs/fs_fs.c:963 msgid "Final line in revision file missing space" msgstr "Faltando espaço na linha final do arquivo de revisão" -#: libsvn_fs_fs/fs_fs.c:992 +#: libsvn_fs_fs/fs_fs.c:993 #, c-format msgid "Can't chmod '%s'" msgstr "Não é possível aplicar chmod a '%s'" -#: libsvn_fs_fs/fs_fs.c:1050 libsvn_fs_fs/fs_fs.c:1107 libsvn_repos/log.c:239 +#: libsvn_fs_fs/fs_fs.c:1051 libsvn_fs_fs/fs_fs.c:1108 libsvn_repos/log.c:239 #: libsvn_repos/log.c:243 #, c-format msgid "No such revision %ld" msgstr "Não há revisão %ld" -#: libsvn_fs_fs/fs_fs.c:1182 +#: libsvn_fs_fs/fs_fs.c:1183 msgid "Malformed svndiff data in representation" msgstr "Dado svndiff mal formado em dado de representação" -#: libsvn_fs_fs/fs_fs.c:1298 libsvn_fs_fs/fs_fs.c:1318 -#: libsvn_fs_fs/fs_fs.c:1331 +#: libsvn_fs_fs/fs_fs.c:1294 libsvn_fs_fs/fs_fs.c:1307 +#: libsvn_fs_fs/fs_fs.c:1338 msgid "Reading one svndiff window read beyond the end of the representation" msgstr "Lendo uma janela de leitura svndiff além do fim da representação" -#: libsvn_fs_fs/fs_fs.c:1420 +#: libsvn_fs_fs/fs_fs.c:1451 msgid "svndiff data requested non-existent source" msgstr "Dado de svndiff requer fonte não existente" -#: libsvn_fs_fs/fs_fs.c:1426 +#: libsvn_fs_fs/fs_fs.c:1457 msgid "svndiff requested position beyond end of stream" msgstr "svndiff requeriu posição além do final da cadeia" -#: libsvn_fs_fs/fs_fs.c:1448 +#: libsvn_fs_fs/fs_fs.c:1480 libsvn_fs_fs/fs_fs.c:1497 msgid "svndiff window length is corrupt" msgstr "Tamanho da janela svndiff está corrompido" -#: libsvn_fs_fs/fs_fs.c:1623 libsvn_fs_fs/fs_fs.c:1636 -#: libsvn_fs_fs/fs_fs.c:1642 +#: libsvn_fs_fs/fs_fs.c:1680 libsvn_fs_fs/fs_fs.c:1693 +#: libsvn_fs_fs/fs_fs.c:1699 msgid "Directory entry corrupt" msgstr "Entrada de diretório corrompida" -#: libsvn_fs_fs/fs_fs.c:1809 +#: libsvn_fs_fs/fs_fs.c:1866 msgid "Missing required node revision ID" msgstr "Faltando ID de revisão de nó requerido" -#: libsvn_fs_fs/fs_fs.c:1819 +#: libsvn_fs_fs/fs_fs.c:1876 msgid "Invalid change ordering: new node revision ID without delete" msgstr "Ordem de mudança inválida: novo ID de revisão de nó sem delete" -#: libsvn_fs_fs/fs_fs.c:1830 +#: libsvn_fs_fs/fs_fs.c:1887 msgid "Invalid change ordering: non-add change on deleted path" msgstr "Ordem de mudança inválida: mudança não-add em caminho removido" -#: libsvn_fs_fs/fs_fs.c:1975 libsvn_fs_fs/fs_fs.c:1983 -#: libsvn_fs_fs/fs_fs.c:2015 libsvn_fs_fs/fs_fs.c:2035 -#: libsvn_fs_fs/fs_fs.c:2069 libsvn_fs_fs/fs_fs.c:2074 +#: libsvn_fs_fs/fs_fs.c:2032 libsvn_fs_fs/fs_fs.c:2040 +#: libsvn_fs_fs/fs_fs.c:2072 libsvn_fs_fs/fs_fs.c:2092 +#: libsvn_fs_fs/fs_fs.c:2126 libsvn_fs_fs/fs_fs.c:2131 msgid "Invalid changes line in rev-file" msgstr "Linha de mudança inválida em rev-file" -#: libsvn_fs_fs/fs_fs.c:2008 +#: libsvn_fs_fs/fs_fs.c:2065 msgid "Invalid change kind in rev file" msgstr "Tipo de mudança inválido em arquivo rev" -#: libsvn_fs_fs/fs_fs.c:2028 +#: libsvn_fs_fs/fs_fs.c:2085 msgid "Invalid text-mod flag in rev-file" msgstr "Flag text-mod inválida em rev-file" -#: libsvn_fs_fs/fs_fs.c:2048 +#: libsvn_fs_fs/fs_fs.c:2105 msgid "Invalid prop-mod flag in rev-file" msgstr "Flag prop-mod inválida em rev-file" -#: libsvn_fs_fs/fs_fs.c:2231 +#: libsvn_fs_fs/fs_fs.c:2288 msgid "Copying from transactions not allowed" msgstr "Não é permitido copiar de transações" -#: libsvn_fs_fs/fs_fs.c:2476 libsvn_fs_fs/fs_fs.c:2483 +#: libsvn_fs_fs/fs_fs.c:2533 libsvn_fs_fs/fs_fs.c:2540 msgid "next-id file corrupt" msgstr "Arquivo next-id corrompido" -#: libsvn_fs_fs/fs_fs.c:2709 +#: libsvn_fs_fs/fs_fs.c:2766 msgid "Invalid change type" msgstr "Tipo de mudança inválido" -#: libsvn_fs_fs/fs_fs.c:3025 +#: libsvn_fs_fs/fs_fs.c:3082 msgid "Can't set text contents of a directory" msgstr "Não pode setar conteúdo de texto de um diretório" -#: libsvn_fs_fs/fs_fs.c:3115 libsvn_fs_fs/fs_fs.c:3120 -#: libsvn_fs_fs/fs_fs.c:3127 +#: libsvn_fs_fs/fs_fs.c:3172 libsvn_fs_fs/fs_fs.c:3177 +#: libsvn_fs_fs/fs_fs.c:3184 msgid "Corrupt current file" msgstr "Arquivo corrente corrompido" -#: libsvn_fs_fs/fs_fs.c:3495 +#: libsvn_fs_fs/fs_fs.c:3552 msgid "Transaction out of date" msgstr "Transação desatualizada" -#: libsvn_fs_fs/fs_fs.c:3735 +#: libsvn_fs_fs/fs_fs.c:3792 msgid "No such transaction" msgstr "Não existe tal transação" -#: libsvn_ra/ra_loader.c:232 +#: libsvn_ra/ra_loader.c:211 #, c-format msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s" msgstr "" "Versão de RA não bate para '%s': encontrado %d.%d.%d%s, esperado %d.%d.%d%s" -#: libsvn_ra/ra_loader.c:246 +#: libsvn_ra/ra_loader.c:261 #, c-format msgid "Unrecognized URL scheme for '%s'" msgstr "Esquema URL não reconhecido para '%s'" -#: libsvn_ra/ra_loader.c:505 +#: libsvn_ra/ra_loader.c:519 #, c-format msgid " - handles '%s' schema\n" msgstr " - trata esquema '%s'\n" -#: libsvn_ra/ra_loader.c:574 -#, c-format -msgid "" -"Mismatched RA plugin version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s" -msgstr "" -"Versão de plugin RA não bate para '%s': encontrado %d.%d.%d%s, espeerado %d.%" -"d.%d%s" - -#: libsvn_ra/ra_loader.c:590 +#: libsvn_ra/ra_loader.c:604 #, c-format msgid "Unrecognized URL scheme '%s'" msgstr "Esquema URL não reconhecido '%s'" @@ -3521,7 +3513,7 @@ msgid "Error writing to stream: unexpected EOF" msgstr "Erro gravando na cadeia: EOF inesperado" -#: libsvn_ra_dav/fetch.c:830 libsvn_ra_svn/client.c:872 +#: libsvn_ra_dav/fetch.c:830 libsvn_ra_svn/client.c:873 #, c-format msgid "" "Checksum mismatch for '%s':\n" @@ -3721,7 +3713,7 @@ msgid "Please upgrade the server to 0.19 or later" msgstr "Por favor atualize o servidor para 0.19 ou superior" -#: libsvn_ra_dav/session.c:896 +#: libsvn_ra_dav/session.c:898 #, c-format msgid "Unsupported RA loader version (%d) for ra_dav" msgstr "Versão de loader RA (%d) não suportada para ra_dav" @@ -3764,7 +3756,7 @@ msgid "%s request failed on '%s'" msgstr "Requisição %s falhou em '%s'" -#: libsvn_ra_local/ra_plugin.c:101 libsvn_ra_local/ra_plugin.c:478 +#: libsvn_ra_local/ra_plugin.c:101 libsvn_ra_local/ra_plugin.c:477 #, c-format msgid "" "'%s'\n" @@ -3781,7 +3773,7 @@ msgid "Module for accessing a repository on local disk." msgstr "Módulo para acessar um repositório em disco local" -#: libsvn_ra_local/ra_plugin.c:248 +#: libsvn_ra_local/ra_plugin.c:247 msgid "Unable to open an ra_local session to URL" msgstr "Não foi possível abrir uma sessão ra_local para URL" @@ -3851,93 +3843,93 @@ msgid "Cannot negotiate authentication mechanism" msgstr "Não foi possível negociar mecanismo de autenticação" -#: libsvn_ra_svn/client.c:453 +#: libsvn_ra_svn/client.c:454 #, c-format msgid "Undefined tunnel scheme '%s'" msgstr "Esquema de túnel '%s' não definido" -#: libsvn_ra_svn/client.c:470 +#: libsvn_ra_svn/client.c:471 #, c-format msgid "Tunnel scheme %s requires environment variable %s to be defined" msgstr "Esquema de túnel %s requer que variável de ambiente %s seja definida" -#: libsvn_ra_svn/client.c:481 +#: libsvn_ra_svn/client.c:482 #, c-format msgid "Can't tokenize command '%s'" msgstr "Não é possível separar comando '%s' em tokens" -#: libsvn_ra_svn/client.c:510 +#: libsvn_ra_svn/client.c:511 #, c-format msgid "Error in child process: %s" msgstr "Erro no processo filho: %s" -#: libsvn_ra_svn/client.c:533 +#: libsvn_ra_svn/client.c:534 msgid "Can't create tunnel" msgstr "Não é possível criar túnel" -#: libsvn_ra_svn/client.c:562 +#: libsvn_ra_svn/client.c:563 msgid "Module for accessing a repository using the svn network protocol." msgstr "Módulo para acessar um repositório usando o protocolo de rede svn." -#: libsvn_ra_svn/client.c:595 +#: libsvn_ra_svn/client.c:596 #, c-format msgid "Illegal svn repository URL '%s'" msgstr "Repositório svn ilegal '%s'" -#: libsvn_ra_svn/client.c:614 +#: libsvn_ra_svn/client.c:615 #, c-format msgid "Server requires minimum version %d" msgstr "Servidor requer versão mínima %d" -#: libsvn_ra_svn/client.c:664 +#: libsvn_ra_svn/client.c:665 msgid "Impossibly long repository root from server" msgstr "Raiz de repositório impossivelmente longa do servidor" -#: libsvn_ra_svn/client.c:731 +#: libsvn_ra_svn/client.c:732 msgid "Server did not send repository root" msgstr "Servidor não enviou a raiz do repositório" -#: libsvn_ra_svn/client.c:852 +#: libsvn_ra_svn/client.c:853 msgid "Non-string as part of file contents" msgstr "Não-string como parte de conteúdo de arquivo" -#: libsvn_ra_svn/client.c:921 +#: libsvn_ra_svn/client.c:922 msgid "Dirlist element not a list" msgstr "Elemento dirlist não é uma lista" -#: libsvn_ra_svn/client.c:1077 +#: libsvn_ra_svn/client.c:1078 msgid "Log entry not a list" msgstr "Entrada de log não é uma lista" -#: libsvn_ra_svn/client.c:1090 +#: libsvn_ra_svn/client.c:1091 msgid "Changed-path entry not a list" msgstr "Entrada changed-path não é uma lista" -#: libsvn_ra_svn/client.c:1173 +#: libsvn_ra_svn/client.c:1174 msgid "get-locations not implemented" msgstr "get-locations não implementado" -#: libsvn_ra_svn/client.c:1186 +#: libsvn_ra_svn/client.c:1187 msgid "Location entry not a list" msgstr "Entrada location não é uma lista" -#: libsvn_ra_svn/client.c:1240 +#: libsvn_ra_svn/client.c:1241 msgid "get-file-revs not implemented" msgstr "get-file-revs não implementado" -#: libsvn_ra_svn/client.c:1254 +#: libsvn_ra_svn/client.c:1255 msgid "Revision entry not a list" msgstr "Entreada de revisão não é uma lista" -#: libsvn_ra_svn/client.c:1267 libsvn_ra_svn/client.c:1292 +#: libsvn_ra_svn/client.c:1268 libsvn_ra_svn/client.c:1293 msgid "Text delta chunk not a string" msgstr "Bloco delta de texto não é uma lista" -#: libsvn_ra_svn/client.c:1304 +#: libsvn_ra_svn/client.c:1305 msgid "The get-file-revs command didn't return any revisions" msgstr "O comando get-file-revs não retornou nenhuma revisão" -#: libsvn_ra_svn/client.c:1356 +#: libsvn_ra_svn/client.c:1359 #, c-format msgid "Unsupported RA loader version (%d) for ra_svn" msgstr "Versão (%d) de RA loader não suportada para ra_svn" @@ -4074,7 +4066,7 @@ msgid "* %s revision %ld.\n" msgstr "* %s revisão %ld.\n" -#: libsvn_repos/fs-wrap.c:56 +#: libsvn_repos/fs-wrap.c:56 libsvn_repos/load.c:1218 msgid "Commit succeeded, but post-commit hook failed" msgstr "Commit completou com sucesso, mas hook post-commit falhou" @@ -4111,7 +4103,7 @@ msgid "Failed to run '%s' hook" msgstr "Falhou ao executar o hook '%s'" -#: libsvn_repos/hooks.c:105 +#: libsvn_repos/hooks.c:108 #, c-format msgid "" "'%s' hook failed with error output:\n" @@ -4120,20 +4112,25 @@ "Hook '%s' falhou com saída de erro:\n" "%s" -#: libsvn_repos/hooks.c:116 +#: libsvn_repos/hooks.c:115 +msgid "'%s' hook failed; no error output available" +msgstr "" +"Hook '%s' falhou; não há saída de erro disponível" + +#: libsvn_repos/hooks.c:126 msgid "Error closing read end of stderr pipe" msgstr "Erro fechando a ponta de leitura de pipe stderr" -#: libsvn_repos/hooks.c:120 +#: libsvn_repos/hooks.c:130 msgid "Error closing null file" msgstr "Erro fechando arquivo null" -#: libsvn_repos/hooks.c:202 +#: libsvn_repos/hooks.c:212 #, c-format msgid "Failed to run '%s' hook; broken symlink" msgstr "Falhou ao executar o hook '%s'; symlink quebrado" -#: libsvn_repos/hooks.c:343 +#: libsvn_repos/hooks.c:353 msgid "" "Repository has not been e |