# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#98 | 27669 | Robert Cowham |
Retired (deleted) this version of the script - and include a reference to its replacement: https://github.com/perforce/p4transfer |
||
#97 | 26350 | Robert Cowham | Handle move/delete where previous rev is obliterated | ||
#96 | 26349 | Robert Cowham | Handle move/add where source obliterated | ||
#95 | 26344 | Robert Cowham | New parameter --end-datetime added to allow unattended runs within a window of opportunity. | ||
#94 | 26277 | Robert Cowham | Extra undo test | ||
#93 | 26276 | Robert Cowham | Fix problem with replicating basic undo | ||
#92 | 23271 | Robert Cowham |
Allow transfers to be done by non-superusers (only requiring write and review privilege). In non-super mode, changelist date/time and author fields are not updated. |
||
#91 | 22794 | Robert Cowham | Allow change_map to be in a subdir | ||
#90 | 22515 | Robert Cowham | Removed preview option which was confusing as it wasn't well tested. | ||
#89 | 22466 | Robert Cowham | Improved preview option handling - with test. | ||
#88 | 22465 | Robert Cowham |
Added tests for r99.2 created depot (no filesize/digest stored) Fixed problem with preview failing comparison Add --p4d option to tests to use different p4d version |
||
#87 | 22461 | Robert Cowham | Tweak extraction of db.* data to support 12.2 server | ||
#86 | 22278 | Robert Cowham | Fix problem transferring into 2012.2 server - need to convert types to canonical type | ||
#85 | 19691 | Robert Cowham |
Fix problems with selective integrations (cherry picking). Has changed behaviour of a few tests. |
||
#84 | 18701 | Robert Cowham | Handle the case of an edit after an archived version. | ||
#83 | 18674 | Robert Cowham |
Fix tests failing due to new canonical form of filetypes with 2015.2 (xtext -> text+x). Unicode works for Mac/Linux with 2015.2+ P4Python installed so don't skip test and update doc. |
||
#82 | 16568 | Robert Cowham |
Require clobber option in both source/target to avoid sync errors. As a result need to improve change_map.csv handling. |
||
#81 | 16425 | Robert Cowham | Remove preflight option and add in test for maximum option. | ||
#80 | 15827 | Robert Cowham |
Avoid unnecessary resyncs of edited files due to incorrect digest calculation and comparison. Update failing test. |
||
#79 | 15529 | Robert Cowham | Fix problem when integrating cherry pick with different filetype. | ||
#78 | 14139 | Robert Cowham | Fix strange problem with copy from & branch from to same revision. | ||
#77 | 13959 | Robert Cowham |
Changed utf16 sync problem handling to raise an exception recommending a retype and linking to KB: http://answers.perforce.com/articles/KB/3117 |
||
#76 | 13921 | Robert Cowham |
Handle unsyncable utf16 files: - note the sync errors - add them to ignore list - if and edit fails and previous version was utf16 then convert to add |
||
#75 | 13576 | Robert Cowham | Fix for when filetypes are not integrated on purpose. | ||
#74 | 12942 | Robert Cowham | Make test env more cross platform re P4CONFIG settings. | ||
#73 | 12941 | Robert Cowham |
Make sure filetype changes are propagated via integrate even when integ.engine=2. Fix a couple of tests failing on OS X. |
||
#72 | 12570 | Robert Cowham | Fix link handling problem. | ||
#71 | 12549 | Robert Cowham | Handle symlinks (on Unix at least) | ||
#70 | 12548 | Robert Cowham | Optimize slightly by checking whole file first before doing line by line search for RCS keywords. | ||
#69 | 12547 | Robert Cowham | Handle RCS keyword files which have been merged in a dodgy manner (what should be a dirty merge pretending to be a clean merge). | ||
#68 | 12532 | Robert Cowham | Handle edit failing when doing old style rename. | ||
#67 | 12524 | Robert Cowham | Handled integrating a delete ontop of a deleted. | ||
#66 | 12495 | Robert Cowham | Fix problem of missing move/add records where source was outside transfer workspace. | ||
#65 | 12489 | Robert Cowham | Handle the multiple overlapping integrates with strange resolve -ay | ||
#64 | 12486 | Robert Cowham | Test for overlapping integrates which passes in this form. | ||
#63 | 12472 | Robert Cowham | Steps along the way to testing a move from outside. | ||
#62 | 12409 | Robert Cowham | Handle utf16 with faulty BOM | ||
#61 | 11882 | Robert Cowham |
Test for new revision with 2 integrates into it, including basic copy. Reduce number of forced integrates if there are multiple. |
||
#60 | 11881 | Robert Cowham | Handled a multiple integrate including a copy after which the file was modified. | ||
#59 | 11863 | Robert Cowham |
Use 'unix' instead of 'share' in transfer client line-endings. To avoid issues with MD5 checksums and the like. |
||
#58 | 11839 | Robert Cowham |
Check for edited files changed. Remove unused parameter from read/write content calls (filetype). Fix problem with purged files being read-only. |
||
#57 | 11835 | Robert Cowham |
Reordered tests into more logical groups. No functional change. |
||
#56 | 11728 | Robert Cowham |
Handle very old logic (pre-tamper protection) where an integrate with resolve -ay could occur and the content of the file be edited in the same change. The result is demoted from an integrate to and edit, but still has the integraiton record. |
||
#55 | 11548 | Robert Cowham | Remove unused logging calls. | ||
#54 | 11518 | Robert Cowham |
Handle text filetypes properly with MD5 calcuations and line endings. Require source and client workspaces to have LineEnd='share' (with test). |
||
#53 | 11478 | Robert Cowham |
Add the ability to batch changes up (default 20,000) Includes tests and adjustments to loggin. |
||
#52 | 11445 | Robert Cowham | Handle delete integration requiring the force flag. | ||
#51 | 11430 | Robert Cowham | Expanded testIntegDeleteProblem and fixed the resulting test failure. | ||
#50 | 11426 | Robert Cowham | Rename a test for clarity. | ||
#49 | 11425 | Robert Cowham | Handle strange case of 3 seperate integrations into a single (new) revision. | ||
#48 | 11407 | Robert Cowham |
Fix problem where an integrate defaults to resolving an add as a delete and requires a second step to be resolved as an add (with integ.engine=3). |
||
#47 | 11342 | Robert Cowham |
Handle renames which were badly propagated via individual integs of the move/add and move/delete using the integ.engine=2 |
||
#46 | 11304 | Robert Cowham | Fix files with perforce wildcars in their names when they are branched from outside. | ||
#45 | 11300 | Robert Cowham |
Create specific exception classes. Handle a integrate -Rb with ignore which comes from "outside" the source workspace. |
||
#44 | 11296 | Robert Cowham | Add another file to the Wildcards test with a C# directory in its name | ||
#43 | 11295 | Robert Cowham |
Handle an integrate where the source has been obliterated (fixes an index error). The target action will be an edit. |
||
#42 | 11293 | Robert Cowham |
Handle integ -Rb which is ignored where the source is not in the source client Just ignore the revision in this case. |
||
#41 | 11282 | Robert Cowham |
Reduce sleep time between tests (required to avoid files being locked). Run all tests down from 50s -> 15s! |
||
#40 | 11276 | Robert Cowham | Remove unnecessary comments for assertions - if they fail then the default error message shown is sufficient. | ||
#39 | 11275 | Robert Cowham |
Handle files with action 'archive' - they have been archived in an archive depot and are ignored by P4Transfer (with a warning in the log file). |
||
#38 | 11271 | Robert Cowham |
Handle files with action 'import' which means they came from remote depots. This action is changed to an 'add' in the target. |
||
#37 | 11268 | Robert Cowham | Add tests for other wildcards. | ||
#36 | 11266 | Robert Cowham | Ensure that workspaces have a matching right hand side. | ||
#35 | 11265 | Robert Cowham |
Handle an integrate with ignore to a deleted first revision Tweak tests to work with Python2.7/3.3 as regards unittest.assertRegex |
||
#34 | 11257 | Robert Cowham | Fix handling of purged files (+Sn). | ||
#33 | 11237 | Robert Cowham |
Added an (optional) change_map file which is appended to after submits. It shows: sourceP4Port,sourceChangeNo,targetChangeNo Makes for easy searching (offline or via p4 grep) as opposed to looking through change list descriptions. |
||
#32 | 11234 | Robert Cowham | Implement configurable change descriptions | ||
#31 | 11230 | Robert Cowham | Handle a delete on top of a delete. | ||
#30 | 11049 | Robert Cowham | Handled strange 'add from' single integration (which is a backout of an earlier change followed by a move) | ||
#29 | 10739 | Robert Cowham | Fix for integrating 2 versions into single target where the target is revision 1. | ||
#28 | 10509 | Robert Cowham | Deal with multiple integrates into the same target. | ||
#27 | 10504 | Robert Cowham | Test for integrate with -Dt being required (previous change) | ||
#26 | 10502 | Robert Cowham | Handle need to do forced integrates | ||
#25 | 10496 | Robert Cowham |
Test for failed submit. When running sizes command, restrict to workspace view for performance (avoid spec depot!) |
||
#24 | 10485 | Robert Cowham | Refactored tests to log basically all p4 commands. | ||
#23 | 10484 | Robert Cowham |
Test for file content changed when adding a file. Minor refactor for the above. Added testOutsideInsideDirtyCopy |
||
#22 | 10481 | Robert Cowham |
Refactored applying journal patches. Include test for branch where file is edited even though it shouldn't be. |
||
#21 | 10479 | Robert Cowham | Resync after move/add if necessary due to file content changes | ||
#20 | 10475 | Robert Cowham | Handle the rename of a deleted file - rather esoteric but possible! | ||
#19 | 10469 | Robert Cowham |
Check file size and digest after a clean merge Handled dodgy merges - cherry picked where they were edited afterwards |
||
#18 | 10468 | Robert Cowham | Proper test for dirty merge which is changed to be a supposed clean merge. | ||
#17 | 10467 | Robert Cowham |
Fix problem requiring integ -i (with integ.engine=2) Improved validation after submission. |
||
#16 | 10438 | Robert Cowham |
Fixed bug where effectively selective integrations were being done on the source. Started better comparison preparation for changelist validation. |
||
#15 | 10147 | Robert Cowham | Fix problem with move/add where there are other integration records on the file that is being added. | ||
#14 | 10141 | Robert Cowham |
Enhanced logging - added specifid ids for different actions. Log a few extra items, including script version and client mappings. Fixed bug regarding the branching of a move file. |
||
#13 | 10136 | Robert Cowham |
Added comments to test cases. Remove unneeded whitespace. |
||
#12 | 10135 | Robert Cowham | Added test for moving from outside to inside | ||
#11 | 10134 | Robert Cowham | Fixed problem where the target of a move is outside the client view - converts move/delete to a delete | ||
#10 | 10110 | Robert Cowham |
Remove unused vars as per pyflakes warnings Add some extra debug logging of paths executed Remove unused code when processing 'add from' |
||
#9 | 10099 | Sven Erik Knop | Added additional test case after reported problem | ||
#8 | 10098 | Robert Cowham |
Fixed bug when a move (rename) by P4V was backed out via 'revert to revision' Removed python3 warning |
||
#7 | 10005 | Sven Erik Knop |
Added move test. Also fixed Unicode test to use platform specific codec: 'mbcs' on Windows, 'UTF-8' on Mac. |
||
#6 | 9731 | Robert Cowham | Added tests for protections - hide something that is in the client view and check that changes are correctly handled. | ||
#5 | 9730 | Robert Cowham | Fixed problem where a changelist to both files inside and outside the workspace view in the same changelist are handled | ||
#4 | 9729 | Robert Cowham | More small refactoring | ||
#3 | 9728 | Robert Cowham |
Minor refactoring. Fixed a couple of pylint warnings. |
||
#2 | 9727 | Robert Cowham | Refactored names of files for clarity | ||
#1 | 9726 | Robert Cowham | Rename test harness | ||
//guest/perforce_software/p4transfer/P4TransferTest.py | |||||
#5 | 9644 | Robert Cowham | Renamed PerforceTransfer to P4Transfer to make tests work. | ||
#4 | 9641 | Robert Cowham |
Latest changes by Robert. Added new options: --repeat for continuous operation --sample-config to produce sample config -Improved logging and notification options (via emails if configured) -Retries in case of error. |
||
#3 | 9474 | Sven Erik Knop | Added test to verify that edited files will also have their +k removed. | ||
#2 | 9473 | Sven Erik Knop |
Added the ability to remove +k from the target Currently tested for add, need to test for edit and integrate as well invoked by using option -k or --nokeywords |
||
#1 | 9170 | Sven Erik Knop |
Branched PerforceTransfer from private area to perforce_software This tool will now get back its original name P4Transfer. |
||
//guest/sven_erik_knop/P4Pythonlib/scripts/transferTest.py | |||||
#10 | 8463 | Sven Erik Knop |
Fixed further problem with files that have an illegal file name containing @,#,* or %. Now it is possible to re-edit the file again as well. Added test case to prove the point. |
||
#9 | 8461 | Sven Erik Knop |
Fixed adding files with illegal chars like '@'. Also added test case. |
||
#8 | 8432 | Sven Erik Knop | Added pre-flight checks (-p) to avoid overwriting existing files. | ||
#7 | 8425 | Sven Erik Knop |
Make PerforceTransfer unidirectional from source to target. Adjusted test cases accordingly. Still missing: Update change user and timestamp to the source user and timestamp Reverify ktext files affected by the change update. Add proper logging |
||
#6 | 8216 | Sven Erik Knop |
Added test cases for integration from outside transfer scope. Fixed bug for integrated deletes from the outside. |
||
#5 | 8215 | Sven Erik Knop |
Upgraded test to include merge w/ edit Fixed a bug in PerforceTransfer.py avoiding a tamper check error. |
||
#4 | 8213 | Sven Erik Knop | Test case for re-add added | ||
#3 | 8212 | Sven Erik Knop |
Added integrate-delete test case Solved integrate-delete problem in PerforceTransfer |
||
#2 | 8211 | Sven Erik Knop |
Additional test cases for integrate Fixed a bug with "ignore", can now be replicated. |
||
#1 | 8210 | Sven Erik Knop |
Fixed a bug in PerforceTransfer where an add followed by an integ to another branch would break the add. Also added the beginning of a test framework to catch those kind of problems in the future. Currently the test framework only checks add, edit, delete and simple integrates. |