Thu, 03 Oct 2019 12:00:25 +0200
implement hash based conflict resolution in dav-sync pull
266 | 1 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
2 | <html xmlns="http://www.w3.org/1999/xhtml"> | |
3 | <head> | |
4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | |
5 | <meta http-equiv="Content-Style-Type" content="text/css" /> | |
6 | <meta name="generator" content="pandoc" /> | |
283
0e36bb75a732
adds dav-sync introduction and sync.xml documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
282
diff
changeset
|
7 | <title>dav info</title> |
266 | 8 | <style type="text/css">code{white-space: pre;}</style> |
9 | <link rel="stylesheet" href="davdoc.css" type="text/css" /> | |
10 | </head> | |
11 | <body> | |
12 | <div class="header"> | |
285
02d3e4b1245f
adds some small fixes for 1.0 release
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
283
diff
changeset
|
13 | <a href="./index.html"><span>DavUtils documentation</span></a> |
266 | 14 | </div> |
15 | <div class="sidebar"> | |
16 | <div class="nav"> | |
17 | <h3>dav</h3> | |
18 | <ul> | |
19 | <li><a href="getting-started.html">Getting started</a></li> | |
20 | <li><a href="commands.html">Commands</a></li> | |
21 | <ul> | |
22 | <li><a href="list.html">list</a></li> | |
23 | <li><a href="get.html">get</a></li> | |
24 | <li><a href="put.html">put</a></li> | |
25 | <li><a href="mkdir.html">mkdir</a></li> | |
26 | <li><a href="remove.html">remove</a></li> | |
27 | <li><a href="copy.html">copy</a></li> | |
28 | <li><a href="move.html">move</a></li> | |
429
1607450065ba
this could be the 1.2 release
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
320
diff
changeset
|
29 | <li><a href="export.html">export</a></li> |
1607450065ba
this could be the 1.2 release
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
320
diff
changeset
|
30 | <li><a href="import.html">import</a></li> |
266 | 31 | <li><a href="get-property.html">get-property</a></li> |
32 | <li><a href="set-property.html">set-property</a></li> | |
320
12ed560c926c
adds documentation for new features
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
285
diff
changeset
|
33 | <li><a href="remove-property.html">remove-property</a></li> |
266 | 34 | <li><a href="lock.html">lock</a></li> |
35 | <li><a href="unlock.html">unlock</a></li> | |
36 | <li><a href="info.html">info</a></li> | |
37 | <li><a href="date.html">date</a></li> | |
38 | <li><a href="add-repository.html">add-repository</a></li> | |
429
1607450065ba
this could be the 1.2 release
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
320
diff
changeset
|
39 | <li><a href="remove-repository.html">remove-repository</a></li> |
266 | 40 | <li><a href="list-repositories.html">list-repositories</a></li> |
41 | <li><a href="check-config.html">check-config</a></li> | |
42 | </ul> | |
43 | <li><a href="configuration.html">Configuration</a></li> | |
44 | <li><a href="encryption.html">Encryption</a></li> | |
45 | </ul> | |
46 | </div> | |
47 | <div class="nav"> | |
48 | <h3>dav-sync</h3> | |
49 | <ul> | |
273
c743721d566f
more documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
266
diff
changeset
|
50 | <li><a href="introduction.html">Introduction</a></li> |
c743721d566f
more documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
266
diff
changeset
|
51 | <li><a href="sync-commands.html">Commands</a></li> |
c743721d566f
more documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
266
diff
changeset
|
52 | <ul> |
c743721d566f
more documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
266
diff
changeset
|
53 | <li><a href="pull.html">pull</a></li> |
c743721d566f
more documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
266
diff
changeset
|
54 | <li><a href="push.html">push</a></li> |
320
12ed560c926c
adds documentation for new features
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
285
diff
changeset
|
55 | <li><a href="archive.html">archive</a></li> |
563
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
429
diff
changeset
|
56 | <li><a href="list-conflicts.html">list-conflicts</a></li> |
273
c743721d566f
more documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
266
diff
changeset
|
57 | <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> |
c743721d566f
more documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
266
diff
changeset
|
58 | <li><a href="delete-conflicts.html">delete-conflicts</a></li> |
c743721d566f
more documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
266
diff
changeset
|
59 | <li><a href="trash-info.html">trash-info</a></li> |
c743721d566f
more documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
266
diff
changeset
|
60 | <li><a href="empty-trash.html">empty-trash</a></li> |
429
1607450065ba
this could be the 1.2 release
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
320
diff
changeset
|
61 | <li><a href="add-tag.html">add-tag</a></li> |
1607450065ba
this could be the 1.2 release
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
320
diff
changeset
|
62 | <li><a href="remove-tag.html">remove-tag</a></li> |
1607450065ba
this could be the 1.2 release
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
320
diff
changeset
|
63 | <li><a href="set-tags.html">set-tags</a></li> |
1607450065ba
this could be the 1.2 release
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
320
diff
changeset
|
64 | <li><a href="list-tags.html">list-tags</a></li> |
273
c743721d566f
more documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
266
diff
changeset
|
65 | <li><a href="add-directory.html">add-directory</a></li> |
c743721d566f
more documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
266
diff
changeset
|
66 | <li><a href="list-directories.html">list-directories</a></li> |
c743721d566f
more documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
266
diff
changeset
|
67 | <li><a href="sync-check-config.html">check-config</a></li> |
c743721d566f
more documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
266
diff
changeset
|
68 | <li><a href="check-repositories.html">check-repositories</a></li> |
c743721d566f
more documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
266
diff
changeset
|
69 | </ul> |
c743721d566f
more documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
266
diff
changeset
|
70 | <li><a href="sync-configuration.html">Configuration</a></li> |
266 | 71 | </ul> |
72 | </div> | |
73 | </div> | |
74 | ||
75 | <!-- begin content --> | |
76 | <div class="content"> | |
283
0e36bb75a732
adds dav-sync introduction and sync.xml documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
282
diff
changeset
|
77 | <div id="header"> |
0e36bb75a732
adds dav-sync introduction and sync.xml documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
282
diff
changeset
|
78 | <h1 class="title">dav info</h1> |
0e36bb75a732
adds dav-sync introduction and sync.xml documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
282
diff
changeset
|
79 | </div> |
285
02d3e4b1245f
adds some small fixes for 1.0 release
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
283
diff
changeset
|
80 | <p><strong><code>dav info [-pc] <url></code></strong></p> |
282
3070d72f54af
more minor improvements to the documentation
Mike Becker <universe@uap-core.de>
parents:
273
diff
changeset
|
81 | <p>Prints some information and lists all properties for the resource specified by <em>url</em>.</p> |
266 | 82 | <h3 id="example-1-info-of-a-collection">Example 1: info of a collection</h3> |
282
3070d72f54af
more minor improvements to the documentation
Mike Becker <universe@uap-core.de>
parents:
273
diff
changeset
|
83 | <p>In this example <em>myserv</em> is a configured repository with the base url <em>https://example.com/webdav/</em>. Because the collection is not encrypted, the <em>url</em> in the info output is just the <em>path</em> appended to the base url.</p> |
266 | 84 | <pre><code>$ dav info myserv/col/ |
85 | name: col | |
86 | path: /col | |
87 | url: https://example.com/webdav/col | |
88 | type: collection | |
89 | size: 28 | |
90 | ||
91 | namespace: DAV: | |
92 | creationdate: 2017-06-14T09:32:43Z | |
93 | getetag: "1000-551e83bebc19c" | |
94 | getlastmodified: Wed, 14 Jun 2017 09:32:43 GMT | |
95 | supportedlock:</code></pre> | |
96 | <h3 id="example-2-encrypted-resource">Example 2: encrypted resource</h3> | |
282
3070d72f54af
more minor improvements to the documentation
Mike Becker <universe@uap-core.de>
parents:
273
diff
changeset
|
97 | <p>With encrypted resources, the <em>url</em> in the info output looks different. The real resource name may be disguised, but the name used by <em>dav</em> is stored encrypted and base64 encoded in the <em>crypto-name</em> property. Read the <a href="./encryption.html">encryption</a> documentation to learn more about the davutils encryption feature.</p> |
266 | 98 | <pre><code>$ dav info -c myserv/crres |
99 | name: crres | |
100 | path: /crres | |
101 | url: https://example.com/webdav/wsIwbLxuJQTGtgiMAD1KGeaY | |
102 | type: resource | |
103 | size: 48 bytes | |
104 | ||
105 | namespace: DAV: | |
106 | creationdate: 2017-07-09T16:18:09Z | |
107 | getcontentlength: 48 | |
108 | getetag: "30-553e4cfecd170" | |
109 | getlastmodified: Sun, 09 Jul 2017 16:18:09 GMT | |
110 | supportedlock: | |
111 | ||
112 | namespace: http://apache.org/dav/props/ | |
113 | executable: F | |
114 | ||
115 | namespace: http://davutils.org/ | |
116 | crypto-hash: fm4zstp/FevTs1aoUXc3+mqTmAf2Go+zQ34rSp8/ixDlGLQJXR74Je+WMl1zxZKbS/+5VwDhyZ9pT3gInsq2SA== | |
117 | crypto-key: mykey | |
118 | crypto-name: ZU+lZtFi3dprBz44714plYwfRnhyI/apYq46Sk/B6QU=</code></pre> | |
119 | </div> | |
120 | <!-- end content --> | |
121 | </body> | |
122 | </html> |