package com.perforce.p4simulink; /** * Copyright (C) 2014 Perforce Software. All rights reserved. * * Please see LICENSE.txt in top-level folder of this distribution. */ import java.io.File; import java.nio.file.Path; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import com.mathworks.cmlink.api.ApplicationInteractor; import com.mathworks.cmlink.api.ConfigurationManagementException; import com.mathworks.cmlink.api.version.r14a.CMAdapter; import com.mathworks.cmlink.api.version.r14a.CMAdapterFactory; import com.mathworks.cmlink.api.version.r14a.CMRepository; import com.mathworks.cmlink.util.interactor.NullApplicationInteractor; import com.perforce.p4simulink.connection.Config; public class P4AdapterFactory implements CMAdapterFactory { private static final Logger log = LogManager .getLogger(P4AdapterFactory.class.getName()); private Config config; @Override public boolean isDirSandboxForThisAdapter(File file) { if (file == null) { return false; } // Walk up through the file tree looking for a Perforce config file. If // we find one, // then we assume that the sandbox is under Perforce control. If we make // it to the root of the filesystem // and haven't found a config file, then we'll just return false and // assume that it's currently outside // Perforce control. Path path = file.toPath(); while (path != null) { File configFile = path.toFile(); if (configFile.isDirectory()) { configFile = new File(configFile.getAbsolutePath() + File.separator + ".p4config"); } if (configFile.exists()) { return true; } else { path = path.getParent(); } } return false; } public CMRepository getRepository() { return getRepository(new NullApplicationInteractor()); } public CMAdapter getAdapterForThisSandboxDir(File file) throws ConfigurationManagementException { return getAdapterForThisSandboxDir(file, new NullApplicationInteractor()); } public CMAdapter getAdapterForThisSandboxDir(File file, ApplicationInteractor applicationInteractor) throws ConfigurationManagementException { log.debug("Constructing new P4Adapter"); return getAdapterForThisSandboxDir(file, applicationInteractor, new Config(file)); } public CMAdapter getAdapterForThisSandboxDir(File file, ApplicationInteractor applicationInteractor, Config config) throws ConfigurationManagementException { log.debug("Constructing new P4Adapter"); this.config = config; if (config != null) { config.load(false); } P4Adapter adapter = new P4Adapter(applicationInteractor, config); adapter.setSandboxRoot(file); return adapter; } public CMRepository getRepository( ApplicationInteractor applicationInteractor) { log.debug("Constructing new P4Repository"); CMRepository repository = null; try { repository = new P4Repository(applicationInteractor); } catch (P4CMException e) { log.info("Error constructing a new P4Repository."); } return repository; } @Override public String getName() { return "P4Simulink"; } public String getDescription() { String description = "Perforce SCM Integration for Simulink"; if (config == null) { config = new Config(); } try { // force reload config.load(true); } catch (P4CMException e) { } if (config.getP4JavaURI() == null || config.getP4JavaURI().length() == 0) { description += "\nNo configuration file(s) found. Please create a file under " + config.getConfigFile().getAbsolutePath(); } return description; } }
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#3 | 11947 | Paul Allen | Added MOVE_ADD and MOVE_DELETE types to P4FileState to support rename. | ||
#2 | 11899 | Paul Allen | Inprogress development - moved work to branch | ||
#1 | 11898 | Paul Allen |
Populate -o //guest/perforce_software/p4sl/main/... //guest/paul_allen/p4sl/.... |
||
//guest/perforce_software/p4sl/main/src/main/java/com/perforce/p4simulink/P4AdapterFactory.java | |||||
#17 | 11672 | Paul Allen |
Tidy up formatting and imports. No functional change. |
||
#16 | 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 |
||
#15 | 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 |
||
#14 | 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 |
||
#13 | 11651 | Paul Allen |
Finalizing alpha code changes - adding jar for release. Transferred from p4://perforce.perforce.com:1666@962486 |
||
#12 | 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 |
||
#11 | 11647 | Paul Allen |
New project creation fixes. Transferred from p4://perforce.perforce.com:1666@958305 |
||
#10 | 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 |
||
#9 | 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 |
||
#8 | 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 |
||
#7 | 11642 | Paul Allen |
More fixes from discussion with Paul and after looking at other integrations work. Transferred from p4://perforce.perforce.com:1666@953553 |
||
#6 | 11641 | Paul Allen |
Fixes from chat with Paul. Transferred from p4://perforce.perforce.com:1666@953389 |
||
#5 | 11638 | Paul Allen |
General cleanup, fixed some logging issues, fixed getFileState. Transferred from p4://perforce.perforce.com:1666@950492 |
||
#4 | 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 |
||
#3 | 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 |
||
#2 | 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 |
||
#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 |