Lines Matching refs:workingDir
194 char* List(const char* base, char* name, const char* workingDir)
197 listStr += string(base) + "/" + workingDir + "\" > " + ScratchFile(name);
1104 void CompareDirs(const char* workingDir, bool renamePass)
1107 char* oldList = List(oldBase, "old", workingDir);
1108 char* newList = List(newBase, "new", workingDir);
1109 char* sandList = List(sandboxBase, "sandbox", workingDir);
1159 workingDir, oldFile);
1165 sandDir ? "directory" : "file" , workingDir, sandFile);
1170 CheckForExec(oldBase, workingDir, oldList,
1171 sandboxBase, workingDir, sandList, 0, 0);
1184 string rename(workingDir);
1199 bool oldSandboxDiff = CompareFiles(oldBase, sandboxBase, workingDir, oldList);
1200 const char* renamedDir = workingDir;
1208 fprintf(commandFile, "p4 integrate \"%s/%s/%s\" \"%s/%s/%s\"\n", sandboxCmd, workingDir, oldFile,
1212 fprintf(commandFile, "git mv \"%s/%s\" \"%s/%s\"\n", workingDir, oldFile,
1219 sandboxCmd, renamedDir, renamed, oldCmd, workingDir, oldFile, newCmd, renamedDir, renamed);
1220 bool success = Merge(workingDir, oldFile, renamedDir, renamed, "/dev/null");
1233 bool oldNewDiff = CompareFiles(oldBase, workingDir, oldList, newBase, renamedDir, renamed);
1245 fprintf(stderr, "*** Modified file deleted: %s/%s\n", workingDir, oldFile);
1246 // FindDeletedAndroidChanges(workingDir, oldFile);
1253 sandboxCmd, workingDir, oldFile, sandboxCmd, workingDir, oldFile);
1255 sandboxCmd, workingDir, oldFile, sandboxCmd, workingDir, oldFile);
1257 fprintf(commandFile, "p4 delete \"%s/%s/%s\"\n", sandboxCmd, workingDir, oldFile);
1259 fprintf(commandFile, "git rm \"%s/%s\"\n", workingDir, oldFile);
1261 fprintf(commandFile, "rm \"%s/%s/%s\"\n", sandboxCmd, workingDir, oldFile);
1268 fprintf(commandFile, "p4 delete \"%s/%s/%s/...\"\n", sandboxCmd, workingDir, oldFile);
1270 fprintf(commandFile, "git rm \"%s/%s/...\"\n", workingDir, oldFile);
1272 fprintf(commandFile, "rm \"%s/%s/%s/...\"\n", sandboxCmd, workingDir, oldFile);
1274 fprintf(stderr, "*** Directory deleted: %s/%s\n", workingDir, oldFile);
1281 string rename(workingDir);
1294 emptyDirectory(newBase, workingDir, newFile) == false) {
1297 newCmd, workingDir, newFile, newCmd, sandboxCmd);
1300 newCmd, workingDir, newFile, newCmd, newCmd, sandboxCmd);
1304 sandboxCmd, workingDir, newFile);
1307 workingDir, newFile);
1310 // if (emptyDirectory(sandboxBase, workingDir)) {
1311 // fprintf(commandFile, "mkdir \"%s/%s\"\n", sandboxCmd, workingDir);
1316 if (strcmp(iter->second.c_str(), workingDir) == 0) {
1328 newCmd, workingDir, newFile, sandboxCmd, workingDir, newFile);
1330 fprintf(commandFile, "p4 add \"%s/%s/%s\"\n", sandboxCmd, workingDir, newFile);
1332 fprintf(commandFile, "git add \"%s/%s\"\n", workingDir, newFile);
1342 size_t newLen1 = strlen(workingDir) + strlen(oldList);
1344 sprintf(newFile, "%s/%.*s", workingDir, (int) strlen(oldList) - 1,
1368 fprintf(stderr, "*** %s/%s differs in the execute bit (may cause problems for perforce)\n", workingDir, oldFile);
1370 // Diff(oldBase, sandboxBase, workingDir, oldFile);
1371 bool oldNewDiff = CompareFiles(oldBase, newBase, workingDir, oldList);
1374 fprintf(commandFile, "p4 edit \"%s/%s/%s\"\n", sandboxCmd, workingDir, oldFile);
1375 bool oldSandboxDiff = CompareFiles(oldBase, sandboxBase, workingDir, oldFile);
1378 sandboxCmd, workingDir, oldFile, oldCmd, workingDir, oldFile, newCmd, workingDir, oldFile);
1379 bool success = Merge(workingDir, oldFile);
1381 fprintf(stderr, "*** Manual merge required: %s/%s\n", workingDir, oldFile);
1384 sandboxCmd, workingDir, oldFile, sandboxCmd, workingDir, oldFile);
1386 sandboxCmd, workingDir, oldFile, sandboxCmd, workingDir, oldFile);
1388 } else fprintf(commandFile, "cp \"%s/%s/%s\" \"%s/%s/%s\"\n", newCmd, workingDir, oldFile ,
1389 sandboxCmd, workingDir, oldFile);
1391 fprintf(commandFile, "git add \"%s/%s\"\n", workingDir, oldFile);
