Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 1 | git-fast-import(1) |
| 2 | ================== |
| 3 | |
| 4 | NAME |
| 5 | ---- |
Junio C Hamano | 7a33631 | 2007-02-13 22:32:36 -0800 | [diff] [blame^] | 6 | git-fast-import - Backend for fast Git data importers |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 7 | |
| 8 | |
| 9 | SYNOPSIS |
| 10 | -------- |
| 11 | frontend | 'git-fast-import' [options] |
| 12 | |
| 13 | DESCRIPTION |
| 14 | ----------- |
| 15 | This program is usually not what the end user wants to run directly. |
| 16 | Most end users want to use one of the existing frontend programs, |
| 17 | which parses a specific type of foreign source and feeds the contents |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 18 | stored there to git-fast-import. |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 19 | |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 20 | fast-import reads a mixed command/data stream from standard input and |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 21 | writes one or more packfiles directly into the current repository. |
| 22 | When EOF is received on standard input, fast import writes out |
| 23 | updated branch and tag refs, fully updating the current repository |
| 24 | with the newly imported data. |
| 25 | |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 26 | The fast-import backend itself can import into an empty repository (one that |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 27 | has already been initialized by gitlink:git-init[1]) or incrementally |
| 28 | update an existing populated repository. Whether or not incremental |
| 29 | imports are supported from a particular foreign source depends on |
| 30 | the frontend program in use. |
| 31 | |
| 32 | |
| 33 | OPTIONS |
| 34 | ------- |
Shawn O. Pearce | 63e0c8b | 2007-02-06 14:58:30 -0500 | [diff] [blame] | 35 | --date-format=<fmt>:: |
| 36 | Specify the type of dates the frontend will supply to |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 37 | fast-import within `author`, `committer` and `tagger` commands. |
Shawn O. Pearce | 63e0c8b | 2007-02-06 14:58:30 -0500 | [diff] [blame] | 38 | See ``Date Formats'' below for details about which formats |
| 39 | are supported, and their syntax. |
| 40 | |
Shawn O. Pearce | 7073e69 | 2007-02-06 16:08:06 -0500 | [diff] [blame] | 41 | --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. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 46 | --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. Pearce | bdf1c06 | 2007-02-11 19:45:56 -0500 | [diff] [blame] | 67 | --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. Pearce | c499d76 | 2007-02-07 02:19:31 -0500 | [diff] [blame] | 76 | --quiet:: |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 77 | Disable all non-fatal output, making fast-import silent when it |
Shawn O. Pearce | c499d76 | 2007-02-07 02:19:31 -0500 | [diff] [blame] | 78 | is successful. This option disables the output shown by |
| 79 | \--stats. |
| 80 | |
| 81 | --stats:: |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 82 | Display some basic statistics about the objects fast-import has |
Shawn O. Pearce | c499d76 | 2007-02-07 02:19:31 -0500 | [diff] [blame] | 83 | created, the packfiles they were stored into, and the |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 84 | memory used by fast-import during this run. Showing this output |
Shawn O. Pearce | c499d76 | 2007-02-07 02:19:31 -0500 | [diff] [blame] | 85 | is currently the default, but can be disabled with \--quiet. |
| 86 | |
| 87 | |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 88 | Performance |
| 89 | ----------- |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 90 | The design of fast-import allows it to import large projects in a minimum |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 91 | amount of memory usage and processing time. Assuming the frontend |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 92 | is able to keep up with fast-import and feed it a constant stream of data, |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 93 | import times for projects holding 10+ years of history and containing |
| 94 | 100,000+ individual commits are generally completed in just 1-2 |
| 95 | hours on quite modest (~$2,000 USD) hardware. |
| 96 | |
| 97 | Most bottlenecks appear to be in foreign source data access (the |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 98 | source just cannot extract revisions fast enough) or disk IO (fast-import |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 99 | writes as fast as the disk will take the data). Imports will run |
| 100 | faster if the source data is stored on a different drive than the |
| 101 | destination Git repository (due to less IO contention). |
| 102 | |
| 103 | |
| 104 | Development Cost |
| 105 | ---------------- |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 106 | A typical frontend for fast-import tends to weigh in at approximately 200 |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 107 | lines of Perl/Python/Ruby code. Most developers have been able to |
| 108 | create working importers in just a couple of hours, even though it |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 109 | is their first exposure to fast-import, and sometimes even to Git. This is |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 110 | an ideal situation, given that most conversion tools are throw-away |
| 111 | (use once, and never look back). |
| 112 | |
| 113 | |
| 114 | Parallel Operation |
| 115 | ------------------ |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 116 | Like `git-push` or `git-fetch`, imports handled by fast-import are safe to |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 117 | run alongside parallel `git repack -a -d` or `git gc` invocations, |
| 118 | or any other Git operation (including `git prune`, as loose objects |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 119 | are never used by fast-import). |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 120 | |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 121 | fast-import does not lock the branch or tag refs it is actively importing. |
| 122 | After the import, during its ref update phase, fast-import tests each |
Shawn O. Pearce | 7073e69 | 2007-02-06 16:08:06 -0500 | [diff] [blame] | 123 | existing branch ref to verify the update will be a fast-forward |
| 124 | update (the commit stored in the ref is contained in the new |
| 125 | history of the commit to be written). If the update is not a |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 126 | fast-forward update, fast-import will skip updating that ref and instead |
| 127 | prints a warning message. fast-import will always attempt to update all |
Shawn O. Pearce | 7073e69 | 2007-02-06 16:08:06 -0500 | [diff] [blame] | 128 | branch refs, and does not stop on the first failure. |
| 129 | |
Shawn O. Pearce | c499d76 | 2007-02-07 02:19:31 -0500 | [diff] [blame] | 130 | Branch updates can be forced with \--force, but its recommended that |
| 131 | this only be used on an otherwise quiet repository. Using \--force |
Shawn O. Pearce | 7073e69 | 2007-02-06 16:08:06 -0500 | [diff] [blame] | 132 | is not necessary for an initial import into an empty repository. |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 133 | |
| 134 | |
| 135 | Technical Discussion |
| 136 | -------------------- |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 137 | fast-import tracks a set of branches in memory. Any branch can be created |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 138 | or modified at any point during the import process by sending a |
| 139 | `commit` command on the input stream. This design allows a frontend |
| 140 | program to process an unlimited number of branches simultaneously, |
| 141 | generating commits in the order they are available from the source |
| 142 | data. It also simplifies the frontend programs considerably. |
| 143 | |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 144 | fast-import does not use or alter the current working directory, or any |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 145 | file within it. (It does however update the current Git repository, |
| 146 | as referenced by `GIT_DIR`.) Therefore an import frontend may use |
| 147 | the working directory for its own purposes, such as extracting file |
| 148 | revisions from the foreign source. This ignorance of the working |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 149 | directory also allows fast-import to run very quickly, as it does not |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 150 | need to perform any costly file update operations when switching |
| 151 | between branches. |
| 152 | |
| 153 | Input Format |
| 154 | ------------ |
| 155 | With the exception of raw file data (which Git does not interpret) |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 156 | the fast-import input format is text (ASCII) based. This text based |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 157 | format simplifies development and debugging of frontend programs, |
| 158 | especially when a higher level language such as Perl, Python or |
| 159 | Ruby is being used. |
| 160 | |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 161 | fast-import is very strict about its input. Where we say SP below we mean |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 162 | *exactly* one space. Likewise LF means one (and only one) linefeed. |
| 163 | Supplying additional whitespace characters will cause unexpected |
| 164 | results, such as branch names or file names with leading or trailing |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 165 | spaces in their name, or early termination of fast-import when it encounters |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 166 | unexpected input. |
| 167 | |
Shawn O. Pearce | 63e0c8b | 2007-02-06 14:58:30 -0500 | [diff] [blame] | 168 | Date Formats |
| 169 | ~~~~~~~~~~~~ |
| 170 | The following date formats are supported. A frontend should select |
| 171 | the format it will use for this import by passing the format name |
Shawn O. Pearce | c499d76 | 2007-02-07 02:19:31 -0500 | [diff] [blame] | 172 | in the \--date-format=<fmt> command line option. |
Shawn O. Pearce | 63e0c8b | 2007-02-06 14:58:30 -0500 | [diff] [blame] | 173 | |
| 174 | `raw`:: |
Shawn O. Pearce | 9b92c82 | 2007-02-07 00:51:58 -0500 | [diff] [blame] | 175 | This is the Git native format and is `<time> SP <offutc>`. |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 176 | It is also fast-import's default format, if \--date-format was |
Shawn O. Pearce | 63e0c8b | 2007-02-06 14:58:30 -0500 | [diff] [blame] | 177 | not specified. |
| 178 | + |
| 179 | The time of the event is specified by `<time>` as the number of |
| 180 | seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is |
| 181 | written as an ASCII decimal integer. |
| 182 | + |
Shawn O. Pearce | 9b92c82 | 2007-02-07 00:51:58 -0500 | [diff] [blame] | 183 | The local offset is specified by `<offutc>` as a positive or negative |
| 184 | offset from UTC. For example EST (which is 5 hours behind UTC) |
| 185 | would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. |
| 186 | The local offset does not affect `<time>`; it is used only as an |
| 187 | advisement to help formatting routines display the timestamp. |
Shawn O. Pearce | 63e0c8b | 2007-02-06 14:58:30 -0500 | [diff] [blame] | 188 | + |
Shawn O. Pearce | 9b92c82 | 2007-02-07 00:51:58 -0500 | [diff] [blame] | 189 | If the local offset is not available in the source material, use |
| 190 | ``+0000'', or the most common local offset. For example many |
Shawn O. Pearce | 63e0c8b | 2007-02-06 14:58:30 -0500 | [diff] [blame] | 191 | organizations have a CVS repository which has only ever been accessed |
| 192 | by users who are located in the same location and timezone. In this |
Shawn O. Pearce | f842fdb | 2007-02-08 01:53:48 -0500 | [diff] [blame] | 193 | case a reasonable offset from UTC could be assumed. |
Shawn O. Pearce | 63e0c8b | 2007-02-06 14:58:30 -0500 | [diff] [blame] | 194 | + |
| 195 | Unlike the `rfc2822` format, this format is very strict. Any |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 196 | variation in formatting will cause fast-import to reject the value. |
Shawn O. Pearce | 63e0c8b | 2007-02-06 14:58:30 -0500 | [diff] [blame] | 197 | |
| 198 | `rfc2822`:: |
| 199 | This is the standard email format as described by RFC 2822. |
| 200 | + |
| 201 | An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git |
Shawn O. Pearce | f842fdb | 2007-02-08 01:53:48 -0500 | [diff] [blame] | 202 | parser is accurate, but a little on the lenient side. It is the |
Shawn O. Pearce | 63e0c8b | 2007-02-06 14:58:30 -0500 | [diff] [blame] | 203 | same parser used by gitlink:git-am[1] when applying patches |
| 204 | received from email. |
| 205 | + |
| 206 | Some malformed strings may be accepted as valid dates. In some of |
| 207 | these cases Git will still be able to obtain the correct date from |
| 208 | the malformed string. There are also some types of malformed |
| 209 | strings which Git will parse wrong, and yet consider valid. |
| 210 | Seriously malformed strings will be rejected. |
| 211 | + |
Shawn O. Pearce | 9b92c82 | 2007-02-07 00:51:58 -0500 | [diff] [blame] | 212 | Unlike the `raw` format above, the timezone/UTC offset information |
| 213 | contained in an RFC 2822 date string is used to adjust the date |
| 214 | value to UTC prior to storage. Therefore it is important that |
| 215 | this information be as accurate as possible. |
| 216 | + |
Shawn O. Pearce | f842fdb | 2007-02-08 01:53:48 -0500 | [diff] [blame] | 217 | If the source material uses RFC 2822 style dates, |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 218 | the frontend should let fast-import handle the parsing and conversion |
Shawn O. Pearce | 63e0c8b | 2007-02-06 14:58:30 -0500 | [diff] [blame] | 219 | (rather than attempting to do it itself) as the Git parser has |
| 220 | been well tested in the wild. |
| 221 | + |
| 222 | Frontends should prefer the `raw` format if the source material |
Shawn O. Pearce | f842fdb | 2007-02-08 01:53:48 -0500 | [diff] [blame] | 223 | already uses UNIX-epoch format, can be coaxed to give dates in that |
| 224 | format, or its format is easiliy convertible to it, as there is no |
| 225 | ambiguity in parsing. |
Shawn O. Pearce | 63e0c8b | 2007-02-06 14:58:30 -0500 | [diff] [blame] | 226 | |
| 227 | `now`:: |
| 228 | Always use the current time and timezone. The literal |
| 229 | `now` must always be supplied for `<when>`. |
| 230 | + |
| 231 | This is a toy format. The current time and timezone of this system |
| 232 | is always copied into the identity string at the time it is being |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 233 | created by fast-import. There is no way to specify a different time or |
Shawn O. Pearce | 63e0c8b | 2007-02-06 14:58:30 -0500 | [diff] [blame] | 234 | timezone. |
| 235 | + |
| 236 | This particular format is supplied as its short to implement and |
| 237 | may be useful to a process that wants to create a new commit |
| 238 | right now, without needing to use a working directory or |
| 239 | gitlink:git-update-index[1]. |
| 240 | + |
| 241 | If separate `author` and `committer` commands are used in a `commit` |
| 242 | the timestamps may not match, as the system clock will be polled |
| 243 | twice (once for each command). The only way to ensure that both |
| 244 | author and committer identity information has the same timestamp |
| 245 | is to omit `author` (thus copying from `committer`) or to use a |
| 246 | date format other than `now`. |
| 247 | |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 248 | Commands |
| 249 | ~~~~~~~~ |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 250 | fast-import accepts several commands to update the current repository |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 251 | and 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. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 276 | Forces fast-import to close the current packfile, generate its |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 277 | 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 | ~~~~~~~~ |
| 283 | Create or update a branch with a new commit, recording one logical |
| 284 | change to the project. |
| 285 | |
| 286 | .... |
| 287 | 'commit' SP <ref> LF |
| 288 | mark? |
Shawn O. Pearce | 63e0c8b | 2007-02-06 14:58:30 -0500 | [diff] [blame] | 289 | ('author' SP <name> SP LT <email> GT SP <when> LF)? |
| 290 | 'committer' SP <name> SP LT <email> GT SP <when> LF |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 291 | data |
| 292 | ('from' SP <committish> LF)? |
| 293 | ('merge' SP <committish> LF)? |
Shawn O. Pearce | 825769a | 2007-02-07 02:03:03 -0500 | [diff] [blame] | 294 | (filemodify | filedelete | filedeleteall)* |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 295 | LF |
| 296 | .... |
| 297 | |
| 298 | where `<ref>` is the name of the branch to make the commit on. |
| 299 | Typically branch names are prefixed with `refs/heads/` in |
| 300 | Git, 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 |
| 303 | a Git refname, no quoting or escaping syntax is supported here. |
| 304 | |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 305 | A `mark` command may optionally appear, requesting fast-import to save a |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 306 | reference to the newly created commit for future use by the frontend |
| 307 | (see below for format). It is very common for frontends to mark |
| 308 | every commit they create, thereby allowing future branch creation |
| 309 | from any imported commit. |
| 310 | |
| 311 | The `data` command following `committer` must supply the commit |
| 312 | message (see below for `data` command syntax). To import an empty |
| 313 | commit message use a 0 length data. Commit messages are free-form |
| 314 | and are not interpreted by Git. Currently they must be encoded in |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 315 | UTF-8, as fast-import does not permit other encodings to be specified. |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 316 | |
Shawn O. Pearce | 825769a | 2007-02-07 02:03:03 -0500 | [diff] [blame] | 317 | Zero or more `filemodify`, `filedelete` and `filedeleteall` commands |
| 318 | may be included to update the contents of the branch prior to |
| 319 | creating the commit. These commands may be supplied in any order. |
| 320 | However it is recommended that a `filedeleteall` command preceed |
| 321 | all `filemodify` commands in the same commit, as `filedeleteall` |
| 322 | wipes the branch clean (see below). |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 323 | |
| 324 | `author` |
| 325 | ^^^^^^^^ |
| 326 | An `author` command may optionally appear, if the author information |
| 327 | might differ from the committer information. If `author` is omitted |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 328 | then fast-import will automatically use the committer's information for |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 329 | the author portion of the commit. See below for a description of |
| 330 | the fields in `author`, as they are identical to `committer`. |
| 331 | |
| 332 | `committer` |
| 333 | ^^^^^^^^^^^ |
| 334 | The `committer` command indicates who made this commit, and when |
| 335 | they made it. |
| 336 | |
| 337 | Here `<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) |
| 340 | and greater-than (\x3e) symbols. These are required to delimit |
| 341 | the 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. Pearce | 63e0c8b | 2007-02-06 14:58:30 -0500 | [diff] [blame] | 345 | The time of the change is specified by `<when>` using the date format |
Shawn O. Pearce | c499d76 | 2007-02-07 02:19:31 -0500 | [diff] [blame] | 346 | that was selected by the \--date-format=<fmt> command line option. |
Shawn O. Pearce | 63e0c8b | 2007-02-06 14:58:30 -0500 | [diff] [blame] | 347 | See ``Date Formats'' above for the set of supported formats, and |
| 348 | their syntax. |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 349 | |
| 350 | `from` |
| 351 | ^^^^^^ |
Shawn O. Pearce | ea5e370 | 2007-02-12 04:08:43 -0500 | [diff] [blame] | 352 | The `from` command is used to specify the commit to initialize |
| 353 | this branch from. This revision will be the first ancestor of the |
| 354 | new commit. |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 355 | |
Shawn O. Pearce | ea5e370 | 2007-02-12 04:08:43 -0500 | [diff] [blame] | 356 | Omitting the `from` command in the first commit of a new branch |
| 357 | will cause fast-import to create that commit with no ancestor. This |
| 358 | tends to be desired only for the initial commit of a project. |
| 359 | Omitting the `from` command on existing branches is usually desired, |
| 360 | as the current commit on that branch is automatically assumed to |
| 361 | be the first ancestor of the new commit. |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 362 | |
| 363 | As `LF` is not valid in a Git refname or SHA-1 expression, no |
| 364 | quoting or escaping syntax is supported within `<committish>`. |
| 365 | |
| 366 | Here `<committish>` is any of the following: |
| 367 | |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 368 | * 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. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 370 | expression. |
| 371 | |
| 372 | * A mark reference, `:<idnum>`, where `<idnum>` is the mark number. |
| 373 | + |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 374 | The reason fast-import uses `:` to denote a mark reference is this character |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 375 | is not legal in a Git branch name. The leading `:` makes it easy |
| 376 | to distingush between the mark 42 (`:42`) and the branch 42 (`42` |
| 377 | or `refs/heads/42`), or an abbreviated SHA-1 which happened to |
| 378 | consist only of base-10 digits. |
| 379 | + |
| 380 | Marks 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 | |
| 387 | The special case of restarting an incremental import from the |
| 388 | current branch value should be written as: |
| 389 | ---- |
| 390 | from refs/heads/branch^0 |
| 391 | ---- |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 392 | The `{caret}0` suffix is necessary as fast-import does not permit a branch to |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 393 | start from itself, and the branch is created in memory before the |
Shawn O. Pearce | 209f129 | 2007-02-08 01:35:37 -0500 | [diff] [blame] | 394 | `from` command is even read from the input. Adding `{caret}0` will force |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 395 | fast-import to resolve the commit through Git's revision parsing library, |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 396 | rather than its internal branch table, thereby loading in the |
| 397 | existing value of the branch. |
| 398 | |
| 399 | `merge` |
| 400 | ^^^^^^^ |
| 401 | Includes one additional ancestor commit, and makes the current |
| 402 | commit a merge commit. An unlimited number of `merge` commands per |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 403 | commit are permitted by fast-import, thereby establishing an n-way merge. |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 404 | However Git's other tools never create commits with more than 15 |
| 405 | additional ancestors (forming a 16-way merge). For this reason |
| 406 | it is suggested that frontends do not use more than 15 `merge` |
| 407 | commands per commit. |
| 408 | |
| 409 | Here `<committish>` is any of the commit specification expressions |
| 410 | also accepted by `from` (see above). |
| 411 | |
| 412 | `filemodify` |
Shawn O. Pearce | ef94edb | 2007-02-06 12:35:02 -0500 | [diff] [blame] | 413 | ^^^^^^^^^^^^ |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 414 | Included in a `commit` command to add a new file or change the |
| 415 | content of an existing file. This command has two different means |
| 416 | of specifying the content of the file. |
| 417 | |
| 418 | External 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 | + |
| 426 | Here `<dataref>` can be either a mark reference (`:<idnum>`) |
| 427 | set by a prior `blob` command, or a full 40-byte SHA-1 of an |
| 428 | existing Git blob object. |
| 429 | |
| 430 | Inline 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 | + |
| 440 | See below for a detailed description of the `data` command. |
| 441 | |
| 442 | In both formats `<mode>` is the type of file entry, specified |
| 443 | in 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 Hamano | 9981b6d | 2007-02-06 12:46:11 -0800 | [diff] [blame] | 449 | * `120000`: A symlink, the content of the file will be the link target. |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 450 | |
| 451 | In both formats `<path>` is the complete path of the file to be added |
| 452 | (if not already existing) or modified (if already existing). |
| 453 | |
| 454 | A `<path>` string must use UNIX-style directory seperators (forward |
| 455 | slash `/`), may contain any byte other than `LF`, and must not |
| 456 | start with double quote (`"`). |
| 457 | |
| 458 | If an `LF` or double quote must be encoded into `<path>` shell-style |
| 459 | quoting should be used, e.g. `"path/with\n and \" in it"`. |
| 460 | |
| 461 | The 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 | |
| 469 | It is recommended that `<path>` always be encoded using UTF-8. |
| 470 | |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 471 | `filedelete` |
Shawn O. Pearce | ef94edb | 2007-02-06 12:35:02 -0500 | [diff] [blame] | 472 | ^^^^^^^^^^^^ |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 473 | Included in a `commit` command to remove a file from the branch. |
| 474 | If the file removal makes its directory empty, the directory will |
| 475 | be automatically removed too. This cascades up the tree until the |
| 476 | first non-empty directory or the root is reached. |
| 477 | |
| 478 | .... |
| 479 | 'D' SP <path> LF |
| 480 | .... |
| 481 | |
| 482 | here `<path>` is the complete path of the file to be removed. |
| 483 | See `filemodify` above for a detailed description of `<path>`. |
| 484 | |
Shawn O. Pearce | 825769a | 2007-02-07 02:03:03 -0500 | [diff] [blame] | 485 | `filedeleteall` |
| 486 | ^^^^^^^^^^^^^^^ |
| 487 | Included in a `commit` command to remove all files (and also all |
| 488 | directories) from the branch. This command resets the internal |
| 489 | branch structure to have no files in it, allowing the frontend |
| 490 | to subsequently add all interesting files from scratch. |
| 491 | |
| 492 | .... |
| 493 | 'deleteall' LF |
| 494 | .... |
| 495 | |
| 496 | This command is extremely useful if the frontend does not know |
| 497 | (or does not care to know) what files are currently on the branch, |
| 498 | and therefore cannot generate the proper `filedelete` commands to |
| 499 | update the content. |
| 500 | |
| 501 | Issuing a `filedeleteall` followed by the needed `filemodify` |
| 502 | commands to set the correct content will produce the same results |
| 503 | as sending only the needed `filemodify` and `filedelete` commands. |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 504 | The `filedeleteall` approach may however require fast-import to use slightly |
Shawn O. Pearce | 825769a | 2007-02-07 02:03:03 -0500 | [diff] [blame] | 505 | more memory per active branch (less than 1 MiB for even most large |
| 506 | projects); so frontends that can easily obtain only the affected |
| 507 | paths for a commit are encouraged to do so. |
| 508 | |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 509 | `mark` |
| 510 | ~~~~~~ |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 511 | Arranges for fast-import to save a reference to the current object, allowing |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 512 | the frontend to recall this object at a future point in time, without |
| 513 | knowing its SHA-1. Here the current object is the object creation |
| 514 | command 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 | |
| 521 | where `<idnum>` is the number assigned by the frontend to this mark. |
Shawn O. Pearce | ef94edb | 2007-02-06 12:35:02 -0500 | [diff] [blame] | 522 | The value of `<idnum>` is expressed as an ASCII decimal integer. |
| 523 | The value 0 is reserved and cannot be used as |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 524 | a mark. Only values greater than or equal to 1 may be used as marks. |
| 525 | |
| 526 | New marks are created automatically. Existing marks can be moved |
| 527 | to another object simply by reusing the same `<idnum>` in another |
| 528 | `mark` command. |
| 529 | |
| 530 | `tag` |
| 531 | ~~~~~ |
| 532 | Creates an annotated tag referring to a specific commit. To create |
| 533 | lightweight (non-annotated) tags see the `reset` command below. |
| 534 | |
| 535 | .... |
| 536 | 'tag' SP <name> LF |
| 537 | 'from' SP <committish> LF |
Shawn O. Pearce | 63e0c8b | 2007-02-06 14:58:30 -0500 | [diff] [blame] | 538 | 'tagger' SP <name> SP LT <email> GT SP <when> LF |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 539 | data |
| 540 | LF |
| 541 | .... |
| 542 | |
| 543 | where `<name>` is the name of the tag to create. |
| 544 | |
| 545 | Tag names are automatically prefixed with `refs/tags/` when stored |
| 546 | in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 547 | use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 548 | corresponding ref as `refs/tags/RELENG-1_0-FINAL`. |
| 549 | |
| 550 | The value of `<name>` must be a valid refname in Git and therefore |
| 551 | may contain forward slashes. As `LF` is not valid in a Git refname, |
| 552 | no quoting or escaping syntax is supported here. |
| 553 | |
| 554 | The `from` command is the same as in the `commit` command; see |
| 555 | above for details. |
| 556 | |
| 557 | The `tagger` command uses the same format as `committer` within |
| 558 | `commit`; again see above for details. |
| 559 | |
| 560 | The `data` command following `tagger` must supply the annotated tag |
| 561 | message (see below for `data` command syntax). To import an empty |
| 562 | tag message use a 0 length data. Tag messages are free-form and are |
| 563 | not interpreted by Git. Currently they must be encoded in UTF-8, |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 564 | as fast-import does not permit other encodings to be specified. |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 565 | |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 566 | Signing annotated tags during import from within fast-import is not |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 567 | supported. Trying to include your own PGP/GPG signature is not |
| 568 | recommended, as the frontend does not (easily) have access to the |
| 569 | complete set of bytes which normally goes into such a signature. |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 570 | If signing is required, create lightweight tags from within fast-import with |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 571 | `reset`, then create the annotated versions of those tags offline |
| 572 | with the standard gitlink:git-tag[1] process. |
| 573 | |
| 574 | `reset` |
| 575 | ~~~~~~~ |
| 576 | Creates (or recreates) the named branch, optionally starting from |
| 577 | a specific revision. The reset command allows a frontend to issue |
| 578 | a new `from` command for an existing branch, or to create a new |
| 579 | branch 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 | |
| 587 | For a detailed description of `<ref>` and `<committish>` see above |
| 588 | under `commit` and `from`. |
| 589 | |
| 590 | The `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 | |
| 598 | would create the lightweight tag `refs/tags/938` referring to |
| 599 | whatever commit mark `:938` references. |
| 600 | |
| 601 | `blob` |
| 602 | ~~~~~~ |
| 603 | Requests writing one file revision to the packfile. The revision |
| 604 | is not connected to any commit; this connection must be formed in |
| 605 | a subsequent `commit` command by referencing the blob through an |
| 606 | assigned mark. |
| 607 | |
| 608 | .... |
| 609 | 'blob' LF |
| 610 | mark? |
| 611 | data |
| 612 | .... |
| 613 | |
| 614 | The mark command is optional here as some frontends have chosen |
| 615 | to generate the Git SHA-1 for the blob on their own, and feed that |
| 616 | directly to `commit`. This is typically more work than its worth |
| 617 | however, as marks are inexpensive to store and easy to use. |
| 618 | |
| 619 | `data` |
| 620 | ~~~~~~ |
| 621 | Supplies raw data (for use as blob/file content, commit messages, or |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 622 | annotated tag messages) to fast-import. Data can be supplied using an exact |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 623 | byte count or delimited with a terminating line. Real frontends |
| 624 | intended for production-quality conversions should always use the |
| 625 | exact byte count format, as it is more robust and performs better. |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 626 | The delimited format is intended primarily for testing fast-import. |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 627 | |
Shawn O. Pearce | ef94edb | 2007-02-06 12:35:02 -0500 | [diff] [blame] | 628 | Exact byte count format:: |
| 629 | The frontend must specify the number of bytes of data. |
| 630 | + |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 631 | .... |
| 632 | 'data' SP <count> LF |
| 633 | <raw> LF |
| 634 | .... |
Shawn O. Pearce | ef94edb | 2007-02-06 12:35:02 -0500 | [diff] [blame] | 635 | + |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 636 | where `<count>` is the exact number of bytes appearing within |
Shawn O. Pearce | ef94edb | 2007-02-06 12:35:02 -0500 | [diff] [blame] | 637 | `<raw>`. The value of `<count>` is expressed as an ASCII decimal |
| 638 | integer. The `LF` on either side of `<raw>` is not |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 639 | included in `<count>` and will not be included in the imported data. |
| 640 | |
Shawn O. Pearce | ef94edb | 2007-02-06 12:35:02 -0500 | [diff] [blame] | 641 | Delimited format:: |
| 642 | A delimiter string is used to mark the end of the data. |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 643 | fast-import will compute the length by searching for the delimiter. |
Shawn O. Pearce | ef94edb | 2007-02-06 12:35:02 -0500 | [diff] [blame] | 644 | This format is primarly useful for testing and is not |
| 645 | recommended for real data. |
| 646 | + |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 647 | .... |
| 648 | 'data' SP '<<' <delim> LF |
| 649 | <raw> LF |
| 650 | <delim> LF |
| 651 | .... |
Shawn O. Pearce | ef94edb | 2007-02-06 12:35:02 -0500 | [diff] [blame] | 652 | + |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 653 | where `<delim>` is the chosen delimiter string. The string `<delim>` |
| 654 | must not appear on a line by itself within `<raw>`, as otherwise |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 655 | fast-import will think the data ends earlier than it really does. The `LF` |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 656 | immediately trailing `<raw>` is part of `<raw>`. This is one of |
| 657 | the limitations of the delimited format, it is impossible to supply |
| 658 | a data chunk which does not have an LF as its last byte. |
| 659 | |
| 660 | `checkpoint` |
| 661 | ~~~~~~~~~~~~ |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 662 | Forces fast-import to close the current packfile, start a new one, and to |
Shawn O. Pearce | 820b931 | 2007-02-07 02:42:44 -0500 | [diff] [blame] | 663 | save out all current branch refs, tags and marks. |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 664 | |
| 665 | .... |
| 666 | 'checkpoint' LF |
| 667 | LF |
| 668 | .... |
| 669 | |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 670 | Note that fast-import automatically switches packfiles when the current |
Shawn O. Pearce | 820b931 | 2007-02-07 02:42:44 -0500 | [diff] [blame] | 671 | packfile reaches \--max-pack-size, or 4 GiB, whichever limit is |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 672 | smaller. During an automatic packfile switch fast-import does not update |
Shawn O. Pearce | 820b931 | 2007-02-07 02:42:44 -0500 | [diff] [blame] | 673 | the branch refs, tags or marks. |
| 674 | |
| 675 | As a `checkpoint` can require a significant amount of CPU time and |
| 676 | disk IO (to compute the overall pack SHA-1 checksum, generate the |
| 677 | corresponding index file, and update the refs) it can easily take |
| 678 | several minutes for a single `checkpoint` command to complete. |
| 679 | |
| 680 | Frontends may choose to issue checkpoints during extremely large |
| 681 | and long running imports, or when they need to allow another Git |
| 682 | process access to a branch. However given that a 30 GiB Subversion |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 683 | repository can be loaded into Git through fast-import in about 3 hours, |
Shawn O. Pearce | 820b931 | 2007-02-07 02:42:44 -0500 | [diff] [blame] | 684 | explicit checkpointing may not be necessary. |
| 685 | |
| 686 | |
Shawn O. Pearce | bdd9f42 | 2007-02-07 03:49:08 -0500 | [diff] [blame] | 687 | Tips and Tricks |
| 688 | --------------- |
| 689 | The following tips and tricks have been collected from various |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 690 | users of fast-import, and are offered here as suggestions. |
Shawn O. Pearce | bdd9f42 | 2007-02-07 03:49:08 -0500 | [diff] [blame] | 691 | |
| 692 | Use One Mark Per Commit |
| 693 | ~~~~~~~~~~~~~~~~~~~~~~~ |
| 694 | When doing a repository conversion, use a unique mark per commit |
| 695 | (`mark :<n>`) and supply the \--export-marks option on the command |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 696 | line. fast-import will dump a file which lists every mark and the Git |
Shawn O. Pearce | bdd9f42 | 2007-02-07 03:49:08 -0500 | [diff] [blame] | 697 | object SHA-1 that corresponds to it. If the frontend can tie |
| 698 | the marks back to the source repository, it is easy to verify the |
| 699 | accuracy and completeness of the import by comparing each Git |
| 700 | commit to the corresponding source revision. |
| 701 | |
| 702 | Coming from a system such as Perforce or Subversion this should be |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 703 | quite simple, as the fast-import mark can also be the Perforce changeset |
Shawn O. Pearce | bdd9f42 | 2007-02-07 03:49:08 -0500 | [diff] [blame] | 704 | number or the Subversion revision number. |
| 705 | |
| 706 | Freely Skip Around Branches |
| 707 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 708 | Don't bother trying to optimize the frontend to stick to one branch |
| 709 | at a time during an import. Although doing so might be slightly |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 710 | faster for fast-import, it tends to increase the complexity of the frontend |
Shawn O. Pearce | bdd9f42 | 2007-02-07 03:49:08 -0500 | [diff] [blame] | 711 | code considerably. |
| 712 | |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 713 | The branch LRU builtin to fast-import tends to behave very well, and the |
Shawn O. Pearce | bdd9f42 | 2007-02-07 03:49:08 -0500 | [diff] [blame] | 714 | cost of activating an inactive branch is so low that bouncing around |
| 715 | between branches has virtually no impact on import performance. |
| 716 | |
Shawn O. Pearce | c734615 | 2007-02-11 19:50:50 -0500 | [diff] [blame] | 717 | Handling Renames |
| 718 | ~~~~~~~~~~~~~~~~ |
| 719 | When importing a renamed file or directory, simply delete the old |
| 720 | name(s) and modify the new name(s) during the corresponding commit. |
| 721 | Git performs rename detection after-the-fact, rather than explicitly |
| 722 | during a commit. |
| 723 | |
Shawn O. Pearce | bdd9f42 | 2007-02-07 03:49:08 -0500 | [diff] [blame] | 724 | Use Tag Fixup Branches |
| 725 | ~~~~~~~~~~~~~~~~~~~~~~ |
| 726 | Some other SCM systems let the user create a tag from multiple |
| 727 | files which are not from the same commit/changeset. Or to create |
| 728 | tags which are a subset of the files available in the repository. |
| 729 | |
| 730 | Importing these tags as-is in Git is impossible without making at |
| 731 | least one commit which ``fixes up'' the files to match the content |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 732 | of the tag. Use fast-import's `reset` command to reset a dummy branch |
Shawn O. Pearce | bdd9f42 | 2007-02-07 03:49:08 -0500 | [diff] [blame] | 733 | outside of your normal branch space to the base commit for the tag, |
| 734 | then commit one or more file fixup commits, and finally tag the |
| 735 | dummy branch. |
| 736 | |
| 737 | For example since all normal branches are stored under `refs/heads/` |
| 738 | name the tag fixup branch `TAG_FIXUP`. This way it is impossible for |
| 739 | the fixup branch used by the importer to have namespace conflicts |
| 740 | with real branches imported from the source (the name `TAG_FIXUP` |
| 741 | is not `refs/heads/TAG_FIXUP`). |
| 742 | |
| 743 | When committing fixups, consider using `merge` to connect the |
| 744 | commit(s) which are supplying file revisions to the fixup branch. |
| 745 | Doing so will allow tools such as gitlink:git-blame[1] to track |
| 746 | through the real commit history and properly annotate the source |
| 747 | files. |
| 748 | |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 749 | After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` |
Shawn O. Pearce | bdd9f42 | 2007-02-07 03:49:08 -0500 | [diff] [blame] | 750 | to remove the dummy branch. |
| 751 | |
| 752 | Import Now, Repack Later |
| 753 | ~~~~~~~~~~~~~~~~~~~~~~~~ |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 754 | As soon as fast-import completes the Git repository is completely valid |
Shawn O. Pearce | bdd9f42 | 2007-02-07 03:49:08 -0500 | [diff] [blame] | 755 | and ready for use. Typicallly this takes only a very short time, |
| 756 | even for considerably large projects (100,000+ commits). |
| 757 | |
| 758 | However repacking the repository is necessary to improve data |
| 759 | locality and access performance. It can also take hours on extremely |
| 760 | large projects (especially if -f and a large \--window parameter is |
| 761 | used). Since repacking is safe to run alongside readers and writers, |
| 762 | run the repack in the background and let it finish when it finishes. |
| 763 | There is no reason to wait to explore your new Git project! |
| 764 | |
| 765 | If you choose to wait for the repack, don't try to run benchmarks |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 766 | or performance tests until repacking is completed. fast-import outputs |
Shawn O. Pearce | bdd9f42 | 2007-02-07 03:49:08 -0500 | [diff] [blame] | 767 | suboptimal packfiles that are simply never seen in real use |
| 768 | situations. |
| 769 | |
| 770 | Repacking Historical Data |
| 771 | ~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 772 | If you are repacking very old imported data (e.g. older than the |
| 773 | last year), consider expending some extra CPU time and supplying |
| 774 | \--window=50 (or higher) when you run gitlink:git-repack[1]. |
| 775 | This will take longer, but will also produce a smaller packfile. |
| 776 | You only need to expend the effort once, and everyone using your |
| 777 | project will benefit from the smaller repository. |
| 778 | |
| 779 | |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 780 | Packfile Optimization |
| 781 | --------------------- |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 782 | When packing a blob fast-import always attempts to deltify against the last |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 783 | blob written. Unless specifically arranged for by the frontend, |
| 784 | this will probably not be a prior version of the same file, so the |
| 785 | generated delta will not be the smallest possible. The resulting |
| 786 | packfile will be compressed, but will not be optimal. |
| 787 | |
| 788 | Frontends which have efficient access to all revisions of a |
| 789 | single file (for example reading an RCS/CVS ,v file) can choose |
| 790 | to supply all revisions of that file as a sequence of consecutive |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 791 | `blob` commands. This allows fast-import to deltify the different file |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 792 | revisions against each other, saving space in the final packfile. |
| 793 | Marks can be used to later identify individual file revisions during |
| 794 | a sequence of `commit` commands. |
| 795 | |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 796 | The packfile(s) created by fast-import do not encourage good disk access |
| 797 | patterns. This is caused by fast-import writing the data in the order |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 798 | it is received on standard input, while Git typically organizes |
| 799 | data within packfiles to make the most recent (current tip) data |
| 800 | appear before historical data. Git also clusters commits together, |
| 801 | speeding up revision traversal through better cache locality. |
| 802 | |
| 803 | For this reason it is strongly recommended that users repack the |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 804 | repository with `git repack -a -d` after fast-import completes, allowing |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 805 | Git to reorganize the packfiles for faster data access. If blob |
| 806 | deltas are suboptimal (see above) then also adding the `-f` option |
| 807 | to force recomputation of all deltas can significantly reduce the |
| 808 | final packfile size (30-50% smaller can be quite typical). |
| 809 | |
Shawn O. Pearce | bdd9f42 | 2007-02-07 03:49:08 -0500 | [diff] [blame] | 810 | |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 811 | Memory Utilization |
| 812 | ------------------ |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 813 | There are a number of factors which affect how much memory fast-import |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 814 | requires to perform an import. Like critical sections of core |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 815 | Git, fast-import uses its own memory allocators to ammortize any overheads |
| 816 | associated with malloc. In practice fast-import tends to ammoritize any |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 817 | malloc overheads to 0, due to its use of large block allocations. |
| 818 | |
| 819 | per object |
| 820 | ~~~~~~~~~~ |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 821 | fast-import maintains an in-memory structure for every object written in |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 822 | this execution. On a 32 bit system the structure is 32 bytes, |
| 823 | on a 64 bit system the structure is 40 bytes (due to the larger |
| 824 | pointer sizes). Objects in the table are not deallocated until |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 825 | fast-import terminates. Importing 2 million objects on a 32 bit system |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 826 | will require approximately 64 MiB of memory. |
| 827 | |
| 828 | The object table is actually a hashtable keyed on the object name |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 829 | (the unique SHA-1). This storage configuration allows fast-import to reuse |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 830 | an existing or already written object and avoid writing duplicates |
| 831 | to the output packfile. Duplicate blobs are surprisingly common |
| 832 | in an import, typically due to branch merges in the source. |
| 833 | |
| 834 | per mark |
| 835 | ~~~~~~~~ |
| 836 | Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 |
| 837 | bytes, depending on pointer size) per mark. Although the array |
| 838 | is sparse, frontends are still strongly encouraged to use marks |
| 839 | between 1 and n, where n is the total number of marks required for |
| 840 | this import. |
| 841 | |
| 842 | per branch |
| 843 | ~~~~~~~~~~ |
| 844 | Branches are classified as active and inactive. The memory usage |
| 845 | of the two classes is significantly different. |
| 846 | |
| 847 | Inactive branches are stored in a structure which uses 96 or 120 |
| 848 | bytes (32 bit or 64 bit systems, respectively), plus the length of |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 849 | the branch name (typically under 200 bytes), per branch. fast-import will |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 850 | easily handle as many as 10,000 inactive branches in under 2 MiB |
| 851 | of memory. |
| 852 | |
| 853 | Active branches have the same overhead as inactive branches, but |
| 854 | also contain copies of every tree that has been recently modified on |
| 855 | that branch. If subtree `include` has not been modified since the |
| 856 | branch became active, its contents will not be loaded into memory, |
| 857 | but if subtree `src` has been modified by a commit since the branch |
| 858 | became active, then its contents will be loaded in memory. |
| 859 | |
| 860 | As active branches store metadata about the files contained on that |
| 861 | branch, their in-memory storage size can grow to a considerable size |
| 862 | (see below). |
| 863 | |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 864 | fast-import automatically moves active branches to inactive status based on |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 865 | a simple least-recently-used algorithm. The LRU chain is updated on |
| 866 | each `commit` command. The maximum number of active branches can be |
Shawn O. Pearce | c499d76 | 2007-02-07 02:19:31 -0500 | [diff] [blame] | 867 | increased or decreased on the command line with \--active-branches=. |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 868 | |
| 869 | per active tree |
| 870 | ~~~~~~~~~~~~~~~ |
| 871 | Trees (aka directories) use just 12 bytes of memory on top of the |
| 872 | memory required for their entries (see ``per active file'' below). |
| 873 | The cost of a tree is virtually 0, as its overhead ammortizes out |
| 874 | over the individual file entries. |
| 875 | |
| 876 | per active file entry |
| 877 | ~~~~~~~~~~~~~~~~~~~~~ |
| 878 | Files (and pointers to subtrees) within active trees require 52 or 64 |
| 879 | bytes (32/64 bit platforms) per entry. To conserve space, file and |
| 880 | tree names are pooled in a common string table, allowing the filename |
| 881 | ``Makefile'' to use just 16 bytes (after including the string header |
| 882 | overhead) no matter how many times it occurs within the project. |
| 883 | |
| 884 | The active branch LRU, when coupled with the filename string pool |
Shawn O. Pearce | 882227f | 2007-02-08 13:49:06 -0500 | [diff] [blame] | 885 | and lazy loading of subtrees, allows fast-import to efficiently import |
Shawn O. Pearce | 6e411d2 | 2007-02-05 21:09:25 -0500 | [diff] [blame] | 886 | projects with 2,000+ branches and 45,114+ files in a very limited |
| 887 | memory footprint (less than 2.7 MiB per active branch). |
| 888 | |
| 889 | |
| 890 | Author |
| 891 | ------ |
| 892 | Written by Shawn O. Pearce <spearce@spearce.org>. |
| 893 | |
| 894 | Documentation |
| 895 | -------------- |
| 896 | Documentation by Shawn O. Pearce <spearce@spearce.org>. |
| 897 | |
| 898 | GIT |
| 899 | --- |
| 900 | Part of the gitlink:git[7] suite |
| 901 | |