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

new delays

Browse source
This commit is contained in:
Peter Cottle 2013-08-02 23:56:29 -07:00
parent d8e348363e
commit fbb0da00f4
7 changed files with 32 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

24
build/bundle.js
View file

@ -6071,24 +6071,24 @@ var initDemo = function(sandbox) {
} else if (params.hasOwnProperty('hgdemo')) {
commands = [
'importTreeNow {"branches":{"master":{"target":"C3","id":"master"},"feature":{"target":"C2","id":"feature"},"debug":{"target":"C4","id":"debug"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C2"],"id":"C4"}},"HEAD":{"target":"feature","id":"HEAD"}}',
'delay 7000',
'delay 1000',
'git rebase master',
'delay 2000',
'delay 1000',
'undo',
'hg book',
'delay 2000',
'delay 1000',
'hg rebase -d master'
];
commands = commands.join(';#').split('#'); // hax
} else if (params.hasOwnProperty('hgdemo2')) {
commands = [
'importTreeNow {"branches":{"master":{"target":"C3","id":"master"},"feature":{"target":"C2","id":"feature"},"debug":{"target":"C4","id":"debug"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C2"],"id":"C4"}},"HEAD":{"target":"debug","id":"HEAD"}}',
'delay 5000',
'delay 1000',
'git rebase master',
'delay 2000',
'delay 1000',
'undo',
'hg sum',
'delay 2000',
'delay 1000',
'hg rebase -d master'
];
commands = commands.join(';#').split('#'); // hax
@ -24088,24 +24088,24 @@ var initDemo = function(sandbox) {
} else if (params.hasOwnProperty('hgdemo')) {
commands = [
'importTreeNow {"branches":{"master":{"target":"C3","id":"master"},"feature":{"target":"C2","id":"feature"},"debug":{"target":"C4","id":"debug"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C2"],"id":"C4"}},"HEAD":{"target":"feature","id":"HEAD"}}',
'delay 7000',
'delay 1000',
'git rebase master',
'delay 2000',
'delay 1000',
'undo',
'hg book',
'delay 2000',
'delay 1000',
'hg rebase -d master'
];
commands = commands.join(';#').split('#'); // hax
} else if (params.hasOwnProperty('hgdemo2')) {
commands = [
'importTreeNow {"branches":{"master":{"target":"C3","id":"master"},"feature":{"target":"C2","id":"feature"},"debug":{"target":"C4","id":"debug"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C2"],"id":"C4"}},"HEAD":{"target":"debug","id":"HEAD"}}',
'delay 5000',
'delay 1000',
'git rebase master',
'delay 2000',
'delay 1000',
'undo',
'hg sum',
'delay 2000',
'delay 1000',
'hg rebase -d master'
];
commands = commands.join(';#').split('#'); // hax

2
build/bundle.min.0f9e6599.js → build/bundle.min.dfe3f962.js
View file

File diff suppressed because one or more lines are too long

2
build/bundle.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
index.html
View file

@ -445,7 +445,7 @@
For a much easier time perusing the source, see the individual files at:
https://github.com/pcottle/learnGitBranching
-->
<script src="build/bundle.min.0f9e6599.js"></script>
<script src="build/bundle.min.dfe3f962.js"></script>
<!-- The advantage of github pages: super-easy, simple, slick static hostic.
The downside? No raw logs to parse for analytics, so I have to include

10
spec/base.js Normal file
View file

@ -0,0 +1,10 @@
var loadTree = function(json) {
return JSON.parse(unescape(json));
};
var TIME = 150;
// useful for throwing garbage and then expecting one commit
var oneCommit = '{"branches":{"master":{"target":"C2","id":"master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"master","id":"HEAD"}}';

12
src/js/app/index.js
View file

@ -139,24 +139,24 @@ var initDemo = function(sandbox) {
} else if (params.hasOwnProperty('hgdemo')) {
commands = [
'importTreeNow {"branches":{"master":{"target":"C3","id":"master"},"feature":{"target":"C2","id":"feature"},"debug":{"target":"C4","id":"debug"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C2"],"id":"C4"}},"HEAD":{"target":"feature","id":"HEAD"}}',
'delay 7000',
'delay 1000',
'git rebase master',
'delay 2000',
'delay 1000',
'undo',
'hg book',
'delay 2000',
'delay 1000',
'hg rebase -d master'
];
commands = commands.join(';#').split('#'); // hax
} else if (params.hasOwnProperty('hgdemo2')) {
commands = [
'importTreeNow {"branches":{"master":{"target":"C3","id":"master"},"feature":{"target":"C2","id":"feature"},"debug":{"target":"C4","id":"debug"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C2"],"id":"C4"}},"HEAD":{"target":"debug","id":"HEAD"}}',
'delay 5000',
'delay 1000',
'git rebase master',
'delay 2000',
'delay 1000',
'undo',
'hg sum',
'delay 2000',
'delay 1000',
'hg rebase -d master'
];
commands = commands.join(';#').split('#'); // hax

1
todo.txt
View file

@ -17,6 +17,7 @@ Origin things:
Medium things:
~~~~~~~~~~~~~~~~~~~~~~~~~~~
[ ] figure out what to do with instant commands (and parse waterfall and the like)
[ ] test coverage for hg!!!
Cases to handle / things to edit
=======================