Method | Description | |
---|---|---|
CanDiffFile ( string pathToFile ) : bool | ||
CanMergeFile ( string pathToFile ) : bool | ||
CanPresentFile ( string pathToFile ) : bool | ||
CanValidateFile ( string pathToFile ) : bool | ||
DescribeInitialContents ( FileInRevision fileInRevision, TempFile file ) : IEnumerable |
||
Do3WayMerge ( MergeOrder mergeOrder ) : void |
Do a 3-file merge, placing the result over the "ours" file and returning an error status Implementations can exit with an exception, which the caller will catch and deal with. The must not have any UI, no interaction with the user. |
|
Find2WayDifferences ( FileInRevision parent, FileInRevision child, HgRepository repository ) : IEnumerable |
||
GetChangePresenter ( IChangeReport report, HgRepository repository ) : IChangePresenter | ||
GetExtensionsOfKnownTextFileTypes ( ) : IEnumerable |
||
ValidateFile ( string pathToFile, IProgress progress ) : string |
Method | Description | |
---|---|---|
CarefullyWriteOutResultingXml ( HtmlFileForMerging oursXml, NodeMergeResult result ) : void | ||
SetupElementStrategies ( XmlMerger merger ) : void |
public CanDiffFile ( string pathToFile ) : bool | ||
pathToFile | string | |
return | bool |
public CanMergeFile ( string pathToFile ) : bool | ||
pathToFile | string | |
return | bool |
public CanPresentFile ( string pathToFile ) : bool | ||
pathToFile | string | |
return | bool |
public CanValidateFile ( string pathToFile ) : bool | ||
pathToFile | string | |
return | bool |
public DescribeInitialContents ( FileInRevision fileInRevision, TempFile file ) : IEnumerable |
||
fileInRevision | FileInRevision | |
file | TempFile | |
return | IEnumerable |
public Do3WayMerge ( MergeOrder mergeOrder ) : void | ||
mergeOrder | MergeOrder | |
return | void |
public Find2WayDifferences ( FileInRevision parent, FileInRevision child, HgRepository repository ) : IEnumerable |
||
parent | FileInRevision | |
child | FileInRevision | |
repository | HgRepository | |
return | IEnumerable |
public GetChangePresenter ( IChangeReport report, HgRepository repository ) : IChangePresenter | ||
report | IChangeReport | |
repository | HgRepository | |
return | IChangePresenter |
public GetExtensionsOfKnownTextFileTypes ( ) : IEnumerable |
||
return | IEnumerable |
public ValidateFile ( string pathToFile, IProgress progress ) : string | ||
pathToFile | string | |
progress | IProgress | |
return | string |