mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-06-16 14:15:26 -06:00
472 lines
12 KiB
C++
472 lines
12 KiB
C++
#include "urepo.h"
|
|
|
|
String SvnCmd(const char *cmd)
|
|
{
|
|
return String() << "svn " << cmd << " --non-interactive ";
|
|
}
|
|
|
|
RepoSync::RepoSync()
|
|
{
|
|
CtrlLayoutOKCancel(*this, "Version control repository synchronize");
|
|
list.AddIndex();
|
|
list.AddIndex();
|
|
list.AddColumn("Action");
|
|
list.AddColumn("Path");
|
|
list.AddColumn("Changes");
|
|
list.ColumnWidths("220 500 100");
|
|
list.NoCursor().EvenRowColor();
|
|
list.SetLineCy(max(Draw::GetStdFontCy(), 20));
|
|
Sizeable().Zoomable();
|
|
BackPaint();
|
|
}
|
|
|
|
int CharFilterSvnMsgRepo(int c)
|
|
{
|
|
return c >= 32 && c < 128 && c != '\"' ? c : 0;
|
|
}
|
|
|
|
bool RepoSync::ListSvn(const String& path)
|
|
{
|
|
Vector<String> ln = Split(Sys("svn status " + path), CharFilterCrLf);
|
|
bool actions = false;
|
|
for(int pass = 0; pass < 2; pass++)
|
|
for(int i = 0; i < ln.GetCount(); i++) {
|
|
String h = ln[i];
|
|
if(h.GetCount() > 7) {
|
|
String file = GetFullPath(TrimLeft(h.Mid(7)));
|
|
if(IsFullPath(file)) {
|
|
actions = true;
|
|
h.Trim(7);
|
|
bool simple = h.Mid(1, 6) == " ";
|
|
int action = simple ? String("MC?!~").Find(h[0]) : SVN_IGNORE;
|
|
if(h == " S ")
|
|
action = REPLACE;
|
|
String an;
|
|
Color color;
|
|
if(action == SVN_IGNORE) {
|
|
color = Black;
|
|
if(simple && h[0] == 'A') {
|
|
an = "svn add";
|
|
action = SVN_ACTION;
|
|
}
|
|
else
|
|
if(simple && h[0] == 'D') {
|
|
an = "svn delete";
|
|
action = SVN_ACTION;
|
|
}
|
|
else {
|
|
an = h.Mid(0, 7);
|
|
color = Gray;
|
|
}
|
|
}
|
|
else {
|
|
int q = file.ReverseFind('.');
|
|
if(action == ADD && q >= 0 && (file.Mid(q + 1) == "mine" ||
|
|
file[q + 1] == 'r' && IsDigit(file[q + 2]))
|
|
&& FileExists(file.Mid(0, q))) {
|
|
action = DELETEC;
|
|
an = "Delete (conflict resolved)";
|
|
color = Black;
|
|
}
|
|
else {
|
|
static const char *as[] = {
|
|
"Modify", "Resolved", "Add", "Remove", "Replace"
|
|
};
|
|
static Color c[] = { LtBlue, Magenta, Green, LtRed, LtMagenta };
|
|
an = as[action];
|
|
color = c[action];
|
|
}
|
|
}
|
|
if(pass == action < 0) {
|
|
int ii = list.GetCount();
|
|
list.Add(action, file, Null,
|
|
AttrText(action < 0 ? ln[i] : " " + file.Mid(path.GetCount() + 1)).Ink(color));
|
|
if(action >= 0) {
|
|
list.SetCtrl(ii, 0, revert.Add().SetLabel(an + (action == ADD ? "\nSkip" : "\nRevert")).NoWantFocus());
|
|
revert.Top() <<= 0;
|
|
Ctrl& b = diff.Add().SetLabel("Changes..").SizePos().NoWantFocus();
|
|
b <<= THISBACK1(DoDiff, ii);
|
|
list.SetCtrl(ii, 2, b);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return actions;
|
|
}
|
|
|
|
String GitCmd(const char *dir, const char *command)
|
|
{
|
|
String h = GetCurrentDirectory();
|
|
SetCurrentDirectory(dir);
|
|
String r = Sys(String() << "git " << command);
|
|
SetCurrentDirectory(h);
|
|
return r;
|
|
}
|
|
|
|
bool RepoSync::ListGit(const String& path)
|
|
{
|
|
Vector<String> ln = Split(GitCmd(path, "status --porcelain ."), CharFilterCrLf);
|
|
bool actions = false;
|
|
for(int i = 0; i < ln.GetCount(); i++) {
|
|
String h = ln[i];
|
|
if(h.GetCount() > 3) {
|
|
String file = AppendFileName(path, h.Mid(3));
|
|
actions = true;
|
|
int action = String("M.?DR").Find(h[1]);
|
|
if(action < 0 || h[0] != '?' && h[0] != ' ')
|
|
action = SVN_IGNORE;
|
|
String an;
|
|
Color color;
|
|
if(action == SVN_IGNORE) {
|
|
an = h;
|
|
color = Gray;
|
|
}
|
|
else {
|
|
static const char *as[] = {
|
|
"Modify", "Resolved", "Add", "Remove", "Rename"
|
|
};
|
|
static Color c[] = { LtBlue, Magenta, Green, LtRed, LtMagenta };
|
|
an = as[action];
|
|
color = c[action];
|
|
}
|
|
int ii = list.GetCount();
|
|
list.Add(action, file, Null, AttrText(action < 0 ? h : file).Ink(color));
|
|
if(action >= 0) {
|
|
list.SetCtrl(ii, 0, revert.Add().SetLabel(an + (action == ADD ? "\nSkip" : "\nRevert")).NoWantFocus());
|
|
revert.Top() <<= 0;
|
|
Ctrl& b = diff.Add().SetLabel("Changes..").SizePos().NoWantFocus();
|
|
b <<= THISBACK1(DoDiff, ii);
|
|
list.SetCtrl(ii, 2, b);
|
|
}
|
|
}
|
|
}
|
|
return actions;
|
|
}
|
|
|
|
void RepoSync::SyncCommits()
|
|
{
|
|
bool commit = true;
|
|
for(int i = 0; i < list.GetCount(); i++) {
|
|
if(SvnOptions *o = dynamic_cast<SvnOptions *>(list.GetCtrl(i, 0)))
|
|
commit = o->commit;
|
|
else
|
|
if(GitOptions *o = dynamic_cast<GitOptions *>(list.GetCtrl(i, 0)))
|
|
commit = o->commit;
|
|
else {
|
|
for(int j = 0; j < 2; j++) {
|
|
Ctrl *ctrl = list.GetCtrl(i, j);
|
|
if(ctrl)
|
|
ctrl->Enable(commit);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void RepoSync::SyncList()
|
|
{
|
|
list.Clear();
|
|
for(const auto& w : work) {
|
|
String path = GetFullPath(w.dir);
|
|
int hi = list.GetCount();
|
|
list.Add(REPOSITORY, path,
|
|
AttrText().Paper(SColorInfo),
|
|
AttrText(path).SetFont(ArialZ(20).Bold()).Paper(SColorInfo).Ink(Black),
|
|
AttrText().Paper(SColorInfo));
|
|
list.SetLineCy(hi, Zy(26));
|
|
bool actions;
|
|
if(w.kind == SVN_DIR) {
|
|
auto& o = list.CreateCtrl<SvnOptions>(hi, 0, false);
|
|
o.SizePos();
|
|
o.commit = true;
|
|
o.commit << [=] { SyncCommits(); };
|
|
o.update = true;
|
|
actions = ListSvn(path);
|
|
if(!actions) {
|
|
o.commit = false;
|
|
o.commit.Disable();
|
|
}
|
|
}
|
|
if(w.kind == GIT_DIR) {
|
|
auto& o = list.CreateCtrl<GitOptions>(hi, 0, false);
|
|
o.SizePos();
|
|
o.commit = true;
|
|
o.commit << [=] { SyncCommits(); };
|
|
o.push = true;
|
|
o.pull = true;
|
|
actions = ListGit(path);
|
|
if(!actions) {
|
|
o.commit = false;
|
|
o.commit.Disable();
|
|
}
|
|
}
|
|
if(actions) {
|
|
list.Add(MESSAGE, Null, AttrText("Commit message:").SetFont(StdFont().Bold()));
|
|
list.SetLineCy(list.GetCount() - 1, (3 * EditField::GetStdHeight()) + 4);
|
|
list.SetCtrl(list.GetCount() - 1, 1, message.Add().SetFilter(CharFilterSvnMsgRepo).VSizePos(2, 2).HSizePos());
|
|
int q = msgmap.Find(w.dir);
|
|
if(q >= 0) {
|
|
message.Top() <<= msgmap[q];
|
|
msgmap.Unlink(q);
|
|
}
|
|
}
|
|
else
|
|
list.Add(-1, Null, "", AttrText("Nothing to do").SetFont(StdFont().Italic()));
|
|
}
|
|
}
|
|
|
|
void RepoSync::DoDiff(int ii)
|
|
{
|
|
String f = list.Get(ii, 1);
|
|
if(!IsNull(f))
|
|
RunRepoDiff(f);
|
|
}
|
|
|
|
#ifdef PLATFORM_WIN32
|
|
void sRepoDeleteFolderDeep(const char *dir)
|
|
{
|
|
{
|
|
FindFile ff(AppendFileName(dir, "*.*"));
|
|
while(ff) {
|
|
String name = ff.GetName();
|
|
String p = AppendFileName(dir, name);
|
|
if(ff.IsFile()) {
|
|
SetFileAttributes(p, GetFileAttributes(p) & ~FILE_ATTRIBUTE_READONLY);
|
|
FileDelete(p);
|
|
}
|
|
else
|
|
if(ff.IsFolder())
|
|
sRepoDeleteFolderDeep(p);
|
|
ff.Next();
|
|
}
|
|
}
|
|
DirectoryDelete(dir);
|
|
}
|
|
#else
|
|
void sRepoDeleteFolderDeep(const char *path)
|
|
{
|
|
DeleteFolderDeep(path);
|
|
}
|
|
#endif
|
|
|
|
void RepoSvnDel(const char *path)
|
|
{
|
|
FindFile ff(AppendFileName(path, "*.*"));
|
|
while(ff) {
|
|
if(ff.IsFolder()) {
|
|
String dir = AppendFileName(path, ff.GetName());
|
|
if(ff.GetName() == ".svn")
|
|
sRepoDeleteFolderDeep(dir);
|
|
else
|
|
RepoSvnDel(dir);
|
|
}
|
|
ff.Next();
|
|
}
|
|
}
|
|
|
|
void RepoSync::Dir(const char *dir, int kind)
|
|
{
|
|
Work& d = work.Add();
|
|
d.dir = dir;
|
|
d.kind = kind;
|
|
}
|
|
|
|
void RepoSync::Dir(const char *dir)
|
|
{
|
|
int kind = GetRepoKind(dir);
|
|
if(kind)
|
|
Dir(dir, kind);
|
|
}
|
|
|
|
void RepoMoveSvn(const String& path, const String& tp)
|
|
{
|
|
FindFile ff(AppendFileName(path, "*.*"));
|
|
while(ff) {
|
|
String nm = ff.GetName();
|
|
String s = AppendFileName(path, nm);
|
|
String t = AppendFileName(tp, nm);
|
|
if(ff.IsFolder()) {
|
|
if(nm == ".svn")
|
|
FileMove(s, t);
|
|
else
|
|
RepoMoveSvn(s, t);
|
|
}
|
|
ff.Next();
|
|
}
|
|
}
|
|
|
|
void RepoSync::DoSync()
|
|
{
|
|
SyncList();
|
|
msgmap.Sweep();
|
|
again:
|
|
Enable();
|
|
if(Run() != IDOK || list.GetCount() == 0) {
|
|
int repoi = 0;
|
|
for(int i = 0; i < list.GetCount(); i++)
|
|
if(list.Get(i, 0) == MESSAGE)
|
|
msgmap.GetAdd(work[repoi++].dir) = list.Get(i, 3);
|
|
return;
|
|
}
|
|
Disable();
|
|
bool changes = false;
|
|
for(int i = 0; i < list.GetCount(); i++) {
|
|
int action = list.Get(i, 0);
|
|
if(action == MESSAGE) {
|
|
if(changes && IsNull(list.Get(i, 3)) && list.GetCtrl(i, 1)->IsEnabled()
|
|
&& !PromptYesNo("Commit message is empty.&Do you want to continue?"))
|
|
goto again;
|
|
changes = false;
|
|
}
|
|
else if(action != REPOSITORY && list.Get(i, 2) == 0)
|
|
changes = true;
|
|
}
|
|
UrepoConsole sys;
|
|
int repoi = 0;
|
|
int l = 0;
|
|
String repo_dir;
|
|
while(l < list.GetCount()) {
|
|
SvnOptions *svn = dynamic_cast<SvnOptions *>(list.GetCtrl(l, 0));
|
|
GitOptions *git = dynamic_cast<GitOptions *>(list.GetCtrl(l, 0));
|
|
String repo_dir = work[repoi++].dir;
|
|
l++;
|
|
String message;
|
|
String filelist; // <-- list of files to update
|
|
bool commit = false;
|
|
while(l < list.GetCount()) {
|
|
int action = list.Get(l, 0);
|
|
if(action == REPOSITORY)
|
|
break;
|
|
String path = list.Get(l, 1);
|
|
bool revert = list.Get(l, 2) == 1;
|
|
if(svn && svn->commit) {
|
|
if(action == MESSAGE && commit) {
|
|
String msg = list.Get(l, 3);
|
|
if(sys.CheckSystem(SvnCmd("commit") << filelist << " -m \"" << msg << "\""))
|
|
msgmap.GetAdd(repo_dir) = msg;
|
|
l++;
|
|
break;
|
|
}
|
|
|
|
if(SvnFile(sys, filelist, action, path, revert))
|
|
commit = true;
|
|
}
|
|
if(git && git->commit) {
|
|
if(action == MESSAGE && commit) {
|
|
String msg = list.Get(l, 3);
|
|
if(sys.Git(repo_dir, "commit -a -m \"" << msg << "\""))
|
|
msgmap.GetAdd(repo_dir) = msg;
|
|
l++;
|
|
break;
|
|
}
|
|
|
|
if(GitFile(sys, action, path, revert))
|
|
commit = true;
|
|
}
|
|
l++;
|
|
}
|
|
if(svn && svn->update)
|
|
sys.CheckSystem(SvnCmd("update").Cat() << repo_dir);
|
|
if(git && git->push)
|
|
sys.Git(repo_dir, "push");
|
|
if(git && git->pull)
|
|
sys.Git(repo_dir, "pull");
|
|
}
|
|
sys.Perform();
|
|
}
|
|
|
|
bool RepoSync::GitFile(UrepoConsole& sys, int action, const String& path, bool revert)
|
|
{
|
|
String repo_dir = GetFileFolder(path);
|
|
String file = GetFileName(path);
|
|
if(revert) {
|
|
if(action != ADD)
|
|
sys.Git(repo_dir, "checkout \"" + file + "\"");
|
|
return false;
|
|
}
|
|
if(action == ADD)
|
|
sys.Git(repo_dir, "add \"" + file + "\"");
|
|
return true;
|
|
}
|
|
|
|
bool RepoSync::SvnFile(UrepoConsole& sys, String& filelist, int action, const String& path, bool revert)
|
|
{
|
|
if(revert) {
|
|
if(action == REPLACE)
|
|
DeleteFolderDeep(path);
|
|
if(action != ADD)
|
|
sys.CheckSystem("svn revert \"" + path + "\"");
|
|
return false;
|
|
}
|
|
if(action != DELETEC)
|
|
filelist << " \"" << path << "\""; // <-- add the file to the list
|
|
switch(action) {
|
|
case ADD:
|
|
RepoSvnDel(path);
|
|
sys.CheckSystem("svn add --force \"" + path + "\"");
|
|
break;
|
|
case REMOVE:
|
|
sys.CheckSystem("svn delete \"" + path + "\"");
|
|
break;
|
|
case CONFLICT:
|
|
sys.CheckSystem("svn resolved \"" + path + "\"");
|
|
break;
|
|
case REPLACE: {
|
|
RepoSvnDel(path);
|
|
String tp = AppendFileName(GetFileFolder(path), Format(Uuid::Create()));
|
|
FileMove(path, tp);
|
|
sys.CheckSystem(SvnCmd("update") << " \"" << path << "\"");
|
|
RepoMoveSvn(path, tp);
|
|
sRepoDeleteFolderDeep(path);
|
|
FileMove(tp, path);
|
|
Vector<String> ln = Split(Sys("svn status \"" + path + "\""), CharFilterCrLf);
|
|
for(int l = 0; l < ln.GetCount(); l++) {
|
|
String h = ln[l];
|
|
if(h.GetCount() > 7) {
|
|
String file = h.Mid(7);
|
|
if(IsFullPath(file)) {
|
|
h.Trim(7);
|
|
if(h == "? ")
|
|
sys.CheckSystem("svn add --force \"" + file + "\"");
|
|
if(h == "! ")
|
|
sys.CheckSystem("svn delete \"" + file + "\"");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
break;
|
|
case DELETEC:
|
|
FileDelete(path);
|
|
break;
|
|
}
|
|
return findarg(action, SVN_IGNORE, DELETEC) < 0;
|
|
}
|
|
|
|
void RepoSync::SetMsgs(const String& s)
|
|
{
|
|
LoadFromString(msgmap, s);
|
|
}
|
|
|
|
String RepoSync::GetMsgs()
|
|
{
|
|
return StoreAsString(msgmap);
|
|
}
|
|
|
|
int GetRepoKind(const String& p)
|
|
{
|
|
if(IsNull(p))
|
|
return NOT_REPO_DIR;
|
|
if(DirectoryExists(AppendFileName(p, ".svn")) || DirectoryExists(AppendFileName(p, "_svn")))
|
|
return SVN_DIR;
|
|
String path = p;
|
|
String path0;
|
|
while(path != path0) {
|
|
path0 = path;
|
|
if(DirectoryExists(AppendFileName(path, ".git")))
|
|
return GIT_DIR;
|
|
DirectoryUp(path);
|
|
if(DirectoryExists(AppendFileName(path, ".svn")))
|
|
return SVN_DIR;
|
|
}
|
|
return NOT_REPO_DIR;
|
|
}
|