diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-07-25 13:10:36 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-07-25 13:10:36 -0700 |
| commit | e5266e2343c8d275d79fa0be725180d0fe3a993c (patch) | |
| tree | 0ba72f5de1949e0527874a799baa224cbe1537e0 /platform/vcs-log/impl/src/com/intellij/vcs/log/ui/render/AbstractPaddingCellRender.java | |
| parent | b03a5855292feb8c331815f883fe64372aacd872 (diff) | |
| parent | 2e5965e996aad62ab1338b09d54caaf99ff3dd6a (diff) | |
| download | idea-e5266e2343c8d275d79fa0be725180d0fe3a993c.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143
Diffstat (limited to 'platform/vcs-log/impl/src/com/intellij/vcs/log/ui/render/AbstractPaddingCellRender.java')
| -rw-r--r-- | platform/vcs-log/impl/src/com/intellij/vcs/log/ui/render/AbstractPaddingCellRender.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/render/AbstractPaddingCellRender.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/render/AbstractPaddingCellRender.java index 973252db6af6..23c736b4420b 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/render/AbstractPaddingCellRender.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/render/AbstractPaddingCellRender.java @@ -107,7 +107,7 @@ public abstract class AbstractPaddingCellRender extends ColoredTableCellRenderer return Collections.emptyMap(); } VirtualFile root = refs.iterator().next().getRoot(); // all refs are from the same commit => they have the same root - refs = myDataHolder.getLogProvider(root).getReferenceManager().sort(refs); + refs = ContainerUtil.sorted(refs, myDataHolder.getLogProvider(root).getReferenceManager().getComparator()); List<VcsRef> branches = getBranches(refs); Collection<VcsRef> tags = ContainerUtil.subtract(refs, branches); return getLabelsForRefs(branches, tags); |