Add version update, add version vnew [vold].

egorpugin · egorpugin · commit 97a5db1e438e · 2017-01-06T11:59:21.000+03:00
diff --git a/src/client/main.cpp b/src/client/main.cpp
@@ -669,13 +669,82 @@ ApiResult api_call(const String &cmd, const Strings &args)
                 return ApiResult::Error;
             }
 
-            Api().add_version(find_remote(remote), p, read_file(args[arg++]));
+            auto f = args[arg++];
+            if (fs::exists(f) && fs::is_regular_file(f))
+            {
+                Api().add_version(find_remote(remote), p, read_file(f));
+                return ApiResult::Handled;
+            }
+
+            if (args.size() < arg + 1)
+            {
+                Api().add_version(find_remote(remote), p, Version(f));
+                return ApiResult::Handled;
+            }
+
+            auto vold = args[arg++];
+            Api().add_version(find_remote(remote), p, Version(f), vold);
+
             return ApiResult::Handled;
         }
 
         return ApiResult::Handled;
     }
 
+    if (cmd == "update")
+    {
+        if (args.size() < 3)
+        {
+            std::cout << "invalid number of arguments\n";
+            std::cout << "usage: cppan update version [remote] name version\n";
+            return ApiResult::Error;
+        }
+
+        size_t arg = 2;
+        String what = args[arg++];
+
+        if (what == "version")
+        {
+            auto proj_usage = []
+            {
+                std::cout << "invalid number of arguments\n";
+                std::cout << "usage: cppan update version [remote] name version\n";
+            };
+
+            if (args.size() < arg + 1)
+            {
+                proj_usage();
+                return ApiResult::Error;
+            }
+
+            String remote = DEFAULT_REMOTE_NAME;
+            ProjectPath p(args[arg++]);
+            if (has_remote(remote) && p.is_relative() && p.size() == 1)
+            {
+                remote = args[arg - 1];
+
+                if (args.size() < arg + 1)
+                {
+                    proj_usage();
+                    return ApiResult::Error;
+                }
+
+                p = ProjectPath(args[arg++]);
+            }
+
+            if (args.size() < arg + 1)
+            {
+                proj_usage();
+                return ApiResult::Error;
+            }
+
+            Api().update_version(find_remote(remote), p, String(args[arg++]));
+            return ApiResult::Handled;
+        }
+
+        return ApiResult::NotHandled;
+    }
+
     if (cmd == "remove")
     {
         if (args.size() < 3)
diff --git a/src/common/api.cpp b/src/common/api.cpp
@@ -80,6 +80,33 @@ void Api::add_version(const Remote &r, ProjectPath p, const String &cppan)
     api_call(r, "add_version", request);
 }
 
+void Api::add_version(const Remote &r, ProjectPath p, const Version &vnew)
+{
+    add_version(r, p, vnew, String());
+}
+
+void Api::add_version(const Remote &r, ProjectPath p, const Version &vnew, const String &vold)
+{
+    check_relative(r, p);
+    ptree request;
+    request.put("project", p.toString());
+    request.put("new", vnew.toString());
+    if (!vold.empty())
+        request.put("old", vold);
+    api_call(r, "add_version", request);
+}
+
+void Api::update_version(const Remote &r, ProjectPath p, const Version &v)
+{
+    if (!v.isBranch())
+        throw std::runtime_error("Only branches can be updated");
+    check_relative(r, p);
+    ptree request;
+    request.put("project", p.toString());
+    request.put("version", v.toString());
+    api_call(r, "update_version", request);
+}
+
 void Api::remove_version(const Remote &r, ProjectPath p, const Version &v)
 {
     check_relative(r, p);
diff --git a/src/common/api.h b/src/common/api.h
@@ -28,6 +28,9 @@ struct Api
     void add_project(const Remote &r, ProjectPath p, ProjectType t);
     void remove_project(const Remote &r, ProjectPath p);
     void add_version(const Remote &r, ProjectPath p, const String &cppan);
+    void add_version(const Remote &r, ProjectPath p, const Version &vnew);
+    void add_version(const Remote &r, ProjectPath p, const Version &vnew, const String &vold);
+    void update_version(const Remote &r, ProjectPath p, const Version &v);
     void remove_version(const Remote &r, ProjectPath p, const Version &v);
     void get_notifications(const Remote &r, int n = 10);
     void clear_notifications(const Remote &r);
diff --git a/src/common/property_tree.cpp b/src/common/property_tree.cpp
@@ -27,8 +27,10 @@ std::string ptree2string(const ptree &p)
 
 ptree string2ptree(const std::string &s)
 {
-    std::istringstream iss(s);
     ptree p;
+    if (s.empty())
+        return p;
+    std::istringstream iss(s);
     pt::read_json(iss, p);
     return p;
 }

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,10 @@ std::string ptree2string(const ptree &p)`
`27`	`27`
`28`	`28`	`ptree string2ptree(const std::string &s)`
`29`	`29`	`{`
`30`		`- std::istringstream iss(s);`
`31`	`30`	`ptree p;`
	`31`	`+ if (s.empty())`
	`32`	`+ return p;`
	`33`	`+ std::istringstream iss(s);`
`32`	`34`	`pt::read_json(iss, p);`
`33`	`35`	`return p;`
`34`	`36`	`}`