Methods Summary |
---|
public void | execute()execute the p4 resolve
if (this.resolvemode.equals(AUTOMATIC)) {
P4CmdOpts = P4CmdOpts + " -am";
} else if (this.resolvemode.equals(FORCE)) {
P4CmdOpts = P4CmdOpts + " -af";
} else if (this.resolvemode.equals(SAFE)) {
P4CmdOpts = P4CmdOpts + " -as";
} else if (this.resolvemode.equals(THEIRS)) {
P4CmdOpts = P4CmdOpts + " -at";
} else if (this.resolvemode.equals(YOURS)) {
P4CmdOpts = P4CmdOpts + " -ay";
} else {
throw new BuildException("unsupported or absent resolve mode");
}
if (P4View == null) {
throw new BuildException("please specify a view");
}
if (this.isRedoall()) {
P4CmdOpts = P4CmdOpts + " -f";
}
if (this.isSimulationmode()) {
P4CmdOpts = P4CmdOpts + " -n";
}
if (this.isForcetextmode()) {
P4CmdOpts = P4CmdOpts + " -t";
}
if (this.isMarkersforall()) {
P4CmdOpts = P4CmdOpts + " -v";
}
execP4Command("-s resolve " + P4CmdOpts + " " + P4View, new SimpleP4OutputHandler(this));
|
public java.lang.String | getResolvemode()returns the resolve mode
return resolvemode;
|
public boolean | isForcetextmode()If set to true, attempts a textual merge, even for binary files
return forcetextmode;
|
public boolean | isMarkersforall()If set to true, puts in markers for all changes, conflicting or not
return markersforall;
|
public boolean | isRedoall()allows previously resolved files to be resolved again
return redoall;
|
public boolean | isSimulationmode()read the simulation mode flag
return simulationmode;
|
public void | setForcetextmode(boolean forcetextmode)If set to true, attempts a textual merge, even for binary files
this.forcetextmode = forcetextmode;
|
public void | setMarkersforall(boolean markersforall)If set to true, puts in markers for all changes, conflicting or not
this.markersforall = markersforall;
|
public void | setRedoall(boolean redoall)set the redoall flag
this.redoall = redoall;
|
public void | setResolvemode(java.lang.String resolvemode)values for resolvemode
- automatic -am
- force -af
- safe -as
- theirs -at
- yours -ay
boolean found = false;
for (int counter = 0; counter < RESOLVE_MODES.length; counter++) {
if (resolvemode.equals(RESOLVE_MODES[counter])) {
found = true;
break;
}
}
if (!found) {
throw new BuildException("Unacceptable value for resolve mode");
}
this.resolvemode = resolvemode;
|
public void | setSimulationmode(boolean simulationmode)sets a flag
this.simulationmode = simulationmode;
|