Changeset 820:8e8998989c94

Timestamp:

08/08/08 22:52:54 (4 months ago)

Author:

Bastian Doetsch <bastian.doetsch@gmx.de>

branch:

default

Message:

Use Sax parser instead of DOM parser

Files:

• src/com/vectrace/MercurialEclipse/commands/AbstractParseChangesetClient.java (modified) (9 diffs)
• styles/log_style.tmpl (modified) (1 diff)
• styles/log_style_with_files (modified) (1 diff)
• styles/log_style_with_files.tmpl (modified) (1 diff)

src/com/vectrace/MercurialEclipse/commands/AbstractParseChangesetClient.java

@@ -11 +11 @@
-package com.vectrace.MercurialEclipse.commands;
-
+import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
@@ -16 +17 @@
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-
-
+
+
-import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
-
-import com.vectrace.MercurialEclipse.MercurialEclipsePlugin;
@@ -46 +43 @@
-import com.vectrace.MercurialEclipse.model.FileStatus.Action;
-import com.vectrace.MercurialEclipse.storage.HgRepositoryLocation;
+import com.vectrace.MercurialEclipse.team.MercurialTeamProvider;
-
-/**
@@ -56 +54 @@
-abstract class AbstractParseChangesetClient extends AbstractClient {
-
+    /**
+     * @author bastian
+     * 
+     */
+    private static final class ChangesetContentHandler implements
+            ContentHandler {
+
+        private String br;
+        private String tg;
+        private int rv;
+        private String ns;
+        private String nl;
+        private String di;
+        private String da;
+        private String au;
+        private String pr;
+        private String de;
+        private static IResource res;
+        private Direction direction;
+        private HgRepositoryLocation repository;
+        private File bundleFile;
+        private File hgRoot;
+        private static Map<IPath, SortedSet<ChangeSet>> fileRevisions;
+        private Set<String> filesModified = new TreeSet<String>();
+        private Set<String> filesAdded = new TreeSet<String>();
+        private Set<String> filesRemoved = new TreeSet<String>();
+        private Action action;
+
+        /**
+         * @param res
+         * @param direction
+         * @param repository
+         * @param bundleFile
+         * @param hgRoot
+         * @param fileRevisions
+         */
+        public ChangesetContentHandler(IResource res, Direction direction,
+                HgRepositoryLocation repository, File bundleFile, File hgRoot,
+                Map<IPath, SortedSet<ChangeSet>> fileRevisions) {
+            ChangesetContentHandler.res = res;
+            this.direction = direction;
+            this.repository = repository;
+            this.bundleFile = bundleFile;
+            this.hgRoot = hgRoot;
+            ChangesetContentHandler.fileRevisions = fileRevisions;
+        }
+
+        private static String unescape(String string) {
+            return string.replaceAll("&lt;", "<").replaceAll("&gt;", ">")
+                    .replaceAll("&amp;", "&");
+        }
+
+        /**
+         * Remove a leading tab on each line in the string.
+         * 
+         * @param string
+         * @return
+         */
+        private static String untab(String string) {
+            return string.replaceAll("\n\t", "\n");
+        }
+
+        private static String[] splitClean(String string, String sep) {
+            if (string == null || string.length() == 0) {
+                return new String[] {};
+            }
+            return string.split(sep);
+        }
+
+        public void characters(char[] ch, int start, int length)
+                throws SAXException {
+        }
+
+        public void endDocument() throws SAXException {
+        }
+
+        public void endElement(String uri, String localName, String name)
+                throws SAXException {
+            if (name.equals("cs")) {
+
+                ChangeSet.Builder csb = new ChangeSet.Builder(rv, nl, br, di,
+                        au);
+                csb.tag(tg);
+                csb.nodeShort(ns);
+                csb.ageDate(da);
+                csb.description(untab(unescape(de)));
+                csb.parents(splitClean(pr, " "));
+
+                csb.hgRoot(hgRoot).bundleFile(bundleFile)
+                        .repository(repository).direction(direction);
+
+                csb.bundleFile(bundleFile);
+                csb.direction(direction);
+                csb.hgRoot(hgRoot);
+                csb.repository(repository);
+                
+                List<FileStatus> list = new ArrayList<FileStatus>();
+                for (String file : filesModified) {
+                    list.add(new FileStatus(FileStatus.Action.MODIFIED, file));
+                }
+                for (String file : filesAdded) {
+                    list.add(new FileStatus(FileStatus.Action.ADDED, file));
+                }
+                for (String file : filesRemoved) {
+                    list.add(new FileStatus(FileStatus.Action.REMOVED, file));
+                }
+                csb.changedFiles(list.toArray(new FileStatus[list.size()]));
+                
+                ChangeSet changeSet = csb.build();
+
+                // changeset to resources & project
+                try {
+                    addChangesetToResourceMap(changeSet);
+                } catch (HgException e) {
+                    throw new SAXException(e);
+                }
+                filesModified.clear();
+                filesAdded.clear();
+                filesRemoved.clear();
+            }
+        }
+
+        public void endPrefixMapping(String prefix) throws SAXException {
+        }
+
+        public void ignorableWhitespace(char[] ch, int start, int length)
+                throws SAXException {
+        }
+
+        public void processingInstruction(String target, String data)
+                throws SAXException {
+        }
+
+        public void setDocumentLocator(Locator locator) {
+        }
+
+        public void skippedEntity(String name) throws SAXException {
+        }
+
+        public void startDocument() throws SAXException {
+        }
+
+        public void startElement(String uri, String localName, String name,
+                Attributes atts) throws SAXException {
+            /*
+             * <br v="{branches}"/> <tg v="{tags}"/> <rv v="{rev}"/> <ns
+             * v="{node|short}"/> <nl v="{node}"/> <di v="{date|isodate}"/> <da
+             * v="{date|age}"/> <au v="{author|person}"/> <pr v="{parents}"/>
+             * <de v="{desc|escape|tabindent}"/>
+             */
+            if (name.equals("br")) {
+                this.br = atts.getValue(0);
+            } else if (name.equals("tg")) {
+                this.tg = atts.getValue(0);
+            } else if (name.equals("rv")) {
+                this.rv = Integer.parseInt(atts.getValue(0));
+            } else if (name.equals("ns")) {
+                this.ns = atts.getValue(0);
+            } else if (name.equals("nl")) {
+                this.nl = atts.getValue(0);
+            } else if (name.equals("di")) {
+                this.di = atts.getValue(0);
+            } else if (name.equals("da")) {
+                this.da = atts.getValue(0);
+            } else if (name.equals("au")) {
+                this.au = atts.getValue(0);
+            } else if (name.equals("pr")) {
+                this.pr = atts.getValue(0);
+            } else if (name.equals("de")) {
+                this.de = untab(unescape(atts.getValue(0)));
+            } else if (name.equals("fl")) {
+                this.action = FileStatus.Action.MODIFIED;
+            } else if (name.equals("fa")) {
+                this.action = FileStatus.Action.ADDED;
+            } else if (name.equals("fd")) {
+                this.action = FileStatus.Action.REMOVED;
+            } else if (name.equals("f")) {
+                if (this.action == Action.ADDED) {
+                    filesAdded.add(atts.getValue(0));
+                    filesModified.remove(atts.getValue(0));
+                } else if (this.action == Action.MODIFIED) {
+                    filesModified.add(atts.getValue(0));                    
+                } else if (this.action == Action.REMOVED) {
+                    filesRemoved.add(atts.getValue(0));
+                    filesModified.remove(atts.getValue(0));
+                }
+            }
+        }
+
+        public void startPrefixMapping(String prefix, String uri)
+                throws SAXException {
+        }
+
+        /**
+         * @param proj
+         * @param fileRevisions
+         * @param cs
+         * @throws HgException
+         * @throws IOException
+         */
+        private final static void addChangesetToResourceMap(ChangeSet cs)
+                throws HgException {
+            try {
+                if (cs.getChangedFiles() != null) {
+                    for (FileStatus file : cs.getChangedFiles()) {
+                        IPath hgRoot = new Path(cs.getHgRoot()
+                                .getCanonicalPath());
+                        IPath fileRelPath = new Path(file.getPath());
+                        IPath fileAbsPath = hgRoot.append(fileRelPath);
+
+                        SortedSet<ChangeSet> revs = addChangeSetRevisions(cs,
+                                fileAbsPath);
+                        fileRevisions.put(fileAbsPath, revs);
+
+                    }
+                }
+
+                // hg root
+                IPath repoPath = new Path(cs.getHgRoot().getCanonicalPath());
+
+                SortedSet<ChangeSet> projectRevs = addChangeSetRevisions(cs,
+                        repoPath);
+
+                fileRevisions.put(repoPath, projectRevs);
+
+                // given path
+                IPath path = res.getLocation();
+                SortedSet<ChangeSet> pathRevs = addChangeSetRevisions(cs, path);
+                fileRevisions.put(path, pathRevs);
+
+            } catch (IOException e) {
+                MercurialEclipsePlugin.logError(e);
+                throw new HgException(e.getLocalizedMessage(), e);
+            }
+        }
+
+        /**
+         * @param fileRevisions
+         * @param cs
+         * @param res
+         * @return
+         */
+        private static SortedSet<ChangeSet> addChangeSetRevisions(ChangeSet cs,
+                IPath path) {
+            SortedSet<ChangeSet> fileRevs = fileRevisions.get(path);
+            if (fileRevs == null) {
+                fileRevs = new TreeSet<ChangeSet>();
+            }
+            fileRevs.add(cs);
+            return fileRevs;
+        }
+
+    }
+
-    private static final String STYLE_SRC = "/styles/log_style";
-    private static final String STYLE = "/log_style";
@@ -61 +313 @@
-    private static final String STYLE_WITH_FILES = "/log_style_with_files";
-    private static final String STYLE_TEMP_EXTN = ".tmpl";
+
+    private static ContentHandler handler;
-
-    /**
@@ -132 +386 @@
-     * <p>
-     * Format of input is defined in the two style files in /styles and is as
-
-
+
-     * 
-     * <pre>
-     * &lt;cs&gt;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-     * &lt;/cs&gt;
-     * ================
-     * </pre>
-     * 
@@ -185 +432 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        return fileRevisions;
@@ -213 +456 @@
-
-    /**
-
+
+
+
+
+
-     * @param fileRevisions
-     * @param cs
-     * @throws HgException
-     * @throws IOException
-     */
-    protected final static void addChangesetToResourceMap(IPath path,
-            Map<IPath, SortedSet<ChangeSet>> fileRevisions, ChangeSet cs)
-            throws HgException {
-        try {
-            if (cs.getChangedFiles() != null) {
-                for (FileStatus file : cs.getChangedFiles()) {
-                    IPath hgRoot = new Path(cs.getHgRoot().getCanonicalPath());
-                    IPath fileRelPath = new Path(file.getPath());
-                    IPath fileAbsPath = hgRoot.append(fileRelPath);
-
-                    SortedSet<ChangeSet> revs = addChangeSetRevisions(
-                            fileRevisions, cs, fileAbsPath);
-                    fileRevisions.put(fileAbsPath, revs);
-
-                }
-            }
-
-            // hg root
-            IPath repoPath = new Path(cs.getHgRoot().getCanonicalPath());
-
-            SortedSet<ChangeSet> projectRevs = addChangeSetRevisions(
-                    fileRevisions, cs, repoPath);
-
-            fileRevisions.put(repoPath, projectRevs);
-
-            // given path
-            SortedSet<ChangeSet> pathRevs = addChangeSetRevisions(
-                    fileRevisions, cs, path);
-            fileRevisions.put(path, pathRevs);
-
-        } catch (IOException e) {
-            MercurialEclipsePlugin.logError(e);
-            throw new HgException(e.getLocalizedMessage(), e);
-        }
-    }
-
-    /**
-     * @param fileRevisions
-     * @param cs
-     * @param res
-     * @return
-     */
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    }
-
-    private static FileStatus[] getFileStatuses(Element csn) {
-        HashSet<String> files = getFilesValue(csn, "fl");
-        HashSet<String> adds = getFilesValue(csn, "fa");
-        HashSet<String> del = getFilesValue(csn, "fd");
-
-        files.removeAll(adds);
-        files.removeAll(del);
-
-        List<FileStatus> statuses = new ArrayList<FileStatus>(files.size());
-        addFiles(statuses, files, Action.MODIFIED);
-        addFiles(statuses, adds, Action.ADDED);
-        addFiles(statuses, del, Action.REMOVED);
-
-        return statuses.toArray(new FileStatus[statuses.size()]);
-    }
-
-    private static HashSet<String> getFilesValue(Element csn, String name) {
-        NodeList nl = csn.getElementsByTagName(name);
-        if (nl.getLength() == 0) {
-            return new HashSet<String>(0);
-        }
-        NodeList files = ((Element) nl.item(0)).getElementsByTagName("f");
-        HashSet<String> ret = new HashSet<String>(files.getLength());
-        for (int i = 0; i < files.getLength(); i++) {
-            ret.add(files.item(i).getTextContent());
-        }
-
-        return ret;
-    }
-
-    private static void addFiles(List<FileStatus> statuses,
-            HashSet<String> files, Action action) {
-        for (String f : files) {
-            statuses.add(new FileStatus(action, f));
-        }
-    }
-
-    private static String[] splitClean(String string, String sep) {
-        if (string == null || string.length() == 0) {
-            return new String[] {};
-        }
-        return string.split(sep);
-    }
-
-    private static String unescape(String string) {
-        return string.replaceAll("&lt;", "<").replaceAll("&gt;", ">")
-                .replaceAll("&amp;", "&");
-    }
-
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-     * @return the cleaned string
-     */
@@ -354 +497 @@
-        return buf.toString();
-    }
-
-    /**
-     * Parse a changeset as output from the log command (see
-     * {@link #createMercurialRevisions()}).
-     * @param hgRoot 
-     * @param direction 
-     * @param bundleFile 
-     * @param repository 
-     * 
-     * @param changeSet
-     * @return
-     */
-    private static ChangeSet getChangeSet(HgRepositoryLocation repository, 
-            File bundleFile, 
-            Direction direction, 
-            File hgRoot, 
-            String changeSet) throws HgException {
-
-        if (changeSet == null) {
-            return null;
-        }
-
-        String outputString = changeSet.substring(changeSet.indexOf("<cs>"));
-        
-        try {
-            DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory
-                    .newInstance();
-            DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
-            Document doc;
-            Reader ir = null;
-            try {
-                ir = new StringReader(outputString);
-                doc = docBuilder.parse(new InputSource(ir));
-            } catch (SAXException e) {
-                outputString = cleanControlChars(outputString);
-                ir = new StringReader(outputString);
-                doc = docBuilder.parse(new InputSource(ir));
-            } finally {
-                if (ir != null) {
-                    ir.close();
-                }
-            }
-
-            // normalize text representation
-            doc.getDocumentElement().normalize();
-
-            NodeList csnl = doc.getElementsByTagName("cs");
-            int totalCs = csnl.getLength();
-            if (totalCs != 1) {
-                // Something screwy going on, should have 1 and 1 only.
-                throw new HgException(
-                        "Cannot parse changeset, bad log output?: " + changeSet);
-            }
-            Element csn = (Element) csnl.item(0);
-
-            ChangeSet.Builder csb = new ChangeSet.Builder(Integer.parseInt(getValue(csn, "rv")),
-                    getValue(csn, "nl"),
-                    getValue(csn, "br"),
-                    getValue(csn, "di"),
-                    getValue(csn,
-                            "au"));
-            csb.tag(getValue(csn, "tg"));
-            csb.nodeShort(getValue(csn, "ns"));
-            csb.ageDate(getValue(csn, "da"));
-            csb.description(untab(unescape(getValue(csn, "de"))));
-            csb.parents(splitClean(getValue(csn, "pr"), " "));
-            csb.changedFiles(getFileStatuses(csn));
-            
-            csb.hgRoot(hgRoot).bundleFile(bundleFile).repository(repository).direction(direction);
-            return csb.build();
-        } catch (ParserConfigurationException e) {
-            throw new HgException("Changeset parser Configuration error", e);
-        } catch (SAXException e) {
-            throw new HgException("Changeset parsing error for \"" + changeSet
-                    + "\"", e);
-        } catch (IOException e) {
-            throw new HgException("Error parsing changeset \"" + changeSet
-                    + "\"", e);
-        }
-    }
-
-    /**
-     * @param csn
-     * @return
-     */
-    private static String getValue(Element csn, String name) {
-        return csn.getElementsByTagName(name).item(0).getTextContent();
-    }
-
-}

styles/log_style.tmpl

@@ -1 +1 @@
-<cs>
->{branches}</br
->{tags}</tg
->{rev}</rv
->{node|short}</ns
->{node}</nl
->{date|isodate}</di
->{date|age}</da
->{author|person}</au
->{parents}</pr
->{desc|escape|tabindent}</de
+ v="{branches}"/
+ v="{tags}"/
+ v="{rev}"/
+ v="{node|short}"/
+ v="{node}"/
+ v="{date|isodate}"/
+ v="{date|age}"/
+ v="{author|person}"/
+ v="{parents}"/
+ v="{desc|escape|tabindent}"/
-</cs>
-============

styles/log_style_with_files

@@ -1 +1 @@
-changeset = log_style_with_files.tmpl
-start_files = ''
->{file|escape}</f
+ v="{file|escape}"/
-end_files = ''
-start_file_adds = ''
->{file_add|escape}</f
+ v="{file_add|escape}"/
-end_file_adds = ''
-start_file_dels = ''
->{file_del|escape}</f
+ v="{file_del|escape}"/
-end_file_dels = ''

styles/log_style_with_files.tmpl

@@ -1 +1 @@
-<cs>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-</cs>
-============