|#2||16213||perforce_software||Move files to proper depot path to view files correctly from project page.|
|#1||14756||tjuricek||p15.1 branch of p4ruby.|
Mirroring the current state of the workshop.
From this point, we will try to rebuild the history of p4-ruby in the workshop from this codeline.
Rework P4Ruby unit tests so they they are actually units. Now the
test order is irrelevant as all tests are standalone. Tidied up
the code formatting as well and removed all the tabs from the ruby
sources files. Added a modeline for vim users so consistent
indentation will be used.
pull unit test fix from p12.1 to main.
Integration only change.
Pull changes from p12.1 to main.
Integration only change.
Fix binary file resolve
Accessing the base_name attribute of a P4::MergeData object resulted
in a segmentation fault when resolving binary files. This is because the
base file is empty for binary files, and the Name() method invoked on it does
not protect itself in case of a NULL value.
User visible change, to be documented in the release notes.
remove md.info[ 'clientFile' ] check
Difficult to test the value of this on different platforms, so removing it for
now. The remaining checks against P4::MergeData#info should be enough to
ensure that it contains the correct information.
Implemented 'action resolve' in P4Ruby.
This extends the existing P4MergeData class to support action resolve. Users
will need to test the MergeData object passed to the block to determine if the
resolve is for content (P4::MergeData#content_resolve?) or action
(P4::MergeData#action_resolve?). The attributes available in
'P4::MergeDatamerge' for an action resolve are:
merge_action : The action chosen for the merge, can be emtpy
yours_action: your action/filetype
their_action: their action/filetype
type: the type of merge. Can be
info: a dictionary with additional information that can vary with the resolve
Updated unit test to test action resolve.
User visible change, to be documented in the release notes for 2012.1.
Quit resolve if there is an exception.
Follow-on from change @410702, which raised exceptions up to the user from
P4#run_resolve. Further testing showed that if multiple resolves are
scheduled and an exception is raised, then subsequent resolves would clear
that. We now check if an exception has been raised by an earlier resolve and
return early if there has been.
Unit test has been updated with this case.
User visible change to be documented in release notes.
Add resolve test case
Before beginning work on ActionResolve, let's add a unit test for content