More robust support for revision ranges #565
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit introduces the RevisionRange, which more closely follows real git in terms of identifying a range of revisions than the current implementation of log. RevisionRange is being used in the new rev-list command first because it is easy to test for ordering. A future commit will replace the existing implementation of log with RevisionRange.
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.
pcottle
approved these changes
Apr 21, 2019
| var msg = null; | ||
|
|
||
| deferred.promise.then(function(commands) { | ||
| msg = commands[commands.length - 1].get('error').get('msg'); |
There was a problem hiding this comment.
i vaguely remember why i store all command output in the error field, but its certainly silly
| }); | ||
|
|
||
| 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; '; |
There was a problem hiding this comment.
sometimes i use serialized tree states for this type fo setup, but this works as well!
There was a problem hiding this comment.
Yeah, serialized tree state would probably be more in keeping with the way the other tests are setup. I'll be perfectly honest: just entering the commands was easier :)
| return thisDeferred.promise; | ||
| }.bind(this)); | ||
| }, this); | ||
|
|
||
| chain.then(function() { | ||
| var nowTime = new Date().getTime(); | ||
| if (entireCommandPromise) { | ||
| entireCommandPromise.resolve(); | ||
| entireCommandPromise.resolve(commands); |
There was a problem hiding this comment.
oh so this adds a return arg to the promise? good call
| }); | ||
|
|
||
| exclusions.forEach(function(exclusion) { | ||
| self.addExcluded(Graph.getUpstreamSet(self.engine, exclusion)); |
| @@ -151,6 +147,12 @@ var Command = Backbone.Model.extend({ | |||
| this.validateArgBounds(args, 0, 2); | |||
| }, | |||
|
|
|||
| impliedHead: function(args, min) { | |||
|
Pushed the site with these changes, it should be live :) |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the first step in adding greater support for revision ranges (see #561). Currently, only log supports revision ranges, it only supports specific kinds (single tip includes and excludes), and only in very limited formats ("git log include" or "git log include ^exclude"). With this PR, log now supports any number of single tip includes or excludes, in any order, as real git does.
This PR also introduces support for the "rev-list" command, which uses the same revision range capability. In addition to increased git compatibility, the rev-list command also provides much simpler output with which to test the output ordering of revision ranges.
Compatibility Note: this PR changes the output ordering of the log command. The previous ordering was essentially a breadth-first search. The new ordering follows the git default, which is based on commit date.