comparison: dav/sync.c
dav/sync.c
- changeset 219
- 9792cfe63b80
- parent 218
- 5f1f7602cf77
- child 220
- f1b3873a6525
equal
deleted
inserted
replaced
| 218:5f1f7602cf77 | 219:9792cfe63b80 |
|---|---|
| 120 void print_usage(char *cmd) { | 120 void print_usage(char *cmd) { |
| 121 fprintf(stderr, "Usage: %s command [options] arguments...\n\n", cmd); | 121 fprintf(stderr, "Usage: %s command [options] arguments...\n\n", cmd); |
| 122 | 122 |
| 123 fprintf(stderr, "Commands:\n"); | 123 fprintf(stderr, "Commands:\n"); |
| 124 fprintf(stderr, " pull [-c] <directory>\n"); | 124 fprintf(stderr, " pull [-c] <directory>\n"); |
| 125 //fprintf(stderr, " push [-r] <directory>\n\n"); | 125 fprintf(stderr, " push [-c] <directory>\n"); |
| 126 fprintf(stderr, " push <directory>\n"); | 126 fprintf(stderr, " resolve-conflicts <directory>\n"); |
| 127 fprintf(stderr, " delete-conflicts <directory>\n"); | |
| 127 fprintf(stderr, " trash-info <directory>\n"); | 128 fprintf(stderr, " trash-info <directory>\n"); |
| 128 fprintf(stderr, " empty-trash <directory>\n\n"); | 129 fprintf(stderr, " empty-trash <directory>\n\n"); |
| 129 | 130 |
| 130 fprintf(stderr, "Options:\n"); | 131 fprintf(stderr, "Options:\n"); |
| 131 fprintf(stderr, " -c Disable conflict detection\n"); | 132 fprintf(stderr, " -c Disable conflict detection\n"); |
| 677 int sync_delete = 0; | 678 int sync_delete = 0; |
| 678 int sync_skipped = 0; | 679 int sync_skipped = 0; |
| 679 int sync_error = 0; | 680 int sync_error = 0; |
| 680 | 681 |
| 681 // upload all changed files | 682 // upload all changed files |
| 682 UcxList *resources = cmd_getoption(a, "read") ? | 683 //UcxList *resources = cmd_getoption(a, "read") ? |
| 683 read_changes(dir, db) : local_scan(dir, db); | 684 // read_changes(dir, db) : local_scan(dir, db); |
| 685 UcxList *resources = local_scan(dir, db); | |
| 684 | 686 |
| 685 UcxMap *lclres = ucx_map_new(db->resources->count); | 687 UcxMap *lclres = ucx_map_new(db->resources->count); |
| 686 int ret = 0; | 688 int ret = 0; |
| 687 UCX_FOREACH(elm, resources) { | 689 UCX_FOREACH(elm, resources) { |
| 688 LocalResource *local_res = elm->data; | 690 LocalResource *local_res = elm->data; |
