subversion

Checkout Tools
  • last updated 7 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1817435 is being indexed.

* site/staging/docs/release-notes/1.6.zh.html: replaced dead link to forum

thread with corresponding one on haxx.se

Suggested by: jamessan

Bail out if 'shelve' finds no modifications.

A rough equivalent of r1817360 on the 'shelve-checkpoint' branch.

* subversion/include/svn_client.h,

subversion/libsvn_client/shelve.c

(svn_client_shelf_has_changes): New.

* subversion/svn/shelve-cmd.c

(svn_cl__shelve): Throw an error if the resulting shelf contains no changes.

* subversion/include/svn_client.h

(svn_client_shelf_get_paths): Correct the 'since' and 'experimental' annotations.

* subversion/libsvn_client/shelve.c

(svn_client_shelf_write_patch): When overwriting an existing file, truncate it.

Merge r1817320 from the 'shelve-checkpoint' branch: Add an API to get the

affected paths. Use it in 'svn shelves' to print how many paths are affected.

* subversion/include/svn_client.h,

subversion/libsvn_client/shelve.c

(svn_client_shelf_get_paths): New.

* subversion/svn/shelve-cmd.c

(shelves_list): Use it.

* subversion/include/svn_diff.h

(svn_patch_t): Tweak doc string.

On the 'shelve-checkpoint' branch: Implement an export-as-patch command.

svn savepoint|sp|checkpoint export NAME [VERSION]

(The change to shelve.c was committed in the previous commit, r1817393.)

* subversion/include/svn_client.h,

subversion/libsvn_client/shelve.c

(svn_client_shelf_export_patch): New.

(svn_client_shelf_version_get_info): Bail out if not found. (Unrelated.)

* subversion/svn/shelve-cmd.c

(export_as_patch): New.

(svn_cl__checkpoint): Call it when 'export' command is used.

* subversion/svn/svn.c

(svn_cl__cmd_table): Update the command help.

On the 'shelve-checkpoint' branch: Implement an export-as-patch command.

svn savepoint|sp|checkpoint export NAME [VERSION]

(Only the change to shelve.c was committed in this commit; the rest in the

next commit, r1817394.)

* subversion/include/svn_client.h,

subversion/libsvn_client/shelve.c

(svn_client_shelf_export_patch): New.

(svn_client_shelf_version_get_info): Bail out if not found. (Unrelated.)

* subversion/svn/shelve-cmd.c

(export_as_patch): New.

(svn_cl__checkpoint): Call it when 'export' command is used.

* subversion/svn/svn.c

(svn_cl__cmd_table): Update the command help.

On the 'shelve-checkpoint' branch: Don't let the library write to stderr.

* subversion/libsvn_client/shelve.c

(write_patch): Discard any error output from an external 'diff' command.

On the 'shelve-checkpoint' branch: Add newline at end of source file.

* subversion/libsvn_client/shelve.c

Add newline.

On the 'shelve-checkpoint' branch: Tweak indentation in the help.

* subversion/svn/shelve-cmd.c

(svn_cl__cmd_table): Indent.

On the 'shelve-checkpoint' branch: Don't leak an error.

* subversion/libsvn_client/shelve.c

(shelf_read_log_message): Clear the error if we ignore it.

On the 'shelve-checkpoint' branch: Don't accept '--with-revprop' as

we don't currently handle it. Update 'bash_completion'.

* subversion/svn/svn.c

(svn_cl__cmd_table): Remove '--with-revprop' from 'svn savepoint'.

* tools/client-side/bash_completion

(_svn): Add missing savepoint options. Reformat for consistency.

On the 'shelve-checkpoint' branch: catch up with trunk@1817373.
  1. … 51 more files in changeset.
On the 'shelve-checkpoint' branch: Add "@warning EXPERIMENTAL" to

Doxygen doc strings.

* subversion/libsvn_client/patch.c

(apply_one_patch): Fix doc string.

On the 'shelve-checkpoint' branch: Bail out if unshelving would affect a path

that is already modified in the WC.

* subversion/svn/shelve-cmd.c

(modification_checker,

check_no_modified_paths): New.

(restore): Check for modified paths before restoring.

On the 'shelve-checkpoint' branch: Bail out if 'shelve' finds no modifications.

* subversion/include/svn_client.h,

subversion/libsvn_client/shelve.c

(svn_client_shelf_save_new_version): Don't bump the version number if the

attempted new version is empty.

(svn_client_shelf_get_paths): Add missing 'experimental' tag.

(write_patch): When overwriting an existing file, truncate it.

* subversion/svn/shelve-cmd.c

(shelve): If no modifications found, throw an error.

On the 'shelve-checkpoint' branch: Add an API to get the affected paths.

Use it in 'svn shelves' to print how many paths are affected.

* subversion/include/svn_client.h,

subversion/libsvn_client/shelve.c

(svn_client_shelf_version_get_info,

svn_client_shelves_list): Minor fixes to doc-strings.

(svn_client_shelf_get_paths): New.

* subversion/svn/shelve-cmd.c

(shelves_list): Use it.

* site/staging/docs/release-notes/1.6.zh.html: Prefix broken links with

"XXX (dead link)" so we at least mark these as broken, if we can't determine

any usable replacement.

* site/staging/docs/release-notes/1.6.zh.html: Added missing trailing /s.
* site/staging/docs/release-notes/1.6.zh.html: Added missing closing ).
* site/staging/docs/release-notes/1.6.zh.html: Replaced corresponding link

text (follow-up on r1816581).

* site/staging/docs/release-notes/1.6.zh.html: Replaced several broken links.
* site/publish: Merge from staging.
* site/staging: Catch-up merge from 'publish'.
Follow-up to r1817053: Fix help formatting and tests.

* subversion/svn/svn.c

(svn_cl__options): Add missing newline.

* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout:

Update test expectations.

* site/publish/docs/release-notes/1.10.html

(Enhancements and Bugfixes/Command-line client improvements):

Add section for 'svn ls --search'.

* subversion/svn/svn.c

(svn_cl__options): Mention that --search arguments may require quotation

marks.

Following up on r1816967, attempt to fix the Python 3 buildbot failure.

See https://ci.apache.org/builders/svn-x64-macosx-local-python3/builds/822

* subversion/tests/cmdline/svntest/verify.py

(): Only import the `svntest` module.

(compare_dump_files): Access the fs_has_sha1() check function as

`svntest.main.fs_has_sha1()`.