Back to results
US 9,557,968 B1Granted
Comparison graph
AssigneeGitHub, Inc.
InventorsStephen Smith, Danny Greg, Karl Tobias Ahlin
Life of this patent
Estimating the term…
Abstract
A system for comparing code branches comprises a code branch separator for determining a first set of commits in a first code branch that are not common to a second code branch, and determining a second set of commits in the second code branch that are not common to the first code branch; and a user interface determiner for determining a display of the first set of commits and the second set of commits.
Claims17
A system for comparing code branches, comprising:
- a processor configured to:
- determine a first set of commits in a first code branch that are not common to a second code branch;
- and
- determine a second set of commits in the second code branch that are not common to the first code branch;
- determine comparison graph display information of the first set of commits and the second set of commits, wherein the comparison graph display information comprises a first code branch line corresponding to the first set of commits and a second code branch line corresponding to the second set of commits;
- categorize a commit in one of the first set of commits and the second set of commits based on the commit including:
- changes in the first code branch not merged with the second code branch;
- changes in a local copy of the second code branch not pushed to a remote version of the second code branch stored in a version control system;
- changes in the second code branch made by another user not pulled to a local version of the second code branch;
- and
- changes in a local copy of the second code branch not synced with a remote version of the second code branch;
- select, for the commit, a location on one of the first code branch line or the second code branch line of the comparison graph display information;
- select, for the commit, a symbol encoding information about the category of the commit;
- and
- provide the comparison graph display information including the commit represented by the selected symbol at the selected location to be displayed;
- and
- a memory coupled to the processor and configured to provide the processor with instructions.
14 more elements
A method for comparing code branches, comprising:
- determining, using a processor, a first set of commits in a first code branch that are not common to a second code branch;
- and
- determining a second set of commits in the second code branch that are not common to the first code branch;
- and
- determining a comparison graph display information of the first set of commits and the second set of commits, wherein the comparison graph display information comprises a first code branch line corresponding to the first set of commits and a second code branch line corresponding to the second set of commits;
- categorizing a commit in one of the first set of commits and the second set of commits based on the commit including:
- changes in the first code branch not merged with the second code branch;
- changes in a local copy of the second code branch not pushed to a remote version of the second code branch stored in a version control system;
- changes in the second code branch made by another user not pulled to a local version of the second code branch;
- and
- changes in a local copy of the second code branch not synced with a remote version of the second code branch;
- selecting, for the commit, a location on one of the first code branch line or the second code branch line of the comparison graph;
- selecting, for the commit, a symbol encoding information about the category of the commit;
- and
- providing the comparison graph display information including the commit represented by the selected symbol at the selected location to be displayed.
12 more elements
A computer program product for comparing code branches, the computer program product being embodied in a non-transitory computer readable storage medium and comprising computer instructions for:
- determining, using a processor, a first set of commits in a first code branch that are not common to a second code branch;
- and
- determining a second set of commits in the second code branch that are not common to the first code branch;
- and
- determining a comparison graph display information of the first set of commits and the second set of commits, wherein the comparison graph display information comprises a first code branch line corresponding to the first set of commits and a second code branch line corresponding to the second set of commits;
- categorizing a commit in one of the first set of commits and the second set of commits based on the commit including:
- changes in the first code branch not merged with the second code branch;
- changes in a local copy of the second code branch not pushed to a remote version of the second code branch stored in a version control system;
- changes in the second code branch made by another user not pulled to a local version of the second code branch;
- and
- changes in a local copy of the second code branch not synced with a remote version of the second code branch;
- selecting, for the commit, a location on one of the first code branch line or the second code branch line of the comparison graph;
- selecting, for the commit, a symbol encoding information about the category of the commit;
- and
- providing the comparison graph display information including the commit represented by the selected symbol at the selected location to be displayed.
12 more elements
Dependencies are inferred from the claim text.