Class: VersionControl_SVN_Resolved

Source Location: /VersionControl_SVN-0.3.2/SVN/Resolved.php

Class Overview

VersionControl_SVN
   |
   --VersionControl_SVN_Resolved

Subversion Resolved command manager class

Author(s):

Clay Loveless <clay at killersoft.com>

Version:

0.3.2

Copyright:

2004-2007 Clay Loveless

Inherited Variables

Class: VersionControl_SVN

VersionControl_SVN::$fetchmode
VersionControl_SVN::$options
VersionControl_SVN::$prepend_cmd
VersionControl_SVN::$shortcuts
VersionControl_SVN::$svn_cmd_parser
VersionControl_SVN::$svn_path
VersionControl_SVN::$switches
VersionControl_SVN::$use_escapeshellcmd

Inherited Methods

Class: VersionControl_SVN

VersionControl_SVN::apiVersion(): Return the VersionControl_SVN API version
VersionControl_SVN::checkCommandRequirements(): Standardized validation of requirements for a command class.
VersionControl_SVN::declareErrorMessages(): Set up VersionControl_SVN error message templates for PEAR_ErrorStack.
VersionControl_SVN::factory(): Create a new VersionControl_SVN command object.
VersionControl_SVN::fetchCommands(): Scan through the SVN directory looking for subclasses.
VersionControl_SVN::fetchShortcuts(): Return the array of pre-defined shortcuts (also known as Alternate Names) for Subversion commands.
VersionControl_SVN::init(): Initialize an object wrapper for a Subversion subcommand.
VersionControl_SVN::parseOutput(): Handle output parsing chores.
VersionControl_SVN::prepare(): Prepare the command switches.
VersionControl_SVN::run(): Run the command with the defined switches.
VersionControl_SVN::setOptions(): Allow for overriding of previously declared options.

Class Details

[line 124]
Subversion Resolved command manager class

Remove "conflicted" state on working copy files or directories.

Note: This subcommand does not semantically resolve conflicts or remove conflict markers; it merely removes the conflict-related artifact files and allows PATH to be committed again.

$switches is an array containing one or more command line options defined by the following associative keys:

 $switches = array(

  'targets'       =>  'ARG',
                      // pass contents of file ARG as additional args
  'R'             =>  true|false,
                      // descend recursively
  'recursive'     =>  true|false,
                      // descend recursively
  'q [quiet]'     =>  true|false,
                      // prints as little as possible
  'config-dir'    =>  'Path to a Subversion configuration directory'
 );

Note: Subversion does not offer an XML output option for this subcommand

The non-interactive option available on the command-line svn client may also be set (true|false), but it is set to true by default.

Usage example:

 <?php

 require_once 'VersionControl/SVN.php';
 
 // Setup error handling -- always a good idea!
 $svnstack = &PEAR_ErrorStack::singleton('VersionControl_SVN');
 
 // Set up runtime options. Will be passed to all
 // subclasses.
 $options = array('fetchmode' => VERSIONCONTROL_SVN_FETCHMODE_RAW);
 
 // Pass array of subcommands we need to factory
 $svn = VersionControl_SVN::factory(array('resolved'), $options);
 
 // Define any switches and aguments we may need
 $switches = array('R' => true);
 $args = array('/path/to/working/copy/TestProj/trunk');
 
 // Run command
 if ($output = $svn->resolved->run($args, $switches)) {
     print_r($output);
 } else {
     if (count($errs = $svnstack->getErrors())) {
         foreach ($errs as $err) {
             echo '<br />'.$err['message']."<br />\n";
             echo "Command used: " . $err['params']['cmd'];
         }
     }
 }
 ?>

Author: Clay Loveless <clay@killersoft.com>
Version: 0.3.2
Copyright: 2004-2007 Clay Loveless

[ Top ]

Class Variables

$args = array()

[line 147]

Command-line arguments that should be passed outside of those specified in switches.

Access: public

Type:

array

[ Top ]

$min_args = 1

[line 156]

Minimum number of args required by this subcommand.

See Version Control with Subversion, Subversion Complete Reference for details on arguments for this subcommand.

Access: public

Type:

int

[ Top ]

$passthru = false

[line 172]

Use exec or passthru to get results from command.

Access: public

Type:

bool

[ Top ]

$required_switches = array()

[line 165]

Switches required by this subcommand.

See Version Control with Subversion, Subversion Complete Reference for details on arguments for this subcommand.

Access: public

Type:

array

[ Top ]

$valid_switches = array('R',
                                'recursive',
                                'quiet',
                                'q',
                                'targets',
                                'config-dir'
                                )

[line 132]

Valid switches for svn resolved

Access: public

Type:

array

[ Top ]

Method Detail

parseOutput [line 267]

mixed parseOutput(
array
$out)

Handles output parsing of standard and verbose output of command.

Return: Returns output requested by fetchmode (if available), or raw output if desired fetchmode is not available.
Access: public

Overrides VersionControl_SVN::parseOutput() (Handle output parsing chores.)

Parameters:

array $out — Array of output captured by exec command in run.

[ Top ]

parseOutputArray [line 301]

void parseOutputArray(

$out)

Helper method for parseOutput that parses output into an associative array

Todo: Finish this method! : )

Parameters:

$out —

[ Top ]

prepare [line 185]

int prepare(
void
0)

Prepare the svn subcommand switches.

Defaults to non-interactive mode, and will auto-set the --xml switch (if available) if $fetchmode is set to VERSIONCONTROL_SVN_FETCHMODE_XML, VERSIONCONTROL_SVN_FETCHMODE_ASSOC or VERSIONCONTROL_SVN_FETCHMODE_OBJECT

Return: true on success, false on failure. Check PEAR_ErrorStack for error details, if any.

Overrides VersionControl_SVN::prepare() (Prepare the command switches.)

Parameters:

void 0 —

[ Top ]

Class: VersionControl_SVN_Resolved

Class Overview

Author(s):

Version:

Copyright:

Variables

Methods

Inherited Variables

Class: VersionControl_SVN

Inherited Methods

Class: VersionControl_SVN

Class Details

Class Variables

$args = array()

$min_args = 1

$passthru = false

$required_switches = array()

$valid_switches = array('R', 'recursive', 'quiet', 'q', 'targets', 'config-dir' )

Method Detail

parseOutput [line 267]

Parameters:

parseOutputArray [line 301]

Parameters:

prepare [line 185]

Parameters:

$valid_switches = array('R',
'recursive',
'quiet',
'q',
'targets',
'config-dir'
)