blob: 77a14bb076b6d8be624345ee10e4bd14cfb2c359 [file] [log] [blame]
Shawn O. Pearce6e411d22007-02-05 21:09:25 -05001git-fast-import(1)
2==================
3
4NAME
5----
Junio C Hamano7a336312007-02-13 22:32:36 -08006git-fast-import - Backend for fast Git data importers
Shawn O. Pearce6e411d22007-02-05 21:09:25 -05007
8
9SYNOPSIS
10--------
11frontend | 'git-fast-import' [options]
12
13DESCRIPTION
14-----------
15This program is usually not what the end user wants to run directly.
16Most end users want to use one of the existing frontend programs,
17which parses a specific type of foreign source and feeds the contents
Shawn O. Pearce882227f2007-02-08 13:49:06 -050018stored there to git-fast-import.
Shawn O. Pearce6e411d22007-02-05 21:09:25 -050019
Shawn O. Pearce882227f2007-02-08 13:49:06 -050020fast-import reads a mixed command/data stream from standard input and
Shawn O. Pearce6e411d22007-02-05 21:09:25 -050021writes one or more packfiles directly into the current repository.
22When EOF is received on standard input, fast import writes out
23updated branch and tag refs, fully updating the current repository
24with the newly imported data.
25
Shawn O. Pearce882227f2007-02-08 13:49:06 -050026The fast-import backend itself can import into an empty repository (one that
Shawn O. Pearce6e411d22007-02-05 21:09:25 -050027has already been initialized by gitlink:git-init[1]) or incrementally
28update an existing populated repository. Whether or not incremental
29imports are supported from a particular foreign source depends on
30the frontend program in use.
31
32
33OPTIONS
34-------
Shawn O. Pearce63e0c8b2007-02-06 14:58:30 -050035--date-format=<fmt>::
36 Specify the type of dates the frontend will supply to
Shawn O. Pearce882227f2007-02-08 13:49:06 -050037 fast-import within `author`, `committer` and `tagger` commands.
Shawn O. Pearce63e0c8b2007-02-06 14:58:30 -050038 See ``Date Formats'' below for details about which formats
39 are supported, and their syntax.
40
Shawn O. Pearce7073e692007-02-06 16:08:06 -050041--force::
42 Force updating modified existing branches, even if doing
43 so would cause commits to be lost (as the new commit does
44 not contain the old commit).
45
Shawn O. Pearce6e411d22007-02-05 21:09:25 -050046--max-pack-size=<n>::
47 Maximum size of each output packfile, expressed in MiB.
48 The default is 4096 (4 GiB) as that is the maximum allowed
49 packfile size (due to file format limitations). Some
50 importers may wish to lower this, such as to ensure the
51 resulting packfiles fit on CDs.
52
53--depth=<n>::
54 Maximum delta depth, for blob and tree deltification.
55 Default is 10.
56
57--active-branches=<n>::
58 Maximum number of branches to maintain active at once.
59 See ``Memory Utilization'' below for details. Default is 5.
60
61--export-marks=<file>::
62 Dumps the internal marks table to <file> when complete.
63 Marks are written one per line as `:markid SHA-1`.
64 Frontends can use this file to validate imports after they
65 have been completed.
66
Shawn O. Pearcebdf1c062007-02-11 19:45:56 -050067--export-pack-edges=<file>::
68 After creating a packfile, print a line of data to
69 <file> listing the filename of the packfile and the last
70 commit on each branch that was written to that packfile.
71 This information may be useful after importing projects
72 whose total object set exceeds the 4 GiB packfile limit,
73 as these commits can be used as edge points during calls
74 to gitlink:git-pack-objects[1].
75
Shawn O. Pearcec499d762007-02-07 02:19:31 -050076--quiet::
Shawn O. Pearce882227f2007-02-08 13:49:06 -050077 Disable all non-fatal output, making fast-import silent when it
Shawn O. Pearcec499d762007-02-07 02:19:31 -050078 is successful. This option disables the output shown by
79 \--stats.
80
81--stats::
Shawn O. Pearce882227f2007-02-08 13:49:06 -050082 Display some basic statistics about the objects fast-import has
Shawn O. Pearcec499d762007-02-07 02:19:31 -050083 created, the packfiles they were stored into, and the
Shawn O. Pearce882227f2007-02-08 13:49:06 -050084 memory used by fast-import during this run. Showing this output
Shawn O. Pearcec499d762007-02-07 02:19:31 -050085 is currently the default, but can be disabled with \--quiet.
86
87
Shawn O. Pearce6e411d22007-02-05 21:09:25 -050088Performance
89-----------
Shawn O. Pearce882227f2007-02-08 13:49:06 -050090The design of fast-import allows it to import large projects in a minimum
Shawn O. Pearce6e411d22007-02-05 21:09:25 -050091amount of memory usage and processing time. Assuming the frontend
Shawn O. Pearce882227f2007-02-08 13:49:06 -050092is able to keep up with fast-import and feed it a constant stream of data,
Shawn O. Pearce6e411d22007-02-05 21:09:25 -050093import times for projects holding 10+ years of history and containing
94100,000+ individual commits are generally completed in just 1-2
95hours on quite modest (~$2,000 USD) hardware.
96
97Most bottlenecks appear to be in foreign source data access (the
Shawn O. Pearce882227f2007-02-08 13:49:06 -050098source just cannot extract revisions fast enough) or disk IO (fast-import
Shawn O. Pearce6e411d22007-02-05 21:09:25 -050099writes as fast as the disk will take the data). Imports will run
100faster if the source data is stored on a different drive than the
101destination Git repository (due to less IO contention).
102
103
104Development Cost
105----------------
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500106A typical frontend for fast-import tends to weigh in at approximately 200
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500107lines of Perl/Python/Ruby code. Most developers have been able to
108create working importers in just a couple of hours, even though it
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500109is their first exposure to fast-import, and sometimes even to Git. This is
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500110an ideal situation, given that most conversion tools are throw-away
111(use once, and never look back).
112
113
114Parallel Operation
115------------------
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500116Like `git-push` or `git-fetch`, imports handled by fast-import are safe to
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500117run alongside parallel `git repack -a -d` or `git gc` invocations,
118or any other Git operation (including `git prune`, as loose objects
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500119are never used by fast-import).
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500120
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500121fast-import does not lock the branch or tag refs it is actively importing.
122After the import, during its ref update phase, fast-import tests each
Shawn O. Pearce7073e692007-02-06 16:08:06 -0500123existing branch ref to verify the update will be a fast-forward
124update (the commit stored in the ref is contained in the new
125history of the commit to be written). If the update is not a
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500126fast-forward update, fast-import will skip updating that ref and instead
127prints a warning message. fast-import will always attempt to update all
Shawn O. Pearce7073e692007-02-06 16:08:06 -0500128branch refs, and does not stop on the first failure.
129
Shawn O. Pearcec499d762007-02-07 02:19:31 -0500130Branch updates can be forced with \--force, but its recommended that
131this only be used on an otherwise quiet repository. Using \--force
Shawn O. Pearce7073e692007-02-06 16:08:06 -0500132is not necessary for an initial import into an empty repository.
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500133
134
135Technical Discussion
136--------------------
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500137fast-import tracks a set of branches in memory. Any branch can be created
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500138or modified at any point during the import process by sending a
139`commit` command on the input stream. This design allows a frontend
140program to process an unlimited number of branches simultaneously,
141generating commits in the order they are available from the source
142data. It also simplifies the frontend programs considerably.
143
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500144fast-import does not use or alter the current working directory, or any
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500145file within it. (It does however update the current Git repository,
146as referenced by `GIT_DIR`.) Therefore an import frontend may use
147the working directory for its own purposes, such as extracting file
148revisions from the foreign source. This ignorance of the working
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500149directory also allows fast-import to run very quickly, as it does not
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500150need to perform any costly file update operations when switching
151between branches.
152
153Input Format
154------------
155With the exception of raw file data (which Git does not interpret)
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500156the fast-import input format is text (ASCII) based. This text based
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500157format simplifies development and debugging of frontend programs,
158especially when a higher level language such as Perl, Python or
159Ruby is being used.
160
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500161fast-import is very strict about its input. Where we say SP below we mean
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500162*exactly* one space. Likewise LF means one (and only one) linefeed.
163Supplying additional whitespace characters will cause unexpected
164results, such as branch names or file names with leading or trailing
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500165spaces in their name, or early termination of fast-import when it encounters
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500166unexpected input.
167
Shawn O. Pearce63e0c8b2007-02-06 14:58:30 -0500168Date Formats
169~~~~~~~~~~~~
170The following date formats are supported. A frontend should select
171the format it will use for this import by passing the format name
Shawn O. Pearcec499d762007-02-07 02:19:31 -0500172in the \--date-format=<fmt> command line option.
Shawn O. Pearce63e0c8b2007-02-06 14:58:30 -0500173
174`raw`::
Shawn O. Pearce9b92c822007-02-07 00:51:58 -0500175 This is the Git native format and is `<time> SP <offutc>`.
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500176 It is also fast-import's default format, if \--date-format was
Shawn O. Pearce63e0c8b2007-02-06 14:58:30 -0500177 not specified.
178+
179The time of the event is specified by `<time>` as the number of
180seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is
181written as an ASCII decimal integer.
182+
Shawn O. Pearce9b92c822007-02-07 00:51:58 -0500183The local offset is specified by `<offutc>` as a positive or negative
184offset from UTC. For example EST (which is 5 hours behind UTC)
185would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''.
186The local offset does not affect `<time>`; it is used only as an
187advisement to help formatting routines display the timestamp.
Shawn O. Pearce63e0c8b2007-02-06 14:58:30 -0500188+
Shawn O. Pearce9b92c822007-02-07 00:51:58 -0500189If the local offset is not available in the source material, use
190``+0000'', or the most common local offset. For example many
Shawn O. Pearce63e0c8b2007-02-06 14:58:30 -0500191organizations have a CVS repository which has only ever been accessed
192by users who are located in the same location and timezone. In this
Shawn O. Pearcef842fdb2007-02-08 01:53:48 -0500193case a reasonable offset from UTC could be assumed.
Shawn O. Pearce63e0c8b2007-02-06 14:58:30 -0500194+
195Unlike the `rfc2822` format, this format is very strict. Any
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500196variation in formatting will cause fast-import to reject the value.
Shawn O. Pearce63e0c8b2007-02-06 14:58:30 -0500197
198`rfc2822`::
199 This is the standard email format as described by RFC 2822.
200+
201An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git
Shawn O. Pearcef842fdb2007-02-08 01:53:48 -0500202parser is accurate, but a little on the lenient side. It is the
Shawn O. Pearce63e0c8b2007-02-06 14:58:30 -0500203same parser used by gitlink:git-am[1] when applying patches
204received from email.
205+
206Some malformed strings may be accepted as valid dates. In some of
207these cases Git will still be able to obtain the correct date from
208the malformed string. There are also some types of malformed
209strings which Git will parse wrong, and yet consider valid.
210Seriously malformed strings will be rejected.
211+
Shawn O. Pearce9b92c822007-02-07 00:51:58 -0500212Unlike the `raw` format above, the timezone/UTC offset information
213contained in an RFC 2822 date string is used to adjust the date
214value to UTC prior to storage. Therefore it is important that
215this information be as accurate as possible.
216+
Shawn O. Pearcef842fdb2007-02-08 01:53:48 -0500217If the source material uses RFC 2822 style dates,
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500218the frontend should let fast-import handle the parsing and conversion
Shawn O. Pearce63e0c8b2007-02-06 14:58:30 -0500219(rather than attempting to do it itself) as the Git parser has
220been well tested in the wild.
221+
222Frontends should prefer the `raw` format if the source material
Shawn O. Pearcef842fdb2007-02-08 01:53:48 -0500223already uses UNIX-epoch format, can be coaxed to give dates in that
224format, or its format is easiliy convertible to it, as there is no
225ambiguity in parsing.
Shawn O. Pearce63e0c8b2007-02-06 14:58:30 -0500226
227`now`::
228 Always use the current time and timezone. The literal
229 `now` must always be supplied for `<when>`.
230+
231This is a toy format. The current time and timezone of this system
232is always copied into the identity string at the time it is being
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500233created by fast-import. There is no way to specify a different time or
Shawn O. Pearce63e0c8b2007-02-06 14:58:30 -0500234timezone.
235+
236This particular format is supplied as its short to implement and
237may be useful to a process that wants to create a new commit
238right now, without needing to use a working directory or
239gitlink:git-update-index[1].
240+
241If separate `author` and `committer` commands are used in a `commit`
242the timestamps may not match, as the system clock will be polled
243twice (once for each command). The only way to ensure that both
244author and committer identity information has the same timestamp
245is to omit `author` (thus copying from `committer`) or to use a
246date format other than `now`.
247
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500248Commands
249~~~~~~~~
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500250fast-import accepts several commands to update the current repository
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500251and control the current import process. More detailed discussion
252(with examples) of each command follows later.
253
254`commit`::
255 Creates a new branch or updates an existing branch by
256 creating a new commit and updating the branch to point at
257 the newly created commit.
258
259`tag`::
260 Creates an annotated tag object from an existing commit or
261 branch. Lightweight tags are not supported by this command,
262 as they are not recommended for recording meaningful points
263 in time.
264
265`reset`::
266 Reset an existing branch (or a new branch) to a specific
267 revision. This command must be used to change a branch to
268 a specific revision without making a commit on it.
269
270`blob`::
271 Convert raw file data into a blob, for future use in a
272 `commit` command. This command is optional and is not
273 needed to perform an import.
274
275`checkpoint`::
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500276 Forces fast-import to close the current packfile, generate its
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500277 unique SHA-1 checksum and index, and start a new packfile.
278 This command is optional and is not needed to perform
279 an import.
280
281`commit`
282~~~~~~~~
283Create or update a branch with a new commit, recording one logical
284change to the project.
285
286....
287 'commit' SP <ref> LF
288 mark?
Shawn O. Pearce63e0c8b2007-02-06 14:58:30 -0500289 ('author' SP <name> SP LT <email> GT SP <when> LF)?
290 'committer' SP <name> SP LT <email> GT SP <when> LF
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500291 data
292 ('from' SP <committish> LF)?
293 ('merge' SP <committish> LF)?
Shawn O. Pearce825769a2007-02-07 02:03:03 -0500294 (filemodify | filedelete | filedeleteall)*
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500295 LF
296....
297
298where `<ref>` is the name of the branch to make the commit on.
299Typically branch names are prefixed with `refs/heads/` in
300Git, so importing the CVS branch symbol `RELENG-1_0` would use
301`refs/heads/RELENG-1_0` for the value of `<ref>`. The value of
302`<ref>` must be a valid refname in Git. As `LF` is not valid in
303a Git refname, no quoting or escaping syntax is supported here.
304
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500305A `mark` command may optionally appear, requesting fast-import to save a
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500306reference to the newly created commit for future use by the frontend
307(see below for format). It is very common for frontends to mark
308every commit they create, thereby allowing future branch creation
309from any imported commit.
310
311The `data` command following `committer` must supply the commit
312message (see below for `data` command syntax). To import an empty
313commit message use a 0 length data. Commit messages are free-form
314and are not interpreted by Git. Currently they must be encoded in
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500315UTF-8, as fast-import does not permit other encodings to be specified.
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500316
Shawn O. Pearce825769a2007-02-07 02:03:03 -0500317Zero or more `filemodify`, `filedelete` and `filedeleteall` commands
318may be included to update the contents of the branch prior to
319creating the commit. These commands may be supplied in any order.
320However it is recommended that a `filedeleteall` command preceed
321all `filemodify` commands in the same commit, as `filedeleteall`
322wipes the branch clean (see below).
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500323
324`author`
325^^^^^^^^
326An `author` command may optionally appear, if the author information
327might differ from the committer information. If `author` is omitted
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500328then fast-import will automatically use the committer's information for
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500329the author portion of the commit. See below for a description of
330the fields in `author`, as they are identical to `committer`.
331
332`committer`
333^^^^^^^^^^^
334The `committer` command indicates who made this commit, and when
335they made it.
336
337Here `<name>` is the person's display name (for example
338``Com M Itter'') and `<email>` is the person's email address
339(``cm@example.com''). `LT` and `GT` are the literal less-than (\x3c)
340and greater-than (\x3e) symbols. These are required to delimit
341the email address from the other fields in the line. Note that
342`<name>` is free-form and may contain any sequence of bytes, except
343`LT` and `LF`. It is typically UTF-8 encoded.
344
Shawn O. Pearce63e0c8b2007-02-06 14:58:30 -0500345The time of the change is specified by `<when>` using the date format
Shawn O. Pearcec499d762007-02-07 02:19:31 -0500346that was selected by the \--date-format=<fmt> command line option.
Shawn O. Pearce63e0c8b2007-02-06 14:58:30 -0500347See ``Date Formats'' above for the set of supported formats, and
348their syntax.
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500349
350`from`
351^^^^^^
Shawn O. Pearceea5e3702007-02-12 04:08:43 -0500352The `from` command is used to specify the commit to initialize
353this branch from. This revision will be the first ancestor of the
354new commit.
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500355
Shawn O. Pearceea5e3702007-02-12 04:08:43 -0500356Omitting the `from` command in the first commit of a new branch
357will cause fast-import to create that commit with no ancestor. This
358tends to be desired only for the initial commit of a project.
359Omitting the `from` command on existing branches is usually desired,
360as the current commit on that branch is automatically assumed to
361be the first ancestor of the new commit.
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500362
363As `LF` is not valid in a Git refname or SHA-1 expression, no
364quoting or escaping syntax is supported within `<committish>`.
365
366Here `<committish>` is any of the following:
367
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500368* The name of an existing branch already in fast-import's internal branch
369 table. If fast-import doesn't know the name, its treated as a SHA-1
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500370 expression.
371
372* A mark reference, `:<idnum>`, where `<idnum>` is the mark number.
373+
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500374The reason fast-import uses `:` to denote a mark reference is this character
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500375is not legal in a Git branch name. The leading `:` makes it easy
376to distingush between the mark 42 (`:42`) and the branch 42 (`42`
377or `refs/heads/42`), or an abbreviated SHA-1 which happened to
378consist only of base-10 digits.
379+
380Marks must be declared (via `mark`) before they can be used.
381
382* A complete 40 byte or abbreviated commit SHA-1 in hex.
383
384* Any valid Git SHA-1 expression that resolves to a commit. See
385 ``SPECIFYING REVISIONS'' in gitlink:git-rev-parse[1] for details.
386
387The special case of restarting an incremental import from the
388current branch value should be written as:
389----
390 from refs/heads/branch^0
391----
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500392The `{caret}0` suffix is necessary as fast-import does not permit a branch to
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500393start from itself, and the branch is created in memory before the
Shawn O. Pearce209f1292007-02-08 01:35:37 -0500394`from` command is even read from the input. Adding `{caret}0` will force
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500395fast-import to resolve the commit through Git's revision parsing library,
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500396rather than its internal branch table, thereby loading in the
397existing value of the branch.
398
399`merge`
400^^^^^^^
401Includes one additional ancestor commit, and makes the current
402commit a merge commit. An unlimited number of `merge` commands per
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500403commit are permitted by fast-import, thereby establishing an n-way merge.
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500404However Git's other tools never create commits with more than 15
405additional ancestors (forming a 16-way merge). For this reason
406it is suggested that frontends do not use more than 15 `merge`
407commands per commit.
408
409Here `<committish>` is any of the commit specification expressions
410also accepted by `from` (see above).
411
412`filemodify`
Shawn O. Pearceef94edb2007-02-06 12:35:02 -0500413^^^^^^^^^^^^
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500414Included in a `commit` command to add a new file or change the
415content of an existing file. This command has two different means
416of specifying the content of the file.
417
418External data format::
419 The data content for the file was already supplied by a prior
420 `blob` command. The frontend just needs to connect it.
421+
422....
423 'M' SP <mode> SP <dataref> SP <path> LF
424....
425+
426Here `<dataref>` can be either a mark reference (`:<idnum>`)
427set by a prior `blob` command, or a full 40-byte SHA-1 of an
428existing Git blob object.
429
430Inline data format::
431 The data content for the file has not been supplied yet.
432 The frontend wants to supply it as part of this modify
433 command.
434+
435....
436 'M' SP <mode> SP 'inline' SP <path> LF
437 data
438....
439+
440See below for a detailed description of the `data` command.
441
442In both formats `<mode>` is the type of file entry, specified
443in octal. Git only supports the following modes:
444
445* `100644` or `644`: A normal (not-executable) file. The majority
446 of files in most projects use this mode. If in doubt, this is
447 what you want.
448* `100755` or `755`: A normal, but executable, file.
Junio C Hamano9981b6d2007-02-06 12:46:11 -0800449* `120000`: A symlink, the content of the file will be the link target.
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500450
451In both formats `<path>` is the complete path of the file to be added
452(if not already existing) or modified (if already existing).
453
454A `<path>` string must use UNIX-style directory seperators (forward
455slash `/`), may contain any byte other than `LF`, and must not
456start with double quote (`"`).
457
458If an `LF` or double quote must be encoded into `<path>` shell-style
459quoting should be used, e.g. `"path/with\n and \" in it"`.
460
461The value of `<path>` must be in canoncial form. That is it must not:
462
463* contain an empty directory component (e.g. `foo//bar` is invalid),
464* end with a directory seperator (e.g. `foo/` is invalid),
465* start with a directory seperator (e.g. `/foo` is invalid),
466* contain the special component `.` or `..` (e.g. `foo/./bar` and
467 `foo/../bar` are invalid).
468
469It is recommended that `<path>` always be encoded using UTF-8.
470
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500471`filedelete`
Shawn O. Pearceef94edb2007-02-06 12:35:02 -0500472^^^^^^^^^^^^
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500473Included in a `commit` command to remove a file from the branch.
474If the file removal makes its directory empty, the directory will
475be automatically removed too. This cascades up the tree until the
476first non-empty directory or the root is reached.
477
478....
479 'D' SP <path> LF
480....
481
482here `<path>` is the complete path of the file to be removed.
483See `filemodify` above for a detailed description of `<path>`.
484
Shawn O. Pearce825769a2007-02-07 02:03:03 -0500485`filedeleteall`
486^^^^^^^^^^^^^^^
487Included in a `commit` command to remove all files (and also all
488directories) from the branch. This command resets the internal
489branch structure to have no files in it, allowing the frontend
490to subsequently add all interesting files from scratch.
491
492....
493 'deleteall' LF
494....
495
496This command is extremely useful if the frontend does not know
497(or does not care to know) what files are currently on the branch,
498and therefore cannot generate the proper `filedelete` commands to
499update the content.
500
501Issuing a `filedeleteall` followed by the needed `filemodify`
502commands to set the correct content will produce the same results
503as sending only the needed `filemodify` and `filedelete` commands.
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500504The `filedeleteall` approach may however require fast-import to use slightly
Shawn O. Pearce825769a2007-02-07 02:03:03 -0500505more memory per active branch (less than 1 MiB for even most large
506projects); so frontends that can easily obtain only the affected
507paths for a commit are encouraged to do so.
508
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500509`mark`
510~~~~~~
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500511Arranges for fast-import to save a reference to the current object, allowing
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500512the frontend to recall this object at a future point in time, without
513knowing its SHA-1. Here the current object is the object creation
514command the `mark` command appears within. This can be `commit`,
515`tag`, and `blob`, but `commit` is the most common usage.
516
517....
518 'mark' SP ':' <idnum> LF
519....
520
521where `<idnum>` is the number assigned by the frontend to this mark.
Shawn O. Pearceef94edb2007-02-06 12:35:02 -0500522The value of `<idnum>` is expressed as an ASCII decimal integer.
523The value 0 is reserved and cannot be used as
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500524a mark. Only values greater than or equal to 1 may be used as marks.
525
526New marks are created automatically. Existing marks can be moved
527to another object simply by reusing the same `<idnum>` in another
528`mark` command.
529
530`tag`
531~~~~~
532Creates an annotated tag referring to a specific commit. To create
533lightweight (non-annotated) tags see the `reset` command below.
534
535....
536 'tag' SP <name> LF
537 'from' SP <committish> LF
Shawn O. Pearce63e0c8b2007-02-06 14:58:30 -0500538 'tagger' SP <name> SP LT <email> GT SP <when> LF
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500539 data
540 LF
541....
542
543where `<name>` is the name of the tag to create.
544
545Tag names are automatically prefixed with `refs/tags/` when stored
546in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500547use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500548corresponding ref as `refs/tags/RELENG-1_0-FINAL`.
549
550The value of `<name>` must be a valid refname in Git and therefore
551may contain forward slashes. As `LF` is not valid in a Git refname,
552no quoting or escaping syntax is supported here.
553
554The `from` command is the same as in the `commit` command; see
555above for details.
556
557The `tagger` command uses the same format as `committer` within
558`commit`; again see above for details.
559
560The `data` command following `tagger` must supply the annotated tag
561message (see below for `data` command syntax). To import an empty
562tag message use a 0 length data. Tag messages are free-form and are
563not interpreted by Git. Currently they must be encoded in UTF-8,
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500564as fast-import does not permit other encodings to be specified.
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500565
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500566Signing annotated tags during import from within fast-import is not
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500567supported. Trying to include your own PGP/GPG signature is not
568recommended, as the frontend does not (easily) have access to the
569complete set of bytes which normally goes into such a signature.
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500570If signing is required, create lightweight tags from within fast-import with
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500571`reset`, then create the annotated versions of those tags offline
572with the standard gitlink:git-tag[1] process.
573
574`reset`
575~~~~~~~
576Creates (or recreates) the named branch, optionally starting from
577a specific revision. The reset command allows a frontend to issue
578a new `from` command for an existing branch, or to create a new
579branch from an existing commit without creating a new commit.
580
581....
582 'reset' SP <ref> LF
583 ('from' SP <committish> LF)?
584 LF
585....
586
587For a detailed description of `<ref>` and `<committish>` see above
588under `commit` and `from`.
589
590The `reset` command can also be used to create lightweight
591(non-annotated) tags. For example:
592
593====
594 reset refs/tags/938
595 from :938
596====
597
598would create the lightweight tag `refs/tags/938` referring to
599whatever commit mark `:938` references.
600
601`blob`
602~~~~~~
603Requests writing one file revision to the packfile. The revision
604is not connected to any commit; this connection must be formed in
605a subsequent `commit` command by referencing the blob through an
606assigned mark.
607
608....
609 'blob' LF
610 mark?
611 data
612....
613
614The mark command is optional here as some frontends have chosen
615to generate the Git SHA-1 for the blob on their own, and feed that
616directly to `commit`. This is typically more work than its worth
617however, as marks are inexpensive to store and easy to use.
618
619`data`
620~~~~~~
621Supplies raw data (for use as blob/file content, commit messages, or
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500622annotated tag messages) to fast-import. Data can be supplied using an exact
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500623byte count or delimited with a terminating line. Real frontends
624intended for production-quality conversions should always use the
625exact byte count format, as it is more robust and performs better.
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500626The delimited format is intended primarily for testing fast-import.
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500627
Shawn O. Pearceef94edb2007-02-06 12:35:02 -0500628Exact byte count format::
629 The frontend must specify the number of bytes of data.
630+
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500631....
632 'data' SP <count> LF
633 <raw> LF
634....
Shawn O. Pearceef94edb2007-02-06 12:35:02 -0500635+
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500636where `<count>` is the exact number of bytes appearing within
Shawn O. Pearceef94edb2007-02-06 12:35:02 -0500637`<raw>`. The value of `<count>` is expressed as an ASCII decimal
638integer. The `LF` on either side of `<raw>` is not
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500639included in `<count>` and will not be included in the imported data.
640
Shawn O. Pearceef94edb2007-02-06 12:35:02 -0500641Delimited format::
642 A delimiter string is used to mark the end of the data.
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500643 fast-import will compute the length by searching for the delimiter.
Shawn O. Pearceef94edb2007-02-06 12:35:02 -0500644 This format is primarly useful for testing and is not
645 recommended for real data.
646+
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500647....
648 'data' SP '<<' <delim> LF
649 <raw> LF
650 <delim> LF
651....
Shawn O. Pearceef94edb2007-02-06 12:35:02 -0500652+
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500653where `<delim>` is the chosen delimiter string. The string `<delim>`
654must not appear on a line by itself within `<raw>`, as otherwise
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500655fast-import will think the data ends earlier than it really does. The `LF`
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500656immediately trailing `<raw>` is part of `<raw>`. This is one of
657the limitations of the delimited format, it is impossible to supply
658a data chunk which does not have an LF as its last byte.
659
660`checkpoint`
661~~~~~~~~~~~~
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500662Forces fast-import to close the current packfile, start a new one, and to
Shawn O. Pearce820b9312007-02-07 02:42:44 -0500663save out all current branch refs, tags and marks.
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500664
665....
666 'checkpoint' LF
667 LF
668....
669
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500670Note that fast-import automatically switches packfiles when the current
Shawn O. Pearce820b9312007-02-07 02:42:44 -0500671packfile reaches \--max-pack-size, or 4 GiB, whichever limit is
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500672smaller. During an automatic packfile switch fast-import does not update
Shawn O. Pearce820b9312007-02-07 02:42:44 -0500673the branch refs, tags or marks.
674
675As a `checkpoint` can require a significant amount of CPU time and
676disk IO (to compute the overall pack SHA-1 checksum, generate the
677corresponding index file, and update the refs) it can easily take
678several minutes for a single `checkpoint` command to complete.
679
680Frontends may choose to issue checkpoints during extremely large
681and long running imports, or when they need to allow another Git
682process access to a branch. However given that a 30 GiB Subversion
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500683repository can be loaded into Git through fast-import in about 3 hours,
Shawn O. Pearce820b9312007-02-07 02:42:44 -0500684explicit checkpointing may not be necessary.
685
686
Shawn O. Pearcebdd9f422007-02-07 03:49:08 -0500687Tips and Tricks
688---------------
689The following tips and tricks have been collected from various
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500690users of fast-import, and are offered here as suggestions.
Shawn O. Pearcebdd9f422007-02-07 03:49:08 -0500691
692Use One Mark Per Commit
693~~~~~~~~~~~~~~~~~~~~~~~
694When doing a repository conversion, use a unique mark per commit
695(`mark :<n>`) and supply the \--export-marks option on the command
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500696line. fast-import will dump a file which lists every mark and the Git
Shawn O. Pearcebdd9f422007-02-07 03:49:08 -0500697object SHA-1 that corresponds to it. If the frontend can tie
698the marks back to the source repository, it is easy to verify the
699accuracy and completeness of the import by comparing each Git
700commit to the corresponding source revision.
701
702Coming from a system such as Perforce or Subversion this should be
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500703quite simple, as the fast-import mark can also be the Perforce changeset
Shawn O. Pearcebdd9f422007-02-07 03:49:08 -0500704number or the Subversion revision number.
705
706Freely Skip Around Branches
707~~~~~~~~~~~~~~~~~~~~~~~~~~~
708Don't bother trying to optimize the frontend to stick to one branch
709at a time during an import. Although doing so might be slightly
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500710faster for fast-import, it tends to increase the complexity of the frontend
Shawn O. Pearcebdd9f422007-02-07 03:49:08 -0500711code considerably.
712
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500713The branch LRU builtin to fast-import tends to behave very well, and the
Shawn O. Pearcebdd9f422007-02-07 03:49:08 -0500714cost of activating an inactive branch is so low that bouncing around
715between branches has virtually no impact on import performance.
716
Shawn O. Pearcec7346152007-02-11 19:50:50 -0500717Handling Renames
718~~~~~~~~~~~~~~~~
719When importing a renamed file or directory, simply delete the old
720name(s) and modify the new name(s) during the corresponding commit.
721Git performs rename detection after-the-fact, rather than explicitly
722during a commit.
723
Shawn O. Pearcebdd9f422007-02-07 03:49:08 -0500724Use Tag Fixup Branches
725~~~~~~~~~~~~~~~~~~~~~~
726Some other SCM systems let the user create a tag from multiple
727files which are not from the same commit/changeset. Or to create
728tags which are a subset of the files available in the repository.
729
730Importing these tags as-is in Git is impossible without making at
731least one commit which ``fixes up'' the files to match the content
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500732of the tag. Use fast-import's `reset` command to reset a dummy branch
Shawn O. Pearcebdd9f422007-02-07 03:49:08 -0500733outside of your normal branch space to the base commit for the tag,
734then commit one or more file fixup commits, and finally tag the
735dummy branch.
736
737For example since all normal branches are stored under `refs/heads/`
738name the tag fixup branch `TAG_FIXUP`. This way it is impossible for
739the fixup branch used by the importer to have namespace conflicts
740with real branches imported from the source (the name `TAG_FIXUP`
741is not `refs/heads/TAG_FIXUP`).
742
743When committing fixups, consider using `merge` to connect the
744commit(s) which are supplying file revisions to the fixup branch.
745Doing so will allow tools such as gitlink:git-blame[1] to track
746through the real commit history and properly annotate the source
747files.
748
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500749After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP`
Shawn O. Pearcebdd9f422007-02-07 03:49:08 -0500750to remove the dummy branch.
751
752Import Now, Repack Later
753~~~~~~~~~~~~~~~~~~~~~~~~
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500754As soon as fast-import completes the Git repository is completely valid
Shawn O. Pearcebdd9f422007-02-07 03:49:08 -0500755and ready for use. Typicallly this takes only a very short time,
756even for considerably large projects (100,000+ commits).
757
758However repacking the repository is necessary to improve data
759locality and access performance. It can also take hours on extremely
760large projects (especially if -f and a large \--window parameter is
761used). Since repacking is safe to run alongside readers and writers,
762run the repack in the background and let it finish when it finishes.
763There is no reason to wait to explore your new Git project!
764
765If you choose to wait for the repack, don't try to run benchmarks
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500766or performance tests until repacking is completed. fast-import outputs
Shawn O. Pearcebdd9f422007-02-07 03:49:08 -0500767suboptimal packfiles that are simply never seen in real use
768situations.
769
770Repacking Historical Data
771~~~~~~~~~~~~~~~~~~~~~~~~~
772If you are repacking very old imported data (e.g. older than the
773last year), consider expending some extra CPU time and supplying
774\--window=50 (or higher) when you run gitlink:git-repack[1].
775This will take longer, but will also produce a smaller packfile.
776You only need to expend the effort once, and everyone using your
777project will benefit from the smaller repository.
778
779
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500780Packfile Optimization
781---------------------
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500782When packing a blob fast-import always attempts to deltify against the last
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500783blob written. Unless specifically arranged for by the frontend,
784this will probably not be a prior version of the same file, so the
785generated delta will not be the smallest possible. The resulting
786packfile will be compressed, but will not be optimal.
787
788Frontends which have efficient access to all revisions of a
789single file (for example reading an RCS/CVS ,v file) can choose
790to supply all revisions of that file as a sequence of consecutive
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500791`blob` commands. This allows fast-import to deltify the different file
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500792revisions against each other, saving space in the final packfile.
793Marks can be used to later identify individual file revisions during
794a sequence of `commit` commands.
795
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500796The packfile(s) created by fast-import do not encourage good disk access
797patterns. This is caused by fast-import writing the data in the order
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500798it is received on standard input, while Git typically organizes
799data within packfiles to make the most recent (current tip) data
800appear before historical data. Git also clusters commits together,
801speeding up revision traversal through better cache locality.
802
803For this reason it is strongly recommended that users repack the
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500804repository with `git repack -a -d` after fast-import completes, allowing
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500805Git to reorganize the packfiles for faster data access. If blob
806deltas are suboptimal (see above) then also adding the `-f` option
807to force recomputation of all deltas can significantly reduce the
808final packfile size (30-50% smaller can be quite typical).
809
Shawn O. Pearcebdd9f422007-02-07 03:49:08 -0500810
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500811Memory Utilization
812------------------
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500813There are a number of factors which affect how much memory fast-import
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500814requires to perform an import. Like critical sections of core
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500815Git, fast-import uses its own memory allocators to ammortize any overheads
816associated with malloc. In practice fast-import tends to ammoritize any
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500817malloc overheads to 0, due to its use of large block allocations.
818
819per object
820~~~~~~~~~~
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500821fast-import maintains an in-memory structure for every object written in
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500822this execution. On a 32 bit system the structure is 32 bytes,
823on a 64 bit system the structure is 40 bytes (due to the larger
824pointer sizes). Objects in the table are not deallocated until
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500825fast-import terminates. Importing 2 million objects on a 32 bit system
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500826will require approximately 64 MiB of memory.
827
828The object table is actually a hashtable keyed on the object name
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500829(the unique SHA-1). This storage configuration allows fast-import to reuse
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500830an existing or already written object and avoid writing duplicates
831to the output packfile. Duplicate blobs are surprisingly common
832in an import, typically due to branch merges in the source.
833
834per mark
835~~~~~~~~
836Marks are stored in a sparse array, using 1 pointer (4 bytes or 8
837bytes, depending on pointer size) per mark. Although the array
838is sparse, frontends are still strongly encouraged to use marks
839between 1 and n, where n is the total number of marks required for
840this import.
841
842per branch
843~~~~~~~~~~
844Branches are classified as active and inactive. The memory usage
845of the two classes is significantly different.
846
847Inactive branches are stored in a structure which uses 96 or 120
848bytes (32 bit or 64 bit systems, respectively), plus the length of
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500849the branch name (typically under 200 bytes), per branch. fast-import will
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500850easily handle as many as 10,000 inactive branches in under 2 MiB
851of memory.
852
853Active branches have the same overhead as inactive branches, but
854also contain copies of every tree that has been recently modified on
855that branch. If subtree `include` has not been modified since the
856branch became active, its contents will not be loaded into memory,
857but if subtree `src` has been modified by a commit since the branch
858became active, then its contents will be loaded in memory.
859
860As active branches store metadata about the files contained on that
861branch, their in-memory storage size can grow to a considerable size
862(see below).
863
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500864fast-import automatically moves active branches to inactive status based on
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500865a simple least-recently-used algorithm. The LRU chain is updated on
866each `commit` command. The maximum number of active branches can be
Shawn O. Pearcec499d762007-02-07 02:19:31 -0500867increased or decreased on the command line with \--active-branches=.
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500868
869per active tree
870~~~~~~~~~~~~~~~
871Trees (aka directories) use just 12 bytes of memory on top of the
872memory required for their entries (see ``per active file'' below).
873The cost of a tree is virtually 0, as its overhead ammortizes out
874over the individual file entries.
875
876per active file entry
877~~~~~~~~~~~~~~~~~~~~~
878Files (and pointers to subtrees) within active trees require 52 or 64
879bytes (32/64 bit platforms) per entry. To conserve space, file and
880tree names are pooled in a common string table, allowing the filename
881``Makefile'' to use just 16 bytes (after including the string header
882overhead) no matter how many times it occurs within the project.
883
884The active branch LRU, when coupled with the filename string pool
Shawn O. Pearce882227f2007-02-08 13:49:06 -0500885and lazy loading of subtrees, allows fast-import to efficiently import
Shawn O. Pearce6e411d22007-02-05 21:09:25 -0500886projects with 2,000+ branches and 45,114+ files in a very limited
887memory footprint (less than 2.7 MiB per active branch).
888
889
890Author
891------
892Written by Shawn O. Pearce <spearce@spearce.org>.
893
894Documentation
895--------------
896Documentation by Shawn O. Pearce <spearce@spearce.org>.
897
898GIT
899---
900Part of the gitlink:git[7] suite
901