rtyler
/
gh-board
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

🐛 fix env diffing

This commit is contained in:
Philip Schatz 2016-04-12 16:34:02 -04:00
parent 2f300c7a33
commit 7053706344
2 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/components/diff-envs.jsx
View File

@ -10,14 +10,12 @@ const DiffEnvs = React.createClass({
return Client.getAnonymousOcto().fromUrl(`https://${hostName}/rev.txt`).read().then((textFile) => {
const shaInfos = {};
textFile.split('\n').forEach((line) => {
let [repoName, updatedStr, toStr, sha] = line.split(' ');
let [repoName, atSymbol, sha] = line.split(' ');
if (repoName[0] === '/') {
repoName = repoName.substring(1);
}
if (repoName && sha) {
if (updatedStr !== 'updated') { throw new Error('BUG! looks like rev.txt is malformed'); }
if (toStr !== 'to') { throw new Error('BUG! looks like rev.txt is malformed'); }
// HACK: to account for the fact that rev.txt uses the old name for tutor-server
if (repoName === 'tutor') {
repoName = 'tutor-server';
}
if (atSymbol !== '@') { throw new Error('BUG! looks like rev.txt is malformed'); }
shaInfos[repoName] = sha;
}
});
@ -29,18 +27,37 @@ const DiffEnvs = React.createClass({
const allPromise = Promise.all([this.requestRev(startHost), this.requestRev(endHost)])
.then(([startShaInfos, endShaInfos]) => {
// Make sure repoInfos only contains repos that are in both the start and end
Object.keys(endShaInfos).forEach((key) => {
if (!startShaInfos[key]) {
delete endShaInfos[key];
}
})
Object.keys(startShaInfos).forEach((key) => {
if (!endShaInfos[key]) {
delete startShaInfos[key];
}
})
// build up an array of shas
const repoInfos = Object.keys(endShaInfos).map((repoName) => {
let repoInfos = Object.keys(endShaInfos).map((repoPath) => {
// HACK: assume the org is openstax
return {repoOwner: 'openstax', repoName};
const [repoOwner, repoName] = repoPath.split('/');
return {repoOwner, repoName};
});
const startShas = repoInfos.map(({repoName}) => {
return startShaInfos[repoName];
const startShas = repoInfos.map(({repoOwner, repoName}) => {
return startShaInfos[`${repoOwner}/${repoName}`];
});
const endShas = repoInfos.map(({repoName}) => {
return endShaInfos[repoName];
const endShas = repoInfos.map(({repoOwner, repoName}) => {
return endShaInfos[`${repoOwner}/${repoName}`];
});
console.log('startShaInfos');
console.log(startShaInfos);
console.log('endShaInfos');
console.log(endShaInfos);
return {repoInfos, startShas, endShas};
});

12
src/components/merged-since.jsx
View File

@ -91,7 +91,17 @@ export const MergedSinceInner = React.createClass({
const allPromise = Promise.all(_.map(repoInfos, ({repoOwner, repoName}, i) => {
const startSha = startShas[i];
const endSha = endShas[i];
return Client.dbPromise().then(() => Client.getOcto().repos(repoOwner, repoName).compare(startSha, endSha).fetch());
return Client.dbPromise().then(() => {
return new Promise((resolve, reject) => {
Client.getOcto().repos(repoOwner, repoName).compare(startSha, endSha).fetch()
.then(resolve)
.catch((err) => {
// Some repositories are private so don't error, just silently fail
resolve({_UNABLE_TO_COMPARE:true, commits:[]});
});
});
});
}));
return (