https://hg.hg4j.com/hg4j/ en-us hg4j Changelog hg4j Changelog [default] Mac support: respect Mac alternatives of command-line arguments for common unix tools https://hg.hg4j.com/hg4j/rev/661e77dc88ba https://hg.hg4j.com/hg4j/rev/661e77dc88ba changeset 661e77dc88ba branch default bookmark tag tip user Artem Tikhomirov <tikhomirov.artem@gmail.com> description Mac support: respect Mac alternatives of command-line arguments for common unix tools files src/org/tmatesoft/hg/internal/FileSystemHelper.java
src/org/tmatesoft/hg/internal/Internals.java
src/org/tmatesoft/hg/util/RegularFileStats.java
]]> Artem Tikhomirov <tikhomirov.artem@gmail.com> Sun, 03 Aug 2014 18:09:00 +0200 Issue 49: NoClassDefFoundError: org/tmatesoft/hg/auth/HgAuthenticator. Missing package in the binary bundle https://hg.hg4j.com/hg4j/rev/a864fb309e4b https://hg.hg4j.com/hg4j/rev/a864fb309e4b changeset a864fb309e4b branch bookmark tag user Artem Tikhomirov <tikhomirov.artem@gmail.com> description Issue 49: NoClassDefFoundError: org/tmatesoft/hg/auth/HgAuthenticator. Missing package in the binary bundle files build.xml
]]> Artem Tikhomirov <tikhomirov.artem@gmail.com> Sun, 03 Aug 2014 18:04:13 +0200 Keyword filtering that doesn't depend on input buffer size and the way input lines got split between filter() calls. KewordFilter got state to keep processed suspicious ...$ lines https://hg.hg4j.com/hg4j/rev/a62079bc422b https://hg.hg4j.com/hg4j/rev/a62079bc422b changeset a62079bc422b branch bookmark tag user Artem Tikhomirov <tikhomirov.artem@gmail.com> description Keyword filtering that doesn't depend on input buffer size and the way input lines got split between filter() calls. KewordFilter got state to keep processed suspicious ...$ lines files src/org/tmatesoft/hg/internal/ByteVector.java
src/org/tmatesoft/hg/internal/Internals.java
src/org/tmatesoft/hg/internal/KeywordFilter.java
src/org/tmatesoft/hg/repo/HgRepositoryFiles.java
test/org/tmatesoft/hg/test/TestKeywordFilter.java
]]> Artem Tikhomirov <tikhomirov.artem@gmail.com> Fri, 11 Oct 2013 21:35:41 +0200 KeywordFilter: 'IllegalStateException: need buffer of at least...' during status op for a small file https://hg.hg4j.com/hg4j/rev/cf200271439a https://hg.hg4j.com/hg4j/rev/cf200271439a changeset cf200271439a branch bookmark tag user Artem Tikhomirov <tikhomirov.artem@gmail.com> description KeywordFilter: 'IllegalStateException: need buffer of at least...' during status op for a small file files src/org/tmatesoft/hg/internal/KeywordFilter.java
src/org/tmatesoft/hg/repo/HgWorkingCopyStatusCollector.java
]]> Artem Tikhomirov <tikhomirov.artem@gmail.com> Mon, 07 Oct 2013 01:56:05 +0200 Report merged lines as changed block if possible, not as a sequence of added/deleted blocks. To facilitate access to merge parent lines AddBlock got mergeLineAt() method that reports index of the line in the second parent (if any), while insertedAt() has been changed to report index in the first parent always https://hg.hg4j.com/hg4j/rev/497e697636fc https://hg.hg4j.com/hg4j/rev/497e697636fc changeset 497e697636fc branch bookmark tag user Artem Tikhomirov <tikhomirov.artem@gmail.com> description Report merged lines as changed block if possible, not as a sequence of added/deleted blocks. To facilitate access to merge parent lines AddBlock got mergeLineAt() method that reports index of the line in the second parent (if any), while insertedAt() has been changed to report index in the first parent always files src/org/tmatesoft/hg/core/HgBlameInspector.java
src/org/tmatesoft/hg/core/HgDiffCommand.java
src/org/tmatesoft/hg/internal/diff/BlameHelper.java
src/org/tmatesoft/hg/internal/diff/ForwardAnnotateInspector.java
src/org/tmatesoft/hg/internal/diff/ReverseAnnotateInspector.java
test/org/tmatesoft/hg/test/TestBlame.java
]]> Artem Tikhomirov <tikhomirov.artem@gmail.com> Wed, 21 Aug 2013 16:23:27 +0200 Merge: tests for resolver and complex scenario. Enable commit for merged revisions. Reuse file revisions if nothing changed https://hg.hg4j.com/hg4j/rev/4ffc17c0b534 https://hg.hg4j.com/hg4j/rev/4ffc17c0b534 changeset 4ffc17c0b534 branch bookmark tag user Artem Tikhomirov <tikhomirov.artem@gmail.com> description Merge: tests for resolver and complex scenario. Enable commit for merged revisions. Reuse file revisions if nothing changed files src/org/tmatesoft/hg/core/HgCommitCommand.java
src/org/tmatesoft/hg/core/HgMergeCommand.java
src/org/tmatesoft/hg/internal/CommitFacility.java
src/org/tmatesoft/hg/internal/RevlogStreamWriter.java
src/org/tmatesoft/hg/repo/HgMergeState.java
test/org/tmatesoft/hg/test/ComplexTest.java
test/org/tmatesoft/hg/test/TestMerge.java
]]> Artem Tikhomirov <tikhomirov.artem@gmail.com> Tue, 20 Aug 2013 18:41:34 +0200 Merge: support 'unresolved' resolution with MergeStateBuilder https://hg.hg4j.com/hg4j/rev/42b88709e41d https://hg.hg4j.com/hg4j/rev/42b88709e41d changeset 42b88709e41d branch bookmark tag user Artem Tikhomirov <tikhomirov.artem@gmail.com> description Merge: support 'unresolved' resolution with MergeStateBuilder files src/org/tmatesoft/hg/core/HgMergeCommand.java
src/org/tmatesoft/hg/internal/DirstateBuilder.java
src/org/tmatesoft/hg/internal/FileUtils.java
src/org/tmatesoft/hg/internal/MergeStateBuilder.java
src/org/tmatesoft/hg/internal/WorkingDirFileWriter.java
src/org/tmatesoft/hg/repo/HgManifest.java
src/org/tmatesoft/hg/repo/HgMergeState.java
src/org/tmatesoft/hg/repo/HgRepositoryFiles.java
test/org/tmatesoft/hg/test/RepoUtils.java
test/org/tmatesoft/hg/test/TestMerge.java
]]> Artem Tikhomirov <tikhomirov.artem@gmail.com> Fri, 16 Aug 2013 19:22:59 +0200 Merge: tests for mediator notifications https://hg.hg4j.com/hg4j/rev/cd5c87d96315 https://hg.hg4j.com/hg4j/rev/cd5c87d96315 changeset cd5c87d96315 branch bookmark tag user Artem Tikhomirov <tikhomirov.artem@gmail.com> description Merge: tests for mediator notifications files build.xml
cmdline/org/tmatesoft/hg/console/Merge.java
src/org/tmatesoft/hg/core/HgMergeCommand.java
test-data/test-repos.jar
test/org/tmatesoft/hg/test/TestMerge.java
]]> Artem Tikhomirov <tikhomirov.artem@gmail.com> Fri, 16 Aug 2013 14:54:09 +0200 Merge command: implement conflict resolution alternatives https://hg.hg4j.com/hg4j/rev/b4242b7e7dfe https://hg.hg4j.com/hg4j/rev/b4242b7e7dfe changeset b4242b7e7dfe branch bookmark tag user Artem Tikhomirov <tikhomirov.artem@gmail.com> description Merge command: implement conflict resolution alternatives files cmdline/org/tmatesoft/hg/console/Merge.java
src/org/tmatesoft/hg/core/HgAddRemoveCommand.java
src/org/tmatesoft/hg/core/HgCheckoutCommand.java
src/org/tmatesoft/hg/core/HgCommitCommand.java
src/org/tmatesoft/hg/core/HgMergeCommand.java
src/org/tmatesoft/hg/core/HgPullCommand.java
src/org/tmatesoft/hg/core/HgRevertCommand.java
src/org/tmatesoft/hg/internal/CommitFacility.java
src/org/tmatesoft/hg/internal/DirstateBuilder.java
src/org/tmatesoft/hg/internal/FileUtils.java

]]> Artem Tikhomirov <tikhomirov.artem@gmail.com> Thu, 15 Aug 2013 18:43:50 +0200 Merge command introduced https://hg.hg4j.com/hg4j/rev/7743a9c10bfa https://hg.hg4j.com/hg4j/rev/7743a9c10bfa changeset 7743a9c10bfa branch bookmark tag user Artem Tikhomirov <tikhomirov.artem@gmail.com> description Merge command introduced files cmdline/org/tmatesoft/hg/console/Merge.java
src/org/tmatesoft/hg/core/HgMergeCommand.java
src/org/tmatesoft/hg/core/HgPullCommand.java
src/org/tmatesoft/hg/core/HgRepoFacade.java
src/org/tmatesoft/hg/internal/ManifestRevision.java
]]> Artem Tikhomirov <tikhomirov.artem@gmail.com> Wed, 14 Aug 2013 20:07:26 +0200