Exemple #1
0
        private Xml2WayDiffer(IMergeEventListener eventListener, string parentPathname, string childPathname,
			string firstElementMarker,
			string startTag, string identfierAttribute)
        {
            _diffingMode = DiffingMode.FromPathnames;
            _parentPathname = parentPathname;
            _childPathname = childPathname;
            if (!string.IsNullOrEmpty(firstElementMarker))
                _firstElementTag = firstElementMarker.Trim();
            _startTag = "<" + startTag.Trim();
            _identfierAttribute = identfierAttribute;
            _eventListener = eventListener;
        }
Exemple #2
0
        private Xml2WayDiffer(IMergeEventListener eventListener, Dictionary<string, byte[]> parentIndex, string childPathname,
			string firstElementMarker,
			string startTag, string identfierAttribute)
        {
            _diffingMode = DiffingMode.FromMixed;
            _parentIndex = parentIndex;
            _childPathname = childPathname;
            if (!string.IsNullOrEmpty(firstElementMarker))
                _firstElementTag = firstElementMarker.Trim();
            _startTag = "<" + startTag.Trim();
            _identfierAttribute = identfierAttribute;
            _eventListener = eventListener;
        }
Exemple #3
0
        private Xml2WayDiffer(HgRepository repository, IMergeEventListener eventListener, FileInRevision parent, FileInRevision child,
			string firstElementMarker,
			string startTag, string identfierAttribute)
        {
            _diffingMode = DiffingMode.FromFileInRevisions;
            _repository = repository;
            _parentFileInRevision = parent;
            _childFileInRevision = child;
            if (!string.IsNullOrEmpty(firstElementMarker))
                _firstElementTag = firstElementMarker.Trim();
            _startTag = "<" + startTag.Trim();
            _identfierAttribute = identfierAttribute;
            _eventListener = eventListener;
        }
Exemple #4
0
 private Xml2WayDiffer(IMergeEventListener eventListener, string parentPathname, string childPathname,
                       string firstElementMarker,
                       string startTag, string identfierAttribute)
 {
     _diffingMode    = DiffingMode.FromPathnames;
     _parentPathname = parentPathname;
     _childPathname  = childPathname;
     if (!string.IsNullOrEmpty(firstElementMarker))
     {
         _firstElementTag = firstElementMarker.Trim();
     }
     _startTag           = "<" + startTag.Trim();
     _identfierAttribute = identfierAttribute;
     _eventListener      = eventListener;
 }
Exemple #5
0
 private Xml2WayDiffer(HgRepository repository, IMergeEventListener eventListener, FileInRevision parent, FileInRevision child,
                       string firstElementMarker,
                       string startTag, string identfierAttribute)
 {
     _diffingMode          = DiffingMode.FromFileInRevisions;
     _repository           = repository;
     _parentFileInRevision = parent;
     _childFileInRevision  = child;
     if (!string.IsNullOrEmpty(firstElementMarker))
     {
         _firstElementTag = firstElementMarker.Trim();
     }
     _startTag           = "<" + startTag.Trim();
     _identfierAttribute = identfierAttribute;
     _eventListener      = eventListener;
 }