Change 4636
Bug fix: P4Ruby was segfaulting on 'p4 diff2' due to the use of
'depotFile' and 'depotFile2' variable names. Normally a variable
suffixed by a number occurs when there are multiple results for
a command. i.e. 'p4 -Ztag filelog' on a file with multiple
revisions and/or integrations. In these cases you'll see:
rev0, rev1, rev2, rev3,...
action0, action1, ...
and in these cases P4Ruby puts all the 'rev*' elements into an array.
But in the case of diff2, there's no 'depotFile0' so P4Ruby was trying
to insert depotFile2 into an array that wasn't an array.
With this change, if P4Ruby finds that a name has already been
defined, and the value it holds is not an array then it will simply
use the name it's been given - including the numerical suffix.
'depotFile' and 'depotFile2' variable names. Normally a variable
suffixed by a number occurs when there are multiple results for
a command. i.e. 'p4 -Ztag filelog' on a file with multiple
revisions and/or integrations. In these cases you'll see:
rev0, rev1, rev2, rev3,...
action0, action1, ...
and in these cases P4Ruby puts all the 'rev*' elements into an array.
But in the case of diff2, there's no 'depotFile0' so P4Ruby was trying
to insert depotFile2 into an array that wasn't an array.
With this change, if P4Ruby finds that a name has already been
defined, and the value it holds is not an array then it will simply
use the name it's been given - including the numerical suffix.