Mercurial > hg4j

comparison src/org/tmatesoft/hg/repo/HgRepository.java @ 407:30922c728341 smartgit3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Better multiline log printout; options to tune default log output
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Fri, 16 Mar 2012 12:51:03 +0100
parents b015f3918120
children 0f5696623512
comparison
equal deleted inserted replaced
404:31a719b9f95e 407:30922c728341
32 import org.tmatesoft.hg.internal.ByteArrayChannel; 32 import org.tmatesoft.hg.internal.ByteArrayChannel;
33 import org.tmatesoft.hg.internal.ConfigFile; 33 import org.tmatesoft.hg.internal.ConfigFile;
34 import org.tmatesoft.hg.internal.DataAccessProvider; 34 import org.tmatesoft.hg.internal.DataAccessProvider;
35 import org.tmatesoft.hg.internal.Experimental; 35 import org.tmatesoft.hg.internal.Experimental;
36 import org.tmatesoft.hg.internal.Filter; 36 import org.tmatesoft.hg.internal.Filter;
37 import org.tmatesoft.hg.internal.Internals;
37 import org.tmatesoft.hg.internal.RevlogStream; 38 import org.tmatesoft.hg.internal.RevlogStream;
38 import org.tmatesoft.hg.internal.SubrepoManager; 39 import org.tmatesoft.hg.internal.SubrepoManager;
39 import org.tmatesoft.hg.util.CancelledException; 40 import org.tmatesoft.hg.util.CancelledException;
40 import org.tmatesoft.hg.util.Pair; 41 import org.tmatesoft.hg.util.Pair;
41 import org.tmatesoft.hg.util.Path; 42 import org.tmatesoft.hg.util.Path;
321 ignore = new HgIgnore(); 322 ignore = new HgIgnore();
322 File ignoreFile = new File(getWorkingDir(), ".hgignore"); 323 File ignoreFile = new File(getWorkingDir(), ".hgignore");
323 try { 324 try {
324 final List<String> errors = ignore.read(ignoreFile); 325 final List<String> errors = ignore.read(ignoreFile);
325 if (errors != null) { 326 if (errors != null) {
326 getContext().getLog().warn(getClass(), "Syntax errors parsing .hgignore:\n%s", errors); 327 getContext().getLog().warn(getClass(), "Syntax errors parsing .hgignore:\n%s", Internals.join(errors, ",\n"));
327 } 328 }
328 } catch (IOException ex) { 329 } catch (IOException ex) {
329 final String m = "Error reading .hgignore file"; 330 final String m = "Error reading .hgignore file";
330 getContext().getLog().warn(getClass(), ex, m); 331 getContext().getLog().warn(getClass(), ex, m);
331 // throw new HgInvalidControlFileException(m, ex, ignoreFile); 332 // throw new HgInvalidControlFileException(m, ex, ignoreFile);