JPH10260882A - Version management system - Google Patents

Abstract

PROBLEM TO BE SOLVED: To enhance the reliability of annotation contents to a repository, and to output them, relating to the contents of a source file at the time of referring to an annotation by accurately making the place of the source file correspond to the annotation. SOLUTION: In a coexisting file (301), in which text and incident information coexist, the decision (305) of an instruction character that instructs the incident information to be deleted, the deletion processing (302), further, the decision (306) of an instruction character that instructs the incident information to be added to the file, and the processing (304) that separates the incident information from the text are performed. Thereby, the separated incident information (310), the position information of the incident information (311) and the text (308) from which the incident information is separated are stored, and when the text is restored (309), the incident information that is instructed by an instruction character (314) is accurately inserted into the text (312) and restored (313).

Description

DETAILED DESCRIPTION OF THE INVENTION

[0001]

BACKGROUND OF THE INVENTION 1. Field of the Invention The present invention relates to a version management system for files requiring history management.

[0002]

2. Description of the Related Art In a case where a document such as a source file, which frequently changes, is managed, a version management system is often used. Such a management system manages the history of changes (hereinafter, referred to as revisions) of files together with revision information.

Here, an example of a conventional version control system will be described with reference to FIG. 13 and FIG.

In FIG. 13, every time a revision of a file is determined (101), a file is taken in according to a user taking-in instruction (hereinafter referred to as check-in) (103). Then, in a storage location (hereinafter, referred to as a repository) (110), this is not stored as a raw file, but only the difference from the previous time is stored (104). At this time,
The current revision information is also stored (105).

[0005] The revision information is, as shown in FIG.
(201) (e.g., revision number, commentary, etc.) that is unique to each change and directly given by the user
(202) automatically assigned by the system (for example,
Current date and time, operator name, etc.).
Thereafter, by repeating the check-in, the history of the file is kept stored in the repository (110) together with the fiber difference and the revision information.

According to the user's take-out instruction (hereinafter referred to as check-out) (107), the file in the differential format can be obtained as a raw file, that is, in the same state as the input file at the time of check-in with that revision ( 106).

The reference to the revision information (108) is separately performed according to a request for outputting a revision log or the like (10).
9). Here, the revision log is information for each revision (for example, revision number, comment, modification date and time, etc.).
Are listed independently of the contents of the text body.

[0008]

However, in the conventional version control system, the input of "annotation" which is one of the above-mentioned revision information has a problem in the following points.

The first problem is that an annotation usually expresses the content of a revision or a supplementary explanation.
If a time lag occurs between the time of updating the file and the time of check-in, it may be difficult to input an accurate description of the annotation.

As a second problem, since there is no association between a file update location and a comment corresponding to the file update location, it is difficult to know where the description content of the comment points in the file. In particular, when corrections are made in a plurality of places in one file, it is difficult to explain all of them in one annotation. As a result, when referring to the annotation, the relation with the file entity may not be seen.

An object of the present invention is to make the contents of a comment in a repository more reliable by accurately associating the location of a source file with a comment and to associate the comment with the contents of the source file when referring to the comment. And a version control system capable of outputting the data.

[0012]

According to the present invention, there is provided a system for inputting a mixed document in which accompanying information related to the text is mixed in a text body and managing the history of the mixed document. A first unit (1501) for extracting accompanying information from among them, a second unit (1502) for storing text text, accompanying information, and information on the position of the accompanying information;
A version control system is configured by including a third means (1503) for generating a mixed document from the text body, the accompanying information, and the information on the position of the accompanying information.

In the first means, only the additional information newly added in the current version is extracted from the mixed document, and at the same time, a portion other than the additional information in the mixed document, that is, the text body is also extracted. doing.

The second means stores not only the text body and the accompanying information separated from the mixed document but also the position in the text body where the original accompanying information exists.

[0015] In the third means, for the text body,
A mixed document is generated by inserting the corresponding accompanying information at the position where the accompanying information originally existed.

[0016]

Embodiments of the present invention will be described below in detail with reference to the drawings.

A first embodiment of the present invention will be described with reference to FIGS. 1 to 8 and FIG.

In the present embodiment, the present invention is applied to the "check-in" and "check-out" of the file version management system.
An example of incorporating the function and an example of “outputting a revision log” will be described. This example is characterized in that the mixed file is logically divided into four parts on the repository at the time of check-in, so that the actual text and the comment are separately managed. Hereinafter, a specific description will be given.

First, the configuration of the present system will be described with reference to FIG.

The data that is the subject of a version control system is generally a text file containing source code. In this text file, additional information for the version control system and a certain directive character are included.
Assume a mixed file 301 that can be interpreted by the present system.

In this system, in order to instruct deletion / addition of specific accompanying information in the mixed file 301, input units 305 and 306 for giving designation characters of the accompanying information and only specific accompanying information from the mixed file 301 are input. A processing unit 302 for removing and discarding the data to generate mixed data 303. The mixed data 303 differs from the mixed file 301 in that unnecessary accompanying information in this revision is removed.

Further, there is provided a processing unit 304 for separating the mixed file 301 into a text and accompanying information. The processing unit 3
04 corresponds to the accompanying information extraction unit 1501. And
It has a processing unit 307 for creating a difference between the texts.

The repository has the following three parts. Storage unit 3 that holds the text as the difference from the previous revision
08, a storage unit 310 that stores the accompanying information in which one line is one unit, and a storage unit 311 that stores where in the text the respective accompanying information is located. In practice, they are stored in files, but may be kept in the same file or separately in different files.

Further, a processing unit 309 for restoring the difference of the text.
And an input unit 314 for designating an instruction character of the accompanying information when the accompanying information is inserted into the text, and a processing unit 312 for inserting the accompanying information into the text and generating a mixed file. The storage units 308, 310, and 311 correspond to the position information storage unit 1502 for the text body / associated information / associated information. Further, the processing unit 312 includes a mixed document generation unit 1503.
Is equivalent to

Next, the operation of the present system will be described with reference to the flowcharts of FIGS. Here, operations related to “check-in”, “chuck-out”, and “revision log output” of a source file will be described.

First, the user prepares a file in which the text and the accompanying information are mixed. This is the power for the system.

Next, the operation at the time of check-in will be described with reference to FIG.

As operation options provided by the user,
In this revision, in order to indicate the accompanying information to be removed from the file, the actually added instruction character is given thereto (steps S401 to S402). The accompanying information added when the file was previously checked out (step S502) is 1
This process is performed to invalidate the previous information because it becomes the previous information.

Next, for the intermediate data from which the specific accompanying information has been deleted, the user gives an instruction character actually added thereto in order to indicate the accompanying information in the current revision (step S403). Then, the currently instructed accompanying information is extracted (step S404).

Next, the extracted accompanying information is stored in the repository (step S405), the positional information of the accompanying information is stored (step S406), and only the text data with no accompanying information is stored in the difference format. (Step S407).

Next, the operation at the time of checkout will be described with reference to FIG.

First, the text difference data in the repository is specified by designating the file revision by the user. The text is restored (step S501).

The user can newly designate a designated character of the accompanying information to be restored (step S50).
2). Then, the accompanying information is inserted into the restored text based on the positional information of the accompanying information (step S50).
3). At this time, an instruction character designated by the user is added to the accompanying information.

Next, the operation at the time of outputting the revision log will be described.
A description will be given based on FIG.

First, the user specifies how many lines of the text located ahead of each accompanying information are to be output (step S).
601). Similarly, the user specifies how many lines of the text located after the associated information are to be output (step S602).

Next, the text difference data in the repository is restored (step S603). The accompanying information is specified based on the positional information of the accompanying information in the repository, and the body is extracted from before and after as many lines as the user instructed (step S).
604).

The output of the revision log may be modified in other ways. For example, it is possible to output accompanying information for each subroutine or function in the source file.

Next, the operation will be described in more detail.
Here, "Check In" and "Check Out"
Variations specified by the user at the time and details of operations related to the variations will be described with reference to FIGS.

The details of the operation of determining the designated character of the accompanying information to be deleted (step S401) and the deleting process (step S402) at the time of check-in in FIG. 2 will be described with reference to FIG. If the user specifies that there is no deletion accompanying information, nothing is performed here (step S701).

In the case of the designation, the designated character of the accompanying information is given (step S702). There are four methods for giving the designated characters.

For example, a character fixed to the system (for example, “p
rev ") (step S703), and a character (for example," r ") automatically generated by the system for each revision.
evl. 2 "etc.) (step S704).
Characters specified by the user on the spot (for example, "bug f
ix "etc.) (step S705), and the character designated when the file is checked out with a lock (e.g.," bugs "etc.) (step S70).
6).

Checking out with a lock means that an exclusive attribute is added for the purpose of updating a file and the file is extracted from a revision. As a result, check-in by other users is completely prohibited.

Thereafter, the associated information indicated by the determined instruction character and the instruction character are deleted (step S70).
7).

The details of the operation of determining the designated character of the additional information to be added (step S403) and the process of separating the additional information (step S404) at the time of check-in in FIG. 2 will be described with reference to FIG. . If the user specifies no additional accompanying information, nothing is performed here (step S
801).

In the case of the designation, the designated character of the accompanying information is given (step S802). There are three ways of giving the variation.

For example, characters fixed to the system (for example, "n
(e.g., "ew") (step S803), and a character automatically generated by the system for each revision (for example, "re").
vl. 3 ”, etc.) (step S804), and a character specified by the user on the spot (eg,“ bug fi
x ") (step S805).

After that, the accompanying information indicated by the determined instruction character is separated from the text (step S806).

The details of the operation of determining the designated character (step S502) and inserting the accompanying information (step S503) at the time of checkout in FIG. 3 will be described with reference to FIG.

When the user instructs to attach the accompanying information (step S901), the instruction character of the accompanying information is given (step S902). There are three types of variations of how to give the instruction characters.

For example, a system fixed character (for example, “p
rev ", etc.) (step S903), and a character automatically generated by the system for each revision (for example," r ").
evl. 2 ") (step S904).
Characters specified by the user on the spot (for example, "bug f
ix ") (step S905).

After that, accompanying information is inserted into the text, and the designated character for this is the currently determined character (step S907).

Finally, only when the check-out is performed with the lock (step S908), the determined instruction character is stored (step S909). This is necessary when the accompanying information added here is deleted as it is at the time of the next check-in (step S706).

If the accompanying information is not added and the lock is provided (step S910), the designated character is cleared (step S911).

The description of the operation related to the variation designated by the user is completed.

Next, using the specific example of FIG. 8, the state of change of the repository due to “check-in” of a file,
The state of the output file by "checkout" will be described.

There is a text file 1301 in which accompanying information is embedded in the text. If the option specification at the time of check-in is as follows: revision number = 1.1, deletion accompanying information = none, additional accompanying information = automatic, the state of the repository after execution is described in the text 1302 and the accompanying information 130
3. Position 1304 of the accompanying information.

Next, a case where the revision 1.1 is checked out is considered. If the option is specified, the indicator character is fixed and the lock is attached, the repository indicator character 1
305 is saved.

An example of a file in which the output file is edited by the user is 1306. The option specification at the time of check-in is as follows: revision number = 1.2, deletion additional information = continuous use, additional accompanying information = specification (“bug fi
x ”), the state of the repository after execution is the text 1307, the accompanying information 1308, and the position 130 of the accompanying information.
It becomes 9.

In the specific example of FIG. 8, some modifications are prepared as the indicating characters of the accompanying information, but the present invention is not limited to this. For example, it is possible to automatically add a check-out date and time, add a name of a check-out person, and add special characters (for example, Exp: and Rel :) indicating an update attribute. Further, a combination of these is also possible.

In this specific example, it has been assumed that the accompanying information is surrounded by a certain specific identical character string. However, this instruction method may be modified. For example, it is also possible to make the information from a specific instruction character to the end (line feed) of the same line as the accompanying information.

Next, a second embodiment of the present invention will be described mainly with reference to FIGS. 9 to 12 and FIG.

In the present embodiment, the present invention is applied to the case where “check-in” and “check-out”
An example in which the function is incorporated into the above function and an example of "output of a revision log" will be described. This example is characterized in that mixed files are managed as they are on the repository in the same format, and accompanying information is identified at the time of checkout. Hereinafter, a specific description will be given.

First, the configuration of the present system will be described with reference to FIG. The description of the same parts as those in FIG. 1 will be omitted.

The system includes a processing unit 1004 for creating a difference from the previous revision from the mixed data 1003 of the text and the accompanying information, a storage unit 1005 for holding the difference,
A processing unit 1006 for restoring the mixed data from the difference. Further, a storage unit 1009 for storing the given instruction characters as they are is provided. Since the storage unit 1009 is information for specifying the position of the accompanying information,
05 corresponds to the position information storage unit 1502 of the text body / associated information / associated information.

Further, the processing unit 1 detects the position of the accompanying information in the restored mixed data from the instruction character and replaces the instruction character with the one given by the user through the input unit 1012.
010. The processing unit 1010 includes the mixed document generation unit 1
503. Since the processing unit 1010 consciously extracts the accompanying information, the processing unit also corresponds to the accompanying information extracting unit 1501.

Next, the operation of this system will be described with reference to FIGS.
1, and further description will be made based on the flowchart of FIG.
Here, the operation related to “check-in” and “check-out” of a source file and “output of a revision log” will be described. Only differences from the first embodiment will be described.

First, the operation at the time of check-in will be described with reference to FIG.

The instruction of the accompanying information to be removed from the file and the deletion process related thereto are shown in FIG.
S402) is the same (steps S1101 to S11)
02).

Next, the process for instructing the accompanying information in the current revision is the same as that in FIG. 2 (step S403) (step S1103). Next, the currently determined instruction character is stored (step S1104), and subsequently, the mixed file is differentially stored (step S1105).

Next, the operation at the time of checkout will be described with reference to FIG.
It will be described based on.

First, the difference between the mixed data in the repository is specified by the designation of the file revision by the user, and the difference is restored (step S1201).

The process of determining the designated character to be replaced by the user at this time is the same as that of FIG. 3 (step S502) (step S1202). Next, the instruction character of the restored mixed data is replaced with the instruction character determined immediately before (step S1203).

The operation at the time of outputting the revision log in the present system is the same as the processing in FIG. 4, and a description thereof will be omitted.

Next, the operation will be described in more detail.
Here, "Check In" and "Check Out"
Variations specified by the user at the time and details of operations related to the variations will be described with reference to FIGS. In this example,
Only differences from the first embodiment will be described.

The determination of the accompanying information to be deleted at the time of check-in and the deletion process therefor are the same as those in FIG.
The process of determining additional information to be added at the time of check-in is the same as that in FIG. 6 described above. No special processing is performed as the subsequent processing (step S806).

The process of determining the designated character at the time of checkout is the same as that of FIG. After the decision, the designated character in the restored data is replaced with the designated character (step S907). If the user instructs not to attach the accompanying information, the accompanying information is deleted from the restored data together with the instruction character (step S906).

The description of the operation related to the variation designated by the user is completed.

Next, with reference to the specific example of FIG. 12, a description will be given of how the repository changes when the file is “checked in” and how the output file is changed when the file is “checked out”.

There is a text file 1401 in which accompanying information is embedded in the text. If the option specification at the time of check-in is: revision number = 1.1, deletion accompanying information = none, additional accompanying information = automatic, the state of the repository after execution is mixed data 1402, instruction character 1403 Becomes

Next, consider the case where this revision 1.1 is checked out. To specify an option, specify
Fixed, with lock, repository indication character 14
04 is saved.

An example of a file obtained by editing the output file by a user is 1405. The option specification when checking this in is as follows: revision number = 1.2, deletion additional information = continuous use, additional accompanying information = specification (“ug fi
x "), the state of the execution repository is mixed data 1406 and instruction character 1407.

[0082]

As described above, according to the present invention,
In a version control system of a file requiring history management, it is possible to input a file embedded with an instruction character for notifying the position of the change information to the version control system, and identify revision information from the file. As a result, the user can add accompanying information at the same time when the file is updated, so that more reliable contents can be expected.

Further, since it is stored where each piece of accompanying information of a plurality of lines is embedded in the file actual state, it is possible to accurately reproduce the relationship between the contents of the accompanying information and the position of the file actual state.

[Brief description of the drawings]

FIG. 1 is a block diagram showing a system configuration according to a first embodiment of the present invention.

FIG. 2 is a flowchart showing a process at the time of check-in.

FIG. 3 is a flowchart showing a process at the time of checkout.

FIG. 4 is a flowchart showing a process of outputting a revision log.

FIG. 5 is a flowchart showing a detailed process regarding deletion accompanying information at the time of check-in.

FIG. 6 is a flowchart showing a detailed process regarding additional accompanying information at the time of check-in.

FIG. 7 is a flowchart showing detailed processing related to accompanying information at the time of checkout.

FIG. 8 is an explanatory diagram showing a specific example of an input file and a repository.

FIG. 9 is a block diagram illustrating a system configuration according to a second embodiment of the present invention.

FIG. 10 is a flowchart showing processing at the time of check-in.

FIG. 11 is a flowchart showing a process at the time of checkout.

FIG. 12 is an explanatory diagram showing a specific example of an input file and a repository.

FIG. 13 is a block diagram showing a configuration of a conventional version management system.

FIG. 14 is a block diagram showing an example of revision information of a conventional version control system.

FIG. 15 is a block diagram showing a system configuration of the present invention.

[Explanation of symbols]

301 Text / Attached Information Mixed File 302 Associated Information Deletion Processing Unit 303 Text / Attached Information Mixed Data 304 Text / Attached Information Division Processing Unit 305 Attached Information Deletion Processing Unit 306 Attached Information Addition Designated Character Input Unit 307 Text Difference Creation Processing Unit 308 Main text difference storage unit 309 Main text difference restoration processing unit 310 Additional information storage unit 311 Additional information position storage unit 312 Additional information insertion processing unit 313 Full text / additive information mixed file 314 Designated character input unit 1001 Full text / additive information mixed file 1002 Attached information deletion processing unit 1003 Text / Auxiliary information mixed data 1004 Mixed data difference creation processing unit 1005 Mixed data storage unit 1006 Mixed data difference restoration processing unit 1007 Associated information deletion designation character input unit 1008 Associated information deletion designation character input unit 1009 Designated character Storage 1010 Designated Character Replacement Processing Unit 1011 Text / Attached Information Mixed File 1012 Additional Designated Character Input Unit 1501 Attached Information Extraction Unit (First Means) 1502 Text Body / Attached Information / Attached Information Position Information Storage Unit (Second Means) 1503 Mixed document generation unit (third means)

Claims (7)

[Claims] 1. A system for performing history management using a mixed document in which a text body and accompanying information related to the body are mixed, wherein: first means for extracting accompanying information from the mixed document; A second means for storing information relating to the position of the text, the accompanying information, and the accompanying information; and a third means for generating a mixed document from the information relating to the position of the text body, the accompanying information, and the accompanying information. And a version control system. 2. The version control system according to claim 1, wherein the accompanying information on the text is related to a change in the text text. 3. The version control system according to claim 1, wherein in the first means, an instruction character is used to indicate the position and range of the accompanying information. 4. The version management system according to claim 3, wherein the instruction character is a character unique to the system, a character automatically generated every time a file is changed, or a character arbitrarily designated this time. . 5. The version management system according to claim 1, wherein said third means generates only a text body. 6. The version control system according to claim 1, wherein in the third means, a mixed document is generated by adding characters for indicating the position and range of the accompanying information to the text body. . 7. The version control system according to claim 1, wherein, in the third means, the number of output lines before and after the accompanying information is specified, and only the output lines within the range are output.