Hi Alexander,

We have followed your instructions and sharing the project works. However, lately we are having trouble with the credentials.

On every start of our application, we are looking for a repository location that is usable for the project -- creating one if it does not exist -- and are setting the credentials on it. We even specify that the credentials should be saved. Then, if the project is not already shared, we share it using the repository location.

However, as soon as the first svn operation is executed, we are prompted for credentials. We have found out that different repository locations are involved, although we would expect only one to exist.

I tried implementing my own ISVNCredentialsPrompt and IOptionProvider, which solves the problem of the user being prompted, because I can provide the credentials without asking the user (he would not know what to enter). But that seems like a workaround to me.

Can you explain how credentials are stored and how we can specify credentials in such a way that we are not prompted? That would save us from having to provide an ISVNCredentialsPrompt and would thus reduce complexity.

Thanks,
Biörn

---

From: subversive-dev-bounces@xxxxxxxxxxx [subversive-dev-bounces@xxxxxxxxxxx] on behalf of Alexander Gurov [alexander.gurov@xxxxxxxxxxxx]
Sent: 26 September 2011 18:22
To: Developers mailing list
Subject: Re: [subversive-dev] Programmatically sharing a project and specifying credentials

Hello Biörn,

First of all you should detect which repository location you could use in order to share the project (below is the part of AlreadyConnectedPage which is responsible for the doing):

String url = ""> for (int i = 0; i < projects.length; i++) {
    SVNChangeStatus info = SVNUtility.getSVNInfoForNotConnected(projects[i]);
    String tmp = SVNUtility.decodeURL(info.url);
    if (url == null) {
        url = "">     }
    else {
        IPath tPath = SVNUtility.createPathForSVNUrl(url);
        IPath tPath2 = SVNUtility.createPathForSVNUrl(tmp);
        if (tPath2.isPrefixOf(tPath)) {
            url = "">         }
        else {
            while (!tPath.isPrefixOf(tPath2)) {
                tPath = tPath.removeLastSegments(1);
            }
            url = "">         }
    }
}
IRepositoryRoot []repositoryRoots = SVNUtility.findRoots(url, true); // here you will get all the acceptable repository locations


IRepositoryLocation location = repositoryRoots[0].getRepositoryLocation(); // you can take the first acceptable one, for example

If there are no location then you should create it first. In order to do so you can use the url you got from the previous step:

AbstractActionOperation createOp =  null;
if (repositoryRoots.length == 0) {
    location = SVNRemoteStorage.instance().newRepositoryLocation();
......// fill the IRepositoryLocation instance here
   createOp =  new AddRepositoryLocationOperation(location);
}

And in the end this is how you could share the projects that already contains Subversion metadata:

IProject []projects = ....;
IRepositoryLocation location = ....;

ReconnectProjectOperation mainOp = new ReconnectProjectOperation(projects, location); // reconnect operation itself

CompositeOperation op = new CompositeOperation(mainOp.getId(), mainOp.getMessagesClass());

op.add(new NotifyProjectStatesChangedOperation(mainOp.getProjects(), ProjectStatesChangedEvent.ST_PRE_SHARED)); // send required notifications
if (createOp != null) {
    op.add(createOp);
    op.add(new SaveRepositoryLocationsOperation());
    op.add(mainOp, new IActionOperation[] {createOp});
}
else {
    op.add(mainOp);
}
op.add(new RefreshResourcesOperation(mainOp, IResource.DEPTH_INFINITE, RefreshResourcesOperation.REFRESH_ALL)); // initialize SVN metadata cache loading, redraw for the workspace resources tree etc.
op.add(new NotifyProjectStatesChangedOperation(mainOp.getProjects(), ProjectStatesChangedEvent.ST_POST_SHARED)); // send required notifications

UIMonitorUtility.doTaskScheduledDefault(op);


Best regards,
Alexander Gurov.

14.09.2011 18:45, Biörnstad, Biörn пишет:

Hello

We want to programmatically enable the sharing of a project that already contains Subversion meta data (.svn). I have found the ShareProjectOperation and the ShareProjectWizard with the AlreadyConnectedPage. However, they contain much code and I am getting slightly lost.

Can someone give me instructions on how to achieve this?

Additionally, we want to provide the credentials (username and password) that Subversive should use when contacting the Subversion repository. Is it possible to specify the information when sharing the project? Or do we need to use an ISVNCredentialsPrompt through an IOptionProvider?

The point is that both operations should be done programmatically without user interaction.

Thanks in advance,
Biörn
_______________________________________________
subversive-dev mailing list
subversive-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/subversive-dev

_______________________________________________
subversive-dev mailing list
subversive-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/subversive-dev

Hi Alexander,

I am not sure where the misunderstanding is, but let me state the problem in more detail. During an update, standard Subversion behaviour is to merge incoming changes into local files, which may contain local changes. This is only the case for text files, not for binary files. In our application, we are using text-based file formats to store our model objects. Thus, an automatic merge would normally take place on these files.

However, in our application, the user never sees the actual files; the user sees only the model objects that are persisted in the files. Therefore, automatic merging must be prevented at any price, because the user cannot verify the automatic merge. If at all, merging would have to take place on a model level, which we might implement in the future.

The behaviour must be the following: If a file has both local changes and changes in the repository, during an update, automatic merging must NOT take place. Instead, the user must be warned that the file could not be updated. The user must then resolve the conflict (move away the locally changed model object, or revert the changes) and retry the update.

One solution would be to mark all our files as binary, because binary files are never merged automatically. However, we would like to have a more elegant solution.

I have attached my ResourceMappingMerger for a start. It contains the core of what I want to accomplish (prevent merging, leave the conflict unresolved). Now I want this class to be called during ALL update operations, not just the one triggered from the synchronize view.

It will take me some more time to create a working plug-in that I can share. Let me know if I can provide you with some other concrete information in the mean time.

Thanks,
Biörn

________________________________________
From: subversive-dev-bounces@xxxxxxxxxxx [subversive-dev-bounces@xxxxxxxxxxx] on behalf of Alexander Gurov [alexander.gurov@xxxxxxxxxxxx]
Sent: 27 July 2012 9:07
To: Developers mailing list
Subject: Re: [subversive-dev] How to prevent automatic merge

Hello Biörn,

It's my fault for misleading you, I've misunderstood your question.
There is the ConflictResolverCallback interface in both libraries, if
we're talking about merging unresolved conflicts only. This interface is
mapped to the ISVNConflictResolutionCallback in Subversive, but yet to
be used anywhere. There is some merge models support in Subversive, but
it seems to be working only when it is related to Synchronize View
contents, while Merge View and Team->Update/Switch actions seems to be
unaffected. I think there should be some code that should allow to
consult models about merge through ISVNConflictResolutionCallback calls.
I'll try asking the person who did implement a models support why it is
working like it is now and how it was supposed to be.

P.S.
Also, if it is not too hard for you and you can avoid revealing any
commercial information, could you please give me some short sample of
how it should look like in code on your side (so I can use it as a test
case to ensure merge support works like it should)?

Best regards,
Alexander.

26.07.2012 15:06, Biörnstad, Biörn пишет:

Hi Alexander,

I am a bit confused by your answer. I have done tests with SVNKit and the Eclipse team framework. When using SVNKit, I am able to take control over the merging process through the ISVNMerger interface. In Eclipse, I seem to be able to do the same through a IResourceMappingMerger. However, it seems that the merger is invoked only when executing "Update All" in the synchronize view (MergeAllOperation/ModelMergeOperation), not during a "normal" update.

Can you clear up my confusion? What are the missing bits in Subversive?

Thanks,
Biörn

________________________________________
From: subversive-dev-bounces@xxxxxxxxxxx [subversive-dev-bounces@xxxxxxxxxxx] on behalf of Alexander Gurov [alexander.gurov@xxxxxxxxxxxx]
Sent: Tuesday, July 17, 2012 21:37
To: Developers mailing list
Subject: Re: [subversive-dev] How to prevent automatic merge

Hello Biörn,

Unfortunately there is no way to interfere with the SVN client library
merging files on update/merge/switch (neither one of both libraries -
SVN Kit and JavaHL - provides such API) and this is why it is impossible
in Subversive as well,

Best regards,
Alexander.

17.07.2012 16:02, Biörnstad, Biörn пишет:

Hi,

What is the easiest way of preventing Subversive from automatically merging files? When the user executes an update operation, I do not want any automatic merges to take place, as with binary files.

I have tried providing an IResourceMappingMerger and an IStorageMerger, but it did not work for me.

Thanks,
Biörn

_______________________________________________
subversive-dev mailing list
subversive-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/subversive-dev