diff options
| author | Pete Wyckoff <pw@padd.com> | 2012-04-29 20:57:14 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-30 15:59:01 -0700 |
| commit | 8d7ec3629cb1fc315b3218a8f277545157334a86 (patch) | |
| tree | 5a29cf40e4195b01d379c17cc09c78b954712ff9 | |
| parent | 9768cafe681a7844d5a1d067991053b25db83bbb (diff) | |
| download | git-8d7ec3629cb1fc315b3218a8f277545157334a86.tar.gz git-8d7ec3629cb1fc315b3218a8f277545157334a86.tar.xz | |
git p4: bring back files in deleted client directory
The code to auto-create the client directory, added in 0591cfa
(git-p4: ensure submit clientPath exists before chdir,
2011-12-09), works when the client directory never existed.
But if the directory is summarily removed without telling p4,
the sync operation will not bring back all the files. Always
do "sync -f" if the client directory is newly created.
Reported-by: Gary Gibbons <ggibbons@perforce.com>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-p4.py | 12 | ||||
| -rwxr-xr-x | t/t9807-git-p4-submit.sh | 7 |
2 files changed, 14 insertions, 5 deletions
@@ -135,8 +135,8 @@ def p4_system(cmd): def p4_integrate(src, dest): p4_system(["integrate", "-Dt", src, dest]) -def p4_sync(path): - p4_system(["sync", path]) +def p4_sync(f, *options): + p4_system(["sync"] + list(options) + [f]) def p4_add(f): p4_system(["add", f]) @@ -1361,12 +1361,18 @@ class P4Submit(Command, P4UserMap): self.oldWorkingDirectory = os.getcwd() # ensure the clientPath exists + new_client_dir = False if not os.path.exists(self.clientPath): + new_client_dir = True os.makedirs(self.clientPath) chdir(self.clientPath) print "Synchronizing p4 checkout..." - p4_sync("...") + if new_client_dir: + # old one was destroyed, and maybe nobody told p4 + p4_sync("...", "-f") + else: + p4_sync("...") self.check() commits = [] diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh index 15417165e..2d7dc27f3 100755 --- a/t/t9807-git-p4-submit.sh +++ b/t/t9807-git-p4-submit.sh @@ -28,6 +28,11 @@ test_expect_success 'submit with no client dir' ' rm -rf "$cli" && git config git-p4.skipSubmitEdit true && git p4 submit + ) && + ( + cd "$cli" && + test_path_is_file file1 && + test_path_is_file file2 ) ' @@ -44,7 +49,6 @@ test_expect_success 'submit --origin' ' ) && ( cd "$cli" && - p4 sync && test_path_is_missing "file3.t" && test_path_is_file "file4.t" ) @@ -79,7 +83,6 @@ test_expect_success 'submit with master branch name from argv' ' ) && ( cd "$cli" && - p4 sync && test_path_is_file "file6.t" && test_path_is_missing "file7.t" ) |