Login | Register
My pages Projects Community openCollabNet

Discussions > commits > svn commit: r1452 - in trunk: subclipse/core svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter/commandline svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter/javahl www/subclipse

subclipse
Discussion topic

Back to topic list

svn commit: r1452 - in trunk: subclipse/core svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter/commandline svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter/javahl www/subclipse

Author markphip
Full name Mark Phippard
Date 2005-07-13 07:23:27 PDT
Message Author: markphip
Date: Wed Jul 13 07:23:27 2005
New Revision: 1452

Modified:
   trunk/subclipse/core​/svnClientAdapter.ja​r
   trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/commandli​ne/SvnCommandLine.ja​va
   trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/javahl/Jh​lClientAdapter.java
   trunk/www/subclipse/​changes.html
Log:
Show Annotations was not working if the file had not been modified yet in
the current location. This would most typically occur when doing it from
a branch.

In JavaHL we had to to switch to using the new syntax that allows us to
specify a peg revision. In this case, we specify a peg revision of HEAD
which lets Subversion trace the history back and find where the file came from.

In the CLI, it didn't seem to be working at all because it was specifying a
revision range of -r START:rev_num and START is not a valid revision. I fixed
this by changing it to just specify -r rev_num which is the same thing. The
CLI automatically specifies a peg revision of @HEAD so there was no need to
specifically supply it.


Modified: trunk/subclipse/core​/svnClientAdapter.ja​r
Url: http://subclipse.tig​ris.org/source/brows​e/subclipse/trunk/su​bclipse/core/svnClie​ntAdapter.jar?view=d​iff&rev=1452​&p1=trunk/subclipse/​core/svnClientAdapte​r.jar&r1=1451​&p2=trunk/subclipse​/core/svnClientAdapt​er.jar&r2=1452
====================​====================​====================​==================
Binary files. No diff available.

Modified: trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/commandli​ne/SvnCommandLine.ja​va
Url: http://subclipse.tig​ris.org/source/brows​e/subclipse/trunk/sv​nClientAdapter/src/m​ain/org/tigris/subve​rsion/svnclientadapt​er/commandline/SvnCo​mmandLine.java?view=​diff&rev=1452​&p1=trunk/svnClient​Adapter/src/main/org​/tigris/subversion/s​vnclientadapter/comm​andline/SvnCommandLi​ne.java&r1=1451​&p2=trunk/svnClie​ntAdapter/src/main/o​rg/tigris/subversion​/svnclientadapter/co​mmandline/SvnCommand​Line.java&r2=145​2
====================​====================​====================​==================
--- trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/commandli​ne/SvnCommandLine.ja​va (original)
+++ trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/commandli​ne/SvnCommandLine.ja​va Wed Jul 13 07:23:27 2005
@@ -778,9 +778,9 @@
         setCommand(ISVNNotif​yListener.Command.AN​NOTATE, false);
         ArrayList args = new ArrayList();
         args.add("annotate");
- args.add(path);
         args.add("-r");
- args.add(validRev(re​visionStart)+":"+val​idRev(revisionEnd));​
+ args.add(validRev(re​visionEnd));
+ args.add(path);
         addAuthInfo(args);
         addConfigInfo(args);
         return execString(args,false);

Modified: trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/javahl/Jh​lClientAdapter.java
Url: http://subclipse.tig​ris.org/source/brows​e/subclipse/trunk/sv​nClientAdapter/src/m​ain/org/tigris/subve​rsion/svnclientadapt​er/javahl/JhlClientA​dapter.java?view=dif​f&rev=1452&p​1=trunk/svnClientAda​pter/src/main/org/ti​gris/subversion/svnc​lientadapter/javahl/​JhlClientAdapter.jav​a&r1=1451&p2​=trunk/svnClientAdap​ter/src/main/org/tig​ris/subversion/svncl​ientadapter/javahl/J​hlClientAdapter.java​&r2=1452
====================​====================​====================​==================
--- trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/javahl/Jh​lClientAdapter.java (original)
+++ trunk/svnClientAdapt​er/src/main/org/tigr​is/subversion/svncli​entadapter/javahl/Jh​lClientAdapter.java Wed Jul 13 07:23:27 2005
@@ -44,7 +44,6 @@
 import org.tigris.subversio​n.svnclientadapter.I​SVNStatus;
 import org.tigris.subversio​n.svnclientadapter.S​VNBaseDir;
 import org.tigris.subversio​n.svnclientadapter.S​VNClientException;
-import org.tigris.subversio​n.svnclientadapter.S​VNConstants;
 import org.tigris.subversio​n.svnclientadapter.S​VNInfoUnversioned;
 import org.tigris.subversio​n.svnclientadapter.S​VNRevision;
 import org.tigris.subversio​n.svnclientadapter.S​VNStatusUnversioned;​
@@ -1378,15 +1377,14 @@
             if(revisionEnd == null)
                 revisionEnd = SVNRevision.HEAD;
             String commandLine = "blame ";
- if(revisionEnd != SVNRevision.HEAD || !revisionStart.equals(new SVNRevision.Number(1)))
- commandLine = commandLine + "-r " + revisionStart.toString() + ":" + revisionEnd.toString() + " ";
- commandLine = commandLine + target.toString();
+ commandLine = commandLine + "-r " + revisionEnd.toString() + " ";
+ commandLine = commandLine + target.toString() + "@HEAD";
             notificationHandler.​logCommandLine(comma​ndLine);
             notificationHandler.​setBaseDir();
             
             JhlAnnotations annotations = new JhlAnnotations();
- svnClient.blame(target, JhlConverter.convert​(revisionStart), JhlConverter.convert​(revisionEnd), annotations);
- return annotations;
+ svnClient.blame(target, Revision.HEAD, JhlConverter.convert​(revisionStart), JhlConverter.convert​(revisionEnd), annotations);
+ return annotations;
         } catch (ClientException e) {
             notificationHandler.​logException(e);
             throw new SVNClientException(e);

Modified: trunk/www/subclipse/​changes.html
Url: http://subclipse.tig​ris.org/source/brows​e/subclipse/trunk/ww​w/subclipse/changes.​html?view=diff&r​ev=1452&p1=trunk​/www/subclipse/chang​es.html&r1=1451​&p2=trunk/www/sub​clipse/changes.html​&r2=1452
====================​====================​====================​==================
--- trunk/www/subclipse/​changes.html (original)
+++ trunk/www/subclipse/​changes.html Wed Jul 13 07:23:27 2005
@@ -105,6 +105,11 @@
  code at the end of the commit process.</li>
  <li>Fixed spelling error. (<a
   href="http://subclipse.tig​ris.org/issues/show_​bug.cgi?id=330">330</a>)</li>
+ <li>Modified Show Annotations action to supply a peg revision of @HEAD. This
+ allows the command to work properly when you perform it on a file that has
+ never been modified in its current location, such as when working in a new
+ branch or when a file has been moved.</li>
+ <li>Show Annotations should now work with the Command Line Adapter</li>
 </ul>
 <hr />
 <a name="0.9.31"></a>

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

Messages

Show all messages in topic

svn commit: r1452 - in trunk: subclipse/core svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter/commandline svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter/javahl www/su... markphip Mark Phippard 2005-07-13 07:23:27 PDT
Messages per page: