Mercurial > hg > dav / changeset

--- a/dav/main.c	Sun Apr 05 10:13:09 2020 +0200
+++ b/dav/main.c	Sun Apr 05 11:06:34 2020 +0200
@@ -252,7 +252,7 @@
     "list [-altdepcR] [-u <date>] <url>",
     "get [-pcRK] [-o <file>] [-u <date>] [-V <version>] <url>",
     "put [-pcR] [-k <key>] [-L <lock>] <url> <file...>",
-    "edit [-pc] [-k <key>] [-V <version>] <url>",
+    "edit [-pc] [-k <key>] [-V <version>] [-L <lock>] <url>",
     "mkdir [-pc] [-k <key>] [-L <lock>] <url> [file...]",
     "remove [-pc] [-L <lock>] <url> [file...]",
     "copy [-pcO] [-L <lock>] <url> <url>",
@@ -1185,7 +1185,7 @@
     if(set_session_config(sn, a)) {
         return -1;
     }
-    // TODO: implement locking feature
+    set_session_lock(sn, a);
         
     if(check_encryption_key(a, sn)) {
         return -1;

--- a/docs/src/dav.1.md	Sun Apr 05 10:13:09 2020 +0200
+++ b/docs/src/dav.1.md	Sun Apr 05 11:06:34 2020 +0200
@@ -25,7 +25,7 @@
 put [**-pcR**] [**-k** *key*] [**-L** *lock*] *url* *file*
 :   Uploads a resource to *url*.
 
-edit [**-pc**] [**-k** *key*] [**-V** *version*] *url*
+edit [**-pc**] [**-k** *key*] [**-V** *version*] [**-L** *lock*] *url*
 :   Downloads or creates a resource and opens the editor.
 
     The editor can be specified via the EDITOR environment variable.

--- a/docs/src/edit.md	Sun Apr 05 10:13:09 2020 +0200
+++ b/docs/src/edit.md	Sun Apr 05 11:06:34 2020 +0200
@@ -2,7 +2,7 @@
 title: 'dav edit'
 ---
 
-**`dav edit [-pc] [-k <key>] [-V <version>] <url>`**
+**`dav edit [-pc] [-k <key>] [-V <version>] [-L <lock>] <url>`**
 
 Downloads a resources and opens an editor. If there is no resource at the
 specified location, it is attempted to create a fresh resource.
@@ -25,4 +25,7 @@
 
 **`-V <version>`** downloads a specific version of the resource. Available versions can be listed with the *list-versions* command
 
+**`-L <lock>`** use a lock token. See [dav lock][1]
 
+[1]: ./lock.html
+