Commit | Line | Data |
---|---|---|
ac1541f4 | 1 | NEWS for rsync 2.6.4 (UNRELEASED) |
a8fd4161 | 2 | Protocol: 29 (changed) |
ac1541f4 WD |
3 | Changes since 2.6.3: |
4 | ||
fd8571c2 WD |
5 | OUTPUT CHANGES: |
6 | ||
7 | - When rsync deletes a directory and outputs a verbose message about | |
8 | it, it now appends a trailing slash to the name instead of (only | |
9 | sometimes) outputting a preceding "directory " string. | |
da1b6eea | 10 | |
a897af2c | 11 | - The --stats output will contain file-list time-statistics if both |
e30b1fb8 WD |
12 | sides are 2.6.4, or if the local side is 2.6.4 and the files are |
13 | being pushed (since the stats come from the sending side). | |
8daa9925 | 14 | (Requires protocol 29 for a pull.) |
591b908f | 15 | |
ea38b5af WD |
16 | - The "%o" (operation) log-format escape now has a third value (besides |
17 | "send" and "recv"): "del." (with trailing dot to make it 4 chars). | |
18 | This changes the way deletions are logged in the daemon's log file. | |
19 | ||
20 | - When the --log-format option is combined with --verbose, rsync now | |
21 | avoids outputting the name of the file twice in most circumstances. | |
22 | As long as the --log-format item does not refer to any post-transfer | |
23 | items (such as %b or %c), the --log-format message is output prior to | |
24 | the transfer with --verbose being the equivalent of a --log-format of | |
25 | '%n%L' (which outputs the name and any symlink info). If the log | |
26 | output must occur after the transfer to be complete, the only time | |
27 | the name is also output prior to the transfer is when --progress was | |
28 | specified (so that the name will precede the progress stats, and the | |
29 | full --log-format output will come after). | |
fd8571c2 | 30 | |
ac1541f4 WD |
31 | BUG FIXES: |
32 | ||
33 | - Restore the list-clearing behavior of "!" in a .cvsignore file (2.6.3 | |
34 | was only treating it as a special token in an rsync include/exclude | |
35 | file). | |
36 | ||
8daa9925 WD |
37 | - The combination of --verbose and --dry-run now mentions the full list |
38 | of changes that would be output without --dry-run. | |
e30b1fb8 | 39 | |
1ed55e3e WD |
40 | - Avoid a mkdir warning when removing a directory in the destination |
41 | that already exists in the --backup-dir. | |
42 | ||
8c577323 | 43 | - An OS that has a binary mode for its files (such as cygwin) needed |
ac1541f4 | 44 | setmode(fd, O_BINARY) called on the temp-file we opened with |
8c577323 | 45 | mkstemp(). (Fix derived from the cygwin's 2.6.3 rsync package.) |
4a888ae6 WD |
46 | |
47 | - Fixed a potential hang when verbosity is high, the client side is | |
48 | the sender, and the file-list is large. | |
ac1541f4 | 49 | |
3117bc16 WD |
50 | - Fixed a potential protocol-corrupting bug where the generator could |
51 | merge a message from the receiver into the middle of a multiplexed | |
52 | packet of data if only part of that data was written out to the | |
53 | socket when we got the message from the generator. | |
4e107712 | 54 | |
ac1541f4 WD |
55 | - We now check if the OS doesn't support using mknod() for creating |
56 | FIFOs and sockets, and compile-in using mkfifo() and socket() when | |
57 | necessary. | |
58 | ||
740bab94 WD |
59 | - Fixed an off-by-one error in the handling of --max-delete=N. |
60 | ||
22f5bd5e | 61 | - One place in the code wasn't checking if fork() failed. |
5d54f339 | 62 | |
8daa9925 WD |
63 | - The "ignore nonreadable" daemon parameter used to erroneously affect |
64 | symlinks that pointed to a non-existent file. This has been fixed. | |
5b2f48da | 65 | |
8c577323 WD |
66 | - If the OS does not have lchown() and a chown() of a symlink will |
67 | affect the referent of a symlink (as it should), we no longer try | |
68 | to set the user and group of a symlink. | |
fbe2aba2 | 69 | |
ec626b3f WD |
70 | - The generator now properly runs the hard-link loop and the dir-time |
71 | rewriting loop after we're sure that the redo phase is complete. | |
72 | ||
da1b6eea WD |
73 | - When --backup was specified with --partial-dir=DIR (where DIR is a |
74 | relative path), the backup code was erroneously trying to backup a | |
75 | file that was put into the partial-dir. | |
ec626b3f | 76 | |
f1223831 WD |
77 | - If a file gets resent in a single transfer and the --backup option is |
78 | enabled along with --inplace, rsync no longer performs a duplicate | |
79 | backup (it used to overwrite the first backup with the failed file). | |
80 | ||
e30b1fb8 WD |
81 | - One call to flush_write_file() was not being checked for an error. |
82 | ||
83 | - The --no-relative option was not being sent from the client to a | |
84 | server sender. | |
85 | ||
86 | - If an rsync daemon specified "dont compress = ..." for a file and the | |
87 | client tried to specify --compress, the libz code was not handling a | |
88 | compression level of 0 properly. This could cause a transfer failure | |
8c577323 | 89 | if the block-size for a file was large enough (e.g. rsync might have |
e30b1fb8 WD |
90 | exited with an error for large files). |
91 | ||
8db3106e WD |
92 | - Fixed a bug that would sometimes surface when using --compress and |
93 | sending a file with a block-size larger than 64K (either manually | |
94 | specified, or computed due to the file being really large). Prior | |
bbbb44ee | 95 | versions of rsync would sometimes fail to decompress the data |
8db3106e WD |
96 | properly, and thus the transferred file would fail its verification. |
97 | ||
a897af2c | 98 | - If a daemon can't open the specified log file (i.e. syslog is not |
8daa9925 WD |
99 | being used), die without crashing. We also output an error about |
100 | the failure on stderr (which will only be seen if --no-detach was | |
a897af2c WD |
101 | specified). |
102 | ||
7b82b5ad | 103 | - A local transfer no longer duplicates all its include/exclude options |
8daa9925 WD |
104 | (since the forked process already has a copy of the exclude list, |
105 | there's no need to send them a set of duplicates). | |
7b82b5ad | 106 | |
7b97c388 WD |
107 | - When --progress is specified, the output of items that the generator |
108 | is creating (e.g. dirs, symlinks) is now integrated into the progress | |
8c577323 | 109 | output without overlapping it. (Requires protocol 29.) |
7b97c388 | 110 | |
e6f5ac11 | 111 | - When --timeout is specified, lulls that occur in the transfer while |
fef101a5 WD |
112 | the generator is doing work that does not generate socket traffic |
113 | (looking for changed files, deleting files, doing directory-time | |
114 | touch-ups, etc.) will cause a new keep-alive packet to be sent that | |
115 | should keep the transfer going as long as the generator continues to | |
116 | make progress. (Requires protocol 29.) | |
47780ddf WD |
117 | |
118 | - The stat size of a device is not added to the total file size of the | |
e6f5ac11 | 119 | items in the transfer since the size might be undefined on some OSes. |
47780ddf | 120 | |
472135e0 WD |
121 | - Fixed a problem with refused-option messages sometimes not making it |
122 | back to the client side when a remote --files-from was in effect and | |
123 | the daemon was the receiver. | |
124 | ||
4e107712 WD |
125 | - The --compare-dest option was not updating a file that differred in |
126 | (the preserved) attributes from the version in the compare-dest DIR. | |
127 | ||
278e3d4f | 128 | - When rsync is copying files into a write-protected directory, fixed |
3117bc16 | 129 | the change-report output for the directory so that we don't report |
278e3d4f WD |
130 | an identical directory as changed. |
131 | ||
ac1541f4 WD |
132 | ENHANCEMENTS: |
133 | ||
8f1b4f36 WD |
134 | - Rsync now supports popt's option aliases, which means that you can |
135 | use /etc/popt and/or ~/.popt to create your own option aliases. | |
136 | ||
da1b6eea | 137 | - Added the --delete-during (--del) option which will delete files |
bbbb44ee | 138 | from the receiving side incrementally as each directory in the |
8daa9925 WD |
139 | transfer is being processed. This makes it more efficient than the |
140 | default, before-the-transfer behavior, which is now available as | |
bbbb44ee | 141 | --delete-before (and is still the default --delete-WHEN option that |
8c577323 WD |
142 | will be chosen if --delete or --delete-excluded is specified without |
143 | a --delete-WHEN choice). All the --del* options infer --delete, so | |
144 | an rsync daemon that refuses "delete" will still refuse to allow any | |
8daa9925 | 145 | file-deleting options. |
0752721d WD |
146 | |
147 | - All the --delete-WHEN options are now more memory efficient: | |
148 | Previously an entire duplicate set of file-list objects was created | |
149 | on the receiving side for the entire destination hierarchy. The new | |
bbbb44ee WD |
150 | algorithm only creates one directory of objects at a time (for files |
151 | inside the transfer). | |
da1b6eea | 152 | |
271220c5 WD |
153 | - Added the --copy-dest option, which works like --link-dest except |
154 | that it copies identical files instead of hard-linking them. | |
155 | ||
156 | - Added support for specifying multiple --compare-dest, --copy-dest, or | |
157 | --link-dest options, but only of a single type. (Promoted from the | |
158 | patches dir and enhanced.) (Requires protocol 29.) | |
22f5bd5e | 159 | |
c3131af9 | 160 | - Added the --max-size option. (Promoted from the patches dir.) |
7a1b73b9 | 161 | |
18ea5dc0 | 162 | - The daemon-mode options were separated from the normal rsync options |
22f5bd5e WD |
163 | so that they can't be mixed together. This makes it impossible to |
164 | start a daemon that had improper default option values that could | |
8c577323 | 165 | cause problems when a client connects (e.g. a hang or an abort). |
18ea5dc0 | 166 | |
8f1b4f36 | 167 | - The --bwlimit option may now be used in combination with --daemon |
e30b1fb8 | 168 | to specify both a default value for the daemon side and a value |
8f1b4f36 WD |
169 | that cannot be exceeded by a user-specified --bwlimit option. |
170 | ||
c3131af9 | 171 | - Added the "port" parameter to the rsyncd.conf file. (Promoted from |
0f7e31f7 WD |
172 | the patches dir.) Also added "address". A command-line option |
173 | will take precedence over a config-file option, as expected. | |
c3131af9 | 174 | |
ac1541f4 WD |
175 | - In _exit_cleanup(): when we are exiting with a partially-received |
176 | file, we now flush any data in the write-cache before closing the | |
177 | partial file. | |
178 | ||
271220c5 WD |
179 | - The --inplace support was enhanced to work with --compare-dest, |
180 | --link-dest, and (the new) --copy-dest options. (Requires protocol | |
181 | 29.) | |
a8fd4161 | 182 | |
9624b864 | 183 | - Added the --dirs (-d) option for an easier way to copy directories |
859fdaad WD |
184 | without recursion. |
185 | ||
bbbb44ee | 186 | - Added the --list-only option, which is mainly a way for the client to |
859fdaad | 187 | put the server into listing mode without needing to resort to any |
8daa9925 WD |
188 | internal option kluges (e.g. the age-old use of "-r --exclude="/*/*" |
189 | for a non-recursive listing). This option is used automatically | |
190 | (behind the scenes) when a modern rsync speaks to a modern daemon, | |
191 | but may also be specified manually if you want to force the use of | |
192 | the --list-only option over a remote-shell connection. | |
859fdaad | 193 | |
8c577323 WD |
194 | - Added the --omit-dir-times (-O) option, which will avoid updating |
195 | the modified time for directories when --times was specified. This | |
e30b1fb8 WD |
196 | option will avoid an extra pass through the file-list at the end of |
197 | the transfer (to tweak all the directory times), which can result in | |
7b82b5ad WD |
198 | an appreciable speedup for a really large transfer. (Promoted from |
199 | the patches dir.) | |
90fdd89a | 200 | |
9624b864 WD |
201 | - Added the --filter (-f) option and its helper option, -F. Filter |
202 | rules are an extension to the existing include/exclude handling | |
203 | that also supports nested filter files as well as per-directory | |
204 | filter files (like .cvsignore, but with full filter-rule parsing). | |
205 | This new option was chosen in order to ensure that all existing | |
206 | include/exclude processing remained 100% compatible with older | |
3723c048 WD |
207 | versions. Protocol 29 is needed for full filter-rule support, but |
208 | backward-compatible rules work with earlier protocol versions. | |
8daa9925 | 209 | (Promoted from the patches dir and enhanced.) |
9624b864 | 210 | |
da1b6eea WD |
211 | - Added the --delay-updates option that puts all updated files into |
212 | a temporary directory (by default ".~tmp~", but settable via the | |
213 | --partial-dir=DIR option) until the end of the transfer. This | |
214 | makes the updates a little more atomic for a large transfer. | |
215 | ||
e30b1fb8 WD |
216 | - If rsync is put into the background, any output from --progress is |
217 | reduced. | |
218 | ||
a897af2c WD |
219 | - Documented the "max verbosity" setting for rsyncd.conf. (This |
220 | setting was added a couple releases ago, but left undocumented.) | |
221 | ||
7b82b5ad | 222 | - The sender and the generator now double-check the file-list index |
8daa9925 WD |
223 | they are given, and refuse to try to do a file transfer on a |
224 | non-file index (since that would indicate that something had gone | |
225 | very wrong). | |
7b82b5ad | 226 | |
8daa9925 WD |
227 | - Added the --itemize-changes (-i) option, which is a way to output a |
228 | more detailed list of what files changed in any way and how they | |
229 | changed. The effect is the same as specifying a --log-format of | |
bd5b85db | 230 | "%i %n%L" (see the rsyncd.conf manpage). Works with --dry-run too. |
5b4e1f31 | 231 | |
3723c048 WD |
232 | - Added the --fuzzy option, which attempts to find a basis file for a |
233 | file that is being created from scratch. The current algorithm | |
234 | only looks in the destination directory for the created file, but | |
235 | it does attempt to find a match based on size/mod-time (in case the | |
236 | file was renamed with no other changes) as well as based on a fuzzy | |
237 | name-matching algorithm. This option requires protocol 29 because | |
238 | it needs the new file-sorting order. (Promoted from patches dir | |
dd18526e | 239 | and enhanced.) (Requires protocol 29.) |
3723c048 | 240 | |
88b93c61 WD |
241 | - Added the --remove-sent-files option, which lets you move files |
242 | between systems. | |
243 | ||
472135e0 WD |
244 | - The hostname in HOST:PATH or HOST::PATH may now be an IPv6 literal |
245 | enclosed in '[' and ']' (e.g. "[::1]"). (We already allowed IPv6 | |
246 | literals in the rsync://HOST:PORT/PATH format.) | |
247 | ||
7b97c388 WD |
248 | - When building under windows, the default for --daemon is now to |
249 | avoid detaching, requiring the new --detach option to force rsync | |
250 | to detach. | |
251 | ||
8daa9925 | 252 | - Improved the option descriptions in the --help text. |
da1b6eea | 253 | |
8daa9925 | 254 | SUPPORT FILES: |
da1b6eea | 255 | |
8daa9925 WD |
256 | - Added atomic-rsync to the support dir: a perl script that will |
257 | transfer some files using rsync, and then move the updated files into | |
258 | place all at once at the end of the transfer. Only works when | |
259 | pulling, and uses --link-dest and a parallel hierarchy of files to | |
260 | effect its update. | |
da1b6eea | 261 | |
8daa9925 WD |
262 | - Added mnt-excl to the support dir: a perl script that takes the |
263 | /proc/mounts file and translates it into a set of excludes that will | |
264 | exclude all mount points (even mapped mounts to the same disk). The | |
265 | excludes are made relative to the specified source dir and properly | |
266 | anchored. | |
da1b6eea | 267 | |
8daa9925 WD |
268 | - Added savetransfer.c to the support dir: a C program that can make |
269 | a copy of all the data that flows over the wire. This lets you test | |
270 | for data corruption (by saving the data on both the sending side and | |
271 | the receiving side) or provides a way to help debug a protocol error. | |
cc17fbfe | 272 | |
8daa9925 WD |
273 | - Added rrsync to the support dir: this is my version of Joe Smith's |
274 | restricted rsync perl script. This helps to ensure that only certain | |
275 | rsync commands can be run by an ssh invocation. | |
a897af2c | 276 | |
a8fd4161 WD |
277 | INTERNAL: |
278 | ||
e30b1fb8 | 279 | - Added better checking of the checksum-header values that come over |
a8fd4161 WD |
280 | the socket. |
281 | ||
8daa9925 | 282 | - Merged a variety of file-deleting functions into a single function so |
e30b1fb8 WD |
283 | that it is easier to maintain. |
284 | ||
285 | - Improved the type of some variables (particularly blocksize vars) for | |
286 | consistency and proper size. | |
287 | ||
288 | - Got rid of the uint64 type (which we didn't need). | |
a8fd4161 | 289 | |
a897af2c WD |
290 | - Use a slightly more compatible set of core #include directives. |
291 | ||
292 | - Defined int32 in a way that ensures that the build dies if we can't | |
293 | find a variable with at least 32 bits. | |
294 | ||
5b4e1f31 WD |
295 | - The daemon's "read only" config item now sets an internal read_only |
296 | variable that makes extra sure that no write/delete calls on the | |
297 | read-only side can succeed. | |
298 | ||
0f7e31f7 WD |
299 | PROTOCOL DIFFERENCES FOR VERSION 29: |
300 | ||
bd5b85db WD |
301 | - A 16-bit flag-word is transmitted after every file-list index. This |
302 | indicates what is changing between the sender and the receiver. The | |
303 | generator now transmits an index and a flag-word to indicate when | |
33f839b3 WD |
304 | dirs and symlinks have changed (instead of producing a message), |
305 | which makes the outputting of the information more consistent and | |
306 | less prone to screen corruption (because either the receiver or the | |
307 | sender is now outputting all the file-change info). | |
bd5b85db | 308 | |
dd18526e WD |
309 | - If a file is being hard-linked, the appropriate bit is enabled in |
310 | the flag-word and the name of the file that was linked immediately | |
311 | follows in vstring format (see below). | |
312 | ||
313 | - If a file is being transferred with an alternate-basis file, the | |
314 | appropriate bit is enabled in the flag-word and a single-byte | |
315 | follows, indicating what type of basis file was chosen. If that | |
316 | indicates that a fuzzy-match was selected, the name of the match | |
317 | immediately follows in vstring format. A vstring is a variable | |
318 | length string that has its size written prior to the string, and | |
319 | no terminating null. If the string is from 1-127 bytes, the length | |
320 | is a single byte. If it is from 128-32767 bytes, the length is | |
321 | written as ((len >> 8) | 0x80) followed by (len % 0x100). | |
0f7e31f7 WD |
322 | |
323 | - The sending of exclude names is done using filter-rule syntax. This | |
324 | means that all names have a prefixed rule indicator, even excludes | |
325 | (which used to be sent as a bare pattern, when possible). The -C | |
326 | option will include the per-dir .cvsignore merge file in the list of | |
327 | filter rules so it is positioned correctly (unlike in some older | |
328 | transfer scenarios). | |
329 | ||
8daa9925 WD |
330 | - Rsync sorts the filename list in a different way: it sorts the subdir |
331 | names after the non-subdir names for each dir's contents, and it | |
332 | always puts a dir's contents immediately after the dir's name in the | |
333 | list. (Previously an item named "foo.txt" would sort in between | |
86e97e17 | 334 | directory "foo/" and "foo/bar".) |
0f7e31f7 WD |
335 | |
336 | - When talking to a protocol 29 rsync daemon, a list-only request | |
8c577323 WD |
337 | is able to note this before the options are sent over the wire and |
338 | the new --list-only option is included in the options. | |
0f7e31f7 WD |
339 | |
340 | - When the --stats bytes are sent over the wire (or stored in a batch), | |
341 | they now include two elapsed-time values: one for how long it took to | |
342 | build the file-list, and one for how long it took to send it over the | |
343 | wire (each expressed in thousandths of a second). | |
344 | ||
8c577323 WD |
345 | - When --delete-excluded is specified with some filter excludes, a |
346 | client sender will now initiate a send of the filter rules to the | |
347 | receiver (older protocols used to omit the sending of excludes in | |
348 | this situation since there were no receiver-specific rules that | |
349 | survived --delete-excluded back then). Note that, as with all the | |
350 | filter-list sending, only items that are significant to the other | |
351 | side will actually be sent over the wire, so the filter-rule list | |
352 | is often empty in this scenario. | |
28c54e81 | 353 | |
0f7e31f7 WD |
354 | - A protocol-29 batch file includes a bit for the setting of the --dirs |
355 | option. Also, the shell script created by --write-batch will use the | |
356 | --filter option instead of --exclude-from to capture any filter rules. | |
357 | ||
47780ddf | 358 | - An index equal to the file-list count is sent as a keep-alive packet |
fef101a5 | 359 | from the generator to the sender, which then forwards it on to the |
47780ddf WD |
360 | receiver. This normally invalid index is only a valid keep-alive |
361 | packet if the 16-bit flag-word that follows it contains a single bit | |
362 | (ITEM_IS_NEW, which is normally an illegal flag to appear alone). | |
363 | ||
ac1541f4 WD |
364 | BUILD CHANGES: |
365 | ||
87ba7282 | 366 | - Handle an operating system that use mkdev() in place of makedev(). |
e30b1fb8 WD |
367 | |
368 | - Improved configure to better handle cross-compiling. |