Run clang-format

Author: alt-graph

include/libgit4cpp/Error.h

@@ -35,10 +35,11 @@ using ::git_error_code; // from git2/errors.h
 
 namespace detail {
 
-class git_category_impl : public std::error_category {
-    public:
-        virtual const char* name() const noexcept;
-        virtual std::string message(int ev) const;
+class git_category_impl : public std::error_category
+{
+public:
+    virtual const char* name() const noexcept;
+    virtual std::string message(int ev) const;
 };
 
 } // namespace detail
@@ -92,38 +93,42 @@ class Error : public std::system_error
     using std::system_error::system_error;
     Error(int ev)
         : std::system_error(ev, git_category())
-        { }
+    {
+    }
     Error(int ev, const std::string& what)
         : std::system_error(ev, git_category(), what)
-        { }
+    {
+    }
     Error(int ev, const char* what)
         : std::system_error(ev, git_category(), what)
-        { }
+    {
+    }
     Error(const std::string& what)
         : std::system_error(static_cast<int>(GIT_EUSER), git_category(), what)
-        { }
+    {
+    }
     Error(const char* what)
         : std::system_error(static_cast<int>(GIT_EUSER), git_category(), what)
-        { }
+    {
+    }
 
     /// The error category must be an unique object
     const std::error_category& git_category()
     {
         static detail::git_category_impl instance;
         return instance;
     }
-
 };
 
 } // namespace git
 
-namespace std
+namespace std {
+// register for implicit conversion to std::error_code
+template <>
+struct is_error_code_enum<git::git_error_code> : public true_type
 {
-    // register for implicit conversion to std::error_code
-    template <>
-    struct is_error_code_enum<git::git_error_code> : public true_type
-    { };
-}
+};
+} // namespace std
 
 std::error_code make_error_code(git::git_error_code e);
 

include/libgit4cpp/Repository.h

@@ -43,12 +43,17 @@ namespace git {
  */
 struct FileStatus
 {
-    std::string path_name; /// Relative path to file. If the path changed this value will have the shape "OLD_NAME -> NEW_NAME".
-    std::string handling;  /// Handling status of file [unchanged, unstaged, staged, untracked, ignored]
-    std::string changes;   /// Change status of file [new file, deleted, renamed, typechanged, modified, unchanged, ignored, untracked]
-
-    friend std::ostream& operator<<(std::ostream& stream, FileStatus const& state) {
-        stream << "FileStatus{ \"" << gul17::escape(state.path_name) << "\": " << state.handling << "; " << state.changes << " }";
+    std::string
+        path_name; /// Relative path to file. If the path changed this value will have the shape "OLD_NAME -> NEW_NAME".
+    std::string
+        handling; /// Handling status of file [unchanged, unstaged, staged, untracked, ignored]
+    std::string
+        changes; /// Change status of file [new file, deleted, renamed, typechanged, modified, unchanged, ignored, untracked]
+
+    friend std::ostream& operator<<(std::ostream& stream, FileStatus const& state)
+    {
+        stream << "FileStatus{ \"" << gul17::escape(state.path_name)
+               << "\": " << state.handling << "; " << state.changes << " }";
         return stream;
     }
 };
@@ -64,7 +69,12 @@ inline std::ostream& operator<<(std::ostream& stream, const RepoState& repostate
     return stream;
 }
 
-enum class BranchType {all = 0, local =1, remote=2};
+enum class BranchType
+{
+    all = 0,
+    local = 1,
+    remote = 2
+};
 
 
 /**
@@ -80,7 +90,6 @@ enum class BranchType {all = 0, local =1, remote=2};
 class Repository
 {
 public:
-
     /**
      * Constructor which specifies the root dir of the git repository.
      * \param file_path  Path to git directory
@@ -152,7 +161,7 @@ class Repository
      *          files were staged successfully.
      * \see add()
      */
-   std::vector <int> add_files(const std::vector<std::filesystem::path>& filepaths);
+    std::vector<int> add_files(const std::vector<std::filesystem::path>& filepaths);
 
     /**
      * Return the commit message of the HEAD commit.
@@ -252,8 +261,8 @@ class Repository
      * \param origin_branch_name name of the existing branch to checkout from
      * \return The reference object of the new branch
     */
-    LibGitReference new_branch(const std::string& branch_name,
-        const std::string& origin_branch_name);
+    LibGitReference new_branch(
+        const std::string& branch_name, const std::string& origin_branch_name);
 
     /**
      * Returns the active branch in the repository.
@@ -276,16 +285,16 @@ class Repository
      * \param branch_name The branch to checkout
      * \param paths specifies the files to checkout
      */
-    void checkout(const std::string& branch_name,
-        const std::vector<std::string>& paths = {"*"});
+    void checkout(
+        const std::string& branch_name, const std::vector<std::string>& paths = { "*" });
 
     /**
      * Switch branches by setting HEAD to an existing branch.
      * \attention If the branch doesn't exist yet, no error will be thrown.
      *            The HEAD will then be attached to an unborn branch.
      * \param branch_name ID, shorthand or full reference name of branch
     */
-   void switch_branch(const std::string& branch_name);
+    void switch_branch(const std::string& branch_name);
 
     /**
      * Remove all entries from the index under a given directory.
@@ -334,7 +343,6 @@ class Repository
     ~Repository();
 
 private:
-
     /// Path to the repository.
     std::filesystem::path repo_path_;
 
@@ -401,7 +409,6 @@ class Repository
      * \return true if file is staged (and filestats initialized), else false
      */
     static bool is_staged(FileStatus& filestats, const git_status_entry* s);
-
 };
 
 } // namespace git

include/libgit4cpp/libgit4cpp.h

@@ -31,6 +31,7 @@
 #include "libgit4cpp/wrapper_functions.h"
 
 /// Namespace git contains all functions, classes, and other declarations of libgit4cpp.
-namespace git { }
+namespace git {
+}
 
 #endif

include/libgit4cpp/types.h

@@ -30,16 +30,17 @@
 
 namespace git {
 
-using LibGitTree = std::unique_ptr<git_tree, void(*)(git_tree*)>;
-using LibGitSignature = std::unique_ptr<git_signature, void(*)(git_signature*)>;
-using LibGitIndex = std::unique_ptr<git_index, void(*)(git_index*)>;
-using LibGitRepository = std::unique_ptr<git_repository, void(*)(git_repository*)>;
-using LibGitRemote = std::unique_ptr<git_remote, void(*)(git_remote*)>;
-using LibGitCommit = std::unique_ptr<git_commit, void(*)(git_commit*)>;
-using LibGitStatusList = std::unique_ptr<git_status_list, void(*)(git_status_list*)>;
-using LibGitReference = std::unique_ptr<git_reference, void(*)(git_reference*)>;
-using LibGitBuf = std::unique_ptr<git_buf, void(*)(git_buf*)>;
-using LibGitBranchIterator = std::unique_ptr<git_branch_iterator, void(*)(git_branch_iterator*)>;
+using LibGitTree = std::unique_ptr<git_tree, void (*)(git_tree*)>;
+using LibGitSignature = std::unique_ptr<git_signature, void (*)(git_signature*)>;
+using LibGitIndex = std::unique_ptr<git_index, void (*)(git_index*)>;
+using LibGitRepository = std::unique_ptr<git_repository, void (*)(git_repository*)>;
+using LibGitRemote = std::unique_ptr<git_remote, void (*)(git_remote*)>;
+using LibGitCommit = std::unique_ptr<git_commit, void (*)(git_commit*)>;
+using LibGitStatusList = std::unique_ptr<git_status_list, void (*)(git_status_list*)>;
+using LibGitReference = std::unique_ptr<git_reference, void (*)(git_reference*)>;
+using LibGitBuf = std::unique_ptr<git_buf, void (*)(git_buf*)>;
+using LibGitBranchIterator
+    = std::unique_ptr<git_branch_iterator, void (*)(git_branch_iterator*)>;
 
 } // namespace git
 

include/libgit4cpp/wrapper_functions.h

@@ -82,7 +82,8 @@ LibGitSignature signature_default(git_repository* repo);
  * \param offset Timezone adjustment for the timestamp
  * \return new git_signature object
  */
-LibGitSignature signature_new(const std::string& name, const std::string& email, time_t time, int offset);
+LibGitSignature signature_new(
+    const std::string& name, const std::string& email, time_t time, int offset);
 
 
 /**
@@ -100,7 +101,8 @@ LibGitTree tree_lookup(git_repository* repo, git_oid tree_id);
  * \param status_opt Struct of status options
  * \return new git_status_list object
  */
-LibGitStatusList status_list_new(git_repository* repo, const git_status_options& status_opt);
+LibGitStatusList status_list_new(
+    git_repository* repo, const git_status_options& status_opt);
 
 /**
  * Collect the reference to the repository head.
@@ -116,8 +118,8 @@ LibGitReference repository_head(git_repository* repo);
  * \param url Adress of remote connection, e.g https://github.com/...
  * \return new git_remote object
  */
-LibGitRemote remote_create (git_repository* repo, const std::string& remote_name,
-                const std::string& url);
+LibGitRemote remote_create(
+    git_repository* repo, const std::string& remote_name, const std::string& url);
 
 /**
  * Find a remote repository by the name under which it is configured in the given
@@ -143,7 +145,8 @@ LibGitRepository clone(const std::string& url, const std::string& repo_path);
  * \param branch_type Which branch type to find, enum with 1=GIT_BRANCH_LOCAL, 2=GIT_BRANCH_REMOTE, 3=GIT_BRANCH_ALL
  * \return new git_reference object
  */
-LibGitReference branch_lookup(git_repository* repo, const std::string& branch_name, git_branch_t branch_type);
+LibGitReference branch_lookup(
+    git_repository* repo, const std::string& branch_name, git_branch_t branch_type);
 
 
 /**
@@ -162,7 +165,8 @@ LibGitTree commit_tree(git_commit* commit);
  * \param force if True, it will force the creation even with uncommited changes
  * \return new git_reference object
  */
-LibGitReference branch_create(git_repository* repo, const std::string& new_branch_name, const git_commit* starting_commit, int force);
+LibGitReference branch_create(git_repository* repo, const std::string& new_branch_name,
+    const git_commit* starting_commit, int force);
 
 /**
  * Find the name of a branch on the remote.

src/Error.cc

@@ -28,8 +28,8 @@ namespace git {
 
 const std::error_category& git_category()
 {
-  static detail::git_category_impl instance{ };
-  return instance;
+    static detail::git_category_impl instance{};
+    return instance;
 }
 
 namespace detail {
@@ -41,54 +41,89 @@ const char* git_category_impl::name() const noexcept
 
 std::string git_category_impl::message(int ev) const
 {
-    switch (static_cast<git_error_code>(ev)) {
-        case git_error_code::GIT_OK: return "GIT_OK";
-        case git_error_code::GIT_ERROR: return "GIT_ERROR";
-        case git_error_code::GIT_ENOTFOUND: return "GIT_ENOTFOUND";
-        case git_error_code::GIT_EEXISTS: return "GIT_EEXISTS";
-        case git_error_code::GIT_EAMBIGUOUS: return "GIT_EAMBIGUOUS";
-        case git_error_code::GIT_EBUFS: return "GIT_EBUFS";
+    switch (static_cast<git_error_code>(ev))
+    {
+    case git_error_code::GIT_OK:
+        return "GIT_OK";
+    case git_error_code::GIT_ERROR:
+        return "GIT_ERROR";
+    case git_error_code::GIT_ENOTFOUND:
+        return "GIT_ENOTFOUND";
+    case git_error_code::GIT_EEXISTS:
+        return "GIT_EEXISTS";
+    case git_error_code::GIT_EAMBIGUOUS:
+        return "GIT_EAMBIGUOUS";
+    case git_error_code::GIT_EBUFS:
+        return "GIT_EBUFS";
 
-        /**
+    /**
          * GIT_EUSER is a special error that is never generated by libgit2
          * code.  You can return it from a callback (e.g to stop an iteration)
          * to know that it was generated by the callback and not by libgit2.
          */
-        case git_error_code::GIT_EUSER: return "GIT_EUSER";
+    case git_error_code::GIT_EUSER:
+        return "GIT_EUSER";
 
-        case git_error_code::GIT_EBAREREPO: return "GIT_EBAREREPO";
-        case git_error_code::GIT_EUNBORNBRANCH: return "GIT_EUNBORNBRANCH";
-        case git_error_code::GIT_EUNMERGED: return "GIT_EUNMERGED";
-        case git_error_code::GIT_ENONFASTFORWARD: return "GIT_ENONFASTFORWARD";
-        case git_error_code::GIT_EINVALIDSPEC: return "GIT_EINVALIDSPEC";
-        case git_error_code::GIT_ECONFLICT: return "GIT_ECONFLICT";
-        case git_error_code::GIT_ELOCKED: return "GIT_ELOCKED";
-        case git_error_code::GIT_EMODIFIED: return "GIT_EMODIFIED";
-        case git_error_code::GIT_EAUTH: return "GIT_EAUTH";
-        case git_error_code::GIT_ECERTIFICATE: return "GIT_ECERTIFICATE";
-        case git_error_code::GIT_EAPPLIED: return "GIT_EAPPLIED";
-        case git_error_code::GIT_EPEEL: return "GIT_EPEEL";
-        case git_error_code::GIT_EEOF: return "GIT_EEOF";
-        case git_error_code::GIT_EINVALID: return "GIT_EINVALID";
-        case git_error_code::GIT_EUNCOMMITTED: return "GIT_EUNCOMMITTED";
-        case git_error_code::GIT_EDIRECTORY: return "GIT_EDIRECTORY";
-        case git_error_code::GIT_EMERGECONFLICT: return "GIT_EMERGECONFLICT";
-        case git_error_code::GIT_PASSTHROUGH: return "GIT_PASSTHROUGH";
-        case git_error_code::GIT_ITEROVER: return "GIT_ITEROVER";
-        case git_error_code::GIT_RETRY: return "GIT_RETRY";
-        case git_error_code::GIT_EMISMATCH: return "GIT_EMISMATCH";
-        case git_error_code::GIT_EINDEXDIRTY: return "GIT_EINDEXDIRTY";
-        case git_error_code::GIT_EAPPLYFAIL: return "GIT_EAPPLYFAIL";
+    case git_error_code::GIT_EBAREREPO:
+        return "GIT_EBAREREPO";
+    case git_error_code::GIT_EUNBORNBRANCH:
+        return "GIT_EUNBORNBRANCH";
+    case git_error_code::GIT_EUNMERGED:
+        return "GIT_EUNMERGED";
+    case git_error_code::GIT_ENONFASTFORWARD:
+        return "GIT_ENONFASTFORWARD";
+    case git_error_code::GIT_EINVALIDSPEC:
+        return "GIT_EINVALIDSPEC";
+    case git_error_code::GIT_ECONFLICT:
+        return "GIT_ECONFLICT";
+    case git_error_code::GIT_ELOCKED:
+        return "GIT_ELOCKED";
+    case git_error_code::GIT_EMODIFIED:
+        return "GIT_EMODIFIED";
+    case git_error_code::GIT_EAUTH:
+        return "GIT_EAUTH";
+    case git_error_code::GIT_ECERTIFICATE:
+        return "GIT_ECERTIFICATE";
+    case git_error_code::GIT_EAPPLIED:
+        return "GIT_EAPPLIED";
+    case git_error_code::GIT_EPEEL:
+        return "GIT_EPEEL";
+    case git_error_code::GIT_EEOF:
+        return "GIT_EEOF";
+    case git_error_code::GIT_EINVALID:
+        return "GIT_EINVALID";
+    case git_error_code::GIT_EUNCOMMITTED:
+        return "GIT_EUNCOMMITTED";
+    case git_error_code::GIT_EDIRECTORY:
+        return "GIT_EDIRECTORY";
+    case git_error_code::GIT_EMERGECONFLICT:
+        return "GIT_EMERGECONFLICT";
+    case git_error_code::GIT_PASSTHROUGH:
+        return "GIT_PASSTHROUGH";
+    case git_error_code::GIT_ITEROVER:
+        return "GIT_ITEROVER";
+    case git_error_code::GIT_RETRY:
+        return "GIT_RETRY";
+    case git_error_code::GIT_EMISMATCH:
+        return "GIT_EMISMATCH";
+    case git_error_code::GIT_EINDEXDIRTY:
+        return "GIT_EINDEXDIRTY";
+    case git_error_code::GIT_EAPPLYFAIL:
+        return "GIT_EAPPLYFAIL";
 #if LIBGIT2_FULLVERSION >= 1005000
-        case git_error_code::GIT_EOWNER: return "GIT_EOWNER";
+    case git_error_code::GIT_EOWNER:
+        return "GIT_EOWNER";
 #if LIBGIT2_FULLVERSION >= 1007000
-        case git_error_code::GIT_TIMEOUT: return "GIT_TIMEOUT";
+    case git_error_code::GIT_TIMEOUT:
+        return "GIT_TIMEOUT";
 #if LIBGIT2_FULLVERSION > 1007002
-        case git_error_code::GIT_EUNCHANGED: return "GIT_EUNCHANGED";
+    case git_error_code::GIT_EUNCHANGED:
+        return "GIT_EUNCHANGED";
 #endif
 #endif
 #endif
-        default: return "unknown GIT error";
+    default:
+        return "unknown GIT error";
     }
 }