Merge pull request #775 from ojab/master

Add option to enable recursion in seafile_diff()

common/rpc-service.c

@@ -1622,7 +1622,7 @@ get_diff_status_str(char status)
 }
 
 GList *
-seafile_diff (const char *repo_id, const char *arg1, const char *arg2, GError **error)
+seafile_diff (const char *repo_id, const char *arg1, const char *arg2, int fold_dir_diff, GError **error)
 {
     SeafRepo *repo;
     char *err_msgs = NULL;
@@ -1645,7 +1645,7 @@ seafile_diff (const char *repo_id, const char *arg1, const char *arg2, GError **
         return NULL;
     }
 
-    diff_entries = seaf_repo_diff (repo, arg1, arg2, &err_msgs);
+    diff_entries = seaf_repo_diff (repo, arg1, arg2, fold_dir_diff, &err_msgs);
     if (err_msgs) {
         g_set_error (error, SEAFILE_DOMAIN, -1, "%s", err_msgs);
         g_free (err_msgs);

include/seafile-rpc.h

@@ -363,7 +363,7 @@ int seafile_remove_task (const char *task_id, int task_type, GError **error);
  */
 GList *
 seafile_diff (const char *repo_id, const char *old, const char *new,
-              GError **error);
+              int fold_dir_diff, GError **error);
 
 GList *
 seafile_branch_gets (const char *repo_id, GError **error);

lib/rpc_table.py

@@ -70,6 +70,7 @@
     [ "objlist", ["string", "string"] ],        
     [ "objlist", ["string", "string", "string"] ],
     [ "objlist", ["string", "string", "int"] ],
+    [ "objlist", ["string", "string", "string", "int"] ],
     [ "objlist", ["string", "string", "int", "int"] ],
     [ "objlist", ["int", "string", "string", "int", "int"] ],
     [ "objlist", ["string", "int", "string", "string", "string"] ],

python/seafile/rpcclient.py

@@ -75,7 +75,7 @@ def seafile_destroy_repo(repo_id):
         pass
     remove_repo = seafile_destroy_repo
 
-    @searpc_func("objlist", ["string", "string", "string"])
+    @searpc_func("objlist", ["string", "string", "string", "int"])
     def seafile_diff():
         pass
     get_diff = seafile_diff

python/seaserv/api.py

@@ -82,8 +82,8 @@ def get_repo_size(self, repo_id):
     def revert_repo(self, repo_id, commit_id, username):
         return seafserv_threaded_rpc.revert_on_server(repo_id, commit_id, username)
 
-    def diff_commits(self, repo_id, old_commit, new_commit):
-        return seafserv_threaded_rpc.get_diff(repo_id, old_commit, new_commit)
+    def diff_commits(self, repo_id, old_commit, new_commit, fold_dir_diff = 1):
+        return seafserv_threaded_rpc.get_diff(repo_id, old_commit, new_commit, fold_dir_diff)
 
     def get_commit_list(self, repo_id, offset, limit):
         return seafserv_threaded_rpc.get_commit_list(repo_id, offset, limit)

server/repo-mgr.h

@@ -92,7 +92,7 @@ GList *
 seaf_repo_get_commits (SeafRepo *repo);
 
 GList *
-seaf_repo_diff (SeafRepo *repo, const char *arg1, const char *arg2, char **error);
+seaf_repo_diff (SeafRepo *repo, const char *arg1, const char *arg2, int fold_dir_diff, char **error);
 
 typedef struct _SeafRepoManager SeafRepoManager;
 typedef struct _SeafRepoManagerPriv SeafRepoManagerPriv;

server/repo-op.c

@@ -4749,7 +4749,7 @@ get_commit(SeafRepo *repo, const char *branch_or_commit)
 }
 
 GList *
-seaf_repo_diff (SeafRepo *repo, const char *old, const char *new, char **error)
+seaf_repo_diff (SeafRepo *repo, const char *old, const char *new, int fold_dir_diff, char **error)
 {
     SeafCommit *c1 = NULL, *c2 = NULL;
     int ret = 0;
@@ -4765,7 +4765,7 @@ seaf_repo_diff (SeafRepo *repo, const char *old, const char *new, char **error)
 
     if (old == NULL || old[0] == '\0') {
         if (c2->parent_id && c2->second_parent_id) {
-            ret = diff_merge (c2, &diff_entries, TRUE);
+            ret = diff_merge (c2, &diff_entries, fold_dir_diff);
             if (ret < 0) {
                 *error = g_strdup("Failed to do diff");
                 seaf_commit_unref (c2);
@@ -4793,7 +4793,7 @@ seaf_repo_diff (SeafRepo *repo, const char *old, const char *new, char **error)
     }
 
     /* do diff */
-    ret = diff_commits (c1, c2, &diff_entries, TRUE);
+    ret = diff_commits (c1, c2, &diff_entries, fold_dir_diff);
     if (ret < 0)
         *error = g_strdup("Failed to do diff");
 

server/seaf-server.c

@@ -196,7 +196,7 @@ static void start_rpc_service (CcnetClient *client, int cloud_mode)
     searpc_server_register_function ("seafserv-threaded-rpcserver",
                                      seafile_diff,
                                      "seafile_diff",
-                                     searpc_signature_objlist__string_string_string());
+                                     searpc_signature_objlist__string_string_string_int());
 
     searpc_server_register_function ("seafserv-threaded-rpcserver",
                                      seafile_post_file,