Mercurial > hg4j
comparison src/org/tmatesoft/hg/repo/HgWorkingCopyStatusCollector.java @ 654:12a4f60ea972
1) Console push tool. 2) Pass class to blame into FileUtils
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Wed, 03 Jul 2013 15:11:40 +0200 |
| parents | 6526d8adbc0f |
| children | 5050ee565bd1 |
comparison
equal
deleted
inserted
replaced
| 653:629a7370554c | 654:12a4f60ea972 |
|---|---|
| 587 repo.getSessionContext().getLog().dump(getClass(), Warn, ex, "Unexpected cancellation"); | 587 repo.getSessionContext().getLog().dump(getClass(), Warn, ex, "Unexpected cancellation"); |
| 588 return check.ultimatelyTheSame(); | 588 return check.ultimatelyTheSame(); |
| 589 } catch (IOException ex) { | 589 } catch (IOException ex) { |
| 590 throw new HgInvalidFileException("File comparison failed", ex).setFileName(p); | 590 throw new HgInvalidFileException("File comparison failed", ex).setFileName(p); |
| 591 } finally { | 591 } finally { |
| 592 new FileUtils(repo.getSessionContext().getLog()).closeQuietly(is); | 592 new FileUtils(repo.getSessionContext().getLog(), this).closeQuietly(is); |
| 593 } | 593 } |
| 594 } | 594 } |
| 595 | 595 |
| 596 /** | 596 /** |
| 597 * @return <code>true</code> if flags are the same | 597 * @return <code>true</code> if flags are the same |
