Do not run diff to find the modification state. Rely on the existing BLD200406151800
authormentlicher@netbeans.org
Tue, 15 Jun 2004 15:50:13 +0000
changeset 47804cbd5eac2544
parent 4779 7491bd5372f2
child 4781 c26a651433d6
Do not run diff to find the modification state. Rely on the existing
status information + the locker status.
This is a fix of issue #42263.
vcs.profiles.pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/commands/PvcsVerifyAction.java
vcs.profiles.pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/config/pvcs.xml
     1.1 --- a/vcs.profiles.pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/commands/PvcsVerifyAction.java	Tue Jun 15 15:47:21 2004 +0000
     1.2 +++ b/vcs.profiles.pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/commands/PvcsVerifyAction.java	Tue Jun 15 15:50:13 2004 +0000
     1.3 @@ -162,12 +162,14 @@
     1.4          notLockedFiles = new ArrayList();
     1.5          List foList = VerifyUtil.getFOs(fileSystem, vars);
     1.6          try {
     1.7 -            fillFilesByState(foList, (args.length > 0) ? args[0] : null);
     1.8 +            fillFilesByState(foList, (args.length > 1) ? args[0] : null);
     1.9          } catch (InterruptedException iexc) {
    1.10              return false;
    1.11          }
    1.12          if (args.length > 1) {
    1.13              lockCommand = args[1];
    1.14 +        } else if (args.length > 0) {
    1.15 +            lockCommand = args[0];
    1.16          } else {
    1.17              lockCommand = "LOCK";
    1.18          }
     2.1 --- a/vcs.profiles.pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/config/pvcs.xml	Tue Jun 15 15:47:21 2004 +0000
     2.2 +++ b/vcs.profiles.pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/config/pvcs.xml	Tue Jun 15 15:50:13 2004 +0000
     2.3 @@ -1355,7 +1355,7 @@
     2.4  
     2.5      <command name="VERIFY_ACTION">
     2.6          <property name="exec">
     2.7 -            <value>vcs.commands.PvcsVerifyAction.class VERIFY_ACTION_DIFF LOCK_</value>
     2.8 +            <value>vcs.commands.PvcsVerifyAction.class LOCK_</value>
     2.9          </property>
    2.10          <property name="runOnMultipleFiles">
    2.11            <value>true</value>