Skip to content
Snippets Groups Projects

Fixes issue 61 compatibility with hg 5.4 and 5.5

Merged Amenel Voglozin requested to merge branch/issue61-compatibility-with-hg5.4 into branch/default
19 files
+ 267
98
Compare changes
  • Side-by-side
  • Inline
Files
19
@@ -33,6 +33,7 @@ import com.aragost.javahg.Repository;
import com.aragost.javahg.commands.flags.GraftCommandFlags;
import com.aragost.javahg.internals.HgInputStream;
import com.aragost.javahg.internals.RuntimeIOException;
import com.aragost.javahg.merge.ConflictOracle;
import com.aragost.javahg.merge.GraftContext;
/**
@@ -91,8 +92,7 @@ public class GraftCommand extends GraftCommandFlags {
throw new RuntimeException(
"JavaHg Graft: Expected a colon (':') separating the revision number and its node ID");
}
int res = Integer.valueOf(line.substring(0, pos));
return res;
return Integer.parseInt(line.substring(0, pos));
}
/**
@@ -158,8 +158,7 @@ public class GraftCommand extends GraftCommandFlags {
@Override
protected void doneHook() {
String errorString = getErrorString();
this.hasConflicts = errorString.indexOf("abort: unresolved conflicts, can't continue") >= 0
|| errorString.indexOf("abort: unresolved merge conflicts (see hg help resolve)") >= 0;
this.hasConflicts = ConflictOracle.isConflictError(errorString);
this.somethingSkipped = errorString.indexOf("skipping ancestor revision ") >= 0;
}
Loading