Change 11643

paul_allen (Paul Allen)
Paul Allen committed this change into //guest/perforce_software/p4sl/main
Request Review
Download .zip
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
  • Files 21
  • Comments 0
17 edited 3 added 1 deleted
build.gradle#4
Loading...
src/main/java/com/perforce/p4simulink/P4Adapter.java#11
Loading...
src/main/java/com/perforce/p4simulink/P4AdapterFactory.java#8
Loading...
src/main/java/com/perforce/p4simulink/P4CMException.java#8
Loading...
src/main/java/com/perforce/p4simulink/P4Interactor.java#11
Loading...
src/main/java/com/perforce/p4simulink/P4Repository.java#7
Loading...
src/main/java/com/perforce/p4simulink/connection/Config.java#12
Loading...
src/main/java/com/perforce/p4simulink/connection/Connection.java#9
Loading...
src/main/java/com/perforce/p4simulink/connection/P4ConnectionPane.java#6
Loading...
src/main/java/com/perforce/p4simulink/util/Files.java#4
Loading...
src/main/java/com/perforce/p4simulink/util/Logging.java#4
Loading...
src/main/java/com/perforce/p4simulink/workspace/P4FileState.java#8
Loading...
src/main/java/ui/P4ConnectionPane.java#1
Loading...
src/main/java/ui/P4Pane.java#1
Loading...
src/main/java/ui/P4PasswordPane.java#1
Loading...
src/main/resources/log4j2.xml#4
Loading...
src/test/java/com/mathworks/cmlink/sdk/tests/CMTestEnvironment.java#5
Loading...
src/test/java/com/mathworks/cmlink/sdk/tests/util/FileCreation.java#5
Loading...
src/test/java/com/mathworks/cmlink/sdk/tests/util/MapUtil.java#5
Loading...
src/test/java/com/mathworks/cmlink/sdk/tests/util/StatusChecker.java#5
Loading...
src/test/java/com/perforce/p4simulink/test/BasicTest.java#6
Loading...
Tip: Use n and p to cycle through the changes.