Examples of SVNStatusType

org.exist.versioning.svn.wc.SVNStatusType

ontents status type SVNStatusType contentsStatus = event.getContentsStatus(); //parse it if(contentsStatus != SVNStatusType.INAPPLICABLE){ if(contentsStatus == SVNStatusType.CONFLICTED){ ... } } //get properties status type SVNStatusType propertiesStatus = event.getPropertiesStatus(); //parse it if(propertiesStatus != SVNStatusType.INAPPLICABLE){ if(contentsStatus == SVNStatusType.CONFLICTED){ ... } } } ... } ... }
or in a status handler (implementing ISVNStatusHandler) registered for an SVNStatusClient like this:

 import org.tmatesoft.svn.core.wc.ISVNStatusHandler; import org.tmatesoft.svn.core.wc.SVNStatus; import org.tmatesoft.svn.core.wc.SVNStatusType; ... public class MyCustomStatusHandler implements ISVNStatusHandler { public void handleStatus(SVNStatus status){     ... //get contents status type SVNStatusType contentsStatus = status.getContentsStatus(); //parse it if(contentsStatus == SVNStatusType.STATUS_MODIFIED){ ... }else if(contentsStatus == SVNStatusType.STATUS_CONFLICTED){ ... }       ... //get properties status type SVNStatusType propertiesStatus = status.getPropertiesStatus(); //parse it if(contentsStatus == SVNStatusType.STATUS_MODIFIED){ ... }else if(contentsStatus == SVNStatusType.STATUS_CONFLICTED){ ... } ... } ... }

@version 1.3 @author TMate Software Ltd. @since 1.2 @see SVNEvent @see SVNStatus

org.tmatesoft.svn.core.wc.SVNStatusType

 import org.tmatesoft.svn.core.wc.ISVNStatusHandler; import org.tmatesoft.svn.core.wc.SVNStatus; import org.tmatesoft.svn.core.wc.SVNStatusType; ... public class MyCustomStatusHandler implements ISVNStatusHandler { public void handleStatus(SVNStatus status){     ... //get contents status type SVNStatusType contentsStatus = status.getContentsStatus(); //parse it if(contentsStatus == SVNStatusType.STATUS_MODIFIED){ ... }else if(contentsStatus == SVNStatusType.STATUS_CONFLICTED){ ... }       ... //get properties status type SVNStatusType propertiesStatus = status.getPropertiesStatus(); //parse it if(contentsStatus == SVNStatusType.STATUS_MODIFIED){ ... }else if(contentsStatus == SVNStatusType.STATUS_CONFLICTED){ ... } ... } ... }

@version 1.3 @author TMate Software Ltd. @since 1.2 @see SVNEvent @see SVNStatus

Examples of org.tmatesoft.svn.core.wc.SVNStatusType

            copyFromRevision = revision;
            // TODO protocol
        }


        SVNFileType fileType = SVNFileType.getType(mergedFile);
        SVNStatusType obstructedStatus = getStatusForObstructedOrMissing(path);
        if (obstructedStatus == SVNStatusType.MISSING || 
                (obstructedStatus == SVNStatusType.OBSTRUCTED && (fileType == SVNFileType.FILE || fileType == SVNFileType.SYMLINK))) {
            return obstructedStatus;
        }

View Full Code Here

Examples of org.tmatesoft.svn.core.wc.SVNStatusType

        if (dir == null) {
            return SVNStatusType.MISSING;
        }
        
        SVNEntry entry = getWCAccess().getEntry(mergedFile, true); 
        SVNStatusType obstructedStatus = getStatusForObstructedOrMissing(path);
        if (obstructedStatus != SVNStatusType.INAPPLICABLE) {
            return obstructedStatus;
        }
        
        SVNFileType fileType = SVNFileType.getType(mergedFile);

View Full Code Here

Examples of org.tmatesoft.svn.core.wc.SVNStatusType

        SVNAdminArea dir = retrieve(mergedFile.getParentFile(), myIsDryRun);
        if (dir == null) {
            return new SVNStatusType[] {SVNStatusType.MISSING, SVNStatusType.MISSING};
        }
        
        SVNStatusType obstructedStatus = getStatusForObstructedOrMissing(path);
        if (obstructedStatus != SVNStatusType.INAPPLICABLE) {
            return new SVNStatusType[] { obstructedStatus, SVNStatusType.UNCHANGED };
        }
        
        SVNStatusType[] result = new SVNStatusType[] {SVNStatusType.UNCHANGED, SVNStatusType.UNCHANGED};
        SVNEntry entry = getWCAccess().getEntry(mergedFile, false);
        SVNFileType fileType = null;
        if (entry != null) {
            fileType = SVNFileType.getType(mergedFile);
        }
        
        if (entry == null || (fileType != SVNFileType.FILE && fileType != SVNFileType.SYMLINK)) {
            myMergeDriver.recordTreeConflict(mergedFile, dir, SVNNodeKind.FILE, SVNConflictAction.EDIT, SVNConflictReason.MISSING);
            setIsConflicted(isTreeConflicted, true);
            return new SVNStatusType[] {SVNStatusType.MISSING, SVNStatusType.MISSING};
        }
        
        if (diff != null && !diff.isEmpty()) {
            boolean[] isTreeConflicted2 = { false };
            result[1] = propertiesChanged(path, originalProperties, diff, isTreeConflicted2);
            if (isTreeConflicted2[0]) {
                setIsConflicted(isTreeConflicted, true);
                return result;
            }
        } 
        
        String name = mergedFile.getName();
        if (file1 != null) {
            boolean textModified = dir.hasTextModifications(name, false);
            if (!textModified && 
                    (SVNProperty.isBinaryMimeType(mimeType1) || SVNProperty.isBinaryMimeType(mimeType2))) {
                boolean same = SVNFileUtil.compareFiles(!myIsAddNecessitatedMerge ? file1 : file2, mergedFile, null);
                if (same) {
                    if (!myIsDryRun && !myIsAddNecessitatedMerge) {
                        SVNFileUtil.rename(file2, mergedFile);
                    }
                    result[0] = SVNStatusType.CHANGED;
                    needsMerge = false;
                }
            }
            
            if (needsMerge) {
                String localLabel = ".working";
                String baseLabel = ".merge-left.r" + revision1;
                String latestLabel = ".merge-right.r" + revision2;
                SVNStatusType mergeResult = dir.mergeText(name, file1, file2, null, localLabel, 
                        baseLabel, latestLabel, diff, myIsDryRun, myDiffOptions, null);


                dir.runLogs();
                if (mergeResult == SVNStatusType.CONFLICTED || mergeResult == SVNStatusType.CONFLICTED_UNRESOLVED) {
                    result[0] = mergeResult;

View Full Code Here

Examples of org.tmatesoft.svn.core.wc.SVNStatusType

                result[0] = SVNStatusType.MISSING;
            }
            return result;
        }
        
        SVNStatusType obstructedStatus = getStatusForObstructedOrMissing(path);
        if (obstructedStatus != SVNStatusType.INAPPLICABLE) {
            return new SVNStatusType[] { obstructedStatus, SVNStatusType.UNCHANGED };
        }
        
        SVNFileType fileType = SVNFileType.getType(mergedFile);

View Full Code Here

Examples of org.tmatesoft.svn.core.wc.SVNStatusType

        SVNAdminArea dir = retrieve(mergedFile.getParentFile(), true);
        if (dir == null) {
            return SVNStatusType.MISSING;
        }
        
        SVNStatusType obstructedStatus = getStatusForObstructedOrMissing(path);
        if (obstructedStatus != SVNStatusType.INAPPLICABLE) {
            return obstructedStatus;
        }
        
        SVNFileType fileType = SVNFileType.getType(mergedFile);

View Full Code Here

Examples of org.tmatesoft.svn.core.wc.SVNStatusType

        SVNLog log = null;
        SVNAdminArea dir = wcAccess.retrieve(parent);
        if (!dryRun) {
            log = dir.getLog();
        }
        SVNStatusType result = dir.mergeProperties(name, baseProperties, diff, null, null, baseMerge, dryRun, log);
        if (!dryRun) {
            log.save();
            dir.runLogs();
        }
        return result;

View Full Code Here

Examples of org.tmatesoft.svn.core.wc.SVNStatusType

                    props2 = filterProperties(props2, true, false, false);


                    SVNProperties propsDiff = computePropsDiff(props1, props2);
                    
                    if (!(myIsIgnoreAncestry || sourcesRelated)) {
                        SVNStatusType cstatus = callback.fileDeleted(targetName, f1, f2, mimeType1, 
                                mimeType2, props1, isTreeConflict);
                        headerSent = notifySingleFileMerge(targetWCPath, isTreeConflict[0] ? SVNEventAction.TREE_CONFLICT : 
                            SVNEventAction.UPDATE_DELETE, cstatus, SVNStatusType.UNKNOWN, event, headerSent);
                        mergeResult = callback.fileAdded(targetName, f1, f2, nextRange.getStartRevision(), 
                                                         nextRange.getEndRevision(), mimeType1, mimeType2,

View Full Code Here

Examples of org.tmatesoft.svn.core.wc.SVNStatusType

            save();
        }
    }


    public SVNStatusType logChangedEntryProperties(String name, SVNProperties modifiedEntryProps) throws SVNException {
        SVNStatusType status = SVNStatusType.LOCK_UNCHANGED;
        if (modifiedEntryProps != null) {
            SVNProperties command = new SVNProperties();
            command.put(SVNLog.NAME_ATTR, name);
            for (Iterator names = modifiedEntryProps.nameSet().iterator(); names.hasNext();) {
                String propName = (String) names.next();

View Full Code Here

Examples of org.tmatesoft.svn.core.wc.SVNStatusType

                if (filteredProps != null) {
                    regularProps = filteredProps; 
                }
            }
            
            SVNStatusType status = SVNPropertiesManager.mergeProperties(getWCAccess(), file, originalProperties, regularProps, 
                    false, myIsDryRun);
            if (!myIsDryRun) {
                for (Iterator propsIter = regularProps.nameSet().iterator(); propsIter.hasNext();) {
                    String propName = (String) propsIter.next();
                    SVNPropertyValue propValue = regularProps.getSVNPropertyValue(propName);

View Full Code Here

Examples of org.tmatesoft.svn.core.wc.SVNStatusType

            
            if (needsMerge) {
                String localLabel = ".working";
                String baseLabel = ".merge-left.r" + revision1;
                String latestLabel = ".merge-right.r" + revision2;
                SVNStatusType mergeResult = dir.mergeText(name, file1, file2, null, localLabel, 
                        baseLabel, latestLabel, diff, myIsDryRun, myDiffOptions, null);


                dir.runLogs();
                if (mergeResult == SVNStatusType.CONFLICTED || mergeResult == SVNStatusType.CONFLICTED_UNRESOLVED) {
                    result[0] = mergeResult;

View Full Code Here

0 1 2 3 4 5

TOP

All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.