Sort include directives within each block (separated by a blank line) in lexicographic order (except to prioritize `sys/types.h` first). First run `clang-format` with the config file: --- SortIncludes: false ... Commit the result temporarily. Then run `clang-format` again with: --- SortIncludes: true IncludeCategories: - Regex: 'sys/types.h' Priority: -1 ... Commit the result temporarily. Start a new branch and cherry-pick the second commit. Manually resolve conflicts to preserve indentation of re-ordered includes. This cleans up the include ordering without changing any other style. Use the following command to run `clang-format`: $ git ls-files -z -- \ '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' | egrep -z -v '(Lexer|Parser|ParserHelper)\.' | egrep -z -v '^Source/cm_sha2' | egrep -z -v '^Source/(kwsys|CursesDialog/form)/' | egrep -z -v '^Utilities/(KW|cm).*/' | egrep -z -v '^Tests/Module/GenerateExportHeader' | egrep -z -v '^Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h' | xargs -0 clang-format -i This selects source files that do not come from a third-party. Inspired-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
73 lines
1.8 KiB
C++
73 lines
1.8 KiB
C++
/*============================================================================
|
|
CMake - Cross Platform Makefile Generator
|
|
Copyright 2000-2013 Kitware, Inc.
|
|
|
|
Distributed under the OSI-approved BSD License (the "License");
|
|
see accompanying file Copyright.txt for details.
|
|
|
|
This software is distributed WITHOUT ANY WARRANTY; without even the
|
|
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
See the License for more information.
|
|
============================================================================*/
|
|
#ifndef cmCTestP4_h
|
|
#define cmCTestP4_h
|
|
|
|
#include "cmCTestGlobalVC.h"
|
|
|
|
#include <map>
|
|
#include <vector>
|
|
|
|
/** \class cmCTestP4
|
|
* \brief Interaction with the Perforce command-line tool
|
|
*
|
|
*/
|
|
class cmCTestP4: public cmCTestGlobalVC
|
|
{
|
|
public:
|
|
/** Construct with a CTest instance and update log stream. */
|
|
cmCTestP4(cmCTest* ctest, std::ostream& log);
|
|
|
|
virtual ~cmCTestP4();
|
|
|
|
private:
|
|
std::vector<std::string> ChangeLists;
|
|
|
|
struct User
|
|
{
|
|
std::string UserName;
|
|
std::string Name;
|
|
std::string EMail;
|
|
std::string AccessTime;
|
|
|
|
User(): UserName(), Name(), EMail(), AccessTime() {}
|
|
};
|
|
std::map<std::string, User> Users;
|
|
std::vector<std::string> P4Options;
|
|
|
|
User GetUserData(const std::string& username);
|
|
void SetP4Options(std::vector<char const*> &options);
|
|
|
|
std::string GetWorkingRevision();
|
|
virtual void NoteOldRevision();
|
|
virtual void NoteNewRevision();
|
|
virtual bool UpdateImpl();
|
|
bool UpdateCustom(const std::string& custom);
|
|
|
|
void LoadRevisions();
|
|
void LoadModifications();
|
|
|
|
// Parsing helper classes.
|
|
class IdentifyParser;
|
|
class ChangesParser;
|
|
class UserParser;
|
|
class DescribeParser;
|
|
class DiffParser;
|
|
friend class IdentifyParser;
|
|
friend class ChangesParser;
|
|
friend class UserParser;
|
|
friend class DescribeParser;
|
|
friend class DiffParser;
|
|
};
|
|
|
|
#endif
|