Package org.tmatesoft.svn.core.wc

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

553
554
555
556
557
558
559
560
        }
        return treeConflict;
    }

    public boolean hasTreeConflict(File path) throws SVNException {
        SVNTreeConflictDescription treeConflict = getTreeConflict(path);
        return treeConflict != null;
    }
View Full Code Here
709
710
711
712
713
714
715
716
717
718
719
            handler = new TCEntryHandler(path, this, handler, depth);
        }
        SVNEntry entry = getEntry(path, showHidden);
        if (entry == null) {
            if (includeTC) {
                SVNTreeConflictDescription tc = getTreeConflict(path);
                if (tc != null) {
                    handler.handleEntry(path, null);
                    return;
                }
            }
View Full Code Here
838
839
840
841
842
843
844
845
846
847
848
849
                return;
            }
            Map tcs = entry.getTreeConflicts();
            for(Iterator paths = tcs.keySet().iterator(); paths.hasNext();) {
                File p = (File) paths.next();
                SVNTreeConflictDescription tc = (SVNTreeConflictDescription) tcs.get(p);
                if (tc.getNodeKind() == SVNNodeKind.DIR && myDepth == SVNDepth.FILES) {
                    continue;
                }
                SVNEntry conflictEntry = myWCAccess.getEntry(p, true);
                if (conflictEntry == null || conflictEntry.isDeleted()) {
                    myDelegate.handleEntry(p, null);
View Full Code Here
851
852
853
854
855
856
857
858
859
860
861
            }
        }

        public void handleError(File path, SVNErrorMessage error) throws SVNException {
            if (error != null && error.getErrorCode() == SVNErrorCode.UNVERSIONED_RESOURCE) {
                SVNTreeConflictDescription tc = myWCAccess.getTreeConflict(path);
                if (tc != null) {
                    myDelegate.handleEntry(path, null);
                    return;
                }
            }
View Full Code Here
1395
1396
1397
1398
1399
1400
1401
1402
1403
       
        SVNConflictVersion leftConflictVersion = new SVNConflictVersion(srcReposRoot, SVNURLUtil.getRelativeURL(srcReposRoot, leftURL),
                myCurrentMergeSource.myRevision1, kind);
        SVNConflictVersion rightConflictVersion = new SVNConflictVersion(srcReposRoot, SVNURLUtil.getRelativeURL(srcReposRoot, rightURL),
                myCurrentMergeSource.myRevision2, kind);
        SVNTreeConflictDescription conflictDescription  = new SVNTreeConflictDescription(victim, kind, action, reason, SVNOperation.MERGE,
                leftConflictVersion, rightConflictVersion);
        adminArea.addTreeConflict(conflictDescription);
    }
View Full Code Here
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
        }
        if (info.getChangelistName() != null) {
            buffer.append("Changelist: " + info.getChangelistName() + "\n");
        }
        if (info.getTreeConflict() != null) {
          SVNTreeConflictDescription tc = info.getTreeConflict();
          String description = SVNTreeConflictUtil.getHumanReadableConflictDescription(tc);
            buffer.append("Tree conflict: " + description + "\n");
            SVNConflictVersion left = tc.getSourceLeftVersion();
            if (left != null) {
                buffer.append("  Source  left: " + SVNTreeConflictUtil.getHumanReadableConflictVersion(left) + "\n");
            }
            SVNConflictVersion right = tc.getSourceRightVersion();
            if (right != null) {
                buffer.append("  Source right: " + SVNTreeConflictUtil.getHumanReadableConflictVersion(right) + "\n");
            }
        }
        buffer.append("\n");
View Full Code Here
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
                buffer = openCDataTag("expires", ((SVNDate) lock.getExpirationDate()).format(), buffer);
            }
            buffer = closeXMLTag("lock", buffer);
        }
        if (info.getTreeConflict() != null) {
          SVNTreeConflictDescription tc = info.getTreeConflict();
          Map attributes = new SVNHashMap();
          attributes.put("victim", tc.getPath().getName());
          attributes.put("kind", tc.getNodeKind().toString());
          attributes.put("operation", tc.getOperation().getName());
          if (tc.getConflictAction() == SVNConflictAction.EDIT) {
              attributes.put("action", "edit");
          } else if (tc.getConflictAction() == SVNConflictAction.ADD) {
              attributes.put("action", "add");
          } else if (tc.getConflictAction() == SVNConflictAction.DELETE) {
              attributes.put("action", "delete");
          }
          if (tc.getConflictReason() == SVNConflictReason.EDITED) {
              attributes.put("reason", "edit");
          } else if (tc.getConflictReason() == SVNConflictReason.OBSTRUCTED) {
              attributes.put("reason", "obstruction");
          } else if (tc.getConflictReason() == SVNConflictReason.DELETED) {
            attributes.put("reason", "delete");
          } else if (tc.getConflictReason() == SVNConflictReason.ADDED) {
            attributes.put("reason", "add");
          } else if (tc.getConflictReason() == SVNConflictReason.MISSING) {
            attributes.put("reason", "missing");
          } else if (tc.getConflictReason() == SVNConflictReason.UNVERSIONED) {
            attributes.put("reason", "unversioned");
          }
          buffer = openXMLTag("tree-conflict", SVNXMLUtil.XML_STYLE_NORMAL, attributes, buffer);
          SVNConflictVersion left = tc.getSourceLeftVersion();
          if (left != null) {
            buffer = printConflictVersionXML(left, "source-left", buffer);           
          }
          SVNConflictVersion right = tc.getSourceLeftVersion();
          if (right != null) {
            buffer = printConflictVersionXML(right, "source-right", buffer);           
          }
          buffer = closeXMLTag("tree-conflict", buffer);
        }
View Full Code Here
TOP

Related Classes of org.tmatesoft.svn.core.wc.SVNTreeConflictDescription

  • org.tigris.subversion.javahl.JavaHLObjectFactory
  • org.tmatesoft.svn.cli.svn.SVNInfoCommand
  • org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea16
  • org.tmatesoft.svn.core.internal.wc.admin.SVNLogRunner
  • org.tmatesoft.svn.core.internal.wc.admin.SVNWCAccess
  • org.tmatesoft.svn.core.internal.wc.admin.SVNWCAccess$TCEntryHandler
  • org.tmatesoft.svn.core.internal.wc.SVNCommitUtil
  • org.tmatesoft.svn.core.internal.wc.SVNMergeDriver
  • org.tmatesoft.svn.core.internal.wc.SVNStatusEditor
  • org.tmatesoft.svn.core.internal.wc.SVNStatusUtil
    • Copyright © 2018 www.massapicom. All rights reserved.
    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.