mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-06-22 22:23:29 +02:00
b9f8e19162
This changes the implementation of the "log" command to use the RevisionRange functionality. RevisionRange sorts the results in order of reverse create time, to match real git. This is a change from the previous implementation of log, which essentially produced a breadth-first ordering.
379 lines
24 KiB
JavaScript
379 lines
24 KiB
JavaScript
var base = require('./base');
|
|
var expectTreeAsync = base.expectTreeAsync;
|
|
var runCommand = base.runCommand;
|
|
|
|
describe('Git', function() {
|
|
it('Commits', function() {
|
|
expectTreeAsync(
|
|
'git commit',
|
|
base.ONE_COMMIT_TREE
|
|
);
|
|
});
|
|
|
|
it('handles commit options', function() {
|
|
expectTreeAsync(
|
|
'git commit; git commit --amend;',
|
|
'%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C2%27%22%2C%22id%22%3A%22master%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C2%27%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%7D'
|
|
);
|
|
});
|
|
|
|
it('throws with bad arg options', function() {
|
|
expectTreeAsync(
|
|
'git commit foo; git commit -am -m; git commit -am -a; git commit -am "hi" "ho"; git commit',
|
|
base.ONE_COMMIT_TREE
|
|
);
|
|
});
|
|
|
|
it('handles lower case branch options', function() {
|
|
expectTreeAsync(
|
|
'git branch banana c0; git commit; git checkout -b side banana; git branch -d banana;git branch -f another c1; git commit',
|
|
'{"branches":{"master":{"target":"C2","id":"master"},"side":{"target":"C3","id":"side"},"another":{"target":"C1","id":"another"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C0"],"id":"C3"}},"HEAD":{"target":"side","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
it('handles branch options', function() {
|
|
expectTreeAsync(
|
|
'git branch banana C0; git commit; git checkout -b side banana; git branch -d banana;git branch -f another C1; git commit',
|
|
'{"branches":{"master":{"target":"C2","id":"master"},"side":{"target":"C3","id":"side"},"another":{"target":"C1","id":"another"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C0"],"id":"C3"}},"HEAD":{"target":"side","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
it('does add', function() {
|
|
expectTreeAsync(
|
|
'git add; git commit',
|
|
base.ONE_COMMIT_TREE
|
|
);
|
|
});
|
|
|
|
it('resets with all options', function() {
|
|
expectTreeAsync(
|
|
'git commit;git reset --soft HEAD~1;git reset --hard HEAD~1;gc;go C1;git reset --hard C3;',
|
|
'{"branches":{"master":{"target":"C3","id":"master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"}},"HEAD":{"target":"C1","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
it('Checkouts', function() {
|
|
expectTreeAsync(
|
|
'git checkout -b side',
|
|
'{"branches":{"master":{"target":"C1","id":"master"},"side":{"target":"C1","id":"side"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"side","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
it('Rebases', function() {
|
|
expectTreeAsync(
|
|
'gc; git checkout -b side C1; gc; git rebase master',
|
|
'%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C2%22%2C%22id%22%3A%22master%22%7D%2C%22side%22%3A%7B%22target%22%3A%22C3%27%22%2C%22id%22%3A%22side%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22side%22%2C%22id%22%3A%22HEAD%22%7D%7D'
|
|
);
|
|
});
|
|
|
|
it('Interactive rebase', function() {
|
|
expectTreeAsync(
|
|
'gc; git checkout -b side C1; gc; git rebase -i master --interactive-test',
|
|
'%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C2%22%2C%22id%22%3A%22master%22%7D%2C%22side%22%3A%7B%22target%22%3A%22C3%27%22%2C%22id%22%3A%22side%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22side%22%2C%22id%22%3A%22HEAD%22%7D%7D'
|
|
);
|
|
});
|
|
|
|
it('Interactive rebases with commit re-ordering', function() {
|
|
expectTreeAsync(
|
|
'gc;gc;git rebase -i C0 --interactive-test C3,C1',
|
|
'%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C1%27%22%2C%22id%22%3A%22master%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C3%27%22%7D%2C%22C1%27%22%3A%7B%22parents%22%3A%5B%22C3%27%22%5D%2C%22id%22%3A%22C1%27%22%7D%7D%2C%22tags%22%3A%7B%7D%2C%22HEAD%22%3A%7B%22id%22%3A%22HEAD%22%2C%22target%22%3A%22master%22%7D%7D'
|
|
);
|
|
});
|
|
|
|
it('Switch branch and execute interactive rebase', function() {
|
|
expectTreeAsync(
|
|
'git branch test;git rebase -i C0 test --interactive-test',
|
|
'%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C1%22%2C%22id%22%3A%22master%22%7D%2C%22test%22%3A%7B%22target%22%3A%22C1%27%22%2C%22id%22%3A%22test%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C1%27%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%27%22%7D%7D%2C%22tags%22%3A%7B%7D%2C%22HEAD%22%3A%7B%22id%22%3A%22HEAD%22%2C%22target%22%3A%22test%22%7D%7D'
|
|
);
|
|
});
|
|
|
|
it('Reverts', function() {
|
|
expectTreeAsync(
|
|
'git revert HEAD',
|
|
'%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C1%27%22%2C%22id%22%3A%22master%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C1%27%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C1%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%7D'
|
|
);
|
|
});
|
|
|
|
it('Merges', function() {
|
|
expectTreeAsync(
|
|
'gc; git checkout -b side C1; gc; git merge master',
|
|
'{"branches":{"master":{"target":"C2","id":"master"},"side":{"target":"C4","id":"side"}},"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","C3"],"id":"C4"}},"HEAD":{"target":"side","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
it('Resets', function() {
|
|
expectTreeAsync(
|
|
'git commit; git reset HEAD~1',
|
|
'{"branches":{"master":{"target":"C1","id":"master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"master","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
it('Branches', function() {
|
|
expectTreeAsync(
|
|
'git branch side C0',
|
|
'{"branches":{"master":{"target":"C1","id":"master"},"side":{"target":"C0","id":"side"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"master","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
it('Branches lowercase', function() {
|
|
expectTreeAsync(
|
|
'git branch side c0',
|
|
'{"branches":{"master":{"target":"C1","id":"master"},"side":{"target":"C0","id":"side"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"master","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
it('Deletes branches', function() {
|
|
expectTreeAsync(
|
|
'git branch side; git branch -d side',
|
|
'{"branches":{"master":{"target":"C1","id":"master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"master","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
it('Amends commits', function() {
|
|
expectTreeAsync(
|
|
'git commit --amend',
|
|
'%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C1%27%22%2C%22id%22%3A%22master%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C1%27%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%7D'
|
|
);
|
|
});
|
|
|
|
it('Cherry picks', function() {
|
|
expectTreeAsync(
|
|
'git checkout -b side C0; gc; git cherry-pick C11; git cherry-pick C1',
|
|
'%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C1%22%2C%22id%22%3A%22master%22%7D%2C%22side%22%3A%7B%22target%22%3A%22C1%27%22%2C%22id%22%3A%22side%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C1%27%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C1%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22side%22%2C%22id%22%3A%22HEAD%22%7D%7D'
|
|
);
|
|
});
|
|
|
|
it('Forces branches', function() {
|
|
expectTreeAsync(
|
|
'git checkout -b side; git branch -f side C0',
|
|
'{"branches":{"master":{"target":"C1","id":"master"},"side":{"target":"C0","id":"side"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"side","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
it('Rebases only new commits to destination', function() {
|
|
expectTreeAsync(
|
|
'git checkout -b side C0; gc; gc;git cherry-pick C1;git rebase master',
|
|
'%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C1%22%2C%22id%22%3A%22master%22%7D%2C%22side%22%3A%7B%22target%22%3A%22C3%27%22%2C%22id%22%3A%22side%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C1%27%22%3A%7B%22parents%22%3A%5B%22C3%22%5D%2C%22id%22%3A%22C1%27%22%7D%2C%22C2%27%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%27%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C2%27%22%5D%2C%22id%22%3A%22C3%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22side%22%2C%22id%22%3A%22HEAD%22%7D%7D'
|
|
);
|
|
});
|
|
|
|
it('checks out after a rebase', function() {
|
|
expectTreeAsync(
|
|
'git commit; git checkout -b bugFix C1; git commit; git rebase master;git checkout master',
|
|
'%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C2%22%2C%22id%22%3A%22master%22%7D%2C%22bugFix%22%3A%7B%22target%22%3A%22C3%27%22%2C%22id%22%3A%22bugFix%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%7D'
|
|
);
|
|
});
|
|
|
|
it('checks out after an interactive rebase', function() {
|
|
expectTreeAsync(
|
|
'git commit; git checkout -b bugFix C1; git commit; git rebase -i master --interactive-test;git checkout master',
|
|
'%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C2%22%2C%22id%22%3A%22master%22%7D%2C%22bugFix%22%3A%7B%22target%22%3A%22C3%27%22%2C%22id%22%3A%22bugFix%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%7D'
|
|
);
|
|
});
|
|
|
|
it('solves merging level', function() {
|
|
expectTreeAsync(
|
|
'git checkout -b bugFix;git commit;git checkout master;git commit;git merge bugFix',
|
|
'{"branches":{"master":{"target":"C1","id":"master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"master","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
it('solves rebase level', function() {
|
|
expectTreeAsync(
|
|
'git checkout -b bugFix;git commit;git checkout master;git commit;git checkout bugFix;git rebase master',
|
|
'{"branches":{"master":{"target":"C1","id":"master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"master","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
it('solves rebase level with interactive rebase', function() {
|
|
expectTreeAsync(
|
|
'git checkout -b bugFix;git commit;git checkout master;git commit;git checkout bugFix;git rebase -i master --interactive-test',
|
|
'{"branches":{"master":{"target":"C1","id":"master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"master","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
it('does a whole bunch of crazy merging', function() {
|
|
expectTreeAsync(
|
|
'gc;go -b side C1;gc;git merge master;go -b bug master;gc;go -b wut C3;git rebase bug;go side;git rebase wut;gc;git rebase wut;git merge C4;go master;git rebase side;go C6;git merge C3\';gb -f wut C8;go bug;git rebase wut',
|
|
'%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C7%22%2C%22id%22%3A%22master%22%7D%2C%22side%22%3A%7B%22target%22%3A%22C7%22%2C%22id%22%3A%22side%22%7D%2C%22bug%22%3A%7B%22target%22%3A%22C8%22%2C%22id%22%3A%22bug%22%7D%2C%22wut%22%3A%7B%22target%22%3A%22C8%22%2C%22id%22%3A%22wut%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C4%22%3A%7B%22parents%22%3A%5B%22C2%22%2C%22C3%22%5D%2C%22id%22%3A%22C4%22%7D%2C%22C5%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C5%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C5%22%5D%2C%22id%22%3A%22C3%27%22%7D%2C%22C6%22%3A%7B%22parents%22%3A%5B%22C4%22%5D%2C%22id%22%3A%22C6%22%7D%2C%22C6%27%22%3A%7B%22parents%22%3A%5B%22C3%27%22%5D%2C%22id%22%3A%22C6%27%22%7D%2C%22C7%22%3A%7B%22parents%22%3A%5B%22C4%22%2C%22C6%27%22%5D%2C%22id%22%3A%22C7%22%7D%2C%22C8%22%3A%7B%22parents%22%3A%5B%22C3%27%22%2C%22C6%22%5D%2C%22id%22%3A%22C8%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22bug%22%2C%22id%22%3A%22HEAD%22%7D%7D'
|
|
);
|
|
});
|
|
|
|
it('if no-ff is specified, will always make a merge commit', function() {
|
|
expectTreeAsync(
|
|
'git commit; go -b side HEAD~1; git commit; git merge master; go master; git merge side --no-ff',
|
|
'{"branches":{"master":{"target":"C5","id":"master","remoteTrackingBranchID":null},"side":{"target":"C4","id":"side","remoteTrackingBranchID":null}},"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","C3"],"id":"C4"},"C5":{"parents":["C2","C4"],"id":"C5"}},"HEAD":{"target":"master","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
it('makes a tag', function() {
|
|
expectTreeAsync(
|
|
'git tag v1',
|
|
'{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"tags":{"v1":{"target":"C1","id":"v1","type":"tag"}},"HEAD":{"target":"master","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
it('makes a tag on another ref', function() {
|
|
expectTreeAsync(
|
|
'git tag v1 C0',
|
|
'{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"tags":{"v1":{"target":"C0","id":"v1","type":"tag"}},"HEAD":{"target":"master","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
it('doesn\'t make a tag if ref doesn\'t resolve', function() {
|
|
expectTreeAsync(
|
|
'git tag v1 foo',
|
|
'{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"tags":{},"HEAD":{"target":"master","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
it('makes tag with relative ref and etc', function() {
|
|
expectTreeAsync(
|
|
'git tag v1 HEAD~1',
|
|
'{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"tags":{"v1":{"target":"C0","id":"v1","type":"tag"}},"HEAD":{"target":"master","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
it('makes tag with 3 letters', function() {
|
|
expectTreeAsync(
|
|
'git tag foo',
|
|
'{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"tags":{"foo":{"target":"C1","id":"foo","type":"tag"}},"HEAD":{"target":"master","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
it('does not make tag if ref does not resolve', function() {
|
|
expectTreeAsync(
|
|
'git tag foo banana',
|
|
'{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"tags":{},"HEAD":{"target":"master","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
it('should respect second command for -B option', function() {
|
|
expectTreeAsync(
|
|
'git commit; git checkout -B side C1',
|
|
'{"branches":{"master":{"target":"C2","id":"master","remoteTrackingBranchID":null},"side":{"target":"C1","id":"side","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"tags":{},"HEAD":{"target":"side","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
it('will throw error if bad commits given to interactive test', function() {
|
|
expectTreeAsync(
|
|
'gc; git rebase HEAD~2 -i --interactive-test C2,C100; gc',
|
|
'{"branches":{"master":{"target":"C3","id":"master","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C2"],"id":"C3"}},"tags":{},"HEAD":{"target":"master","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
it('can handle slashes and dashes in branch names but doesn\'t allow o/', function() {
|
|
expectTreeAsync(
|
|
'git branch foo/bar; git commit; git checkout foo/bar; gc; go master; git merge foo/bar; go foo/bar; git checkout -b bar-baz; git commit; git branch o/foo',
|
|
'{"branches":{"master":{"target":"C4","id":"master","remoteTrackingBranchID":null},"foo/bar":{"target":"C3","id":"foo/bar","remoteTrackingBranchID":null},"bar-baz":{"target":"C5","id":"bar-baz","remoteTrackingBranchID":null}},"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","C3"],"id":"C4"},"C5":{"parents":["C3"],"id":"C5"}},"tags":{},"HEAD":{"target":"bar-baz","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
it('the regex allows for multiple dashes but not in a row', function() {
|
|
expectTreeAsync(
|
|
'git branch foo-bar-banana-baz; gc; git branch foo----bar//baz',
|
|
'{"branches":{"master":{"target":"C2","id":"master","remoteTrackingBranchID":null},"foo-bar-b":{"target":"C1","id":"foo-bar-b","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"tags":{},"HEAD":{"target":"master","id":"HEAD"}}'
|
|
);
|
|
});
|
|
|
|
describe('RevList', function() {
|
|
|
|
it('requires at least 1 argument', function() {
|
|
runCommand('git rev-list', function(commandMsg) {
|
|
expect(commandMsg).toContain('at least 1');
|
|
});
|
|
});
|
|
|
|
describe('supports', function() {
|
|
var SETUP = 'git co -b left C0; gc; git merge master; git co -b right C0; gc; git merge master; git co -b all left; git merge right; ';
|
|
|
|
it('single included revision', function() {
|
|
runCommand(SETUP + 'git rev-list all', function(commandMsg) {
|
|
expect(commandMsg).toBe('C6\nC5\nC4\nC3\nC2\nC1\nC0\n');
|
|
});
|
|
});
|
|
|
|
it('single excluded revision', function() {
|
|
runCommand(SETUP + 'git rev-list all ^right', function(commandMsg) {
|
|
expect(commandMsg).toBe('C6\nC3\nC2\n');
|
|
});
|
|
});
|
|
|
|
it('multiple included revisions', function() {
|
|
runCommand(SETUP + 'git rev-list right left', function(commandMsg) {
|
|
expect(commandMsg).toBe('C5\nC4\nC3\nC2\nC1\nC0\n');
|
|
});
|
|
});
|
|
|
|
it('multiple excluded revisions', function() {
|
|
runCommand(SETUP + 'git rev-list all ^right ^left', function(commandMsg) {
|
|
expect(commandMsg).toBe('C6\n');
|
|
});
|
|
});
|
|
});
|
|
});
|
|
|
|
describe('Log supports', function() {
|
|
var SETUP = 'git co -b left C0; gc; git merge master; git co -b right C0; gc; git merge master; git co -b all left; git merge right; ';
|
|
|
|
it('implied HEAD', function() {
|
|
runCommand(SETUP + '; git co right; git log', function(commandMsg) {
|
|
expect(commandMsg).toContain('Commit: C0\n');
|
|
expect(commandMsg).toContain('Commit: C1\n');
|
|
expect(commandMsg).not.toContain('Commit: C2\n');
|
|
expect(commandMsg).not.toContain('Commit: C3\n');
|
|
expect(commandMsg).toContain('Commit: C4\n');
|
|
expect(commandMsg).toContain('Commit: C5\n');
|
|
expect(commandMsg).not.toContain('Commit: C6\n');
|
|
});
|
|
});
|
|
|
|
it('single included revision', function() {
|
|
runCommand(SETUP + 'git log right', function(commandMsg) {
|
|
expect(commandMsg).toContain('Commit: C0\n');
|
|
expect(commandMsg).toContain('Commit: C1\n');
|
|
expect(commandMsg).not.toContain('Commit: C2\n');
|
|
expect(commandMsg).not.toContain('Commit: C3\n');
|
|
expect(commandMsg).toContain('Commit: C4\n');
|
|
expect(commandMsg).toContain('Commit: C5\n');
|
|
expect(commandMsg).not.toContain('Commit: C6\n');
|
|
});
|
|
});
|
|
|
|
it('single excluded revision', function() {
|
|
runCommand(SETUP + 'git log all ^right', function(commandMsg) {
|
|
expect(commandMsg).not.toContain('Commit: C0\n');
|
|
expect(commandMsg).not.toContain('Commit: C1\n');
|
|
expect(commandMsg).toContain('Commit: C2\n');
|
|
expect(commandMsg).toContain('Commit: C3\n');
|
|
expect(commandMsg).not.toContain('Commit: C4\n');
|
|
expect(commandMsg).not.toContain('Commit: C5\n');
|
|
expect(commandMsg).toContain('Commit: C6\n');
|
|
});
|
|
});
|
|
|
|
it('multiple included revisions', function() {
|
|
runCommand(SETUP + 'git log right left', function(commandMsg) {
|
|
expect(commandMsg).toContain('Commit: C0\n');
|
|
expect(commandMsg).toContain('Commit: C1\n');
|
|
expect(commandMsg).toContain('Commit: C2\n');
|
|
expect(commandMsg).toContain('Commit: C3\n');
|
|
expect(commandMsg).toContain('Commit: C4\n');
|
|
expect(commandMsg).toContain('Commit: C5\n');
|
|
expect(commandMsg).not.toContain('Commit: C6\n');
|
|
});
|
|
});
|
|
|
|
it('multiple excluded revisions', function() {
|
|
runCommand(SETUP + 'git log all ^right ^left', function(commandMsg) {
|
|
expect(commandMsg).not.toContain('Commit: C0\n');
|
|
expect(commandMsg).not.toContain('Commit: C1\n');
|
|
expect(commandMsg).not.toContain('Commit: C2\n');
|
|
expect(commandMsg).not.toContain('Commit: C3\n');
|
|
expect(commandMsg).not.toContain('Commit: C4\n');
|
|
expect(commandMsg).not.toContain('Commit: C5\n');
|
|
expect(commandMsg).toContain('Commit: C6\n');
|
|
});
|
|
});
|
|
});
|
|
});
|