MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[file-history, hg] calcCurrentRevisionNumber actually gets last revision for the file

Browse Source
This commit is contained in:
Julia Beliaeva
2018-04-11 19:26:30 +03:00
parent 7a28202a04
commit a37c643781
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgHistoryProvider.java
+9 -5
View File
@@ -79,7 +79,7 @@ public class HgHistoryProvider implements VcsHistoryProvider {
return null;
}
final List<VcsFileRevision> revisions = new ArrayList<>(getHistory(filePath, vcsRoot, myProject));
return createAppendableSession(vcsRoot, revisions, null);
return createAppendableSession(vcsRoot, filePath, revisions, null);
}
public void reportAppendableHistory(FilePath filePath, final VcsAppendableHistorySessionPartner partner) throws VcsException {
@@ -88,7 +88,7 @@ public class HgHistoryProvider implements VcsHistoryProvider {
final List<HgFileRevision> history = getHistory(filePath, vcsRoot, myProject);
if (history.size() == 0) return;
final VcsAbstractHistorySession emptySession = createAppendableSession(vcsRoot, Collections.emptyList(), null);
final VcsAbstractHistorySession emptySession = createAppendableSession(vcsRoot, filePath, Collections.emptyList(), null);
partner.reportCreatedEmptySession(emptySession);
for (HgFileRevision hgFileRevision : history) {
@@ -97,11 +97,15 @@ public class HgHistoryProvider implements VcsHistoryProvider {
partner.finished();
}
private VcsAbstractHistorySession createAppendableSession(final VirtualFile vcsRoot, List<VcsFileRevision> revisions, @Nullable VcsRevisionNumber number) {
@NotNull
private VcsAbstractHistorySession createAppendableSession(@NotNull VirtualFile vcsRoot,
@NotNull FilePath filePath,
@NotNull List<VcsFileRevision> revisions,
@Nullable VcsRevisionNumber number) {
return new VcsAbstractHistorySession(revisions, number) {
@Nullable
protected VcsRevisionNumber calcCurrentRevisionNumber() {
return new HgWorkingCopyRevisionsCommand(myProject).firstParent(vcsRoot);
return new HgWorkingCopyRevisionsCommand(myProject).parents(vcsRoot, filePath).first;
}
public HistoryAsTreeProvider getHistoryAsTreeProvider() {
@@ -110,7 +114,7 @@ public class HgHistoryProvider implements VcsHistoryProvider {
@Override
public VcsHistorySession copy() {
return createAppendableSession(vcsRoot, getRevisionList(), getCurrentRevisionNumber());
return createAppendableSession(vcsRoot, filePath, getRevisionList(), getCurrentRevisionNumber());
}
};
}