Skip to content

Add ability to reference branches and tags via refs/*#112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BinaryMuse wants to merge 1 commit into
base:gh-pages
Choose a base branch
from
Open

Add ability to reference branches and tags via refs/* #112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions js/historyview.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -359,6 +359,17 @@ define(['d3'], function() {
}
},

matchesTag: function matchesTag(ref, type, tag) {
const short = type + "/" + tag
const long = "refs/" + short

if (ref === tag || ref === short || ref === long) {
return true
}

return false
},

/**
* @method getCommit
* @param ref {String} the id or a tag name that refers to the commit
Expand DownExpand Up@@ -406,6 +417,7 @@ define(['d3'], function() {
throw new Error("Ref " + ref + " is ambiguous")
}

var matchesTag = this.matchesTag
for (var i = 0; i < commitData.length; i++) {
var commit = commitData[i];
if (commit === ref) {
Expand All@@ -421,19 +433,20 @@ define(['d3'], function() {
var matchedTag = function() {
for (var j = 0; j < commit.tags.length; j++) {
var tag = commit.tags[j];
if (tag === ref) {
if (matchesTag(ref, "heads", tag)) {
matchedCommit = commit;
return true;
}

if (tag.indexOf('[') === 0 && tag.indexOf(']') === tag.length - 1) {
tag = tag.substring(1, tag.length - 1);
}
if (tag === ref) {

if (matchesTag(ref, "tags", tag)) {
matchedCommit = commit;
return true;
}
}
}
}();
if (matchedTag === true) {
break;
Expand DownExpand Up@@ -861,7 +874,7 @@ define(['d3'], function() {
for (b = 0; b < this.branches.length; b++) {
branch = this.branches[b];
if (branch.indexOf('/') === -1) {
commit = this.getCommit(branch);
commit = this.getCommit("refs/heads/" + branch);
parent = this.getCommit(commit.parent);
parent2 = this.getCommit(commit.parent2);

Expand Down