Mercurial > jhg

diff src/org/tmatesoft/hg/core/HgDiffCommand.java @ 709:497e697636fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Wed, 21 Aug 2013 16:23:27 +0200
parents 7839ff0bfd78
children
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/core/HgDiffCommand.java	Tue Aug 20 18:41:34 2013 +0200
+++ b/src/org/tmatesoft/hg/core/HgDiffCommand.java	Wed Aug 21 16:23:27 2013 +0200
@@ -254,7 +254,7 @@
 		progress.start(2);
 		try {
 			final CancelSupport cancel = getCancelSupport(insp, true);
-			int changelogRevisionIndex = clogRevIndexEnd.get();
+			int changelogRevisionIndex = clogRevIndexEnd.get(TIP);
 			// TODO detect if file is text/binary (e.g. looking for chars < ' ' and not \t\r\n\f
 			int fileRevIndex = fileRevIndex(df, changelogRevisionIndex);
 			int[] fileRevParents = new int[2];