Mercurial > jhg

comparison src/org/tmatesoft/hg/internal/FileUtils.java @ 705:b4242b7e7dfe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge command: implement conflict resolution alternatives
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Thu, 15 Aug 2013 18:43:50 +0200
parents 24f4efedc9d5
children 42b88709e41d
comparison
equal deleted inserted replaced
704:7743a9c10bfa 705:b4242b7e7dfe
103 fos.write(buf, 0, r); 103 fos.write(buf, 0, r);
104 } 104 }
105 fos.flush(); 105 fos.flush();
106 fos.close(); 106 fos.close();
107 } 107 }
108 108
109 public void closeQuietly(Closeable stream) { 109 public void closeQuietly(Closeable stream) {
110 closeQuietly(stream, null); 110 closeQuietly(stream, null);
111 } 111 }
112 112
113 public void closeQuietly(Closeable stream, File f) { 113 public void closeQuietly(Closeable stream, File f) {
124 } 124 }
125 log.dump(troublemaker == null ? getClass() : troublemaker, Severity.Warn, ex, msg); 125 log.dump(troublemaker == null ? getClass() : troublemaker, Severity.Warn, ex, msg);
126 } 126 }
127 } 127 }
128 } 128 }
129
130 // nothing special, just a single place with common prefix
131 public File createTempFile() throws IOException {
132 return File.createTempFile("hg4j-", null);
133 }
129 } 134 }