Do a cross-project merge of Paul Mackerras' gitk visualizer
[git/git.git] / Documentation / cvs-migration.txt
1 Git for CVS users
2 =================
3
4 Ok, so you're a CVS user. That's ok, it's a treatable condition, and the
5 first step to recovery is admitting you have a problem. The fact that
6 you are reading this file means that you may be well on that path
7 already.
8
9 The thing about CVS is that it absolutely sucks as a source control
10 manager, and you'll thus be happy with almost anything else. Git,
11 however, may be a bit _too_ different (read: "good") for your taste, and
12 does a lot of things differently.
13
14 One particular suckage of CVS is very hard to work around: CVS is
15 basically a tool for tracking _file_ history, while git is a tool for
16 tracking _project_ history. This sometimes causes problems if you are
17 used to doing very strange things in CVS, in particular if you're doing
18 things like making branches of just a subset of the project. Git can't
19 track that, since git never tracks things on the level of an individual
20 file, only on the whole project level.
21
22 The good news is that most people don't do that, and in fact most sane
23 people think it's a bug in CVS that makes it tag (and check in changes)
24 one file at a time. So most projects you'll ever see will use CVS
25 _as_if_ it was sane. In which case you'll find it very easy indeed to
26 move over to Git.
27
28 First off: this is not a git tutorial. See Documentation/tutorial.txt
29 for how git actually works. This is more of a random collection of
30 gotcha's and notes on converting from CVS to git.
31
32 Second: CVS has the notion of a "repository" as opposed to the thing
33 that you're actually working in (your working directory, or your
34 "checked out tree"). Git does not have that notion at all, and all git
35 working directories _are_ the repositories. However, you can easily
36 emulate the CVS model by having one special "global repository", which
37 people can synchronize with. See details later, but in the meantime
38 just keep in mind that with git, every checked out working tree will
39 have a full revision control history of its own.
40
41
42 Importing a CVS archive
43 -----------------------
44
45 Ok, you have an old project, and you want to at least give git a chance
46 to see how it performs. The first thing you want to do (after you've
47 gone through the git tutorial, and generally familiarized yourself with
48 how to commit stuff etc in git) is to create a git'ified version of your
49 CVS archive.
50
51 Happily, that's very easy indeed. Git will do it for you, although git
52 will need the help of a program called "cvsps":
53
54 http://www.cobite.com/cvsps/
55
56 which is not actually related to git at all, but which makes CVS usage
57 look almost sane (ie you almost certainly want to have it even if you
58 decide to stay with CVS). However, git will want at _least_ version 2.1
59 of cvsps (available at the address above), and in fact will currently
60 refuse to work with anything else.
61
62 Once you've gotten (and installed) cvsps, you may or may not want to get
63 any more familiar with it, but make sure it is in your path. After that,
64 the magic command line is
65
66 git cvsimport <cvsroot> <module>
67
68 which will do exactly what you'd think it does: it will create a git
69 archive of the named CVS module. The new archive will be created in a
70 subdirectory named <module>.
71
72 It can take some time to actually do the conversion for a large archive
73 since it involves checking out from CVS every revision of every file,
74 and the conversion script can be reasonably chatty, but on some not very
75 scientific tests it averaged about eight revisions per second, so a
76 medium-sized project should not take more than a couple of minutes. For
77 larger projects or remote repositories, the process may take longer.
78
79
80 Emulating CVS behaviour
81 -----------------------
82
83
84 FIXME! Talk about setting up several repositories, and pulling and
85 pushing between them. Talk about merging, and branches. Some of this
86 needs to be in the tutorial too.
87
88
89
90 CVS annotate
91 ------------
92
93 So, something has gone wrong, and you don't know whom to blame, and
94 you're an ex-CVS user and used to do "cvs annotate" to see who caused
95 the breakage. You're looking for the "git annotate", and it's just
96 claiming not to find such a script. You're annoyed.
97
98 Yes, that's right. Core git doesn't do "annotate", although it's
99 technically possible, and there are at least two specialized scripts out
100 there that can be used to get equivalent information (see the git
101 mailing list archives for details).
102
103 Git has a couple of alternatives, though, that you may find sufficient
104 or even superior depending on your use. One is called "git-whatchanged"
105 (for obvious reasons) and the other one is called "pickaxe" ("a tool for
106 the software archeologist").
107
108 The "git-whatchanged" script is a truly trivial script that can give you
109 a good overview of what has changed in a file or a directory (or an
110 arbitrary list of files or directories). The "pickaxe" support is an
111 additional layer that can be used to further specify exactly what you're
112 looking for, if you already know the specific area that changed.
113
114 Let's step back a bit and think about the reason why you would
115 want to do "cvs annotate a-file.c" to begin with.
116
117 You would use "cvs annotate" on a file when you have trouble
118 with a function (or even a single "if" statement in a function)
119 that happens to be defined in the file, which does not do what
120 you want it to do. And you would want to find out why it was
121 written that way, because you are about to modify it to suit
122 your needs, and at the same time you do not want to break its
123 current callers. For that, you are trying to find out why the
124 original author did things that way in the original context.
125
126 Many times, it may be enough to see the commit log messages of
127 commits that touch the file in question, possibly along with the
128 patches themselves, like this:
129
130 $ git-whatchanged -p a-file.c
131
132 This will show log messages and patches for each commit that
133 touches a-file.
134
135 This, however, may not be very useful when this file has many
136 modifications that are not related to the piece of code you are
137 interested in. You would see many log messages and patches that
138 do not have anything to do with the piece of code you are
139 interested in. As an example, assuming that you have this piece
140 code that you are interested in in the HEAD version:
141
142 if (frotz) {
143 nitfol();
144 }
145
146 you would use git-rev-list and git-diff-tree like this:
147
148 $ git-rev-list HEAD |
149 git-diff-tree --stdin -v -p -S'if (frotz) {
150 nitfol();
151 }'
152
153 We have already talked about the "--stdin" form of git-diff-tree
154 command that reads the list of commits and compares each commit
155 with its parents. The git-whatchanged command internally runs
156 the equivalent of the above command, and can be used like this:
157
158 $ git-whatchanged -p -S'if (frotz) {
159 nitfol();
160 }'
161
162 When the -S option is used, git-diff-tree command outputs
163 differences between two commits only if one tree has the
164 specified string in a file and the corresponding file in the
165 other tree does not. The above example looks for a commit that
166 has the "if" statement in it in a file, but its parent commit
167 does not have it in the same shape in the corresponding file (or
168 the other way around, where the parent has it and the commit
169 does not), and the differences between them are shown, along
170 with the commit message (thanks to the -v flag). It does not
171 show anything for commits that do not touch this "if" statement.
172
173 Also, in the original context, the same statement might have
174 appeared at first in a different file and later the file was
175 renamed to "a-file.c". CVS annotate would not help you to go
176 back across such a rename, but GIT would still help you in such
177 a situation. For that, you can give the -C flag to
178 git-diff-tree, like this:
179
180 $ git-whatchanged -p -C -S'if (frotz) {
181 nitfol();
182 }'
183
184 When the -C flag is used, file renames and copies are followed.
185 So if the "if" statement in question happens to be in "a-file.c"
186 in the current HEAD commit, even if the file was originally
187 called "o-file.c" and then renamed in an earlier commit, or if
188 the file was created by copying an existing "o-file.c" in an
189 earlier commit, you will not lose track. If the "if" statement
190 did not change across such rename or copy, then the commit that
191 does rename or copy would not show in the output, and if the
192 "if" statement was modified while the file was still called
193 "o-file.c", it would find the commit that changed the statement
194 when it was in "o-file.c".
195
196 [ BTW, the current versions of "git-diff-tree -C" is not eager
197 enough to find copies, and it will miss the fact that a-file.c
198 was created by copying o-file.c unless o-file.c was somehow
199 changed in the same commit.]
200
201 You can use the --pickaxe-all flag in addition to the -S flag.
202 This causes the differences from all the files contained in
203 those two commits, not just the differences between the files
204 that contain this changed "if" statement:
205
206 $ git-whatchanged -p -C -S'if (frotz) {
207 nitfol();
208 }' --pickaxe-all
209
210 [ Side note. This option is called "--pickaxe-all" because -S
211 option is internally called "pickaxe", a tool for software
212 archaeologists.]