Merge branch 'stable-2.12'

* stable-2.12:
  AbstractSubmit: Extend tests to check for ref-updated events
  Print proper name for TrustedListenableFutureTask in show-queue command
  Remove non working Reindex --dry-run option
  Synchronize MyersDiff and HistogramDiff invocations on local variable
  RebaseSorter: leave commit /merge candidate as interesting if referenced

This reverts I0ce6e9f0 (listed above), since those tests are still
failing in master, as per open Issue 4123. Change Ic978fb28 aims at
bringing those tests in master -once the latter issue gets resolved.

Change-Id: Icf9cb1f3f9650e0b8ddc0350353e78ae37933b23
This commit is contained in:
Marco Miller
2016-05-25 14:05:19 -04:00
7 changed files with 59 additions and 23 deletions

View File

@@ -478,6 +478,16 @@ public abstract class AbstractDaemonTest {
.create(new BranchInput());
}
protected BranchApi createBranchWithRevision(Branch.NameKey branch,
String revision) throws Exception {
BranchInput in = new BranchInput();
in.revision = revision;
return gApi.projects()
.name(branch.getParentKey().get())
.branch(branch.get())
.create(in);
}
private static final List<Character> RANDOM =
Chars.asList(new char[]{'a','b','c','d','e','f','g','h'});
protected PushOneCommit.Result amendChange(String changeId)