Author: naba
Date: Sun Feb 10 08:34:04 2008
New Revision: 3615
URL: http://svn.gnome.org/viewvc/anjuta?rev=3615&view=rev
Log:
* plugins/subversion/svn-add-command.c: (svn_add_command_new):
* plugins/subversion/svn-cat-command.c: (svn_cat_command_new):
* plugins/subversion/svn-command.c:
(svn_command_make_canonical_path):
* plugins/subversion/svn-command.h:
* plugins/subversion/svn-copy-command.c: (svn_copy_command_new):
* plugins/subversion/svn-diff-command.c: (svn_diff_command_new):
* plugins/subversion/svn-log-command.c: (svn_log_command_new):
* plugins/subversion/svn-merge-command.c: (svn_merge_command_new):
* plugins/subversion/svn-remove-command.c:
(svn_remove_command_new):
* plugins/subversion/svn-status-command.c:
(svn_status_command_new):
* plugins/subversion/svn-switch-command.c:
(svn_switch_command_new):
* plugins/subversion/svn-update-command.c:
(svn_update_command_new):
Make sure that all paths are \"canonical\" by libsvn rules so anjuta
doesn\'t
die if the user gives a path that libsvn doesn\'t like.
Fixes bug #515500
Modified:
trunk/ChangeLog
trunk/plugins/subversion/svn-add-command.c
trunk/plugins/subversion/svn-cat-command.c
trunk/plugins/subversion/svn-command.c
trunk/plugins/subversion/svn-command.h
trunk/plugins/subversion/svn-copy-command.c
trunk/plugins/subversion/svn-diff-command.c
trunk/plugins/subversion/svn-log-command.c
trunk/plugins/subversion/svn-merge-command.c
trunk/plugins/subversion/svn-remove-command.c
trunk/plugins/subversion/svn-status-command.c
trunk/plugins/subversion/svn-switch-command.c
trunk/plugins/subversion/svn-update-command.c
Modified: trunk/plugins/subversion/svn-add-command.c
==============================================================================
--- trunk/plugins/subversion/svn-add-command.c (original)
+++ trunk/plugins/subversion/svn-add-command.c Sun Feb 10 08:34:04 2008
@@ -97,7 +97,8 @@
SvnAddCommand *self;
self = g_object_new (SVN_TYPE_ADD_COMMAND, NULL);
- self->priv->path = g_strdup (path);
+ self->priv->path = svn_command_make_canonical_path (SVN_COMMAND (self),
+
path);
self->priv->force = force;
self->priv->recursive = recursive;
Modified: trunk/plugins/subversion/svn-cat-command.c
==============================================================================
--- trunk/plugins/subversion/svn-cat-command.c (original)
+++ trunk/plugins/subversion/svn-cat-command.c Sun Feb 10 08:34:04 2008
@@ -148,7 +148,8 @@
SvnCatCommand *self;
self = g_object_new (SVN_TYPE_CAT_COMMAND, NULL);
- self->priv->path = g_strdup (path);
+ self->priv->path = svn_command_make_canonical_path (SVN_COMMAND (self),
+
path);
self->priv->revision = revision;
self->priv->output = g_queue_new ();
Modified: trunk/plugins/subversion/svn-command.c
==============================================================================
--- trunk/plugins/subversion/svn-command.c (original)
+++ trunk/plugins/subversion/svn-command.c Sun Feb 10 08:34:04 2008
@@ -599,6 +599,16 @@
g_mutex_unlock (self->priv->ui_lock);
}
+gchar *
+svn_command_make_canonical_path (SvnCommand *self, gchar *path)
+{
+ const gchar *canonical_path;
+
+ canonical_path = svn_path_canonicalize (path, self->priv->pool);
+
+ return g_strdup (canonical_path);
+}
+
svn_opt_revision_t *
svn_command_get_revision (gchar *revision)
{
Modified: trunk/plugins/subversion/svn-command.h
==============================================================================
--- trunk/plugins/subversion/svn-command.h (original)
+++ trunk/plugins/subversion/svn-command.h Sun Feb 10 08:34:04 2008
@@ -65,6 +65,7 @@
apr_pool_t *svn_command_get_pool (SvnCommand *self);
void svn_command_lock_ui (SvnCommand *self);
void svn_command_unlock_ui (SvnCommand *self);
+gchar *svn_command_make_canonical_path (SvnCommand *self, gchar *path);
/* Static methods */
svn_opt_revision_t *svn_command_get_revision (gchar *revision);
Modified: trunk/plugins/subversion/svn-copy-command.c
==============================================================================
--- trunk/plugins/subversion/svn-copy-command.c (original)
+++ trunk/plugins/subversion/svn-copy-command.c Sun Feb 10 08:34:04 2008
@@ -149,9 +149,11 @@
self = g_object_new (SVN_TYPE_COPY_COMMAND, NULL);
- self->priv->source_path = g_strdup (source_path);
+ self->priv->source_path = svn_command_make_canonical_path (SVN_COMMAND
(self),
+
source_path);
self->priv->source_revision = source_revision;
- self->priv->dest_path = g_strdup (dest_path);
+ self->priv->dest_path = svn_command_make_canonical_path (SVN_COMMAND
(self),
+
dest_path);
self->priv->log_message = g_strdup (log_message);
return self;
Modified: trunk/plugins/subversion/svn-diff-command.c
==============================================================================
--- trunk/plugins/subversion/svn-diff-command.c (original)
+++ trunk/plugins/subversion/svn-diff-command.c Sun Feb 10 08:34:04 2008
@@ -183,7 +183,8 @@
SvnDiffCommand *self;
self = g_object_new (SVN_TYPE_DIFF_COMMAND, NULL);
- self->priv->path = g_strdup (path);
+ self->priv->path = svn_command_make_canonical_path (SVN_COMMAND (self),
+
path);
self->priv->revision1 = revision1;
self->priv->revision2 = revision2;
self->priv->recursive = recursive;
Modified: trunk/plugins/subversion/svn-log-command.c
==============================================================================
--- trunk/plugins/subversion/svn-log-command.c (original)
+++ trunk/plugins/subversion/svn-log-command.c Sun Feb 10 08:34:04 2008
@@ -175,8 +175,8 @@
SvnLogCommand *self;
self = g_object_new (SVN_TYPE_LOG_COMMAND, NULL);
- self->priv->path = g_strdup (path);
-
+ self->priv->path = svn_command_make_canonical_path (SVN_COMMAND (self),
+
path);
return self;
}
Modified: trunk/plugins/subversion/svn-merge-command.c
==============================================================================
--- trunk/plugins/subversion/svn-merge-command.c (original)
+++ trunk/plugins/subversion/svn-merge-command.c Sun Feb 10 08:34:04 2008
@@ -134,11 +134,14 @@
SvnMergeCommand *self;
self = g_object_new (SVN_TYPE_MERGE_COMMAND, NULL);
- self->priv->path1 = g_strdup (path1);
- self->priv->path2 = g_strdup (path2);
+ self->priv->path1 = svn_command_make_canonical_path (SVN_COMMAND (self),
+
path1);
+ self->priv->path2 = svn_command_make_canonical_path (SVN_COMMAND (self),
+
path2);
self->priv->start_revision = start_revision;
self->priv->end_revision = end_revision;
- self->priv->target_path = g_strdup (target_path);
+ self->priv->target_path = svn_command_make_canonical_path (SVN_COMMAND
(self),
+
target_path);
self->priv->recursive = recursive;
self->priv->ignore_ancestry = ignore_ancestry;
self->priv->force = force;
Modified: trunk/plugins/subversion/svn-remove-command.c
==============================================================================
--- trunk/plugins/subversion/svn-remove-command.c (original)
+++ trunk/plugins/subversion/svn-remove-command.c Sun Feb 10 08:34:04 2008
@@ -139,7 +139,8 @@
SvnRemoveCommand *self;
self = g_object_new (SVN_TYPE_REMOVE_COMMAND, NULL);
- self->priv->path = g_strdup (path);
+ self->priv->path = svn_command_make_canonical_path (SVN_COMMAND (self),
+
path);
self->priv->log_message = g_strdup (log_message);
self->priv->force = force;
Modified: trunk/plugins/subversion/svn-status-command.c
==============================================================================
--- trunk/plugins/subversion/svn-status-command.c (original)
+++ trunk/plugins/subversion/svn-status-command.c Sun Feb 10 08:34:04 2008
@@ -146,7 +146,8 @@
SvnStatusCommand *self;
self = g_object_new (SVN_TYPE_STATUS_COMMAND, NULL);
- self->priv->path = g_strdup (path);
+ self->priv->path = svn_command_make_canonical_path (SVN_COMMAND (self),
+
path);
self->priv->recursive = recursive;
self->priv->get_all_items = get_all_items;
Modified: trunk/plugins/subversion/svn-switch-command.c
==============================================================================
--- trunk/plugins/subversion/svn-switch-command.c (original)
+++ trunk/plugins/subversion/svn-switch-command.c Sun Feb 10 08:34:04 2008
@@ -115,7 +115,8 @@
SvnSwitchCommand *self;
self = g_object_new (SVN_TYPE_SWITCH_COMMAND, NULL);
- self->priv->working_copy_path = g_strdup (working_copy_path);
+ self->priv->working_copy_path = svn_command_make_canonical_path
(SVN_COMMAND (self),
+
working_copy_path);
self->priv->branch_url = g_strdup (branch_url);
self->priv->revision = revision;
self->priv->recursive = recursive;
Modified: trunk/plugins/subversion/svn-update-command.c
==============================================================================
--- trunk/plugins/subversion/svn-update-command.c (original)
+++ trunk/plugins/subversion/svn-update-command.c Sun Feb 10 08:34:04 2008
@@ -119,7 +119,8 @@
self = g_object_new (SVN_TYPE_UPDATE_COMMAND, NULL);
- self->priv->path = g_strdup (path);
+ self->priv->path = svn_command_make_canonical_path (SVN_COMMAND (self),
+
path);
self->priv->revision = g_strdup (revision);
self->priv->recursive = recursive;
_______________________________________________
SVN-commits-list mailing list (read only)
http://mail.gnome.org/mailman/listinfo/svn-commits-list
Want to limit the commits to a few modules? Go to above URL, log in to edit
your options and select the modules ('topics') you want.
Module maintainer? It is possible to set the reply-to to your development
mailing list. Email [EMAIL PROTECTED] if interested.
