mirror of
https://github.com/mangosfour/server.git
synced 2025-12-12 10:37:03 +00:00
[c12536] Happy New Year 2013
Update authorship information and prepare for easier ways next year Signed-off-by: Schmoozerd <schmoozerd@cmangos> (based on commit [12325] - b7dbcda)
This commit is contained in:
Schmoozerd
Antz
parent
86a243c910
commit
a05738717a
542 changed files with 3274 additions and 1846 deletions
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
|
||||
* This file is part of the Continued-MaNGOS Project
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -52,9 +52,10 @@
|
|||
#define NUM_REMOTES 2
|
||||
#define NUM_DATABASES 3
|
||||
|
||||
char remotes[NUM_REMOTES][MAX_REMOTE] = {
|
||||
"git@github.com:mangos/server.git",
|
||||
"git://github.com/mangos/server.git" // used for fetch if present
|
||||
char remotes[NUM_REMOTES][MAX_REMOTE] =
|
||||
{
|
||||
"git@github.com:cmangos/mangos-cata.git",
|
||||
"git://github.com/cmangos/mangos-cata.git" // used for fetch if present
|
||||
};
|
||||
|
||||
char remote_branch[MAX_REMOTE] = "master";
|
||||
|
|
@ -63,30 +64,46 @@ char rev_sql_file[MAX_PATH] = "src/shared/revision_sql.h";
|
|||
char sql_update_dir[MAX_PATH] = "sql/updates";
|
||||
char new_index_file[MAX_PATH] = ".git/git_id_index";
|
||||
|
||||
char databases[NUM_DATABASES][MAX_DB] = {
|
||||
char databases[NUM_DATABASES][MAX_DB] =
|
||||
{
|
||||
"characters",
|
||||
"mangos",
|
||||
"realmd"
|
||||
};
|
||||
|
||||
char db_version_table[NUM_DATABASES][MAX_DB] = {
|
||||
char db_version_table[NUM_DATABASES][MAX_DB] =
|
||||
{
|
||||
"character_db_version",
|
||||
"db_version",
|
||||
"realmd_db_version",
|
||||
};
|
||||
|
||||
char db_sql_file[NUM_DATABASES][MAX_PATH] = {
|
||||
char db_sql_file[NUM_DATABASES][MAX_PATH] =
|
||||
{
|
||||
"sql/characters.sql",
|
||||
"sql/mangos.sql",
|
||||
"sql/realmd.sql"
|
||||
};
|
||||
|
||||
char db_sql_rev_field[NUM_DATABASES][MAX_PATH] = {
|
||||
char db_sql_rev_field[NUM_DATABASES][MAX_PATH] =
|
||||
{
|
||||
"REVISION_DB_CHARACTERS",
|
||||
"REVISION_DB_MANGOS",
|
||||
"REVISION_DB_REALMD"
|
||||
};
|
||||
|
||||
bool db_sql_rev_parent[NUM_DATABASES] =
|
||||
{
|
||||
false,
|
||||
false,
|
||||
true
|
||||
};
|
||||
|
||||
#define REV_PREFIX "c"
|
||||
#define REV_SCAN REV_PREFIX "%d"
|
||||
#define REV_PRINT REV_PREFIX "%04d"
|
||||
#define REV_FORMAT "[" REV_PRINT "]"
|
||||
|
||||
bool allow_replace = false;
|
||||
bool local = false;
|
||||
bool do_fetch = false;
|
||||
|
|
@ -97,8 +114,8 @@ bool generate_makefile = false; // not need for cmak
|
|||
|
||||
char origins[NUM_REMOTES][MAX_REMOTE];
|
||||
int rev;
|
||||
int last_sql_rev[NUM_DATABASES] = {0,0,0};
|
||||
int last_sql_nr[NUM_DATABASES] = {0,0,0};
|
||||
int last_sql_rev[NUM_DATABASES] = {0, 0, 0};
|
||||
int last_sql_nr[NUM_DATABASES] = {0, 0, 0};
|
||||
|
||||
char head_message[MAX_MSG];
|
||||
char path_prefix[MAX_PATH] = "";
|
||||
|
|
@ -112,18 +129,18 @@ char new_index_cmd[MAX_CMD];
|
|||
|
||||
std::set<std::string> new_sql_updates;
|
||||
|
||||
FILE *cmd_pipe;
|
||||
FILE* cmd_pipe;
|
||||
|
||||
bool find_path()
|
||||
{
|
||||
printf("+ finding path\n");
|
||||
char *ptr;
|
||||
char* ptr;
|
||||
char cur_path[MAX_PATH];
|
||||
getcwd(cur_path, MAX_PATH);
|
||||
size_t len = strlen(cur_path);
|
||||
strncpy(base_path, cur_path, len+1);
|
||||
strncpy(base_path, cur_path, len + 1);
|
||||
|
||||
if(cur_path[len-1] == '/' || cur_path[len-1] == '\\')
|
||||
if (cur_path[len - 1] == '/' || cur_path[len - 1] == '\\')
|
||||
{
|
||||
// we're in root, don't bother
|
||||
return false;
|
||||
|
|
@ -131,15 +148,15 @@ bool find_path()
|
|||
|
||||
// don't count the root
|
||||
int count_fwd = 0, count_back = 0;
|
||||
for(ptr = cur_path-1; ptr = strchr(ptr+1, '/'); count_fwd++);
|
||||
for(ptr = cur_path-1; ptr = strchr(ptr+1, '\\'); count_back++);
|
||||
for (ptr = cur_path - 1; ptr = strchr(ptr + 1, '/'); count_fwd++);
|
||||
for (ptr = cur_path - 1; ptr = strchr(ptr + 1, '\\'); count_back++);
|
||||
int count = std::max(count_fwd, count_back);
|
||||
|
||||
char path[MAX_PATH];
|
||||
for(int i = 0; i < count; i++)
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
snprintf(path, MAX_PATH, "%s.git", path_prefix);
|
||||
if(0 == chdir(path))
|
||||
if (0 == chdir(path))
|
||||
{
|
||||
chdir(cur_path);
|
||||
return true;
|
||||
|
|
@ -147,11 +164,11 @@ bool find_path()
|
|||
strncat(path_prefix, "../", MAX_PATH);
|
||||
|
||||
ptr = strrchr(base_path, '\\');
|
||||
if(ptr) *ptr = '\0';
|
||||
if (ptr) *ptr = '\0';
|
||||
else
|
||||
{
|
||||
ptr = strrchr(base_path, '/');
|
||||
if(ptr) *ptr = '\0';
|
||||
if (ptr) *ptr = '\0';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -161,17 +178,17 @@ bool find_path()
|
|||
bool find_origin()
|
||||
{
|
||||
printf("+ finding origin\n");
|
||||
if( (cmd_pipe = popen( "git remote -v", "r" )) == NULL )
|
||||
if ((cmd_pipe = popen("git remote -v", "r")) == NULL)
|
||||
return false;
|
||||
|
||||
bool ret = false;
|
||||
while(fgets(buffer, MAX_BUF, cmd_pipe))
|
||||
while (fgets(buffer, MAX_BUF, cmd_pipe))
|
||||
{
|
||||
char name[256], remote[MAX_REMOTE];
|
||||
sscanf(buffer, "%s %s", name, remote);
|
||||
for(int i = 0; i < NUM_REMOTES; i++)
|
||||
for (int i = 0; i < NUM_REMOTES; i++)
|
||||
{
|
||||
if(strcmp(remote, remotes[i]) == 0)
|
||||
if (strcmp(remote, remotes[i]) == 0)
|
||||
{
|
||||
strncpy(origins[i], name, MAX_REMOTE);
|
||||
ret = true;
|
||||
|
|
@ -195,21 +212,21 @@ bool check_fwd()
|
|||
{
|
||||
printf("+ checking fast forward\n");
|
||||
snprintf(cmd, MAX_CMD, "git log -n 1 --pretty=\"format:%%H\" %s/%s", (origins[1][0] ? origins[1] : origins[0]), remote_branch);
|
||||
if( (cmd_pipe = popen( cmd, "r" )) == NULL )
|
||||
if ((cmd_pipe = popen(cmd, "r")) == NULL)
|
||||
return false;
|
||||
|
||||
if(!fgets(buffer, MAX_BUF, cmd_pipe)) return false;
|
||||
if (!fgets(buffer, MAX_BUF, cmd_pipe)) return false;
|
||||
strncpy(origin_hash, buffer, MAX_HASH);
|
||||
pclose(cmd_pipe);
|
||||
|
||||
if( (cmd_pipe = popen( "git log --pretty=\"format:%H\"", "r" )) == NULL )
|
||||
if ((cmd_pipe = popen("git log --pretty=\"format:%H\"", "r")) == NULL)
|
||||
return false;
|
||||
|
||||
bool found = false;
|
||||
while(fgets(buffer, MAX_BUF, cmd_pipe))
|
||||
while (fgets(buffer, MAX_BUF, cmd_pipe))
|
||||
{
|
||||
buffer[strlen(buffer) - 1] = '\0';
|
||||
if(strncmp(origin_hash, buffer, MAX_BUF) == 0)
|
||||
if (strncmp(origin_hash, buffer, MAX_BUF) == 0)
|
||||
{
|
||||
found = true;
|
||||
break;
|
||||
|
|
@ -217,22 +234,24 @@ bool check_fwd()
|
|||
}
|
||||
pclose(cmd_pipe);
|
||||
|
||||
if(!found)
|
||||
if (!found)
|
||||
{
|
||||
// with fetch you still get the latest rev, you just rebase afterwards and push
|
||||
// without it you may not get the right rev
|
||||
if(do_fetch) printf("WARNING: non-fastforward, use rebase!\n");
|
||||
if (do_fetch) printf("WARNING: non-fastforward, use rebase!\n");
|
||||
else { printf("ERROR: non-fastforward, use rebase!\n"); return false; }
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
int get_rev(const char *from_msg)
|
||||
int get_rev(const char* from_msg)
|
||||
{
|
||||
// accept only the rev number format, not the sql update format
|
||||
char nr_str[256];
|
||||
if(sscanf(from_msg, "[%[0123456789]]", nr_str) != 1) return 0;
|
||||
if(from_msg[strlen(nr_str)+1] != ']') return 0;
|
||||
if (sscanf(from_msg, "[" REV_PREFIX "%[0123456789]]", nr_str) != 1) return 0;
|
||||
// ("[")+(REV_PREFIX)+("]")-1
|
||||
if (from_msg[strlen(nr_str) + strlen(REV_PREFIX) + 2 - 1] != ']') return 0;
|
||||
|
||||
return atoi(nr_str);
|
||||
}
|
||||
|
||||
|
|
@ -240,26 +259,26 @@ bool find_rev()
|
|||
{
|
||||
printf("+ finding next revision number\n");
|
||||
// find the highest rev number on either of the remotes
|
||||
for(int i = 0; i < NUM_REMOTES; i++)
|
||||
for (int i = 0; i < NUM_REMOTES; i++)
|
||||
{
|
||||
if(!local && !origins[i][0]) continue;
|
||||
if (!local && !origins[i][0]) continue;
|
||||
|
||||
if(local) snprintf(cmd, MAX_CMD, "git log HEAD --pretty=\"format:%%s\"");
|
||||
if (local) snprintf(cmd, MAX_CMD, "git log HEAD --pretty=\"format:%%s\"");
|
||||
else sprintf(cmd, "git log %s/%s --pretty=\"format:%%s\"", origins[i], remote_branch);
|
||||
if( (cmd_pipe = popen( cmd, "r" )) == NULL )
|
||||
if ((cmd_pipe = popen(cmd, "r")) == NULL)
|
||||
continue;
|
||||
|
||||
int nr;
|
||||
while(fgets(buffer, MAX_BUF, cmd_pipe))
|
||||
while (fgets(buffer, MAX_BUF, cmd_pipe))
|
||||
{
|
||||
nr = get_rev(buffer);
|
||||
if(nr >= rev)
|
||||
rev = nr+1;
|
||||
if (nr >= rev)
|
||||
rev = nr + 1;
|
||||
}
|
||||
pclose(cmd_pipe);
|
||||
}
|
||||
|
||||
if(rev > 0) printf("Found [%d].\n", rev);
|
||||
if (rev > 0) printf("Found " REV_FORMAT ".\n", rev);
|
||||
|
||||
return rev > 0;
|
||||
}
|
||||
|
|
@ -279,38 +298,40 @@ std::string generateSqlHeader()
|
|||
std::ostringstream newData;
|
||||
newData << "#ifndef __REVISION_SQL_H__" << std::endl;
|
||||
newData << "#define __REVISION_SQL_H__" << std::endl;
|
||||
for(int i = 0; i < NUM_DATABASES; ++i)
|
||||
for (int i = 0; i < NUM_DATABASES; ++i)
|
||||
{
|
||||
newData << " #define " << db_sql_rev_field[i] << " \"required_" << last_sql_update[i] << "\"" << std::endl;
|
||||
}
|
||||
newData << "#endif // __REVISION_SQL_H__" << std::endl;
|
||||
return newData.str();
|
||||
}
|
||||
|
||||
void system_switch_index(const char *cmd)
|
||||
void system_switch_index(const char* cmd)
|
||||
{
|
||||
// do the command for the original index and then for the new index
|
||||
// both need to be updated with the changes before commit
|
||||
// but the new index will contains only the desired changes
|
||||
// while the old may contain others
|
||||
system(cmd);
|
||||
if(!use_new_index) return;
|
||||
if(putenv(new_index_cmd) != 0) return;
|
||||
if (!use_new_index) return;
|
||||
if (putenv(new_index_cmd) != 0) return;
|
||||
system(cmd);
|
||||
if(putenv(old_index_cmd) != 0) return;
|
||||
if (putenv(old_index_cmd) != 0) return;
|
||||
}
|
||||
|
||||
bool write_rev_nr()
|
||||
{
|
||||
printf("+ writing revision_nr.h\n");
|
||||
char rev_str[256];
|
||||
sprintf(rev_str, "%d", rev);
|
||||
sprintf(rev_str, "%04d", rev);
|
||||
std::string header = generateNrHeader(rev_str);
|
||||
|
||||
char prefixed_file[MAX_PATH];
|
||||
snprintf(prefixed_file, MAX_PATH, "%s%s", path_prefix, rev_nr_file);
|
||||
|
||||
if(FILE* OutputFile = fopen(prefixed_file, "wb"))
|
||||
if (FILE* OutputFile = fopen(prefixed_file, "wb"))
|
||||
{
|
||||
fprintf(OutputFile,"%s", header.c_str());
|
||||
fprintf(OutputFile, "%s", header.c_str());
|
||||
fclose(OutputFile);
|
||||
|
||||
// add the file to both indices, to be committed later
|
||||
|
|
@ -325,16 +346,16 @@ bool write_rev_nr()
|
|||
|
||||
bool write_rev_sql()
|
||||
{
|
||||
if(new_sql_updates.empty()) return true;
|
||||
if (new_sql_updates.empty()) return true;
|
||||
printf("+ writing revision_sql.h\n");
|
||||
std::string header = generateSqlHeader();
|
||||
|
||||
char prefixed_file[MAX_PATH];
|
||||
snprintf(prefixed_file, MAX_PATH, "%s%s", path_prefix, rev_sql_file);
|
||||
|
||||
if(FILE* OutputFile = fopen(prefixed_file, "wb"))
|
||||
if (FILE* OutputFile = fopen(prefixed_file, "wb"))
|
||||
{
|
||||
fprintf(OutputFile,"%s", header.c_str());
|
||||
fprintf(OutputFile, "%s", header.c_str());
|
||||
fclose(OutputFile);
|
||||
|
||||
// add the file to both indices, to be committed later
|
||||
|
|
@ -350,28 +371,28 @@ bool write_rev_sql()
|
|||
bool find_head_msg()
|
||||
{
|
||||
printf("+ finding last message on HEAD\n");
|
||||
if( (cmd_pipe = popen( "git log -n 1 --pretty=\"format:%s%n%n%b\"", "r" )) == NULL )
|
||||
if ((cmd_pipe = popen("git log -n 1 --pretty=\"format:%s%n%n%b\"", "r")) == NULL)
|
||||
return false;
|
||||
|
||||
int poz = 0;
|
||||
while(poz < 16384-1 && EOF != (head_message[poz++] = fgetc(cmd_pipe)));
|
||||
head_message[poz-1] = '\0';
|
||||
while (poz < 16384 - 1 && EOF != (head_message[poz++] = fgetc(cmd_pipe)));
|
||||
head_message[poz - 1] = '\0';
|
||||
|
||||
pclose(cmd_pipe);
|
||||
|
||||
if(int head_rev = get_rev(head_message))
|
||||
if (int head_rev = get_rev(head_message))
|
||||
{
|
||||
if(!allow_replace)
|
||||
if (!allow_replace)
|
||||
{
|
||||
printf("Last commit on HEAD is [%d]. Use -r to replace it with [%d].\n", head_rev, rev);
|
||||
printf("Last commit on HEAD is " REV_FORMAT ". Use -r to replace it with " REV_FORMAT ".\n", head_rev, rev);
|
||||
return false;
|
||||
}
|
||||
|
||||
// skip the rev number in the commit
|
||||
char *p = strchr(head_message, ']'), *q = head_message;
|
||||
assert(p && *(p+1));
|
||||
p+=2;
|
||||
while(*p) *q = *p, p++, q++;
|
||||
char* p = strchr(head_message, ']'), *q = head_message;
|
||||
assert(p && *(p + 1));
|
||||
p += 2;
|
||||
while (*p) *q = *p, p++, q++;
|
||||
*q = 0;
|
||||
return true;
|
||||
}
|
||||
|
|
@ -384,14 +405,14 @@ bool amend_commit()
|
|||
printf("+ amending last commit\n");
|
||||
|
||||
// commit the contents of the (new) index
|
||||
if(use_new_index && putenv(new_index_cmd) != 0) return false;
|
||||
if (use_new_index && putenv(new_index_cmd) != 0) return false;
|
||||
snprintf(cmd, MAX_CMD, "git commit --amend -F-");
|
||||
if( (cmd_pipe = popen( cmd, "w" )) == NULL )
|
||||
if ((cmd_pipe = popen(cmd, "w")) == NULL)
|
||||
return false;
|
||||
|
||||
fprintf(cmd_pipe, "[%d] %s", rev, head_message);
|
||||
fprintf(cmd_pipe, REV_FORMAT " %s", rev, head_message);
|
||||
pclose(cmd_pipe);
|
||||
if(use_new_index && putenv(old_index_cmd) != 0) return false;
|
||||
if (use_new_index && putenv(old_index_cmd) != 0) return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
@ -399,6 +420,7 @@ bool amend_commit()
|
|||
struct sql_update_info
|
||||
{
|
||||
int rev;
|
||||
char parentRev[MAX_BUF];
|
||||
int nr;
|
||||
int db_idx;
|
||||
char db[MAX_BUF];
|
||||
|
|
@ -406,24 +428,24 @@ struct sql_update_info
|
|||
bool has_table;
|
||||
};
|
||||
|
||||
bool get_sql_update_info(const char *buffer, sql_update_info &info)
|
||||
bool get_sql_update_info(const char* buffer, sql_update_info& info)
|
||||
{
|
||||
info.table[0] = '\0';
|
||||
int dummy[3];
|
||||
if(sscanf(buffer, "%d_%d_%d", &dummy[0], &dummy[1], &dummy[2]) == 3)
|
||||
if (sscanf(buffer, REV_SCAN "_%[^_]_%d_%d", &dummy[0], &dummy[1], &dummy[2]) == 3)
|
||||
return false;
|
||||
|
||||
if(sscanf(buffer, "%d_%d_%[^_]_%[^.].sql", &info.rev, &info.nr, info.db, info.table) != 4 &&
|
||||
sscanf(buffer, "%d_%d_%[^.].sql", &info.rev, &info.nr, info.db) != 3)
|
||||
if (sscanf(buffer, REV_SCAN "_%[^_]_%d_%[^_]_%[^.].sql", &info.rev, &info.nr, info.db, info.table) != 4 &&
|
||||
sscanf(buffer, REV_SCAN "_%[^_]_%d_%[^.].sql", &info.rev, &info.nr, info.db) != 3)
|
||||
{
|
||||
info.rev = 0; // this may be set by the first scans, even if they fail
|
||||
if(sscanf(buffer, "%d_%[^_]_%[^.].sql", &info.nr, info.db, info.table) != 3 &&
|
||||
sscanf(buffer, "%d_%[^.].sql", &info.nr, info.db) != 2)
|
||||
if (sscanf(buffer, "%d_%[^_]_%[^.].sql", &info.nr, info.db, info.table) != 3 &&
|
||||
sscanf(buffer, "%d_%[^.].sql", &info.nr, info.db) != 2)
|
||||
return false;
|
||||
}
|
||||
|
||||
for(info.db_idx = 0; info.db_idx < NUM_DATABASES; info.db_idx++)
|
||||
if(strncmp(info.db, databases[info.db_idx], MAX_DB) == 0) break;
|
||||
for (info.db_idx = 0; info.db_idx < NUM_DATABASES; info.db_idx++)
|
||||
if (strncmp(info.db, databases[info.db_idx], MAX_DB) == 0) break;
|
||||
info.has_table = (info.table[0] != '\0');
|
||||
return true;
|
||||
}
|
||||
|
|
@ -433,24 +455,24 @@ bool find_sql_updates()
|
|||
printf("+ finding new sql updates on HEAD\n");
|
||||
// add all updates from HEAD
|
||||
snprintf(cmd, MAX_CMD, "git show HEAD:%s", sql_update_dir);
|
||||
if( (cmd_pipe = popen( cmd, "r" )) == NULL )
|
||||
if ((cmd_pipe = popen(cmd, "r")) == NULL)
|
||||
return false;
|
||||
|
||||
// skip first two lines
|
||||
if(!fgets(buffer, MAX_BUF, cmd_pipe)) { pclose(cmd_pipe); return false; }
|
||||
if(!fgets(buffer, MAX_BUF, cmd_pipe)) { pclose(cmd_pipe); return false; }
|
||||
if (!fgets(buffer, MAX_BUF, cmd_pipe)) { pclose(cmd_pipe); return false; }
|
||||
if (!fgets(buffer, MAX_BUF, cmd_pipe)) { pclose(cmd_pipe); return false; }
|
||||
|
||||
sql_update_info info;
|
||||
|
||||
while(fgets(buffer, MAX_BUF, cmd_pipe))
|
||||
while (fgets(buffer, MAX_BUF, cmd_pipe))
|
||||
{
|
||||
buffer[strlen(buffer) - 1] = '\0';
|
||||
if(!get_sql_update_info(buffer, info)) continue;
|
||||
if (!get_sql_update_info(buffer, info)) continue;
|
||||
|
||||
if(info.db_idx == NUM_DATABASES)
|
||||
if (info.db_idx == NUM_DATABASES)
|
||||
{
|
||||
if(info.rev > 0) printf("WARNING: incorrect database name for sql update %s\n", buffer);
|
||||
continue;
|
||||
if (info.rev > 0) printf("WARNING: incorrect database name for sql update %s\n", buffer);
|
||||
continue;
|
||||
}
|
||||
|
||||
new_sql_updates.insert(buffer);
|
||||
|
|
@ -458,27 +480,35 @@ bool find_sql_updates()
|
|||
|
||||
pclose(cmd_pipe);
|
||||
|
||||
// Add last milestone's file information
|
||||
last_sql_rev[0] = 12300;
|
||||
last_sql_nr[0] = 2;
|
||||
sscanf("12300_02_characters_mail", "%s", last_sql_update[0]);
|
||||
last_sql_rev[2] = 12112;
|
||||
last_sql_nr[2] = 1;
|
||||
sscanf("12112_01_realmd_account_access", "%s", last_sql_update[2]);
|
||||
|
||||
// remove updates from the last commit also found on origin
|
||||
snprintf(cmd, MAX_CMD, "git show %s:%s", origin_hash, sql_update_dir);
|
||||
if( (cmd_pipe = popen( cmd, "r" )) == NULL )
|
||||
if ((cmd_pipe = popen(cmd, "r")) == NULL)
|
||||
return false;
|
||||
|
||||
// skip first two lines
|
||||
if(!fgets(buffer, MAX_BUF, cmd_pipe)) { pclose(cmd_pipe); return false; }
|
||||
if(!fgets(buffer, MAX_BUF, cmd_pipe)) { pclose(cmd_pipe); return false; }
|
||||
if (!fgets(buffer, MAX_BUF, cmd_pipe)) { pclose(cmd_pipe); return false; }
|
||||
if (!fgets(buffer, MAX_BUF, cmd_pipe)) { pclose(cmd_pipe); return false; }
|
||||
|
||||
while(fgets(buffer, MAX_BUF, cmd_pipe))
|
||||
while (fgets(buffer, MAX_BUF, cmd_pipe))
|
||||
{
|
||||
buffer[strlen(buffer) - 1] = '\0';
|
||||
if(!get_sql_update_info(buffer, info)) continue;
|
||||
if (!get_sql_update_info(buffer, info)) continue;
|
||||
|
||||
// find the old update with the highest rev for each database
|
||||
// (will be the required version for the new update)
|
||||
std::set<std::string>::iterator itr = new_sql_updates.find(buffer);
|
||||
if(itr != new_sql_updates.end() )
|
||||
if (itr != new_sql_updates.end())
|
||||
{
|
||||
if(info.rev > 0 && (info.rev > last_sql_rev[info.db_idx] ||
|
||||
(info.rev == last_sql_rev[info.db_idx] && info.nr > last_sql_nr[info.db_idx])))
|
||||
if (info.rev > 0 && (info.rev > last_sql_rev[info.db_idx] ||
|
||||
(info.rev == last_sql_rev[info.db_idx] && info.nr > last_sql_nr[info.db_idx])))
|
||||
{
|
||||
last_sql_rev[info.db_idx] = info.rev;
|
||||
last_sql_nr[info.db_idx] = info.nr;
|
||||
|
|
@ -490,9 +520,9 @@ bool find_sql_updates()
|
|||
|
||||
pclose(cmd_pipe);
|
||||
|
||||
if(!new_sql_updates.empty())
|
||||
if (!new_sql_updates.empty())
|
||||
{
|
||||
for(std::set<std::string>::iterator itr = new_sql_updates.begin(); itr != new_sql_updates.end(); ++itr)
|
||||
for (std::set<std::string>::iterator itr = new_sql_updates.begin(); itr != new_sql_updates.end(); ++itr)
|
||||
printf("%s\n", itr->c_str());
|
||||
}
|
||||
else
|
||||
|
|
@ -501,14 +531,14 @@ bool find_sql_updates()
|
|||
return true;
|
||||
}
|
||||
|
||||
bool copy_file(const char *src_file, const char *dst_file)
|
||||
bool copy_file(const char* src_file, const char* dst_file)
|
||||
{
|
||||
FILE * fin = fopen( src_file, "rb" );
|
||||
if(!fin) return false;
|
||||
FILE * fout = fopen( dst_file, "wb" );
|
||||
if(!fout) { fclose(fin); return false; }
|
||||
FILE* fin = fopen(src_file, "rb");
|
||||
if (!fin) return false;
|
||||
FILE* fout = fopen(dst_file, "wb");
|
||||
if (!fout) { fclose(fin); return false; }
|
||||
|
||||
for(char c = getc(fin); !feof(fin); putc(c, fout), c = getc(fin));
|
||||
for (char c = getc(fin); !feof(fin); putc(c, fout), c = getc(fin));
|
||||
|
||||
fclose(fin);
|
||||
fclose(fout);
|
||||
|
|
@ -517,16 +547,16 @@ bool copy_file(const char *src_file, const char *dst_file)
|
|||
|
||||
bool convert_sql_updates()
|
||||
{
|
||||
if(new_sql_updates.empty()) return true;
|
||||
if (new_sql_updates.empty()) return true;
|
||||
|
||||
printf("+ converting sql updates\n");
|
||||
|
||||
// rename the sql update files and add the required update statement
|
||||
for(std::set<std::string>::iterator itr = new_sql_updates.begin(); itr != new_sql_updates.end(); ++itr)
|
||||
for (std::set<std::string>::iterator itr = new_sql_updates.begin(); itr != new_sql_updates.end(); ++itr)
|
||||
{
|
||||
sql_update_info info;
|
||||
if(!get_sql_update_info(itr->c_str(), info)) return false;
|
||||
if(info.db_idx == NUM_DATABASES) return false;
|
||||
if (!get_sql_update_info(itr->c_str(), info)) return false;
|
||||
if (info.db_idx == NUM_DATABASES) return false;
|
||||
|
||||
// generating the new name should work for updates with or without a rev
|
||||
char src_file[MAX_PATH], new_name[MAX_PATH], dst_file[MAX_PATH];
|
||||
|
|
@ -534,8 +564,8 @@ bool convert_sql_updates()
|
|||
snprintf(new_name, MAX_PATH, "%d_%0*d_%s%s%s", rev, 2, info.nr, info.db, info.has_table ? "_" : "", info.table);
|
||||
snprintf(dst_file, MAX_PATH, "%s%s/%s.sql", path_prefix, sql_update_dir, new_name);
|
||||
|
||||
FILE * fin = fopen( src_file, "r" );
|
||||
if(!fin) return false;
|
||||
FILE* fin = fopen(src_file, "r");
|
||||
if (!fin) return false;
|
||||
|
||||
std::ostringstream out_buff;
|
||||
|
||||
|
|
@ -546,12 +576,12 @@ bool convert_sql_updates()
|
|||
|
||||
// skip the first one or two lines from the input
|
||||
// if it already contains update requirements
|
||||
if(fgets(buffer, MAX_BUF, fin))
|
||||
if (fgets(buffer, MAX_BUF, fin))
|
||||
{
|
||||
char dummy[MAX_BUF];
|
||||
if(sscanf(buffer, "ALTER TABLE %s CHANGE COLUMN required_%s required_%s bit", dummy, dummy, dummy) == 3)
|
||||
if (sscanf(buffer, "ALTER TABLE %s CHANGE COLUMN required_%s required_%s bit", dummy, dummy, dummy) == 3)
|
||||
{
|
||||
if(fgets(buffer, MAX_BUF, fin) && buffer[0] != '\n')
|
||||
if (fgets(buffer, MAX_BUF, fin) && buffer[0] != '\n')
|
||||
out_buff << buffer;
|
||||
}
|
||||
else
|
||||
|
|
@ -559,15 +589,15 @@ bool convert_sql_updates()
|
|||
}
|
||||
|
||||
// copy the rest of the file
|
||||
while(fgets(buffer, MAX_BUF, fin))
|
||||
while (fgets(buffer, MAX_BUF, fin))
|
||||
out_buff << buffer;
|
||||
|
||||
fclose(fin);
|
||||
|
||||
FILE * fout = fopen( dst_file, "w" );
|
||||
if(!fout) { fclose(fin); return false; }
|
||||
FILE* fout = fopen(dst_file, "w");
|
||||
if (!fout) { fclose(fin); return false; }
|
||||
|
||||
fprintf(fout, "%s",out_buff.str().c_str());
|
||||
fprintf(fout, "%s", out_buff.str().c_str());
|
||||
|
||||
fclose(fout);
|
||||
|
||||
|
|
@ -576,7 +606,7 @@ bool convert_sql_updates()
|
|||
system_switch_index(cmd);
|
||||
|
||||
// delete src file if it different by name from dst file
|
||||
if(strncmp(src_file,dst_file,MAX_PATH))
|
||||
if (strncmp(src_file, dst_file, MAX_PATH))
|
||||
{
|
||||
snprintf(cmd, MAX_CMD, "git rm --quiet %s", src_file);
|
||||
system_switch_index(cmd);
|
||||
|
|
@ -591,30 +621,30 @@ bool convert_sql_updates()
|
|||
|
||||
bool generate_sql_makefile()
|
||||
{
|
||||
if(new_sql_updates.empty()) return true;
|
||||
if (new_sql_updates.empty()) return true;
|
||||
|
||||
// find all files in the update dir
|
||||
snprintf(cmd, MAX_CMD, "git show HEAD:%s", sql_update_dir);
|
||||
if( (cmd_pipe = popen( cmd, "r" )) == NULL )
|
||||
if ((cmd_pipe = popen(cmd, "r")) == NULL)
|
||||
return false;
|
||||
|
||||
// skip first two lines
|
||||
if(!fgets(buffer, MAX_BUF, cmd_pipe)) { pclose(cmd_pipe); return false; }
|
||||
if(!fgets(buffer, MAX_BUF, cmd_pipe)) { pclose(cmd_pipe); return false; }
|
||||
if (!fgets(buffer, MAX_BUF, cmd_pipe)) { pclose(cmd_pipe); return false; }
|
||||
if (!fgets(buffer, MAX_BUF, cmd_pipe)) { pclose(cmd_pipe); return false; }
|
||||
|
||||
char newname[MAX_PATH];
|
||||
std::set<std::string> file_list;
|
||||
sql_update_info info;
|
||||
|
||||
while(fgets(buffer, MAX_BUF, cmd_pipe))
|
||||
while (fgets(buffer, MAX_BUF, cmd_pipe))
|
||||
{
|
||||
buffer[strlen(buffer) - 1] = '\0';
|
||||
if(buffer[strlen(buffer) - 1] != '/' &&
|
||||
strncmp(buffer, "Makefile.am", MAX_BUF) != 0)
|
||||
if (buffer[strlen(buffer) - 1] != '/' &&
|
||||
strncmp(buffer, "Makefile.am", MAX_BUF) != 0)
|
||||
{
|
||||
if(new_sql_updates.find(buffer) != new_sql_updates.end())
|
||||
if (new_sql_updates.find(buffer) != new_sql_updates.end())
|
||||
{
|
||||
if(!get_sql_update_info(buffer, info)) return false;
|
||||
if (!get_sql_update_info(buffer, info)) return false;
|
||||
snprintf(newname, MAX_PATH, "%d_%0*d_%s%s%s.sql", rev, 2, info.nr, info.db, info.has_table ? "_" : "", info.table);
|
||||
file_list.insert(newname);
|
||||
}
|
||||
|
|
@ -628,11 +658,11 @@ bool generate_sql_makefile()
|
|||
// write the makefile
|
||||
char file_name[MAX_PATH];
|
||||
snprintf(file_name, MAX_PATH, "%s%s/Makefile.am", path_prefix, sql_update_dir);
|
||||
FILE *fout = fopen(file_name, "w");
|
||||
if(!fout) { pclose(cmd_pipe); return false; }
|
||||
FILE* fout = fopen(file_name, "w");
|
||||
if (!fout) { pclose(cmd_pipe); return false; }
|
||||
|
||||
fprintf(fout,
|
||||
"# Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>\n"
|
||||
"# This file is part of the Continued-MaNGOS Project\n"
|
||||
"#\n"
|
||||
"# This program is free software; you can redistribute it and/or modify\n"
|
||||
"# it under the terms of the GNU General Public License as published by\n"
|
||||
|
|
@ -669,12 +699,12 @@ bool generate_sql_makefile()
|
|||
}
|
||||
|
||||
fprintf(fout,
|
||||
"\n## Additional files to include when running 'make dist'\n"
|
||||
"# SQL update files, to upgrade database schema from older revisions\n"
|
||||
"EXTRA_DIST = \\\n"
|
||||
);
|
||||
"\n## Additional files to include when running 'make dist'\n"
|
||||
"# SQL update files, to upgrade database schema from older revisions\n"
|
||||
"EXTRA_DIST = \\\n"
|
||||
);
|
||||
|
||||
for(std::set<std::string>::iterator itr = file_list.begin(), next; itr != file_list.end(); ++itr)
|
||||
for (std::set<std::string>::iterator itr = file_list.begin(), next; itr != file_list.end(); ++itr)
|
||||
{
|
||||
next = itr; ++next;
|
||||
fprintf(fout, "\t%s%s\n", itr->c_str(), next == file_list.end() ? "" : " \\");
|
||||
|
|
@ -690,14 +720,14 @@ bool generate_sql_makefile()
|
|||
|
||||
bool change_sql_database()
|
||||
{
|
||||
if(new_sql_updates.empty()) return true;
|
||||
if (new_sql_updates.empty()) return true;
|
||||
printf("+ changing database sql files\n");
|
||||
|
||||
// rename the database files, copy their contents back
|
||||
// and change the required update line
|
||||
for(int i = 0; i < NUM_DATABASES; i++)
|
||||
for (int i = 0; i < NUM_DATABASES; i++)
|
||||
{
|
||||
if(last_sql_update[i][0] == '\0') continue;
|
||||
if (last_sql_update[i][0] == '\0') continue;
|
||||
|
||||
char old_file[MAX_PATH], tmp_file[MAX_PATH], dummy[MAX_BUF];
|
||||
|
||||
|
|
@ -706,28 +736,29 @@ bool change_sql_database()
|
|||
|
||||
rename(old_file, tmp_file);
|
||||
|
||||
FILE *fin = fopen( tmp_file, "r" );
|
||||
if(!fin) return false;
|
||||
FILE *fout = fopen( old_file, "w" );
|
||||
if(!fout) return false;
|
||||
FILE* fin = fopen(tmp_file, "r");
|
||||
if (!fin) return false;
|
||||
FILE* fout = fopen(old_file, "w");
|
||||
if (!fout) return false;
|
||||
|
||||
snprintf(dummy, MAX_CMD, "CREATE TABLE `%s` (\n", db_version_table[i]);
|
||||
while(fgets(buffer, MAX_BUF, fin))
|
||||
while (fgets(buffer, MAX_BUF, fin))
|
||||
{
|
||||
fputs(buffer, fout);
|
||||
if(strncmp(buffer, dummy, MAX_BUF) == 0)
|
||||
if (strncmp(buffer, dummy, MAX_BUF) == 0)
|
||||
break;
|
||||
}
|
||||
|
||||
while(1)
|
||||
while (1)
|
||||
{
|
||||
if(!fgets(buffer, MAX_BUF, fin)) return false;
|
||||
if(sscanf(buffer, " `required_%s`", dummy) == 1) break;
|
||||
if (!fgets(buffer, MAX_BUF, fin)) return false;
|
||||
if (sscanf(buffer, " `required_%s`", dummy) == 1) break;
|
||||
fputs(buffer, fout);
|
||||
}
|
||||
|
||||
fprintf(fout, " `required_%s` bit(1) default NULL\n", last_sql_update[i]);
|
||||
while(fgets(buffer, MAX_BUF, fin))
|
||||
|
||||
while (fgets(buffer, MAX_BUF, fin))
|
||||
fputs(buffer, fout);
|
||||
|
||||
fclose(fin);
|
||||
|
|
@ -743,26 +774,26 @@ bool change_sql_database()
|
|||
bool change_sql_history()
|
||||
{
|
||||
snprintf(cmd, MAX_CMD, "git log HEAD --pretty=\"format:%%H\"");
|
||||
if( (cmd_pipe = popen( cmd, "r" )) == NULL )
|
||||
if ((cmd_pipe = popen(cmd, "r")) == NULL)
|
||||
return false;
|
||||
|
||||
std::list<std::string> hashes;
|
||||
while(fgets(buffer, MAX_BUF, cmd_pipe))
|
||||
while (fgets(buffer, MAX_BUF, cmd_pipe))
|
||||
{
|
||||
buffer[strlen(buffer) - 1] = '\0';
|
||||
if(strncmp(origin_hash, buffer, MAX_HASH) == 0)
|
||||
if (strncmp(origin_hash, buffer, MAX_HASH) == 0)
|
||||
break;
|
||||
|
||||
hashes.push_back(buffer);
|
||||
}
|
||||
pclose(cmd_pipe);
|
||||
if(hashes.empty()) return false; // must have at least one commit
|
||||
if(hashes.size() < 2) return true; // only one commit, ok but nothing to do
|
||||
if (hashes.empty()) return false; // must have at least one commit
|
||||
if (hashes.size() < 2) return true; // only one commit, ok but nothing to do
|
||||
|
||||
snprintf(cmd, MAX_CMD, "git reset --hard %s", origin_hash);
|
||||
system(cmd);
|
||||
|
||||
for(std::list<std::string>::reverse_iterator next = hashes.rbegin(), itr = next++; next != hashes.rend(); ++itr, ++next)
|
||||
for (std::list<std::string>::reverse_iterator next = hashes.rbegin(), itr = next++; next != hashes.rend(); ++itr, ++next)
|
||||
{
|
||||
// stage the changes from the orignal commit
|
||||
snprintf(cmd, MAX_CMD, "git cherry-pick -n %s", itr->c_str());
|
||||
|
|
@ -774,10 +805,10 @@ bool change_sql_history()
|
|||
|
||||
// remove the newly added files
|
||||
snprintf(cmd, MAX_CMD, "git diff --cached --diff-filter=A --name-only %s%s", path_prefix, sql_update_dir);
|
||||
if( (cmd_pipe = popen( cmd, "r" )) == NULL )
|
||||
if ((cmd_pipe = popen(cmd, "r")) == NULL)
|
||||
return false;
|
||||
|
||||
while(fgets(buffer, MAX_BUF, cmd_pipe))
|
||||
while (fgets(buffer, MAX_BUF, cmd_pipe))
|
||||
{
|
||||
buffer[strlen(buffer) - 1] = '\0';
|
||||
snprintf(cmd, MAX_CMD, "git rm -f --quiet %s%s", path_prefix, buffer);
|
||||
|
|
@ -800,15 +831,16 @@ bool change_sql_history()
|
|||
|
||||
bool prepare_new_index()
|
||||
{
|
||||
if(!use_new_index) return true;
|
||||
if (!use_new_index) return true;
|
||||
|
||||
// only use a new index if there are staged changes that should be preserved
|
||||
if( (cmd_pipe = popen( "git diff --cached", "r" )) == NULL ) {
|
||||
if ((cmd_pipe = popen("git diff --cached", "r")) == NULL)
|
||||
{
|
||||
use_new_index = false;
|
||||
return false;
|
||||
}
|
||||
|
||||
if(!fgets(buffer, MAX_BUF, cmd_pipe))
|
||||
if (!fgets(buffer, MAX_BUF, cmd_pipe))
|
||||
{
|
||||
use_new_index = false;
|
||||
pclose(cmd_pipe);
|
||||
|
|
@ -822,29 +854,29 @@ bool prepare_new_index()
|
|||
// copy the existing index file to a new one
|
||||
char src_file[MAX_PATH], dst_file[MAX_PATH];
|
||||
|
||||
char *old_index = getenv("GIT_INDEX_FILE");
|
||||
if(old_index) strncpy(src_file, old_index, MAX_PATH);
|
||||
char* old_index = getenv("GIT_INDEX_FILE");
|
||||
if (old_index) strncpy(src_file, old_index, MAX_PATH);
|
||||
else snprintf(src_file, MAX_PATH, "%s.git/index", path_prefix);
|
||||
snprintf(dst_file, MAX_PATH, "%s%s", path_prefix, new_index_file);
|
||||
|
||||
if(!copy_file(src_file, dst_file)) return false;
|
||||
if (!copy_file(src_file, dst_file)) return false;
|
||||
|
||||
// doesn't seem to work with path_prefix
|
||||
snprintf(new_index_cmd, MAX_CMD, "GIT_INDEX_FILE=%s/%s", base_path, new_index_file);
|
||||
if(putenv(new_index_cmd) != 0) return false;
|
||||
if (putenv(new_index_cmd) != 0) return false;
|
||||
|
||||
// clear the new index
|
||||
system("git reset -q --mixed HEAD");
|
||||
|
||||
// revert to old index
|
||||
snprintf(old_index_cmd, MAX_CMD, "GIT_INDEX_FILE=");
|
||||
if(putenv(old_index_cmd) != 0) return false;
|
||||
if (putenv(old_index_cmd) != 0) return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool cleanup_new_index()
|
||||
{
|
||||
if(!use_new_index) return true;
|
||||
if (!use_new_index) return true;
|
||||
printf("+ cleaning up the new index\n");
|
||||
char idx_file[MAX_PATH];
|
||||
snprintf(idx_file, MAX_PATH, "%s%s", path_prefix, new_index_file);
|
||||
|
|
@ -854,22 +886,22 @@ bool cleanup_new_index()
|
|||
|
||||
#define DO(cmd) if(!cmd) { printf("FAILED\n"); return 1; }
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
for(int i = 1; i < argc; i++)
|
||||
for (int i = 1; i < argc; i++)
|
||||
{
|
||||
if(argv[i] == NULL) continue;
|
||||
if(strncmp(argv[i], "-r", 2) == 0 || strncmp(argv[i], "--replace", 9) == 0)
|
||||
if (argv[i] == NULL) continue;
|
||||
if (strncmp(argv[i], "-r", 2) == 0 || strncmp(argv[i], "--replace", 9) == 0)
|
||||
allow_replace = true;
|
||||
else if(strncmp(argv[i], "-l", 2) == 0 || strncmp(argv[i], "--local", 7) == 0)
|
||||
else if (strncmp(argv[i], "-l", 2) == 0 || strncmp(argv[i], "--local", 7) == 0)
|
||||
local = true;
|
||||
else if(strncmp(argv[i], "-f", 2) == 0 || strncmp(argv[i], "--fetch", 7) == 0)
|
||||
else if (strncmp(argv[i], "-f", 2) == 0 || strncmp(argv[i], "--fetch", 7) == 0)
|
||||
do_fetch = true;
|
||||
else if(strncmp(argv[i], "-s", 2) == 0 || strncmp(argv[i], "--sql", 5) == 0)
|
||||
else if (strncmp(argv[i], "-s", 2) == 0 || strncmp(argv[i], "--sql", 5) == 0)
|
||||
do_sql = true;
|
||||
else if(strncmp(argv[i], "--branch=", 9) == 0)
|
||||
else if (strncmp(argv[i], "--branch=", 9) == 0)
|
||||
snprintf(remote_branch, MAX_REMOTE, "%s", argv[i] + 9);
|
||||
else if(strncmp(argv[i], "-h", 2) == 0 || strncmp(argv[i], "--help", 6) == 0)
|
||||
else if (strncmp(argv[i], "-h", 2) == 0 || strncmp(argv[i], "--help", 6) == 0)
|
||||
{
|
||||
printf("Usage: git_id [OPTION]\n");
|
||||
printf("Generates a new rev number and updates revision_nr.h and the commit message.\n");
|
||||
|
|
@ -893,30 +925,30 @@ int main(int argc, char *argv[])
|
|||
return 1;
|
||||
}
|
||||
|
||||
DO( find_path() );
|
||||
if(!local)
|
||||
DO(find_path());
|
||||
if (!local)
|
||||
{
|
||||
DO( find_origin() );
|
||||
if(do_fetch)
|
||||
DO( fetch_origin() );
|
||||
DO( check_fwd() );
|
||||
DO(find_origin());
|
||||
if (do_fetch)
|
||||
DO(fetch_origin());
|
||||
DO(check_fwd());
|
||||
}
|
||||
DO( find_rev() );
|
||||
DO( find_head_msg() );
|
||||
if(do_sql)
|
||||
DO( find_sql_updates() );
|
||||
DO( prepare_new_index() );
|
||||
DO( write_rev_nr() );
|
||||
if(do_sql)
|
||||
DO(find_rev());
|
||||
DO(find_head_msg());
|
||||
if (do_sql)
|
||||
DO(find_sql_updates());
|
||||
DO(prepare_new_index());
|
||||
DO(write_rev_nr());
|
||||
if (do_sql)
|
||||
{
|
||||
DO( convert_sql_updates() );
|
||||
DO(convert_sql_updates());
|
||||
if (generate_makefile)
|
||||
DO( generate_sql_makefile() );
|
||||
DO( change_sql_database() );
|
||||
DO( write_rev_sql() );
|
||||
DO(generate_sql_makefile());
|
||||
DO(change_sql_database());
|
||||
DO(write_rev_sql());
|
||||
}
|
||||
DO( amend_commit() );
|
||||
DO( cleanup_new_index() );
|
||||
DO(amend_commit());
|
||||
DO(cleanup_new_index());
|
||||
//if(do_sql)
|
||||
// DO( change_sql_history() );
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue