Skip to content
This repository was archived by the owner on Jul 13, 2024. It is now read-only.

Commit 4ab6597

Browse files
nicoespeonnicoespeon
committed
Merge develop into master
2 parents a9a27fd + 20ff48b commit 4ab6597

13 files changed

+216
-73
lines changed

‎bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gitgraph.js",
3-
"version": "1.5.0",
3+
"version": "1.6.0",
44
"main": [ "./build/gitgraph.js", "./build/gitgraph.css" ],
55
"ignore": [
66
"**/.*"

‎build/gitgraph.js

+40-18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ==========================================================
2-
* GitGraph v1.5.0
2+
* GitGraph v1.6.0
33
* https://github.com/nicoespeon/gitgraph.js
44
* ==========================================================
55
* Copyright (c) 2016 Nicolas CARLO (@nicoespeon) ٩(^‿^)۶
@@ -833,6 +833,7 @@
833833
*
834834
* @param {Branch} [target = this.parent.HEAD]
835835
* @param {(String | Object)} [commitOptions] - Message | Options of commit
836+
* @param {Boolean} [commitOptions.fastForward=false] - If true, merge should use fast-forward if possible
836837
*
837838
* @this Branch
838839
*
@@ -859,26 +860,47 @@
859860
commitOptions.type = "mergeCommit";
860861
commitOptions.parentCommit = this.commits.slice( -1 )[ 0 ];
861862

862-
targetBranch.commit( commitOptions );
863+
var branchParentCommit = this.commits[0].parentCommit;
864+
var parentBranchLastCommit = targetBranch.commits.slice( -1 )[ 0 ];
865+
var isFastForwardPossible = (branchParentCommit.sha1 === parentBranchLastCommit.sha1);
866+
if (commitOptions.fastForward && isFastForwardPossible) {
867+
this.color = targetBranch.color;
868+
869+
// Make branch path follow target branch ones
870+
var targetBranchX = targetBranch.path[1].x;
871+
this.path.forEach(function (point) {
872+
point.x = targetBranchX;
873+
});
874+
875+
this.commits.forEach(function (commit) {
876+
commit.x = branchParentCommit.x;
877+
commit.labelColor = branchParentCommit.labelColor;
878+
commit.messageColor = branchParentCommit.messageColor;
879+
commit.dotColor = branchParentCommit.dotColor;
880+
commit.dotStrokeColor = branchParentCommit.dotStrokeColor;
881+
});
882+
} else {
883+
targetBranch.commit( commitOptions );
863884

864-
// Add points to path
865-
var targetCommit = targetBranch.commits.slice( -1 )[ 0 ];
866-
var endOfBranch = {
867-
x: this.offsetX + this.template.commit.spacingX * (targetCommit.showLabel ? 3 : 2) - this.parent.commitOffsetX,
868-
y: this.offsetY + this.template.commit.spacingY * (targetCommit.showLabel ? 3 : 2) - this.parent.commitOffsetY,
869-
type: "join"
870-
};
871-
this.pushPath( JSON.parse( JSON.stringify( endOfBranch ) ) ); // Elegant way for cloning an object
885+
// Add points to path
886+
var targetCommit = targetBranch.commits.slice( -1 )[ 0 ];
887+
var endOfBranch = {
888+
x: this.offsetX + this.template.commit.spacingX * (targetCommit.showLabel ? 3 : 2) - this.parent.commitOffsetX,
889+
y: this.offsetY + this.template.commit.spacingY * (targetCommit.showLabel ? 3 : 2) - this.parent.commitOffsetY,
890+
type: "join"
891+
};
892+
this.pushPath( JSON.parse( JSON.stringify( endOfBranch ) ) ); // Elegant way for cloning an object
872893

873-
var mergeCommit = {
874-
x: targetCommit.x,
875-
y: targetCommit.y,
876-
type: "end"
877-
};
878-
this.pushPath( mergeCommit );
894+
var mergeCommit = {
895+
x: targetCommit.x,
896+
y: targetCommit.y,
897+
type: "end"
898+
};
899+
this.pushPath( mergeCommit );
879900

880-
endOfBranch.type = "start";
881-
this.pushPath( endOfBranch ); // End of branch for future commits
901+
endOfBranch.type = "start";
902+
this.pushPath( endOfBranch ); // End of branch for future commits
903+
}
882904

883905
// Auto-render
884906
this.parent.render();

‎build/gitgraph.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/Branch.html

+73-5
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ <h5>This:</h5>
566566

567567
<dt class="tag-source">Source:</dt>
568568
<dd class="tag-source"><ul class="dummy"><li>
569-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line888">line 888</a>
569+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line910">line 910</a>
570570
</li></ul></dd>
571571

572572

@@ -1061,7 +1061,75 @@ <h5>Parameters:</h5>
10611061
</td>
10621062

10631063

1064-
<td class="description last"><p>Message | Options of commit</p></td>
1064+
<td class="description last"><p>Message | Options of commit</p>
1065+
<h6>Properties</h6>
1066+
1067+
1068+
<table class="params">
1069+
<thead>
1070+
<tr>
1071+
1072+
<th>Name</th>
1073+
1074+
1075+
<th>Type</th>
1076+
1077+
1078+
<th>Argument</th>
1079+
1080+
1081+
1082+
<th>Default</th>
1083+
1084+
1085+
<th class="last">Description</th>
1086+
</tr>
1087+
</thead>
1088+
1089+
<tbody>
1090+
1091+
1092+
<tr>
1093+
1094+
<td class="name"><code>fastForward</code></td>
1095+
1096+
1097+
<td class="type">
1098+
1099+
1100+
<span class="param-type">Boolean</span>
1101+
1102+
1103+
1104+
</td>
1105+
1106+
1107+
<td class="attributes">
1108+
1109+
&lt;optional><br>
1110+
1111+
1112+
1113+
1114+
1115+
</td>
1116+
1117+
1118+
1119+
<td class="default">
1120+
1121+
false
1122+
1123+
</td>
1124+
1125+
1126+
<td class="description last"><p>If true, merge should use fast-forward if possible</p></td>
1127+
</tr>
1128+
1129+
1130+
</tbody>
1131+
</table>
1132+
</td>
10651133
</tr>
10661134

10671135

@@ -1092,7 +1160,7 @@ <h5>Parameters:</h5>
10921160

10931161
<dt class="tag-source">Source:</dt>
10941162
<dd class="tag-source"><ul class="dummy"><li>
1095-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line831">line 831</a>
1163+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line832">line 832</a>
10961164
</li></ul></dd>
10971165

10981166

@@ -1187,7 +1255,7 @@ <h5>This:</h5>
11871255

11881256
<dt class="tag-source">Source:</dt>
11891257
<dd class="tag-source"><ul class="dummy"><li>
1190-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line913">line 913</a>
1258+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line935">line 935</a>
11911259
</li></ul></dd>
11921260

11931261

@@ -1306,7 +1374,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
13061374
<br clear="both">
13071375

13081376
<footer>
1309-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 09 2016 08:47:33 GMT+0100 (CET)
1377+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 16 2016 13:45:44 GMT+0100 (CET)
13101378
</footer>
13111379

13121380
<script> prettyPrint(); </script>

‎docs/Commit.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -1335,7 +1335,7 @@ <h6>Properties</h6>
13351335

13361336
<dt class="tag-source">Source:</dt>
13371337
<dd class="tag-source"><ul class="dummy"><li>
1338-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line987">line 987</a>
1338+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1009">line 1009</a>
13391339
</li></ul></dd>
13401340

13411341

@@ -1425,7 +1425,7 @@ <h5>This:</h5>
14251425

14261426
<dt class="tag-source">Source:</dt>
14271427
<dd class="tag-source"><ul class="dummy"><li>
1428-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1119">line 1119</a>
1428+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1141">line 1141</a>
14291429
</li></ul></dd>
14301430

14311431

@@ -1497,7 +1497,7 @@ <h5>This:</h5>
14971497

14981498
<dt class="tag-source">Source:</dt>
14991499
<dd class="tag-source"><ul class="dummy"><li>
1500-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1038">line 1038</a>
1500+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1060">line 1060</a>
15011501
</li></ul></dd>
15021502

15031503

@@ -1544,7 +1544,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
15441544
<br clear="both">
15451545

15461546
<footer>
1547-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 09 2016 08:47:33 GMT+0100 (CET)
1547+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 16 2016 13:45:44 GMT+0100 (CET)
15481548
</footer>
15491549

15501550
<script> prettyPrint(); </script>

‎docs/GitGraph.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1696,7 +1696,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
16961696
<br clear="both">
16971697

16981698
<footer>
1699-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 09 2016 08:47:34 GMT+0100 (CET)
1699+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 16 2016 13:45:44 GMT+0100 (CET)
17001700
</footer>
17011701

17021702
<script> prettyPrint(); </script>

‎docs/Template.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1093,7 +1093,7 @@ <h6>Properties</h6>
10931093

10941094
<dt class="tag-source">Source:</dt>
10951095
<dd class="tag-source"><ul class="dummy"><li>
1096-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1235">line 1235</a>
1096+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1257">line 1257</a>
10971097
</li></ul></dd>
10981098

10991099

@@ -1228,7 +1228,7 @@ <h5>Parameters:</h5>
12281228

12291229
<dt class="tag-source">Source:</dt>
12301230
<dd class="tag-source"><ul class="dummy"><li>
1231-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1315">line 1315</a>
1231+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1337">line 1337</a>
12321232
</li></ul></dd>
12331233

12341234

@@ -1297,7 +1297,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
12971297
<br clear="both">
12981298

12991299
<footer>
1300-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 09 2016 08:47:34 GMT+0100 (CET)
1300+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 16 2016 13:45:44 GMT+0100 (CET)
13011301
</footer>
13021302

13031303
<script> prettyPrint(); </script>

‎docs/gitgraph.js.html

+40-18
Original file line numberDiff line numberDiff line change
@@ -850,6 +850,7 @@ <h1 class="page-title">Source: gitgraph.js</h1>
850850
*
851851
* @param {Branch} [target = this.parent.HEAD]
852852
* @param {(String | Object)} [commitOptions] - Message | Options of commit
853+
* @param {Boolean} [commitOptions.fastForward=false] - If true, merge should use fast-forward if possible
853854
*
854855
* @this Branch
855856
*
@@ -876,26 +877,47 @@ <h1 class="page-title">Source: gitgraph.js</h1>
876877
commitOptions.type = "mergeCommit";
877878
commitOptions.parentCommit = this.commits.slice( -1 )[ 0 ];
878879

879-
targetBranch.commit( commitOptions );
880+
var branchParentCommit = this.commits[0].parentCommit;
881+
var parentBranchLastCommit = targetBranch.commits.slice( -1 )[ 0 ];
882+
var isFastForwardPossible = (branchParentCommit.sha1 === parentBranchLastCommit.sha1);
883+
if (commitOptions.fastForward && isFastForwardPossible) {
884+
this.color = targetBranch.color;
885+
886+
// Make branch path follow target branch ones
887+
var targetBranchX = targetBranch.path[1].x;
888+
this.path.forEach(function (point) {
889+
point.x = targetBranchX;
890+
});
891+
892+
this.commits.forEach(function (commit) {
893+
commit.x = branchParentCommit.x;
894+
commit.labelColor = branchParentCommit.labelColor;
895+
commit.messageColor = branchParentCommit.messageColor;
896+
commit.dotColor = branchParentCommit.dotColor;
897+
commit.dotStrokeColor = branchParentCommit.dotStrokeColor;
898+
});
899+
} else {
900+
targetBranch.commit( commitOptions );
880901

881-
// Add points to path
882-
var targetCommit = targetBranch.commits.slice( -1 )[ 0 ];
883-
var endOfBranch = {
884-
x: this.offsetX + this.template.commit.spacingX * (targetCommit.showLabel ? 3 : 2) - this.parent.commitOffsetX,
885-
y: this.offsetY + this.template.commit.spacingY * (targetCommit.showLabel ? 3 : 2) - this.parent.commitOffsetY,
886-
type: "join"
887-
};
888-
this.pushPath( JSON.parse( JSON.stringify( endOfBranch ) ) ); // Elegant way for cloning an object
902+
// Add points to path
903+
var targetCommit = targetBranch.commits.slice( -1 )[ 0 ];
904+
var endOfBranch = {
905+
x: this.offsetX + this.template.commit.spacingX * (targetCommit.showLabel ? 3 : 2) - this.parent.commitOffsetX,
906+
y: this.offsetY + this.template.commit.spacingY * (targetCommit.showLabel ? 3 : 2) - this.parent.commitOffsetY,
907+
type: "join"
908+
};
909+
this.pushPath( JSON.parse( JSON.stringify( endOfBranch ) ) ); // Elegant way for cloning an object
889910

890-
var mergeCommit = {
891-
x: targetCommit.x,
892-
y: targetCommit.y,
893-
type: "end"
894-
};
895-
this.pushPath( mergeCommit );
911+
var mergeCommit = {
912+
x: targetCommit.x,
913+
y: targetCommit.y,
914+
type: "end"
915+
};
916+
this.pushPath( mergeCommit );
896917

897-
endOfBranch.type = "start";
898-
this.pushPath( endOfBranch ); // End of branch for future commits
918+
endOfBranch.type = "start";
919+
this.pushPath( endOfBranch ); // End of branch for future commits
920+
}
899921

900922
// Auto-render
901923
this.parent.render();
@@ -1464,7 +1486,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
14641486
<br clear="both">
14651487

14661488
<footer>
1467-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 09 2016 08:47:33 GMT+0100 (CET)
1489+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 16 2016 13:45:44 GMT+0100 (CET)
14681490
</footer>
14691491

14701492
<script> prettyPrint(); </script>

‎docs/global.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
10071007
<br clear="both">
10081008

10091009
<footer>
1010-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 09 2016 08:47:33 GMT+0100 (CET)
1010+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 16 2016 13:45:44 GMT+0100 (CET)
10111011
</footer>
10121012

10131013
<script> prettyPrint(); </script>

‎docs/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
131131
<br clear="both">
132132

133133
<footer>
134-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 09 2016 08:47:33 GMT+0100 (CET)
134+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 16 2016 13:45:44 GMT+0100 (CET)
135135
</footer>
136136

137137
<script> prettyPrint(); </script>

‎examples/index.js

+10-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,16 @@ test.commit( "Final commit" );
112112
test.merge( master, "My special merge commit message" );
113113

114114
// Then, continue committing on the "test" branch
115-
test.commit( { message: "It works !" } );
115+
test.commit({ message: "It works !" });
116+
117+
var fastForwardBranch = test.branch("fast-forward");
118+
fastForwardBranch.commit("First commit on FF branch");
119+
fastForwardBranch.commit("Second commit on FF branch");
120+
121+
// If not commented, it will prevent fast-forward
122+
// test.commit("Make Fast Forward impossible");
123+
124+
fastForwardBranch.merge(test, { fastForward: true });
116125

117126
/***********************
118127
* TAGS *

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gitgraph.js",
3-
"version": "1.5.0",
3+
"version": "1.6.0",
44
"author": "Nicolas Carlo <nicolascarlo.espeon@gmail.com>",
55
"description": "A JavaScript library to draw pretty git graphs in the browser",
66
"contributors": [

0 commit comments

Comments
 (0)