diff options
| author | Jérôme Vouillon <vouillon@pps.jussieu.fr> | 2009-07-10 14:55:30 +0000 |
|---|---|---|
| committer | Jérôme Vouillon <vouillon@pps.jussieu.fr> | 2009-07-10 14:55:30 +0000 |
| commit | 59e44114fd936c3f53f1d39c6cf442f5921bc243 (patch) | |
| tree | 4e39bee39d45349306ca30dfe3c784e87e034ff1 /src/common.ml | |
| parent | cd2c0928e21058fd032ae6d8170dc9565ada3dd1 (diff) | |
| download | unison-59e44114fd936c3f53f1d39c6cf442f5921bc243.zip unison-59e44114fd936c3f53f1d39c6cf442f5921bc243.tar.gz unison-59e44114fd936c3f53f1d39c6cf442f5921bc243.tar.bz2 | |
* Accurate computation of the amount of data to transfer
* Accurate update of the amount of data transferred, including:
- when transferring by copying on the remote host
- when the file was already transferred to the remote host
- in case of errors
* Text UI: list partially transferred directories in transfer summary
and use appropriate exit code (indicating that some files were skipped)
* Improved error reporting when the destination is updated during
synchronization: Unison now tells which file has been updated, and how.
* Fix include directive failure when the line ends by CRLF
(the CR was not removed)
* Limit the length of temporary file names
* Ignore errors when writing to the log file
* Mac UI: some performance improvements
* GTK UI: possibility to display errors in auxiliary detail window +
other small changes
* Save archive after update detection when there is no archive on disk yet
* GTK UI: Made restart work also when roots are given from the command line
Diffstat (limited to 'src/common.ml')
| -rw-r--r-- | src/common.ml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common.ml b/src/common.ml index e069293..bd3763c 100644 --- a/src/common.ml +++ b/src/common.ml @@ -113,7 +113,8 @@ type replicaContent = { typ : Fileinfo.typ; status : status; desc : Props.t; - ui : updateItem } + ui : updateItem; + size : int * Uutil.Filesize.t } type direction = Conflict @@ -165,7 +166,7 @@ let rcLength rc rc' = if riAction rc rc' = `SetProps then Uutil.Filesize.zero else - Props.length rc.desc + snd rc.size let riLength ri = match ri.replicas with |