Changeset 36

Timestamp:

06/30/04 00:30:56

Author:

DenisG

Message:

[SubversionSharp] Add SvnClient?.Status and Log with related Delegate

Files:

• trunk/SubversionSharp/dev/src/Svn.cs (modified) (3 diffs)
• trunk/SubversionSharp/dev/src/SvnClient.cs (modified) (2 diffs)
• trunk/SubversionSharp/dev/src/SvnDelegate.cs (modified) (3 diffs)
• trunk/SubversionSharp/dev/src/SvnWcStatus.cs (modified) (1 diff)

trunk/SubversionSharp/dev/src/Svn.cs

@@ -180 +180 @@
-                                                             IntPtr pool);
-                                                             
+        internal delegate void svn_wc_status_func_t(IntPtr baton, IntPtr path, IntPtr status);
+        
+        internal delegate IntPtr svn_log_message_receiver_t(IntPtr baton, IntPtr changed_paths, 
+                                                            uint revision, IntPtr author, 
+                                                            IntPtr date, IntPtr message, 
+                                                            IntPtr pool);
+                                                             
-        [DllImport("svn_client-1", CharSet=CharSet.Ansi)] static extern
-        internal IntPtr svn_client_checkout(out uint result_rev, string URL, 
@@ -220 +227 @@
-        internal IntPtr svn_client_status(out uint result_rev, 
-                                          string path, IntPtr revision,
-IntPtr
+svn_wc_status_func_t
-                                          int descend, int get_all, int update, int no_ignore, 
-                                          IntPtr ctx, IntPtr pool);
@@ -227 +234 @@
-        internal IntPtr svn_client_log(IntPtr targets, IntPtr start, IntPtr end,
-                                       int discover_changed_paths, int strict_node_history, 
-IntPtr
+svn_log_message_receiver_t
-                                       IntPtr ctx, IntPtr pool);
-    

trunk/SubversionSharp/dev/src/SvnClient.cs

@@ -20 +20 @@
-                                              AprArray commitItems, IntPtr baton,
-                                              AprPool pool);
-
+
+
+
+
+
+
-        public static int Checkout(string url, string path, 
-                                   SvnOptRevision revision, 
@@ -127 +132 @@
-            return(commitInfo);
-        }
+        
+        public static int Status(string path,
+                                 SvnOptRevision revision,
+                                 SvnWcStatus.Func statusFunc, IntPtr statusBaton,
+                                 bool descend, bool getAll, bool update, bool noIgnore,
+                                 SvnClientContext ctx, AprPool pool)
+        {
+            uint rev;
+            SvnDelegate statusDelegate = new SvnDelegate(statusFunc);
+            Debug.Write(String.Format("svn_client_status({0},{1},{2},{3},{4:X},{5},{6},{7},{8},{9})...",path,revision,statusFunc.Method.Name,statusBaton.ToInt32(),(descend) ? 1 : 0,(getAll) ? 1 : 0,(update) ? 1 : 0,(noIgnore) ? 1 : 0,ctx,pool));
+            SvnError err = Svn.svn_client_status(out rev, path, revision,
+                                                 (Svn.svn_wc_status_func_t) statusDelegate.Wrapper,
+                                                 statusBaton,
+                                                 (descend) ? 1 : 0, (getAll) ? 1 : 0,
+                                                 (update) ? 1 : 0, (noIgnore) ? 1 : 0,
+                                                 ctx, pool);
+            if( !err.IsNoError )
+                throw new SvnException(err);
+            Debug.WriteLine(String.Format("Done({0})",rev));
+            if( update )
+                return(unchecked((int)rev));
+            else
+                return(-1);
+        }
+        
+        public static void Log(AprArray targets,
+                               SvnOptRevision start, SvnOptRevision end,
+                               bool discoverChangedPaths, bool strictNodeHistory,
+                               LogMessageReceiver receiver, IntPtr baton,
+                               SvnClientContext ctx, AprPool pool)
+        {
+            SvnDelegate receiverDelegate = new SvnDelegate(receiver);
+            Debug.WriteLine(String.Format("svn_client_log({0},{1},{2},{3},{4},{5},{6},{7},{8})",targets,start,end,(discoverChangedPaths ? 1 :0),(strictNodeHistory ? 1 :0),receiver.Method.Name,baton,ctx,pool));
+            SvnError err = Svn.svn_client_log(targets, start, end,
+                                              (discoverChangedPaths ? 1 :0),
+                                              (strictNodeHistory ? 1 :0),
+                                              (Svn.svn_log_message_receiver_t)receiverDelegate.Wrapper,
+                                              baton,
+                                              ctx, pool);
+            if( !err.IsNoError )
+                throw new SvnException(err);
+        }
-    }
-}

trunk/SubversionSharp/dev/src/SvnDelegate.cs

@@ -75 +75 @@
-            SvnWcNotify.Func func = mFunc as SvnWcNotify.Func;
-            try {
-
+Wc
-                func(baton, new AprString(path),
-                     (SvnWcNotify.Action) action, (Svn.NodeKind) kind, 
@@ -81 +81 @@
-                     (SvnWcNotify.State) prop_state, unchecked((int) revision));
-            }
-e 
+
-                return;
-            }
@@ -148 +148 @@
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        // svn_auth_simple_prompt_func_t Wrapper
-        public SvnDelegate(SvnAuthProviderObject.SimplePrompt func)

trunk/SubversionSharp/dev/src/SvnWcStatus.cs

@@ -18 +18 @@
-    public unsafe class SvnWcStatus
-    {
+        public delegate void Func(IntPtr baton, AprString path, SvnWcStatus status);
+        
-        public enum Kind {
-            None = 1,