MergeChangeInfo BuilDirectoryConflict(bool isResolved, long itemId) { DiffChanged src = new DiffChanged( CreateFileRevision(itemId), -1, "foo.c", -1, Difference.DiffNodeStatus.Added); DiffChanged dst = new DiffChanged( CreateFileRevision(itemId), -1, "foo.c", -1, Difference.DiffNodeStatus.Added); DirectoryConflict dirConflict = new EvilTwinConflict(src, dst); dirConflict.SetIsResolved(isResolved); MergeChangeInfo result = new MergeChangeInfo( new MountPointWithPath( MountPointId.WORKSPACE_ROOT, new RepositorySpec(), "/"), dirConflict, null, null, MergeChangesCategory.Type.DirectoryConflicts, true); return(result); }
static FileConflict CreateModifiedDifference(long size) { DiffChanged src = new DiffChanged( CreateFileRevision(size), -1, CreateRandomPath(), -1, Difference.DiffNodeStatus.Changed); return(new FileConflict(src, null)); }
internal static FileConflict CreateModifiedDifference(string path) { DiffChanged src = new DiffChanged( CreateFileRevision(128), -1, path, -1, Difference.DiffNodeStatus.Changed); return(new FileConflict(src, null)); }
FileConflict BuildFileConflict(long itemId) { DiffChanged src = new DiffChanged( CreateFileRevision(itemId), -1, "foo.c", -1, Difference.DiffNodeStatus.Changed); DiffChanged dst = new DiffChanged( CreateFileRevision(itemId), -1, "foo.c", -1, Difference.DiffNodeStatus.Changed); return(new FileConflict(src, dst)); }
static EvilTwinConflict CreateEvilTwinConflict(int addedSize) { DiffChanged src = new DiffChanged( CreateFileRevision(addedSize), -1, CreateRandomPath(), -1, Difference.DiffNodeStatus.Added); DiffChanged dst = new DiffChanged( CreateFileRevision(addedSize), -1, CreateRandomPath(), -1, Difference.DiffNodeStatus.Added); return(new EvilTwinConflict(src, dst)); }
internal static EvilTwinConflict CreateEvilTwinConflict(string path) { DiffChanged src = new DiffChanged( CreateFileRevision(128), -1, path, -1, Difference.DiffNodeStatus.Added); DiffChanged dst = new DiffChanged( CreateFileRevision(128), -1, path, -1, Difference.DiffNodeStatus.Added); return(new EvilTwinConflict(src, dst)); }
static ChangeDeleteConflict CreateChangeDeleteConflict( long changeSize, long deleteSize, bool isChangeDelete) { DiffChanged src = new DiffChanged( CreateFileRevision(changeSize), -1, CreateRandomPath(), -1, Difference.DiffNodeStatus.Changed); DiffChanged dst = new DiffChanged( CreateFileRevision(deleteSize), -1, CreateRandomPath(), -1, Difference.DiffNodeStatus.Deleted); if (isChangeDelete) { return(new ChangeDeleteConflict(src, dst)); } return(new ChangeDeleteConflict(dst, src)); }
IncomingChangeInfo BuildFileConflict(MountPointId mountPointId, long itemId) { DiffChanged src = new DiffChanged( CreateFileRevision(itemId), -1, "foo.c", -1, Difference.DiffNodeStatus.Changed); DiffChanged dst = new DiffChanged( CreateFileRevision(itemId), -1, "foo.c", -1, Difference.DiffNodeStatus.Changed); return(new IncomingChangeInfo( new MountPointWithPath( mountPointId, new RepositorySpec(), "/"), new FileConflict(src, dst), IncomingChangesCategory.Type.FileConflicts)); }
protected virtual void OnDiffChanged(EventArgs e) { DiffChanged?.Invoke(this, e); }