Home | History | Annotate | Download | only in webkitmerge

Lines Matching refs:newFile

203 bool Merge(const char* oldDir, const char* oldFile, const char* newDir, const char* newFile, 
209 sandboxBase, oldDir, oldFile, oldBase, oldDir, oldFile, newBase, newDir, newFile, outFile);
1150 const char* newFile = newFileStr.c_str();
1283 rename.append(newFile);
1293 if (strcmp(sandFile, newFile) != 0 &&
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);
1314 size_t newLen1 = strlen(newFile);
1319 if (firstLen > newLen1 && strcmp(newFile,
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);
1343 char* newFile = new char[newLen1 + 1];
1344 sprintf(newFile, "%s/%.*s", workingDir, (int) strlen(oldList) - 1,
1347 if (emptyDirectory(newBase, newFile) == false) {
1350 newCmd, newFile, newCmd, sandboxCmd);
1353 newCmd, newFile, newCmd, newCmd, sandboxCmd);
1357 sandboxCmd, newFile);
1359 fprintf(copyDirFile, "git add \"%s\"", newFile);
1362 CompareDirs(newFile, renamePass);
1363 delete[] newFile;