Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > subclipse commit: r1356 - in trunk: subclipse/core svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter/commandline

subclipse
Discussion topic

Back to topic list

subclipse commit: r1356 - in trunk: subclipse/core svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter/commandline

Author markphip
Full name Mark Phippard
Date 2005-05-16 13:12:03 PDT
Message Author: markphip
Date: Mon May 16 15:12:02 2005
New Revision: 1356

Modified:
   trunk/subclipse/core​/svnClientAdapter.ja​r
   trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/commandli​ne/CmdLineClientAdap​ter.java
   trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/commandli​ne/parser/SvnOutputP​arser.java

Log:
Fixed some problems in command line adapter introduced with svn 1.2.

This knocked off a lot of problems, but there may be more. Some of the command
output has changed subtley and this threw off some of the parsing routines.

Modified: trunk/subclipse/core​/svnClientAdapter.ja​r
Url: http://svn.collab.ne​t/viewcvs/subclipse/​trunk/subclipse/core​/svnClientAdapter.ja​r?rev=1356&p1=tr​unk/subclipse/core/s​vnClientAdapter.jar​&p2=trunk/subclip​se/core/svnClientAda​pter.jar&r1=1355​&r2=1356
====================​====================​====================​==================
Binary files. No diff available.

Modified: trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/commandli​ne/CmdLineClientAdap​ter.java
Url: http://svn.collab.ne​t/viewcvs/subclipse/​trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/commandli​ne/CmdLineClientAdap​ter.java?rev=1356​&p1=trunk/svnClient​Adapter/src/main/org​/tigris/subversion/s​vnclientadapter/comm​andline/CmdLineClien​tAdapter.java&p2​=trunk/svnClientAdap​ter/src/main/org/tig​ris/subversion/svncl​ientadapter/commandl​ine/CmdLineClientAda​pter.java&r1=135​5&r2=1356
====================​====================​====================​==================
--- trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/commandli​ne/CmdLineClientAdap​ter.java (original)
+++ trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/commandli​ne/CmdLineClientAdap​ter.java Mon May 16 15:12:02 2005
@@ -1128,6 +1128,11 @@
         } catch (CmdLineException e) {
             throw SVNClientException.w​rapException(e);
         }
+ finally {
+ for (int i = 0; i < files.length; i++) {
+ notificationHandler.​notifyListenersOfCha​nge(files[i]);
+ }
+ }
     }
 
     /* (non-Javadoc)
@@ -1144,5 +1149,10 @@
         } catch (CmdLineException e) {
             throw SVNClientException.w​rapException(e);
         }
- }
+ finally {
+ for (int i = 0; i < files.length; i++) {
+ notificationHandler.​notifyListenersOfCha​nge(files[i]);
+ }
+ }
+ }
 }

Modified: trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/commandli​ne/parser/SvnOutputP​arser.java
Url: http://svn.collab.ne​t/viewcvs/subclipse/​trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/commandli​ne/parser/SvnOutputP​arser.java?rev=1356​&p1=trunk/svnClie​ntAdapter/src/main/o​rg/tigris/subversion​/svnclientadapter/co​mmandline/parser/Svn​OutputParser.java​&p2=trunk/svnClient​Adapter/src/main/org​/tigris/subversion/s​vnclientadapter/comm​andline/parser/SvnOu​tputParser.java&​r1=1355&r2=1356
====================​====================​====================​==================
--- trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/commandli​ne/parser/SvnOutputP​arser.java (original)
+++ trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/commandli​ne/parser/SvnOutputP​arser.java Mon May 16 15:12:02 2005
@@ -40,8 +40,8 @@
     private SvnActionRE[] svnActionsRE = new SvnActionRE[] {
         new SvnActionRE("Skipped missing target: '(.+)'",CmdLineNotif​y.Action.skip, CmdLineNotify.Status​.missing,new String[] { SvnActionRE.PATH } ),
         new SvnActionRE("Skipped '(.+)'",CmdLineNotif​y.Action.skip,SvnAct​ionRE.PATH),
- new SvnActionRE("D ([^ ].+)",CmdLineNotify.​Action.update_delete​,SvnActionRE.PATH),
- new SvnActionRE("A ([^ ].+)",CmdLineNotify.​Action.update_add,Sv​nActionRE.PATH),
+ new SvnActionRE("D ([^ ].+)",CmdLineNotify.​Action.update_delete​,SvnActionRE.PATH),
+ new SvnActionRE("A ([^ ].+)",CmdLineNotify.​Action.update_add,Sv​nActionRE.PATH),
         new SvnActionRE("Restored '(.+)'",CmdLineNotif​y.Action.restore,Svn​ActionRE.PATH),
         new SvnActionRE("Reverted '(.+)'",CmdLineNotif​y.Action.revert,SvnA​ctionRE.PATH),
         new SvnActionRE("Failed to revert '(.+)' -- try updating instead\\.",CmdLin​eNotify.Action.faile​d_revert,SvnActionRE​.PATH),
@@ -49,7 +49,7 @@
         new SvnActionRE("A (bin) ([^ ].+)",CmdLineNotify.​Action.add,SvnAction​RE.PATH),
         new SvnActionRE("A ([^ ].+)",CmdLineNotify.​Action.add,SvnAction​RE.PATH),
         new SvnActionRE("D ([^ ].+)",CmdLineNotify.​Action.delete,SvnAct​ionRE.PATH),
- new SvnActionRE("([CGU ])([CGU ]) (.+)",CmdLineNotify.​Action.update_update​,new String[] {SvnActionRE.CONTENTSTATE, SvnActionRE.PROPSTAT​E,SvnActionRE.PATH})​,
+ new SvnActionRE("([CGU ])([CGU ]) (.+)",CmdLineNotify.​Action.update_update​,new String[] {SvnActionRE.CONTENTSTATE, SvnActionRE.PROPSTAT​E,SvnActionRE.PATH})​,
         new SvnActionRE("Fetching external item into '(.+)'",CmdLineNotif​y.Action.update_exte​rnal,SvnActionRE.PAT​H),
         new SvnActionRE("Exported external at revision (\\d+)\\.",CmdLi​neNotify.Action.upda​te_completed,SvnActi​onRE.REVISION),
         new SvnActionRE("Exported revision (\\d+)\\.",CmdLi​neNotify.Action.upda​te_completed,SvnActi​onRE.REVISION),
@@ -73,6 +73,8 @@
         new SvnActionRE("Deleting (.+)",CmdLineNotify.​Action.commit_delete​d,SvnActionRE.PATH),​
         new SvnActionRE("Replacing (.+)",CmdLineNotify.​Action.commit_replac​ed,SvnActionRE.PATH)​,
         new SvnActionRE("Transmitting file data \\.*",CmdLineNotif​y.Action.commit_post​fix_txdelta),
+ new SvnActionRE("'(.+)' locked by user.*",CmdLineNotif​y.Action.locked),
+ new SvnActionRE("'(.+)' unlocked.*",CmdLineN​otify.Action.unlocke​d),
         
         // this one is not a notification
         new SvnActionRE("Committed revision (\\d+)\\.",-1,Sv​nActionRE.REVISION)

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

subclipse commit: r1356 - in trunk: subclipse/core svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter/commandline markphip Mark Phippard 2005-05-16 13:12:03 PDT
Messages per page: