Package org.tmatesoft.svn.core.wc
Class SVNMergeFileSet
java.lang.Object
org.tmatesoft.svn.core.wc.SVNMergeFileSet
The SVNMergeFileSet class holds information about the file that is to be merged.
This information includes references to
File
objects with working, base, repository contents;
file mimeType; labels to append to the file name to produce conflict files in case a merge fails with a
conflict, and so on.- Since:
- 1.2
- Version:
- 1.3
-
Field Summary
Fields -
Constructor Summary
ConstructorsConstructorDescriptionSVNMergeFileSet
(SVNAdminArea adminArea, SVNLog log, File baseFile, File localFile, String wcPath, File reposFile, File resultFile, File copyFromFile, String mimeType) Creates a newSVNMergeFileSet
object given the data prepared for merging a file. -
Method Summary
Modifier and TypeMethodDescriptionvoid
dispose()
Disposes this object.Returns the admin area which controls the file.Returns the file containing the pristine file contents.Returns the base file label.Returns the base file path.Returns the file which is the copy source for the file being merged.Returns the copy source path.Returns the detranslated working copy file.Returns the local file label.Returns the path of the detranslated version of the working copy file.getLog()
Returns the log object.Returns the mime type of the file.Returns the repository version of the file.Returns the repository file label.Returns the path to the file containing the contents of the repository version of the file.Returns the file where the merged resultant text is written to.Returns the path of the file where the merged resultant text is written to.Returns the working copy file as it presents in the working copy.Returns the path of the working copy file.boolean
isBinary()
Tells whether this file is binary or textual.void
setMergeLabels
(String baseLabel, String localLabel, String repositoryLabel) Sets the labels for conflict files.
-
Field Details
-
myLocalFilePath
-
myBaseFilePath
-
myRepositoryFilePath
-
myWCFilePath
-
myMergeResultFilePath
-
myMimeType
-
myAdminArea
-
myLog
-
myLocalLabel
-
myBaseLabel
-
myRepositoryLabel
-
myLocalFile
-
myBaseFile
-
myRepositoryFile
-
myMergeResultFile
-
myCopyFromFile
-
myTmpPaths
-
-
Constructor Details
-
SVNMergeFileSet
public SVNMergeFileSet(SVNAdminArea adminArea, SVNLog log, File baseFile, File localFile, String wcPath, File reposFile, File resultFile, File copyFromFile, String mimeType) Creates a newSVNMergeFileSet
object given the data prepared for merging a file. Note: This is intended for internal use only, not for API users.- Parameters:
adminArea
- admin area the file is controlled underlog
- log objectbaseFile
- file with pristine contentslocalFile
- file with translated working contentswcPath
- working copy path relative to the location ofadminArea
reposFile
- file contents from the repositoryresultFile
- file where the resultant merged contents will be written tocopyFromFile
- contents of the copy source file (if any)mimeType
- file mime type
-
-
Method Details
-
setMergeLabels
Sets the labels for conflict files. IfbaseLabel
is null, ".old" will be set by default. IflocalLabel
is null, ".working" will be set by default. IfrepositoryLabel
is null, ".new" will be set by default.- Parameters:
baseLabel
- base file labellocalLabel
- working file labelrepositoryLabel
- repository file label
-
getLog
Returns the log object. Note: This is intended for internal use only, not for API users.- Returns:
- wc modification commands logger
-
getBaseLabel
Returns the base file label.- Returns:
- base label string
-
getLocalLabel
Returns the local file label.- Returns:
- working file label
-
getRepositoryLabel
Returns the repository file label.- Returns:
- label of the repository file version
-
getBasePath
Returns the base file path. If thebase file
is located under theadmin area
, then the return path will be just a relevant to the admin area path of the base file. Otherwise (in case the repository file is located not under the admin area) this method will create a temporary file in the.svn/tmp
area of the admin area and copy the contents of the base file into it; the return path will be again relative to the location of the admin area.- Returns:
- path of the file with pristine contents
- Throws:
SVNException
-
getLocalPath
Returns the path of the detranslated version of the working copy file. Detranslating of a working copy file takes place in case it's a symlink, or it has keywords or eol-style properties set on it.- Returns:
- path to the file with detranslated working contents; it's relevant to the
admin area
location
-
getWCPath
Returns the path of the working copy file.- Returns:
- path of the working copy file; it's relevant to the
admin area
location
-
getRepositoryPath
Returns the path to the file containing the contents of the repository version of the file. If therepository file
is located under theadmin area
, then the return path will be just a relevant to the admin area path of the repository file. Otherwise (in case the repository file is located not under the admin area) this method will create a temporary file in the.svn/tmp
area of the admin area and copy the contents of the repository file into it; the return path will be again relative to the location of the admin area.- Returns:
- path of the file containing file contents that come from the repository
- Throws:
SVNException
-
getResultPath
Returns the path of the file where the merged resultant text is written to.- Returns:
- path of the result file; it's relevant to the
admin area
location
-
getBaseFile
Returns the file containing the pristine file contents.- Returns:
- base file
-
getWCFile
Returns the working copy file as it presents in the working copy.- Returns:
- working copy file
-
getLocalFile
Returns the detranslated working copy file. Detranslating of a working copy file takes place in case it's a symlink, or it has keywords or eol-style properties set on it.- Returns:
- detranslated working copy file
-
getRepositoryFile
Returns the repository version of the file.- Returns:
- repository file
-
getResultFile
Returns the file where the merged resultant text is written to.- Returns:
- merge result file
-
isBinary
public boolean isBinary()Tells whether this file is binary or textual. The result will depend on the value of the filemime type
.- Returns:
- true if binary
-
getMimeType
Returns the mime type of the file.- Returns:
- file mime type
-
getAdminArea
Returns the admin area which controls the file. Note: this method is not intended for API users.- Returns:
- admin area
-
dispose
Disposes this object. Note: this method is not intended for API users.- Throws:
SVNException
-
getCopyFromFile
Returns the file which is the copy source for the file being merged.- Returns:
- copy source file
-
getCopyFromPath
Returns the copy source path.- Returns:
- path of the copy source file;
it's relevant to the
admin area
location - Since:
- 1.3
-