package com.perforce.p4simulink; /** * Perforce SCM Integration */ import com.mathworks.cmlink.api.ApplicationInteractor; import com.mathworks.cmlink.api.ConfigurationManagementException; import com.mathworks.cmlink.api.InteractorSupportedFeature; import com.mathworks.cmlink.api.Terminator; import com.mathworks.cmlink.api.customization.CustomizationWidgetFactory; import com.mathworks.cmlink.api.version.r14a.CMInteractor; import com.perforce.p4java.client.IClient; import com.perforce.p4java.core.file.FileSpecBuilder; import com.perforce.p4java.core.file.IFileSpec; import com.perforce.p4java.exception.P4JavaException; import com.perforce.p4java.impl.generic.client.ClientView; import com.perforce.p4java.impl.mapbased.client.Client; import com.perforce.p4java.server.IOptionsServer; import com.perforce.p4simulink.connection.Config; import com.perforce.p4simulink.connection.Connection; import com.perforce.p4simulink.util.Logging; import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.TrueFileFilter; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import ui.P4ConnectionPane; import ui.P4PasswordPane; import javax.swing.*; import java.awt.*; import java.io.File; import java.io.IOException; import java.util.*; import java.util.List; public class P4Interactor implements CMInteractor { protected static final Logger log = LogManager.getLogger(P4Interactor.class.getName()); // list of supported features private static final Collection<InteractorSupportedFeature> supportedFeatures = EnumSet.of( InteractorSupportedFeature.CONNECTION ); protected IClient client = null; protected Config config; protected Connection connection; protected Terminator terminator; protected ApplicationInteractor applicationInteractor; protected File sandboxRoot; public P4Interactor(ApplicationInteractor applicationInteractor, Config config) throws P4CMException { this.config = config; // this is a handle we can use to open new dialog/popup windows if needed this.applicationInteractor = applicationInteractor; for (int i = 0; i < 5; i++) { try { if (config != null && config.exists()) { this.config.load(); } connection = new Connection(); terminator = applicationInteractor.getTerminator(); break; } catch (P4CMException e) { showNotification("Error connecting to Perforce."); showConnectDialogue(); showPasswordDialogue(); Logging.logException(log, e); } } } public void setTerminator(Terminator terminator) { this.terminator = terminator; } public File getSandboxRoot() { return sandboxRoot; } public void setSandboxRoot(File sandboxRoot) { this.sandboxRoot = sandboxRoot; } @Override public void buildCustomActions(CustomizationWidgetFactory customizationWidgetFactory) { log.debug("buildCustomActions()"); } @Override public boolean isFeatureSupported(InteractorSupportedFeature interactorSupportedFeature) { return supportedFeatures.contains(interactorSupportedFeature); } /** * Checks if the integration is ready. As the integration needs to be connected to a Perforce Server, * we check if a IOptionsServer object exists for the session and is connected. If it does, * then we're ready; otherwise, we still need to connect. * * @return is the connection to the Perforce Server ready or not. */ @Override public boolean isReady() { return connection.isReady(); } /** * Disconnect from the Perforce Server and close the Perforce session. * * @throws ConfigurationManagementException */ @Override public void disconnect() throws ConfigurationManagementException { connection.disconnect(); } /** * @param clientName specified client name * @return IClient client */ public IClient getClient(String clientName) throws ConfigurationManagementException { if (client != null) { return client; } try { IOptionsServer server = getServer(); if (server == null) { showNotification("Unable to connect to server."); showPasswordDialogue(); log.error("Unable to connect to server."); } if (clientName == null || clientName.isEmpty()) { showNotification("No client specified. Please supply a valid client."); showConnectDialogue(); log.error("No client specified."); } IClient newClient = server.getClient(clientName); if (newClient == null) { showNotification("Unable to find the specified client '" + clientName + "'."); showConnectDialogue(); log.error("Unable to find the specified client '" + clientName + "'."); } if (sandboxRoot != null && !newClient.getRoot().equalsIgnoreCase(sandboxRoot.getAbsolutePath())) { newClient.setRoot(sandboxRoot.getAbsolutePath()); } if (newClient.getClientView() == null || newClient.getClientView().getEntryList().isEmpty()) { showNotification( "The client view for '" + clientName + "' is empty, and this will map the entire depot. " + "Please restrict your Simulink client to only the depot paths you require for this project." ); log.error("The client view for '" + clientName + "' is empty, and this will map the entire depot. " + "Please restrict your Simulink client to only the depot paths you require for this project." ); } server.updateClient(newClient, false); server.setCurrentClient(newClient); newClient.setServer(server); client = newClient; return client; } catch (P4JavaException e) { Logging.logException(log, e, true); } return client; } public IClient getClient() throws ConfigurationManagementException { try { return getClient(config.getClient()); } catch (ConfigurationManagementException e) { Logging.logException(log, e, true); } return null; } public IOptionsServer getServer() { return connection.getServer(); } /** * Converts a collection of files into a list of IFileSpec objects. Any directories contained in the input list * are expanded into a list of files contained within them (if any). * * @param files Collection of files for which we want to get file specs. Note that directories are expanded into * the list of files contain in them (if any). * @return List of IFileSpec objects for the input list. */ public List<IFileSpec> toSpec(Collection<File> files) { List<IFileSpec> specs = new ArrayList<>(); try { HashSet<String> filePaths = new HashSet<>(); for (File file : files) { // adding a directory means we should add the files under it if (file.isDirectory()) { filePaths.add(file.getCanonicalPath() + "/..."); } else { // regular file filePaths.add(file.getCanonicalPath()); } } if (!filePaths.isEmpty()) { specs = FileSpecBuilder.makeFileSpecList(filePaths.toArray(new String[filePaths.size()])); } } catch (IOException e) { log.error("IO Exception building list of file specs: " + e.getLocalizedMessage()); } return specs; } public List<IFileSpec> toSpec(File file) { return toSpec(Collections.singletonList(file)); } /** * Get the address from our P4Config object and attempt to connect to that endpoint. If there are any problems * connecting to the server, catch the exception and rethrow as a P4CMException. * * @throws ConfigurationManagementException */ @Override public void connect() throws ConfigurationManagementException { try { if (config == null || config.getAddress().isEmpty() || config.getUser().isEmpty()) { showConnectDialogue(); } if (!config.hasPassword()) { showPasswordDialogue();; } connection.connect(config); client = getClient(config.getClient()); } catch(ConfigurationManagementException e) { // not enough configuration to connect showConnectDialogue(); if (config != null && config.getAddress().length() > 0) { Logging.logException(log, e, true); } // connect failed for another reason, no need to rethrow Logging.logException(log, e); showNotification(e.getLocalizedMessage()); } } private void showConnectDialogue() { P4ConnectionPane pane = new P4ConnectionPane(config); // limit the number of times we check for(int i = 0; i < 5; i++) { int option = JOptionPane.showConfirmDialog( applicationInteractor.getParentFrame(), pane.getFields(), "Open Connection", JOptionPane.OK_CANCEL_OPTION ); // update the config with the new values, if the user clicked ok if (option == JOptionPane.OK_OPTION) { boolean isValid = pane.getServer() != null && !pane.getServer().isEmpty() && pane.getUsername() != null && !pane.getUsername().isEmpty() && pane.getWorkspace() != null && !pane.getWorkspace().isEmpty(); // one of the required fields wasn't filled in, so re-display the dialog if (!isValid) { continue; } config.setAddress(pane.getServer()); config.setClient(pane.getWorkspace()); config.setUser(pane.getUsername()); try { config.save(); } catch (P4CMException e) { log.error("Couldn't save config: " + e.getLocalizedMessage()); } // config saved, so break out of the loop and clear any results pane.clearResults(); break; } else { break; } } } private void showNotification(String message) { JOptionPane.showMessageDialog( applicationInteractor.getParentFrame(), message, "Enter Password", JOptionPane.INFORMATION_MESSAGE ); } private void showPasswordDialogue() { P4PasswordPane pane = new P4PasswordPane(); // @todo: maybe just loop until they hit cancel or a valid password for (int i = 0; i < 5; i++) { int option = JOptionPane.showConfirmDialog( applicationInteractor.getParentFrame(), pane.getFields(), "Enter Password", JOptionPane.OK_CANCEL_OPTION ); // update the config with the new values, if the user clicked ok if (option == JOptionPane.OK_OPTION) { String password = pane.getPassword(); // ask again if (password == null || password.isEmpty()) { continue; } config.setPassword(password); } break; } } @Override public String getSystemName() { return "Perforce SCM Integration for Simulink"; } @Override public String getShortSystemName() { return "P4Simulink"; } }
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#32 | 16676 | Paul Allen |
Look for P4CONFIG file above starting location for 'isDirSandboxForThisAdapter' function. (+ extra error logging) |
||
#31 | 13842 | Paul Allen |
New P4Adapter setup designed to avoid passing the URI. #review-13782 |
||
#30 | 12439 | Paul Allen | Test conflict/resolve | ||
#29 | 12023 | Paul Allen | Copying using p4Simulink_dev->main | ||
#28 | 11681 | Paul Allen |
Fixes to unit tests. - Fixed paths for testMove in OverrideTests - Removed adding of target before a move. - Closing of resources; writer - Added missing serialisation ID - removed unused variables. |
||
#27 | 11672 | Paul Allen |
Tidy up formatting and imports. No functional change. |
||
#26 | 11664 | Paul Allen |
New build for Mathworks to look at. Transferred from p4://perforce.perforce.com:1666@991739 |
||
#25 | 11663 | Paul Allen |
Fixing issues reported by Tim Hosey at Mathworks: fixed check project button by making getFileState function use the client root instead of a list of files for large file sets. Also investigated error messaging formats and determined that they and the "could not create new file" error are both controlled by MATLAB and not P4Simulink. All calls to "p4 reconcile" will strip the "No file(s) to reconcile." message as well. Transferred from p4://perforce.perforce.com:1666@991730 |
||
#24 | 11662 | Paul Allen |
Fix NPE in changelist selector, remove reference to "Simulink project" from error messages. Transferred from p4://perforce.perforce.com:1666@988672 |
||
#23 | 11661 | Paul Allen |
Finishing up unit tests. Transferred from p4://perforce.perforce.com:1666@985194 |
||
#22 | 11659 | Paul Allen |
Performance improvements, continued: improved performance of getFileState() by replacing the client haveList call with a direct server command. Also improved isLatest by removing fstat calls and replacing with simpler calls to diff and sync. Transferred from p4://perforce.perforce.com:1666@983506 |
||
#21 | 11656 | Paul Allen |
Additional functionality from Scania meeting, including current changelist selector (still needs descriptions added) as well as .p4ignore editor. Transferred from p4://perforce.perforce.com:1666@978388 |
||
#20 | 11655 | Paul Allen |
Updating for Scania demo. Transferred from p4://perforce.perforce.com:1666@977338 |
||
#19 | 11653 | Paul Allen |
Fixes for R2014b of MATLAB/Simulink, including: * No longer prompting for connection information in isDirSandboxForThisAdapter * Fixed up commit logic, so it no longer uses the current changelist * Added back logic to walk the directory tree to find a .p4config file, rather than needing one in the sandbox directory * Added new buttons for re-connecting to p4d, and editing .p4config * Investigated conflict issues - fixed some, better logic coming * Removed .p4ignore generation - wrong spot for it Transferred from p4://perforce.perforce.com:1666@976888 |
||
#18 | 11652 | Paul Allen |
Added boilerplate to code, fixed build issues (NPEs on plugin load), removed Mathworks classes from plugin jar, fixed delete vs missing issue on remove() call. Transferred from p4://perforce.perforce.com:1666@970498 |
||
#17 | 11651 | Paul Allen |
Finalizing alpha code changes - adding jar for release. Transferred from p4://perforce.perforce.com:1666@962486 |
||
#16 | 11650 | Paul Allen |
Adding README.txt, added revision number changes for files that have changed in the depot (have/head style) and added build version and type to build process as well as version string within the plugin. Transferred from p4://perforce.perforce.com:1666@959461 |
||
#15 | 11648 | Paul Allen |
Final changes after demo with PM, including removal of depot path from the connection dialogue, and fixing of the p4 print issue. Transferred from p4://perforce.perforce.com:1666@958518 |
||
#14 | 11647 | Paul Allen |
New project creation fixes. Transferred from p4://perforce.perforce.com:1666@958305 |
||
#13 | 11645 | Paul Allen |
Refactoring and additional work on UI: Removed Connection class and went with global server/client objects. Implemented panes for connection, depot path and passwords. Passwords are only requested when required. Transferred from p4://perforce.perforce.com:1666@957149 |
||
#12 | 11644 | Paul Allen |
Paul's changes: Refactor getAddress and getAddressForConfig to getPort and getP4JavaURI. There were a few cases when the wrong value was written + getPort was not working. Password had a null password object (now initilised) P4PaswordPane needs some work - must talk to Perfoce to see if it needs a pass or is already logged in. There are still sync -f (this is very bad) Think I miss understood the checkout method after finding and reading the JavaDoc. You were right to start. Looks like a p4 edit. Would like to set a break point and find out when it is used. Elliot's changes: * Changed export() to use p4 'print' * Connect/login now looks for P4TICKETS env var * Config no longer stores P4PASSWD or P4TICKETS * Removed P4TICKET functionality (was only for P4Jenkins) * Ensured we're using a global IServer object * checkout() now uses editFiles() (opens all files for edit) * Changed all "sync -f" to plain "sync" * Removed final client update with force flag * Removed error dialogues regarding login issues * Investigated use of P4IGNORE - I'll need to write my own filter, no big deal Transferred from p4://perforce.perforce.com:1666@955247 |
||
#11 | 11643 | Paul Allen |
Unshelved from pending changelist '953729': Paul: Added: - getWorkspaceState() -- run a p4 status - getOpenedState() -- run p4 opened - getIgnoreState() -- run p4 add -n Modified: - add() -- seemed to call reopen? - P4FileState -- simple constructor for state Elliot: * global client and changelist object within the adapter * removed repeated client updates and changelist refreshes * removed 'reopen' in add * added calls to 'edit' where appropriate file states are found * made 'checkout' a pure sync, with no edits * commented a bunch of the @Override methods * added a call to haveList in getFileState so we can see versions of files in the project * changed the connection pane to look like p4v's * refactored a bit of the dialogue code, added calls to prompt for password (like p4v) * changed all log.trace() calls to log.debug() so the log file messiness can be controlled more easily Functionality that now works properly: * open project from source control, with properly-configured .p4config file * add new project to source control, with properly-configured .p4config file * add * edit * commit * revert * compare reversions (opens Simulink diff tool) Things to work on: * dialogues (particularily the password one, but the connection one is a bit dodge-y) * remove from project (possibly always making the Simulink project meta-data editable will fix this - it *almost* works) - the current issue is Simulink needs to edit the meta-data, but Perforce has made the files read-only, so Simulink throws up on itself Transferred from p4://perforce.perforce.com:1666@954622 |
||
#10 | 11642 | Paul Allen |
More fixes from discussion with Paul and after looking at other integrations work. Transferred from p4://perforce.perforce.com:1666@953553 |
||
#9 | 11641 | Paul Allen |
Fixes from chat with Paul. Transferred from p4://perforce.perforce.com:1666@953389 |
||
#8 | 11640 | Paul Allen |
Fixes to project integrity checks within Simulink. Transferred from p4://perforce.perforce.com:1666@952945 |
||
#7 | 11639 | Paul Allen |
Integrate code from the P4Jenkins plugin, add ability to authenticate with tickets or ticket file. Worked through some issues with getting current file state. Transferred from p4://perforce.perforce.com:1666@952289 |
||
#6 | 11638 | Paul Allen |
General cleanup, fixed some logging issues, fixed getFileState. Transferred from p4://perforce.perforce.com:1666@950492 |
||
#5 | 11637 | Paul Allen |
Fix up isLatest, uncheckout, add back code that searched for a .p4rc file within the sandbox directory first, then looks in ~/.p4simulink/ and finally ~/. Transferred from p4://perforce.perforce.com:1666@950121 |
||
#4 | 11636 | Paul Allen |
Updates to integrate with Simulink, merging into one directory. Added auto submits to add, remove, etc since this is what Simulink expects. Transferred from p4://perforce.perforce.com:1666@947024 |
||
#3 | 11635 | Paul Allen |
Updated gradle build to create a "fat jar", fixed some issues with the interfaces when it runs in Simulink itself. Added connection.configuration pane, switched the adapter to use a current changelist which gives a more svn-ish feel (which the Adapter is expecting). Added some more unit tests. General re-factoring. Transferred from p4://perforce.perforce.com:1666@946607 |
||
#2 | 11634 | Paul Allen |
Debugging actual adapter functionality and starting to integrate with Simulink. Transferred from p4://perforce.perforce.com:1666@938961 |
||
#1 | 11632 | Paul Allen |
Added commons-exec library, server startup/shutdown for unit tests, fixed a bunch of NPEs. Transferred from p4://perforce.perforce.com:1666@937331 |