mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-25 23:48:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

color animation

Browse source
This commit is contained in:
Peter Cottle 2013-09-01 12:24:20 -07:00
parent 9ee683a29f
commit 3ff56c002c
2 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
build/bundle.js
View file

@ -8121,7 +8121,6 @@ GitEngine.prototype.push = function(options) {
GitEngine.prototype.fetch = function(options) { GitEngine.prototype.fetch = function(options) {
options = options || {}; options = options || {};
var localBranch = this.refs['o/master'];
// fetch all local branches // fetch all local branches
var allRemotes = this.branchCollection.filter(function(branch) { var allRemotes = this.branchCollection.filter(function(branch) {
@ -8191,7 +8190,13 @@ GitEngine.prototype.fetch = function(options) {
var deferred = Q.defer(); var deferred = Q.defer();
var chain = deferred.promise; var chain = deferred.promise;
var originBranchSet = this.origin.getUpstreamBranchSet();
_.each(commitsToMake, function(commitJSON) { _.each(commitsToMake, function(commitJSON) {
// technically we could grab the wrong one here
// but this works for now
var originBranch = originBranchSet[commitJSON.id][0].obj;
var localBranch = this.refs[originBranch.getPrefixedID()];
chain = chain.then(_.bind(function() { chain = chain.then(_.bind(function() {
return this.animationFactory.playHighlightPromiseAnimation( return this.animationFactory.playHighlightPromiseAnimation(
this.origin.refs[commitJSON.id], this.origin.refs[commitJSON.id],
@ -26566,7 +26571,6 @@ GitEngine.prototype.push = function(options) {
GitEngine.prototype.fetch = function(options) { GitEngine.prototype.fetch = function(options) {
options = options || {}; options = options || {};
var localBranch = this.refs['o/master'];
// fetch all local branches // fetch all local branches
var allRemotes = this.branchCollection.filter(function(branch) { var allRemotes = this.branchCollection.filter(function(branch) {
@ -26636,7 +26640,13 @@ GitEngine.prototype.fetch = function(options) {
var deferred = Q.defer(); var deferred = Q.defer();
var chain = deferred.promise; var chain = deferred.promise;
var originBranchSet = this.origin.getUpstreamBranchSet();
_.each(commitsToMake, function(commitJSON) { _.each(commitsToMake, function(commitJSON) {
// technically we could grab the wrong one here
// but this works for now
var originBranch = originBranchSet[commitJSON.id][0].obj;
var localBranch = this.refs[originBranch.getPrefixedID()];
chain = chain.then(_.bind(function() { chain = chain.then(_.bind(function() {
return this.animationFactory.playHighlightPromiseAnimation( return this.animationFactory.playHighlightPromiseAnimation(
this.origin.refs[commitJSON.id], this.origin.refs[commitJSON.id],

8
src/js/git/index.js
View file

@ -901,7 +901,6 @@ GitEngine.prototype.push = function(options) {
GitEngine.prototype.fetch = function(options) { GitEngine.prototype.fetch = function(options) {
options = options || {}; options = options || {};
var localBranch = this.refs['o/master'];
// fetch all local branches // fetch all local branches
var allRemotes = this.branchCollection.filter(function(branch) { var allRemotes = this.branchCollection.filter(function(branch) {
@ -937,7 +936,6 @@ GitEngine.prototype.fetch = function(options) {
// command simply commits), but we are doing it anyways for correctness // command simply commits), but we are doing it anyways for correctness
commitsToMake = this.getUniqueObjects(commitsToMake); commitsToMake = this.getUniqueObjects(commitsToMake);
commitsToMake = this.descendSortDepth(commitsToMake); commitsToMake = this.descendSortDepth(commitsToMake);
console.log('ocmmits', commitsToMake);
if (commitsToMake.length === 0) { if (commitsToMake.length === 0) {
this.command.addWarning(intl.str( this.command.addWarning(intl.str(
@ -972,7 +970,13 @@ GitEngine.prototype.fetch = function(options) {
var deferred = Q.defer(); var deferred = Q.defer();
var chain = deferred.promise; var chain = deferred.promise;
var originBranchSet = this.origin.getUpstreamBranchSet();
_.each(commitsToMake, function(commitJSON) { _.each(commitsToMake, function(commitJSON) {
// technically we could grab the wrong one here
// but this works for now
var originBranch = originBranchSet[commitJSON.id][0].obj;
var localBranch = this.refs[originBranch.getPrefixedID()];
chain = chain.then(_.bind(function() { chain = chain.then(_.bind(function() {
return this.animationFactory.playHighlightPromiseAnimation( return this.animationFactory.playHighlightPromiseAnimation(
this.origin.refs[commitJSON.id], this.origin.refs[commitJSON.id],