cl-conflicts.c

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

Changeset 1465299 is being indexed.

Make the conflict message "local %s %s, incoming %s %s upon %s"

translatable by constructing it from longer parts, each translated,

instead of single words (some of which were not translated at all).

* subversion/svn/cl-conflicts.c

(svn_cl__get_human_readable_tree_conflict_description): Build string out

of translated sub-phrases rather than from single words.

(local_reason_str, incoming_action_str, operation_str): New functions.

(map_conflict_action_human, map_conflict_reason_human,

action_str, reason_str): Removed.

Patch by: Mattias Engdegård <mattiase@bredband.net>

Use svn_hash_gets and svn_hash_sets.

* subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c

* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c

* subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c

* subversion/libsvn_auth_gnome_keyring/gnome_keyring.c

* subversion/libsvn_client/commit.c

* subversion/libsvn_delta/compat.c

* subversion/libsvn_delta/editor.c

* subversion/libsvn_diff/parse-diff.c

* subversion/libsvn_diff/util.c

* subversion/libsvn_fs/access.c

* subversion/libsvn_fs_base/bdb/changes-table.c

* subversion/libsvn_fs_base/dag.c

* subversion/libsvn_fs_base/fs.c

* subversion/libsvn_fs_base/lock.c

* subversion/libsvn_fs_base/revs-txns.c

* subversion/libsvn_fs_base/tree.c

* subversion/libsvn_fs_fs/fs_fs.c

* subversion/libsvn_fs_fs/lock.c

* subversion/libsvn_fs_fs/temp_serializer.c

* subversion/libsvn_fs_fs/tree.c

* subversion/libsvn_fs_util/fs-util.c

* subversion/libsvn_ra/compat.c

* subversion/libsvn_ra/deprecated.c

* subversion/libsvn_ra/ra_loader.c

* subversion/libsvn_ra_local/ra_plugin.c

* subversion/libsvn_ra_serf/blame.c

* subversion/libsvn_ra_serf/blncache.c

* subversion/libsvn_ra_serf/commit.c

* subversion/libsvn_ra_serf/getlocations.c

* subversion/libsvn_ra_serf/getlocationsegments.c

* subversion/libsvn_ra_serf/getlocks.c

* subversion/libsvn_ra_serf/inherited_props.c

* subversion/libsvn_ra_serf/log.c

* subversion/libsvn_ra_serf/merge.c

* subversion/libsvn_ra_serf/mergeinfo.c

* subversion/libsvn_ra_serf/options.c

* subversion/libsvn_ra_serf/property.c

* subversion/libsvn_ra_serf/serf.c

* subversion/libsvn_ra_serf/update.c

* subversion/libsvn_ra_serf/util.c

* subversion/libsvn_ra_serf/xml.c

* subversion/libsvn_ra_svn/client.c

* subversion/libsvn_ra_svn/editorp.c

* subversion/libsvn_ra_svn/marshal.c

* subversion/mod_dav_svn/activity.c

* subversion/mod_dav_svn/lock.c

* subversion/mod_dav_svn/merge.c

* subversion/mod_dav_svn/reports/update.c

* subversion/mod_dav_svn/repos.c

* subversion/mod_dav_svn/version.c

* subversion/svn/cl-conflicts.c

* subversion/svn/commit-cmd.c

* subversion/svn/conflict-callbacks.c

* subversion/svn/help-cmd.c

* subversion/svn/propedit-cmd.c

* subversion/svn/propget-cmd.c

* subversion/svn/status-cmd.c

* subversion/svn/status.c

* subversion/svn/svn.c

* subversion/svn/util.c

* subversion/svnadmin/svnadmin.c

* subversion/svndumpfilter/svndumpfilter.c

* subversion/svnlook/svnlook.c

* subversion/svnmucc/svnmucc.c

* subversion/svnrdump/dump_editor.c

* subversion/svnrdump/load_editor.c

* subversion/svnrdump/svnrdump.c

* subversion/svnrdump/util.c

* subversion/svnserve/serve.c

* subversion/svnsync/svnsync.c

* subversion/svnsync/sync.c

  1. … 70 more files in changeset.
Following up on r1432470, tweak xml output a bit.

* subversion/svn/cl-conflicts.c

(svn_cl__append_conflict_info_xml): Use argument name 'type' to avoid

confusion with the 'kind' argument for tree conflicts. Add the operation.

Following up on r1432454, make 'svn info' print more of the conflict

information that is now available, instead of still just printing

what we originally stored for conflicts in svn_wc_entry_t.

info.rnc needs updating after this patch. I expected to copy and paste

the missing pieces (src-left, etc.) from the tree conflicts, but these

aren't defined yet, while introduced in 1.6.

* subversion/svn/cl-conflicts.c

Renamed from tree-conflicts.c

(map_conflict_kind_xml): New map.

(svn_cl__append_tree_conflict_info_xml): Rename to...

(append_tree_conflict_info_xml): ... this and make static.

(svn_cl__append_conflict_info_xml): New function that handles all conflict

kinds.

* subversion/svn/cl-conflicts.h

Renamed from tree-conflicts.h

(svn_cl__append_tree_conflict_info_xml): Rename to...

(svn_cl__append_conflict_info_xml): ... this. Update docstring.

* subversion/svn/conflict-callbacks.c

(includes): Updated for rename.

* subversion/svn/info-cmd.c

(includes): Follow rename.

(print_info_xml): Delegate all conflict work to

svn_cl__append_conflict_info_xml.

(print_info): Print left and right version for the first conflict, instead

of just for tree conflicts.

* subversion/svn/status.c

(includes): Updated for rename.

* subversion/svn/tree-conflicts.c

Renamed to cl-conflicts.c

* subversion/svn/tree-conflicts.h

Renamed to cl-conflicts.h

  1. … 6 more files in changeset.