Changeset 38
- Timestamp:
- 06/30/04 16:04:42
- Files:
-
- trunk/SubversionSharp/dev/src/Svn.cs (modified) (7 diffs)
- trunk/SubversionSharp/dev/src/SvnClient.cs (modified) (10 diffs)
- trunk/SubversionSharp/dev/src/SvnDelegate.cs (modified) (4 diffs)
- trunk/SubversionSharp/dev/src/SvnWcEntry.cs (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/SubversionSharp/dev/src/Svn.cs
r36 r38 87 87 int action, int kind, 88 88 IntPtr mime_type, int content_state, 89 int prop_state, uint revision);89 int prop_state, int revision); 90 90 #endregion 91 91 … … 183 183 184 184 internal delegate IntPtr svn_log_message_receiver_t(IntPtr baton, IntPtr changed_paths, 185 uint revision, IntPtr author,185 int revision, IntPtr author, 186 186 IntPtr date, IntPtr message, 187 187 IntPtr pool); 188 189 internal delegate IntPtr svn_client_blame_receiver_t(IntPtr baton, long line_no, 190 int revision, IntPtr author, 191 IntPtr date, IntPtr line, 192 IntPtr pool); 188 193 189 194 [DllImport("svn_client-1", CharSet=CharSet.Ansi)] static extern 190 internal IntPtr svn_client_checkout(out uint result_rev, string URL,195 internal IntPtr svn_client_checkout(out int result_rev, string URL, 191 196 string path, IntPtr revision, int recurse, 192 197 IntPtr ctx, IntPtr pool); 193 198 194 199 [DllImport("svn_client-1", CharSet=CharSet.Ansi)] static extern 195 internal IntPtr svn_client_update (out uint result_rev, string path,200 internal IntPtr svn_client_update (out int result_rev, string path, 196 201 IntPtr revision, int recurse, 197 202 IntPtr ctx, IntPtr pool); 198 203 199 204 [DllImport("svn_client-1", CharSet=CharSet.Ansi)] static extern 200 internal IntPtr svn_client_switch(out uint result_rev, string path, string url,205 internal IntPtr svn_client_switch(out int result_rev, string path, string url, 201 206 IntPtr revision, int recurse, 202 207 IntPtr ctx, IntPtr pool); … … 225 230 226 231 [DllImport("svn_client-1", CharSet=CharSet.Ansi)] static extern 227 internal IntPtr svn_client_status(out uint result_rev,232 internal IntPtr svn_client_status(out int result_rev, 228 233 string path, IntPtr revision, 229 234 svn_wc_status_func_t status_func, IntPtr status_baton, … … 239 244 [DllImport("svn_client-1", CharSet=CharSet.Ansi)] static extern 240 245 internal IntPtr svn_client_blame(string path_or_url, IntPtr start, IntPtr end, 241 IntPtrreceiver, IntPtr receiver_baton,246 svn_client_blame_receiver_t receiver, IntPtr receiver_baton, 242 247 IntPtr ctx, IntPtr pool); 243 248 … … 291 296 internal IntPtr svn_client_revprop_set(string propname, IntPtr propval, 292 297 string Url, IntPtr revision, 293 out uint set_rev, int force,298 out int set_rev, int force, 294 299 IntPtr ctx, IntPtr pool); 295 300 … … 301 306 [DllImport("svn_client-1", CharSet=CharSet.Ansi)] static extern 302 307 internal IntPtr svn_client_revprop_get(string propname, out IntPtr propval, 303 string URL, IntPtr revision, out uint set_rev,308 string URL, IntPtr revision, out int set_rev, 304 309 IntPtr ctx, IntPtr pool); 305 310 … … 311 316 [DllImport("svn_client-1", CharSet=CharSet.Ansi)] static extern 312 317 internal IntPtr svn_client_revprop_list(out IntPtr props, 313 string URL, IntPtr revision, out uint set_rev,318 string URL, IntPtr revision, out int set_rev, 314 319 IntPtr ctx, IntPtr pool); 315 320 316 321 [DllImport("svn_client-1", CharSet=CharSet.Ansi)] static extern 317 internal IntPtr svn_client_export(out uint result_rev,322 internal IntPtr svn_client_export(out int result_rev, 318 323 string from, string to, IntPtr revision, int force, 319 324 IntPtr ctx, IntPtr pool); trunk/SubversionSharp/dev/src/SvnClient.cs
r36 r38 24 24 int revision, AprString author, 25 25 AprString date, AprString message, 26 AprPool pool); 26 AprPool pool); 27 28 public delegate SvnError BlameReceiver(IntPtr baton, long line_no, int revision, 29 AprString author, AprString date, AprString line, 30 AprPool pool); 27 31 28 32 public static int Checkout(string url, string path, … … 30 34 bool recurse, SvnClientContext ctx, AprPool pool) 31 35 { 32 uint rev;36 int rev; 33 37 Debug.Write(String.Format("svn_client_checkout({0},{1},{2},{3},{4},{5})...",url,path,revision,recurse,ctx,pool)); 34 38 SvnError err = Svn.svn_client_checkout(out rev, url, path, … … 38 42 throw new SvnException(err); 39 43 Debug.WriteLine(String.Format("Done({0})",rev)); 40 return( unchecked((int)rev));44 return(rev); 41 45 } 42 46 … … 46 50 bool recurse, SvnClientContext ctx, AprPool pool) 47 51 { 48 uint rev;52 int rev; 49 53 Debug.Write(String.Format("svn_client_update({0},{1},{2},{3},{4})...",path,revision,recurse,ctx,pool)); 50 54 SvnError err = Svn.svn_client_update(out rev, path, … … 54 58 throw new SvnException(err); 55 59 Debug.WriteLine(String.Format("Done({0})",rev)); 56 return( unchecked((int)rev));60 return(rev); 57 61 } 58 62 … … 61 65 bool recurse, SvnClientContext ctx, AprPool pool) 62 66 { 63 uint rev;67 int rev; 64 68 Debug.Write(String.Format("svn_client_switch({0},{1},{2},{3},{4},{5})...",path,url,revision,recurse,ctx,pool)); 65 69 SvnError err = Svn.svn_client_switch(out rev, path, url, … … 69 73 throw new SvnException(err); 70 74 Debug.WriteLine(String.Format("Done({0})",rev)); 71 return( unchecked((int)rev));75 return(rev); 72 76 } 73 77 … … 139 143 SvnClientContext ctx, AprPool pool) 140 144 { 141 uint rev;145 int rev; 142 146 SvnDelegate statusDelegate = new SvnDelegate(statusFunc); 143 147 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)); … … 152 156 Debug.WriteLine(String.Format("Done({0})",rev)); 153 157 if( update ) 154 return( unchecked((int)rev));158 return(rev); 155 159 else 156 160 return(-1); … … 174 178 throw new SvnException(err); 175 179 } 180 181 public static void Blame(string path_or_url, 182 SvnOptRevision start, SvnOptRevision end, 183 BlameReceiver receiver, IntPtr baton, 184 SvnClientContext ctx, AprPool pool) 185 { 186 SvnDelegate receiverDelegate = new SvnDelegate(receiver); 187 Debug.WriteLine(String.Format("svn_client_blame({0},{1},{2},{3},{4},{5},{6})",path_or_url,start,end,receiver.Method.Name,baton,ctx,pool)); 188 SvnError err = Svn.svn_client_blame(path_or_url, start, end, 189 (Svn.svn_client_blame_receiver_t)receiverDelegate.Wrapper, 190 baton, 191 ctx, pool); 192 if( !err.IsNoError ) 193 throw new SvnException(err); 194 } 176 195 } 177 196 } trunk/SubversionSharp/dev/src/SvnDelegate.cs
r36 r38 71 71 int action, int kind, 72 72 IntPtr mime_type, int content_state, 73 int prop_state, uint revision)73 int prop_state, int revision) 74 74 { 75 75 SvnWcNotify.Func func = mFunc as SvnWcNotify.Func; 76 76 try { 77 Debug.WriteLine(String.Format("[Callback:{0}]SvnWcNotifyFunc({1:X},{2},{3},{4},{5},{6},{7},{8})",func.Method.Name,baton,new AprString(path),(SvnWcNotify.Action) action,(Svn.NodeKind) kind,new AprString(mime_type),(SvnWcNotify.State) content_state,(SvnWcNotify.State) prop_state, unchecked((int) revision)));77 Debug.WriteLine(String.Format("[Callback:{0}]SvnWcNotifyFunc({1:X},{2},{3},{4},{5},{6},{7},{8})",func.Method.Name,baton,new AprString(path),(SvnWcNotify.Action) action,(Svn.NodeKind) kind,new AprString(mime_type),(SvnWcNotify.State) content_state,(SvnWcNotify.State) prop_state,revision)); 78 78 func(baton, new AprString(path), 79 79 (SvnWcNotify.Action) action, (Svn.NodeKind) kind, 80 80 new AprString(mime_type), (SvnWcNotify.State) content_state, 81 (SvnWcNotify.State) prop_state, unchecked((int) revision));81 (SvnWcNotify.State) prop_state, revision); 82 82 } 83 83 catch( Exception ) { … … 178 178 //[CLSCompliant(false))] 179 179 private IntPtr SvnLogMessageReceiverWrapper(IntPtr baton, IntPtr changed_paths, 180 uint revision, IntPtr author,180 int revision, IntPtr author, 181 181 IntPtr date, IntPtr message, 182 182 IntPtr pool) … … 185 185 SvnClient.LogMessageReceiver func = mFunc as SvnClient.LogMessageReceiver; 186 186 try { 187 Debug.Write(String.Format("[Callback:{0}]SvnLogMessageReceiver({1:X},{2},{3},{4},{5},{6},{7})...",func.Method.Name,baton,new AprHash(changed_paths), unchecked((int)revision),new AprString(author),new AprString(date),new AprString(message),new AprPool(pool)));187 Debug.Write(String.Format("[Callback:{0}]SvnLogMessageReceiver({1:X},{2},{3},{4},{5},{6},{7})...",func.Method.Name,baton,new AprHash(changed_paths),revision,new AprString(author),new AprString(date),new AprString(message),new AprPool(pool))); 188 188 err = func(baton, new AprHash(changed_paths), 189 unchecked((int)revision), new AprString(author),189 revision, new AprString(author), 190 190 new AprString(date), new AprString(message), 191 191 new AprPool(pool)); … … 201 201 } 202 202 203 203 204 // svn_client_blame_receiver_t Wrapper 205 public SvnDelegate(SvnClient.BlameReceiver func) 206 { 207 mFunc = func; 208 mWrapperFunc = new Svn.svn_client_blame_receiver_t(SvnClientBlameReceiverWrapper); 209 } 210 211 private IntPtr SvnClientBlameReceiverWrapper(IntPtr baton, long lineNo, int revision, 212 IntPtr author, IntPtr date, IntPtr line, 213 IntPtr pool) 214 { 215 SvnError err = SvnError.NoError; 216 SvnClient.BlameReceiver func = mFunc as SvnClient.BlameReceiver; 217 try { 218 Debug.Write(String.Format("[Callback:{0}]SvnClientBlameReceiver({1:X},{2},{3},{4},{5},{6},{7})...",func.Method.Name,baton,lineNo,revision,new AprString(author),new AprString(date),new AprString(line),new AprPool(pool))); 219 err = func(baton, lineNo, revision, 220 new AprString(author), new AprString(date), new AprString(line), 221 new AprPool(pool)); 222 Debug.WriteLine((err.IsNoError) ? "Return(NoError)" : String.Format("Return({0})",err.Message)); 223 } 224 catch( SvnException e ) { 225 err = SvnError.Create(e.AprErr, SvnError.NoError, e.Message); 226 } 227 catch( Exception e ) { 228 err = SvnError.Create(215000, SvnError.NoError, e.Message); 229 } 230 return(err); 231 } 232 204 233 205 234 // svn_auth_simple_prompt_func_t Wrapper trunk/SubversionSharp/dev/src/SvnWcEntry.cs
r33 r38 31 31 { 32 32 public IntPtr name; 33 public uint revision;33 public int revision; 34 34 public IntPtr url; 35 35 public IntPtr repos; … … 42 42 public int incomplete; 43 43 public IntPtr copyfrom_url; 44 public uint copyfrom_rev;44 public int copyfrom_rev; 45 45 public IntPtr conflict_old; 46 46 public IntPtr conflict_new; … … 50 50 public long prop_time; 51 51 public IntPtr checksum; 52 public uint cmt_rev;52 public int cmt_rev; 53 53 public long cmt_date; 54 54 public IntPtr cmt_author; … … 116 116 { 117 117 CheckPtr(); 118 return( unchecked((int)mEntry->revision));118 return(mEntry->revision); 119 119 } 120 120 } … … 215 215 { 216 216 CheckPtr(); 217 return( unchecked((int)mEntry->copyfrom_rev));217 return(mEntry->copyfrom_rev); 218 218 } 219 219 } … … 287 287 { 288 288 CheckPtr(); 289 return( unchecked((int)mEntry->cmt_rev));289 return(mEntry->cmt_rev); 290 290 } 291 291 }