On Wed, Jul 15, 2009 at 22:16, Hyrum K. Wright<hyrum_at_hyrumwright.org> wrote:
>...
> +++ trunk/subversion/libsvn_wc/status.c Wed Jul 15 13:16:30 2009 (r38426)
>...
> @@ -867,6 +868,7 @@ get_dir_status(struct edit_baton *eb,
> apr_hash_index_t *hi;
> const svn_wc_entry_t *dir_entry;
> const char *path = svn_wc_adm_access_path(adm_access);
> + svn_wc__db_t *db = svn_wc__adm_get_db(adm_access);
Could just use eb->db instead.
>...
> @@ -980,9 +982,13 @@ get_dir_status(struct edit_baton *eb,
> else
> {
> svn_wc_conflict_description_t *tree_conflict;
> - SVN_ERR(svn_wc__get_tree_conflict(&tree_conflict,
> - svn_dirent_join(path, entry, subpool),
> - adm_access, subpool));
> + const char *abspath;
> +
> + SVN_ERR(svn_dirent_get_absolute(&abspath,
> + svn_dirent_join(path, entry, subpool),
> + subpool));
Or: abspath = svn_dirent_join(local_abspath, entry, subpool);
And can I suggest renaming "entry" to something like "entry_name" or
somesuch? Confusion reigns...
>...
> +++ trunk/subversion/libsvn_wc/tree_conflicts.c Wed Jul 15 13:16:30 2009 (r38426)
>...
> @@ -648,7 +655,8 @@ svn_wc__get_tree_conflict2(svn_wc_confli
> const svn_wc_entry_t *entry;
> int i;
>
> - SVN_ERR(svn_dirent_get_absolute(&victim_abspath, victim_path, scratch_pool));
> + SVN_ERR_ASSERT(svn_dirent_is_absolute(victim_abspath));
> +
> svn_dirent_split(victim_abspath, &parent_abspath, &victim_name,
> scratch_pool);
> err = svn_wc__get_entry(&entry, db, parent_abspath, FALSE,
> @@ -665,7 +673,7 @@ svn_wc__get_tree_conflict2(svn_wc_confli
> }
>
> SVN_ERR(svn_wc__read_tree_conflicts(&conflicts, entry->tree_conflict_data,
> - svn_dirent_dirname(victim_path,
> + svn_dirent_dirname(victim_abspath,
> scratch_pool),
> result_pool));
The dirname() was needed because it wanted a relpath. But if you want
an abspath, then it was done above: parent_abspath.
>...
Cheers,
-g
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2381422
Received on 2009-08-07 20:40:31 CEST