Version histories for multiple portions of program code

• US 9,063,742 B1
• Filed: 12/17/2013
• Issued: 06/23/2015
• Est. Priority Date: 10/22/2013
• Status: Active Grant

• Current Assignee: The MathWorks, Inc.
• Original Assignee: The MathWorks, Inc.
• Inventors: Bienkowski, Joseph R., MacDonald, Jared D.
• Primary Examiner(s): Khatri, Anil
• Application Number:
  US14/109,236
• Time in Patent Office: 553 Days
• Field of Search: 717113-116, 717123-127
• US Class Current: 1/1
• CPC Class Codes: G06F 40/197 Version control for software G06F8/71
• CPC Class Codes: G06F 8/71 Version control security arrangements therefor G06F21/57; Configuration management

Abstract

A device may partition program code into multiple portions. The device may detect a first modification to a first portion of program code from a first version to a second version, and may detect a second modification to a second portion of program code from a third version to a fourth version. The device may detect the second modification after detecting the first modification. The device may store a first version history that identifies the first version, the second version, and a first temporal relationship between the first and second versions. The device may store a second version history that identifies the third version, the fourth version, and a second temporal relationship between the third and fourth versions. The device may receive an indication to undo the first modification after detecting the second modification, and may undo the first modification, without undoing the second modification, based on receiving the indication.

Claims

1. A device, comprising:

one or more processors to;

obtain program code;

partition the program code into a plurality of portions of program code,

the plurality of portions including a first portion of program code and a second portion of program code;

store, in a first data structure, information that identifies the first portion of program code;

store, in a second data structure, information that identifies the second portion of program code,

the first data structure and the second data structure being separately identifiable;

receive, via a user interface, input that modifies the first portion of program code from a first version to a second version;

store, in the first data structure, information that identifies the first version and the second version;

receive an indication to replace the second version with the first version;

identify the first data structure based on receiving the indication;

identify the first version using the first data structure; and

replace the second version with the first version, by providing the first version via the user interface, based on identifying the first version.

2. The device of claim 1, where the one or more processors are further to:

receive a selection of the first portion of program code;

provide a version history, associated with the first portion of program code, for display on the user interface based on receiving the selection of the first portion of program code,

the version history identifying the first version and the second version;

receive a selection of the first version via the user interface; and

where the one or more processors, when receiving the indication to replace the second version with the first version, are further to;

receive the indication to replace the second version with the first version based on receiving the selection of the first version via the user interface.

3. The device of claim 2, where the one or more processors, when storing the information that identifies the first version and the second version, are further to:

store a first result of evaluating the first version of the first portion of program code; and

store a second result of evaluating the second version of the first portion of program code; and

where the one or more processors, when providing the version history, are further to;

provide, via the user interface, the first result for display; and

provide, via the user interface, the second result for display.

4. The device of claim 2, where the one or more processors, when providing the version history, are further to:

provide an indication of a temporal relationship between the first version and the second version.

5. The device of claim 1, where the one or more processors are further to:

provide a related history that identifies one or more related versions, of another portion of program code, that relate to the first version or the second version;

receive an indication to replace the second version with a third version, of the one or more related versions, based on providing the related history; and

replace, on the user interface, the second version with the third version based on receiving the indication to replace the second version with the third version.

6. The device of claim 1, where the one or more processors, when receiving the indication to replace the second version with the first version, are further to:

receive an indication to perform an undo operation; and

receive the indication to replace the second version with the first version based on receiving the indication to perform the undo operation.

7. The device of claim 6, where the one or more processors are further to:

receive an indication to perform a redo operation; and

replace, on the user interface, the first version with the second version based on receiving the indication to perform the redo operation.

8. A computer-readable medium storing instructions, the instructions comprising:

one or more instructions that, when executed by one or more processors, cause the one or more processors to;

partition program code into a plurality of portions of program code;

detect a first modification to a first portion of program code, of the plurality of portions of program code, from a first version to a second version;

detect a second modification to a second portion of program code, of the plurality of portions of program code, from a third version to a fourth version,

the second modification being detected after the first modification;

store a first version history, associated with the first portion of program code, that identifies the first version, the second version, and a first temporal relationship between the first version and the second version;

store a second version history, associated with the second portion of program code, that identifies the third version, the fourth version, and a second temporal relationship between the third version and the fourth version;

receive an indication to undo the first modification after detecting the second modification;

undo the first modification, without undoing the second modification, based on receiving the indication; and

provide information associated with undoing the first modification.

9. The computer-readable medium of claim 8, where the one or more instructions, that cause the one or more processors to store the first version history and the second version history, further cause the one or more processors to:

store the first version history in a first data structure; and

store the second version history in a second, different, data structure; and

where the one or more instructions, that cause the one or more processors to undo the first modification, further cause the one or more processors to;

identify the first data structure based on receiving the indication to undo the first modification; and

identify the first version using the first data structure; and

replace, on a user interface, the second version with the first version based on identifying the first version.

10. The computer-readable medium of claim 9, where the one or more instructions, that cause the one or more processors to store the first version history in the first data structure, further cause the one or more processors to:

identify the first data structure based on the first portion of program code,

the first data structure identifying a plurality of versions of the first portion of program code,

the plurality of versions including the first version and the second version, the plurality of versions not including the third version or the fourth version.

11. The computer-readable medium of claim 8, where the one or more instructions, that cause the one or more processors to store the first version history and the second version history, further cause the one or more processors to:

store the first version history and the second version history in a same data structure.

12. The computer-readable medium of claim 8, where the one or more instructions, when executed by the one or more processors, further cause the one or more processors to:

receive a selection of the first portion of program code;

provide the first version history for display on a user interface based on receiving the selection of the first portion of program code;

receive a selection of the first version via the user interface; and

where the one or more instructions, that cause the one or more processors to undo the first modification, further cause the one or more processors to;

undo the first modification based on receiving the selection of the first version.

13. The computer-readable medium of claim 12, where the one or more instructions, that cause the one or more processors to provide the first version history for display, further cause the one or more processors to:

provide information that identifies the first temporal relationship.

14. The computer-readable medium of claim 8, where the one or more instructions, when executed by the one or more processors, further cause the one or more processors to:

store, based on detecting the first modification, a first result of evaluating the first version of the first portion of program code;

store, based on detecting the first modification, a second result of evaluating the second version of the first portion of program code;

provide the first result and the second result for display on a user interface;

receive a selection of the first result; and

where the one or more instructions, that cause the one or more processors to undo the first modification, further cause the one or more processors to;

undo the first modification based on receiving the selection of the first result.

15. A method, comprising:

partitioning program code into a plurality of portions of program code,

the partitioning being performed by one or more devices;

detecting a first modification to a first portion of program code, of the plurality of portions of program code, from a first version to a second version,

the detecting the first modification being performed by the one or more devices;

detecting a second modification to a second portion of program code, of the plurality of portions of program code, from a third version to a fourth version,

the detecting the second modification being performed by the one or more devices;

storing a first version history, associated with the first portion of program code, that identifies the first version and the second version,

the storing the first version history being performed by the one or more devices;

storing a second version history, associated with the second portion of program code, that identifies the third version and the fourth version,

the second version history being different from the first version history,

the storing the second version history being performed by the one or more devices;

determining to restore the first version of the first portion of program code or the third version of the second portion of program code,

the determining to restore being performed by the one or more devices; and

selectively performing a first action or a second action based on determining to restore the first version or the third version,

the first action including replacing, on a user interface, the second version with the first version when determining to restore the first version,

the second action including replacing, on the user interface, the fourth version with the third version when determining to restore the third version, and

the selectively performing being performed by the one or more devices.

16. The method of claim 15, where storing the first version history and the second version history further comprising:

storing the first version history and the second version history in separately-identifiable data structures.

17. The method of claim 15, where the second modification is detected after the first modification;

and

where determining to restore the first version or the third version further comprises;

receiving an indication to perform an undo operation associated with the first portion of program code; and

determining to restore the first version based on receiving the indication to perform the undo operation.

18. The method of claim 15, further comprising:

detecting a third modification of the first portion of program code to a fifth version;

storing, in the first version history, information that identifies the fifth version;

receiving a selection of the first portion of program code;

providing, via the user interface and based on receiving the selection, information that identifies the first version, the second version, the fifth version, and a temporal relationship between the first version, the second version, and the fifth version;

detecting a selection of the first version, the second version, or the fifth version;

providing the selected version for display via the user interface; and

providing, for display, a result of evaluating the selected version of the first portion of program code.

19. The method of claim 18, where providing the information that identifies the temporal relationship further comprises:

providing the first version, the second version, and the fifth version for display in an order that indicates the temporal relationship.

20. The method of claim 15, where determining to restore the first version or the third version further comprises:

receiving an indication to provide the first version history associated with the first portion of program code;

providing information that identifies the first version and a first result of executing the first version;

providing information that identifies the second version and a second result of executing the second version;

receiving a selection of the information that identifies the first version or the first result; and

determining to restore the first version based on receiving the selection of the information that identifies the first version or the first result.