Version Control With Subversion Source

Fix issue #1341: Change 'svn revert' to 'svn undo', to avoid confusion
with 'svn resolve'.

* subversion/libsvn_wc/adm_ops.c
(error_in_undo): Replaces revert_error.
(undo_admin_things): Replaces revert_admin_things.
(svn_wc_add): Fix comments.
(svn_wc_undo): Replaces svn_wc_revert. Adjust for above changes.

* subversion/include/svn_wc.h
(svn_wc_undo): Replaces svn_wc_revert.
(svn_wc_notify_action_t): Use svn_wc_notify_undo instead of
svn_wc_notify_revert now. All callers changed.

* subversion/clients/cmdline/feedback.c
(notify): Adjust for new notifications.

* subversion/libsvn_client/revert.c: Renamed to below.

* subversion/libsvn_client/undo.c: New file, replaces revert.c.
(svn_client_undo): Replaces svn_client_revert. Call svn_wc_undo
now, not svn_wc_revert.

* subversion/include/svn_client.h
(svn_client_undo): Replaces svn_client_revert.

* subversion/clients/cmdline/main.c
(svn_cl__cmd_table): Use "undo" instead of "revert".

* subversion/clients/cmdline/revert-cmd.c: Renamed to below.

* subversion/clients/cmdline/undo-cmd.c: New file, replaces
revert-cmd.c.
(svn_cl__undo): Replaces svn_cl__revert.

* subversion/clients/cmdline/cl.h: Declare svn_cl__undo.

Tests:

* subversion/tests/clients/cmdline/basic_tests.py
(basic_undo): Replaces basic_revert.
(test_list): Adjust for above.

* subversion/tests/clients/cmdline/copy_tests.py
(mv_and_undo_directory): Replaces mv_and_revert_directory.
(repos_to_wc): Call undo instead of revert.
(test_list): Adjust for above.

* subversion/tests/clients/cmdline/merge_tests.py
(textual_merges_galore, simple_property_merges, merge_one_file):
Call undo instead of revert.

* subversion/tests/clients/cmdline/prop_tests.py
(undo_replacement_props): Replaces revert_replacement_props.
(test_list): Adjust for above.

* subversion/tests/clients/cmdline/schedule_tests.py
(undo_add_files, undo_add_directories, undo_nested_adds,
undo_add_executable, undo_delete_files, undo_delete_dirs):
Replace revert_add_files, revert_add_directories,
revert_nested_adds, revert_add_executable, revert_delete_files,
and revert_delete_dirs respectively.
(test_list): Adjust for above.

* subversion/tests/clients/cmdline/switch_tests.py
(commit_routine_switching): Use undo instead of revert.

* subversion/tests/clients/cmdline/trans_tests.py: Adjust comment.

* subversion/tests/clients/cmdline/update_tests.py
(update_to_resolve_text_conflicts): Replaces
update_to_revert_text_conflicts. No comment.
(test_list): Adjust.

* subversion/tests/clients/cmdline/getopt_tests_data/svn--help_stdout,
subversion/tests/clients/cmdline/getopt_tests_data/svn_help_stdout:
Adjust.

Documentation and notes:

* doc/book/book/appa.xml, doc/book/book/ch03.xml,
doc/book/book/ch04.xml, doc/book/book/ch08.xml,
doc/book/book/ch06.xml: Adjust accordingly.

* doc/translations/french/appendices.texi: Adjust.

* doc/book/outline.txt: Adjust.

* doc/user/svn-ref.tex: Adjust.

* subversion/clients/cmdline/man/svn.1: Adjust.

* notes/autoversioning-strategy.txt: Adjust

* www/project_faq.html
(undo): Replaces "revert" question.

* CHANGES: Mention that it's 'svn undo' now.

Interfaces:

* tools/client-side/bash_completion: Adjust completions.

* tools/client-side/psvn/psvn.el
(svn-status-undo-file): Replaces svn-status-revert-file.
Keybinding also changed, but see comment about narrowing keyspace.

* tools/client-side/vc-svn.el
(vc-svn-undo): Replaces vc-svn-revert.

* tools/dev/svn-dev.el
(svn-undo): Replaces svn-revert.

Bindings:

* subversion/bindings/ruby/wc.c
(wc_undo): Replaces wc_revert. Call svn_wc_undo now.
(svn_ruby_init_wc): Change wc_revert to wc_undo, although the whole
thing is commented out so this is just cosmetic.

* subversion/bindings/ruby/client.c
(cl_undo): Replaces cl_revert. Call svn_client_undo now.
(svn_ruby_init_client): Map "undo" to cl_undo, instead of "revert"
to cl_revert.

* subversion/bindings/java/javahl/native/SVNClient.h
(class SVNClient): It's undo, not revert.

* subversion/bindings/java/javahl/native/Notify.cpp
(Notify::onNotify): Use undo instead of revert.

* subversion/bindings/java/javahl/native/SVNClient.cpp
(SVNClient::undo): Replaces SVNClient::revert. Call svn_client_undo.

* subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp
(Java_org_tigris_subversion_javahl_SVNClient_undo): Replace
Java_org_tigris_subversion_javahl_SVNClient_revert, etc.

* subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Notify.java
(Notify.Action): Use undo instead of revert.

* subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClient.java
(SVNClient.undo): Replaces revert.

Patch from Bruce A. Mah <bmah@...>, issue #1340:

When compiling the svn book, handle the case where "svnversion ."
doesn't work (i.e. we don't have an svnversion executable in our $PATH
or we aren't building inside a checked-out working copy).

* doc/book/Makefile (BOOK_VERSION_SOURCE): Check to see if "svnversion
." produces an error before trying to use its output. Provide a
fallback for the version.xml entity if this doesn't work.

* doc/book/book.xml: Let version.xml provide the complete subtitle
text.

* doc/book/TODO: add more things that need book documentation

Directory for russian translation added.

* doc/book/TODO: new file. I'm tired of keeping this list to myself.

* ch07.xml: invalid xml in book source; add missing </para>.

Fix various grammar, typos, and no longer correct things in the book
documentation. Patch and log message graciously provided by David
Summers <david@...>.

* doc/book/book/ch03.xml : Grammar fix.

* doc/book/book/ch04.xml : Make example match commentary.

* doc/book/book/ch05.xml : Grammar fix.

* doc/book/book/ch07.xml : Grammar fix. Authentication data is no longer
stored in the .svn/auth working copy directories.

* doc/book/book/ch08.xml : Fix typo on "Revision".
Take out "+" in example prompt and program response.

Continue issue #730: restartable checkouts.

Make 'svn status' recognize incomplete directories. Also, fix a
buglet related to the new 'incomplete' flags, only now revealed by
'svn status'.

Mauve Bikeshed: show a "!" for incomplete dirs, just like missing
items, so that users realize that 'svn up' needs to be run.

[ People are still arguming, but let's try this out for a little
while. If we come up with a different consensus, or if this causes
disaster/confusion, we can always change it. ]

* libsvn_wc/entries.c, entries.h (svn_wc__entries_init): if 0 or -1 is
passed in as a revnum, then do *not* mark THIS_DIR as incomplete;
it's just a new directory being scheduled for addition.

* libsvn_wc/update_editor.c (close_directory): egads, stop having
close_directory() bump the directory revnum! this is old cruft, no
longer necessary, since the legitimate revnum is already installed
by open_dir() or add_dir().

* libsvn_wc/status.c (assemble_status): notice incompleteness in the
same place we recognize absence.

* svn_wc.h (enum svn_wc_status_kind): new 'incomplete' status enum.

* cmdline/status.c (generate_status_code): show a '!' for incompleteness.

* cmdline/main.c (svn_cl__cmd_table): augment 'svn help' description.

* book/ch03.xml, ch08.xml: update book's description of '!', and what
to do when you see it.

Ignore generated version.xml

Patch provided (with a small tweak) by"Bruce A. Mah"
<bmah@...>

Automatically include a version number in renditions of the book,
as reported by svnversion.

* doc/book/Makefile
($(BOOK_VERSION_SOURCE)): Generate a version.xml
file that defines the output of svnversion as an XML entity.
($(BOOK_HTML_TARGET), book-html-chunk, $(BOOK_PDF_TARGET),
$(BOOK_PS_TARGET)): Depend on the generated version.xml file.
book-clean: Remove the generated version.xml file.

* doc/book/book/book.xml: Include the generated version.xml file
and insert its svn.version entity in an appropriate place in the
title page.