{"thread":{"id":"29690","subject":"[PATCHv4] git-p4: RCS keyword handling","startedAt":"2012-02-22T10:15:40Z","lastAt":"2012-02-22T22:44:20Z","messageCount":5,"participants":["Luke Diamand","Pete Wyckoff","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"185163","messageId":"1329905741-2092-1-git-send-email-luke@diamand.org","threadId":"29690","inReplyTo":null,"subject":"[PATCHv4] git-p4: RCS keyword handling","fromName":"Luke Diamand","fromEmail":"luke@diamand.org","sentAt":"2012-02-22T10:15:40Z","receivedAt":"2012-02-22T10:15:40Z","isPatch":false,"sender":{"key":"luke@diamand.org","avatar":"https://avatars.githubusercontent.com/u/5330967?v=4"},"body":"Updated patch incorporating comments from Pete and Junio to\nhandle RCS keyword expansion in git-p4.\n\nNote: The current patch fails to to handle the case where a user\nadds an expanded RCS keyword in *git* (e.g. via cut-n-paste).\nI'll try to address that separately. There's a failing test case\nfor this.\n\nThis version:\n\n - uses \"p4 fstat\" to get the filetype\n - uses Junio's suggested regexp to match $Keyword:$\n - uses the sets of added/deleted files rather than parsing diff output\n - various other small fixes spotted by Pete\n - adds additional test cases\n\nLuke Diamand (1):\n  git-p4: add initial support for RCS keywords\n\n Documentation/git-p4.txt   |    5 +\n contrib/fast-import/git-p4 |  118 ++++++++++++--\n t/t9810-git-p4-rcs.sh      |  388 ++++++++++++++++++++++++++++++++++++++++++++\n 3 files changed, 501 insertions(+), 10 deletions(-)\n create mode 100755 t/t9810-git-p4-rcs.sh\n\n-- \n1.7.9.259.ga92e\n"},{"id":"185164","messageId":"1329905741-2092-2-git-send-email-luke@diamand.org","threadId":"29690","inReplyTo":"1329905741-2092-1-git-send-email-luke@diamand.org","subject":"[PATCHv4] git-p4: add initial support for RCS keywords","fromName":"Luke Diamand","fromEmail":"luke@diamand.org","sentAt":"2012-02-22T10:15:41Z","receivedAt":"2012-02-22T10:15:41Z","isPatch":false,"sender":{"key":"luke@diamand.org","avatar":"https://avatars.githubusercontent.com/u/5330967?v=4"},"body":"RCS keywords cause problems for git-p4 as perforce always\nexpands them (if +k is set) and so when applying the patch,\ngit reports that the files have been modified by both sides,\nwhen in fact they haven't.\n\nThis change means that when git-p4 detects a problem applying\na patch, it will check to see if keyword expansion could be\nthe culprit. If it is, it strips the keywords in the p4\nrepository so that they match what git is expecting. It then\nhas another go at applying the patch.\n\nThis behaviour is enabled with a new git-p4 configuration\noption and is off by default.\n\nImproved-by: Pete Wyckoff <pw@padd.com>\nSigned-off-by: Luke Diamand <luke@diamand.org>\n---\n Documentation/git-p4.txt   |    5 +\n contrib/fast-import/git-p4 |  118 ++++++++++++--\n t/t9810-git-p4-rcs.sh      |  388 ++++++++++++++++++++++++++++++++++++++++++++\n 3 files changed, 501 insertions(+), 10 deletions(-)\n create mode 100755 t/t9810-git-p4-rcs.sh\n\ndiff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt\nindex 8b92cc0..3fecefa 100644\n--- a/Documentation/git-p4.txt\n+++ b/Documentation/git-p4.txt\n@@ -483,6 +483,11 @@ git-p4.skipUserNameCheck::\n \tuser map, 'git p4' exits.  This option can be used to force\n \tsubmission regardless.\n \n+git-p4.attemptRCSCleanup:\n+    If enabled, 'git p4 submit' will attempt to cleanup RCS keywords\n+    ($Header$, etc). These would otherwise cause merge conflicts and prevent\n+    the submit going ahead. This option should be considered experimental at\n+    present.\n \n IMPLEMENTATION DETAILS\n ----------------------\ndiff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4\nindex a78d9c5..c8b6c8a 100755\n--- a/contrib/fast-import/git-p4\n+++ b/contrib/fast-import/git-p4\n@@ -10,7 +10,7 @@\n \n import optparse, sys, os, marshal, subprocess, shelve\n import tempfile, getopt, os.path, time, platform\n-import re\n+import re, shutil\n \n verbose = False\n \n@@ -186,6 +186,47 @@ def split_p4_type(p4type):\n         mods = s[1]\n     return (base, mods)\n \n+#\n+# return the raw p4 type of a file (text, text+ko, etc)\n+#\n+def p4_type(file):\n+    results = p4CmdList([\"fstat\", \"-T\", \"headType\", file])\n+    return results[0]['headType']\n+\n+#\n+# Given a type base and modifier, return a regexp matching\n+# the keywords that can be expanded in the file\n+#\n+def p4_keywords_regexp_for_type(base, type_mods):\n+    if base in (\"text\", \"unicode\", \"binary\"):\n+        kwords = None\n+        if \"ko\" in type_mods:\n+            kwords = 'Id|Header'\n+        elif \"k\" in type_mods:\n+            kwords = 'Id|Header|Author|Date|DateTime|Change|File|Revision'\n+        else:\n+            return None\n+        pattern = r\"\"\"\n+            \\$              # Starts with a dollar, followed by...\n+            (%s)            # one of the keywords, followed by...\n+            (:[^$]+)?       # possibly an old expansion, followed by...\n+            \\$              # another dollar\n+            \"\"\" % kwords\n+        return pattern\n+    else:\n+        return None\n+\n+#\n+# Given a file, return a regexp matching the possible\n+# RCS keywords that will be expanded, or None for files\n+# with kw expansion turned off.\n+#\n+def p4_keywords_regexp_for_file(file):\n+    if not os.path.exists(file):\n+        return None\n+    else:\n+        (type_base, type_mods) = split_p4_type(p4_type(file))\n+        return p4_keywords_regexp_for_type(type_base, type_mods)\n \n def setP4ExecBit(file, mode):\n     # Reopens an already open file and changes the execute bit to match\n@@ -753,6 +794,29 @@ class P4Submit(Command, P4UserMap):\n \n         return result\n \n+    def patchRCSKeywords(self, file, pattern):\n+        # Attempt to zap the RCS keywords in a p4 controlled file matching the given pattern\n+        (handle, outFileName) = tempfile.mkstemp(dir='.')\n+        try:\n+            outFile = os.fdopen(handle, \"w+\")\n+            inFile = open(file, \"r\")\n+            regexp = re.compile(pattern, re.VERBOSE)\n+            for line in inFile.readlines():\n+                line = regexp.sub(r'$\\1$', line)\n+                outFile.write(line)\n+            inFile.close()\n+            outFile.close()\n+            # Forcibly overwrite the original file\n+            os.unlink(file)\n+            shutil.move(outFileName, file)\n+        except:\n+            # cleanup our temporary file\n+            os.unlink(outFileName)\n+            print \"Failed to strip RCS keywords in %s\" % file\n+            raise\n+\n+        print \"Patched up RCS keywords in %s\" % file\n+\n     def p4UserForCommit(self,id):\n         # Return the tuple (perforce user,git email) for a given git commit id\n         self.getUserMapFromPerforceServer()\n@@ -918,6 +982,7 @@ class P4Submit(Command, P4UserMap):\n         filesToDelete = set()\n         editedFiles = set()\n         filesToChangeExecBit = {}\n+\n         for line in diff:\n             diff = parseDiffTreeEntry(line)\n             modifier = diff['status']\n@@ -964,9 +1029,45 @@ class P4Submit(Command, P4UserMap):\n         patchcmd = diffcmd + \" | git apply \"\n         tryPatchCmd = patchcmd + \"--check -\"\n         applyPatchCmd = patchcmd + \"--check --apply -\"\n+        patch_succeeded = True\n \n         if os.system(tryPatchCmd) != 0:\n+            fixed_rcs_keywords = False\n+            patch_succeeded = False\n             print \"Unfortunately applying the change failed!\"\n+\n+            # Patch failed, maybe it's just RCS keyword woes. Look through\n+            # the patch to see if that's possible.\n+            if gitConfig(\"git-p4.attemptRCSCleanup\",\"--bool\") == \"true\":\n+                file = None\n+                pattern = None\n+                kwfiles = {}\n+                for file in editedFiles | filesToDelete:\n+                    # did this file's delta contain RCS keywords?\n+                    pattern = p4_keywords_regexp_for_file(file)\n+\n+                    if pattern:\n+                        # this file is a possibility...look for RCS keywords.\n+                        regexp = re.compile(pattern, re.VERBOSE)\n+                        for line in read_pipe_lines([\"git\", \"diff\", \"%s^..%s\" % (id, id), file]):\n+                            if regexp.search(line):\n+                                if verbose:\n+                                    print \"got keyword match on %s in %s in %s\" % (pattern, line, file)\n+                                kwfiles[file] = pattern\n+                                break\n+\n+                for file in kwfiles:\n+                    if verbose:\n+                        print \"zapping %s with %s\" % (line,pattern)\n+                    self.patchRCSKeywords(file, kwfiles[file])\n+                    fixed_rcs_keywords = True\n+\n+            if fixed_rcs_keywords:\n+                print \"Retrying the patch with RCS keywords cleaned up\"\n+                if os.system(tryPatchCmd) == 0:\n+                    patch_succeeded = True\n+\n+        if not patch_succeeded:\n             print \"What do you want to do?\"\n             response = \"x\"\n             while response != \"s\" and response != \"a\" and response != \"w\":\n@@ -1585,15 +1686,12 @@ class P4Sync(Command, P4UserMap):\n \n         # Note that we do not try to de-mangle keywords on utf16 files,\n         # even though in theory somebody may want that.\n-        if type_base in (\"text\", \"unicode\", \"binary\"):\n-            if \"ko\" in type_mods:\n-                text = ''.join(contents)\n-                text = re.sub(r'\\$(Id|Header):[^$]*\\$', r'$\\1$', text)\n-                contents = [ text ]\n-            elif \"k\" in type_mods:\n-                text = ''.join(contents)\n-                text = re.sub(r'\\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$]*\\$', r'$\\1$', text)\n-                contents = [ text ]\n+        pattern = p4_keywords_regexp_for_type(type_base, type_mods)\n+        if pattern:\n+            regexp = re.compile(pattern, re.VERBOSE)\n+            text = ''.join(contents)\n+            text = regexp.sub(r'$\\1$', text)\n+            contents = [ text ]\n \n         self.gitStream.write(\"M %s inline %s\\n\" % (git_mode, relPath))\n \ndiff --git a/t/t9810-git-p4-rcs.sh b/t/t9810-git-p4-rcs.sh\nnew file mode 100755\nindex 0000000..9e84b5a\n--- /dev/null\n+++ b/t/t9810-git-p4-rcs.sh\n@@ -0,0 +1,388 @@\n+#!/bin/sh\n+\n+test_description='git-p4 rcs keywords'\n+\n+. ./lib-git-p4.sh\n+\n+test_expect_success 'start p4d' '\n+\tstart_p4d\n+'\n+\n+#\n+# Make one file with keyword lines at the top, and\n+# enough plain text to be able to test modifications\n+# far away from the keywords.\n+#\n+test_expect_success 'init depot' '\n+\t(\n+\t\tcd \"$cli\" &&\n+\t\tcat <<-\\EOF >filek &&\n+\t\t$Id$\n+\t\t/* $Revision$ */\n+\t\t# $Change$\n+\t\tline4\n+\t\tline5\n+\t\tline6\n+\t\tline7\n+\t\tline8\n+\t\tEOF\n+\t\tcp filek fileko &&\n+\t\tsed -i \"s/Revision/Revision: do not scrub me/\" fileko\n+\t\tcp fileko file_text &&\n+\t\tsed -i \"s/Id/Id: do not scrub me/\" file_text\n+\t\tp4 add -t text+k filek &&\n+\t\tp4 submit -d \"filek\" &&\n+\t\tp4 add -t text+ko fileko &&\n+\t\tp4 submit -d \"fileko\" &&\n+\t\tp4 add -t text file_text &&\n+\t\tp4 submit -d \"file_text\"\n+\t)\n+'\n+\n+#\n+# Generate these in a function to make it easy to use single quote marks.\n+#\n+write_scrub_scripts() {\n+\tcat >\"$TRASH_DIRECTORY/scrub_k.py\" <<-\\EOF &&\n+\timport re, sys\n+\tsys.stdout.write(re.sub(r'(?i)\\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$]*\\$', r'$\\1$', sys.stdin.read()))\n+\tEOF\n+\tcat >\"$TRASH_DIRECTORY/scrub_ko.py\" <<-\\EOF\n+\timport re, sys\n+\tsys.stdout.write(re.sub(r'(?i)\\$(Id|Header):[^$]*\\$', r'$\\1$', sys.stdin.read()))\n+\tEOF\n+}\n+\n+test_expect_success 'scrub scripts' '\n+\twrite_scrub_scripts\n+'\n+\n+#\n+# Compare $cli/file to its scrubbed version, should be different.\n+# Compare scrubbed $cli/file to $git/file, should be same.\n+#\n+scrub_k_check() {\n+\tfile=$1 &&\n+\tscrub=\"$TRASH_DIRECTORY/$file\" &&\n+\t\"$PYTHON_PATH\" \"$TRASH_DIRECTORY/scrub_k.py\" <\"$git/$file\" >\"$scrub\" &&\n+\t! test_cmp \"$cli/$file\" \"$scrub\" &&\n+\ttest_cmp \"$git/$file\" \"$scrub\" &&\n+\trm \"$scrub\"\n+}\n+scrub_ko_check() {\n+\tfile=$1 &&\n+\tscrub=\"$TRASH_DIRECTORY/$file\" &&\n+\t\"$PYTHON_PATH\" \"$TRASH_DIRECTORY/scrub_ko.py\" <\"$git/$file\" >\"$scrub\" &&\n+\t! test_cmp \"$cli/$file\" \"$scrub\" &&\n+\ttest_cmp \"$git/$file\" \"$scrub\" &&\n+\trm \"$scrub\"\n+}\n+\n+#\n+# Modify far away from keywords.  If no RCS lines show up\n+# in the diff, there is no conflict.\n+#\n+test_expect_success 'edit far away from RCS lines' '\n+\ttest_when_finished cleanup_git &&\n+\t\"$GITP4\" clone --dest=\"$git\" //depot &&\n+\t(\n+\t\tcd \"$git\" &&\n+\t\tgit config git-p4.skipSubmitEdit true &&\n+\t\tsed -i \"s/^line7/line7 edit/\" filek &&\n+\t\tgit commit -m \"filek line7 edit\" filek &&\n+\t\t\"$GITP4\" submit &&\n+\t\tscrub_k_check filek\n+\t)\n+'\n+\n+#\n+# Modify near the keywords.  This will require RCS scrubbing.\n+#\n+test_expect_success 'edit near RCS lines' '\n+\ttest_when_finished cleanup_git &&\n+\t\"$GITP4\" clone --dest=\"$git\" //depot &&\n+\t(\n+\t\tcd \"$git\" &&\n+\t\tgit config git-p4.skipSubmitEdit true &&\n+\t\tgit config git-p4.attemptRCSCleanup true &&\n+\t\tsed -i \"s/^line4/line4 edit/\" filek &&\n+\t\tgit commit -m \"filek line4 edit\" filek &&\n+\t\t\"$GITP4\" submit &&\n+\t\tscrub_k_check filek\n+\t)\n+'\n+\n+#\n+# Modify the keywords themselves.  This also will require RCS scrubbing.\n+#\n+test_expect_success 'edit keyword lines' '\n+\ttest_when_finished cleanup_git &&\n+\t\"$GITP4\" clone --dest=\"$git\" //depot &&\n+\t(\n+\t\tcd \"$git\" &&\n+\t\tgit config git-p4.skipSubmitEdit true &&\n+\t\tgit config git-p4.attemptRCSCleanup true &&\n+\t\tsed -i \"/Revision/d\" filek &&\n+\t\tgit commit -m \"filek remove Revision line\" filek &&\n+\t\t\"$GITP4\" submit &&\n+\t\tscrub_k_check filek\n+\t)\n+'\n+\n+#\n+# Scrubbing text+ko files should not alter all keywords, just Id, Header.\n+#\n+test_expect_success 'scrub ko files differently' '\n+\ttest_when_finished cleanup_git &&\n+\t\"$GITP4\" clone --dest=\"$git\" //depot &&\n+\t(\n+\t\tcd \"$git\" &&\n+\t\tgit config git-p4.skipSubmitEdit true &&\n+\t\tgit config git-p4.attemptRCSCleanup true &&\n+\t\tsed -i \"s/^line4/line4 edit/\" fileko &&\n+\t\tgit commit -m \"fileko line4 edit\" fileko &&\n+\t\t\"$GITP4\" submit &&\n+\t\tscrub_ko_check fileko &&\n+\t\t! scrub_k_check fileko\n+\t)\n+'\n+\n+# hack; git-p4 submit should do it on its own\n+test_expect_success 'cleanup after failure' '\n+\t(\n+\t\tcd \"$cli\" &&\n+\t\tp4 revert ...\n+\t)\n+'\n+\n+#\n+# Do not scrub anything but +k or +ko files.  Sneak a change into\n+# the cli file so that submit will get a conflict.  Make sure that\n+# scrubbing doesn't make a mess of things.\n+#\n+# Assumes that git-p4 exits leaving the p4 file open, with the\n+# conflict-generating patch unapplied.\n+#\n+# This might happen only if the git repo is behind the p4 repo at\n+# submit time, and there is a conflict.\n+#\n+test_expect_success 'do not scrub plain text' '\n+\ttest_when_finished cleanup_git &&\n+\t\"$GITP4\" clone --dest=\"$git\" //depot &&\n+\t(\n+\t\tcd \"$git\" &&\n+\t\tgit config git-p4.skipSubmitEdit true &&\n+\t\tgit config git-p4.attemptRCSCleanup true &&\n+\t\tsed -i \"s/^line4/line4 edit/\" file_text &&\n+\t\tgit commit -m \"file_text line4 edit\" file_text &&\n+\t\t(\n+\t\t\tcd \"$cli\" &&\n+\t\t\tp4 open file_text &&\n+\t\t\tsed -i \"s/^line5/line5 p4 edit/\" file_text &&\n+\t\t\tp4 submit -d \"file5 p4 edit\"\n+\t\t) &&\n+\t\t! \"$GITP4\" submit &&\n+\t\t(\n+\t\t\t# exepct something like:\n+\t\t\t#    file_text - file(s) not opened on this client\n+\t\t\t# but not copious diff output\n+\t\t\tcd \"$cli\" &&\n+\t\t\tp4 diff file_text >wc &&\n+\t\t\ttest_line_count = 1 wc\n+\t\t)\n+\t)\n+'\n+\n+# hack; git-p4 submit should do it on its own\n+test_expect_success 'cleanup after failure 2' '\n+\t(\n+\t\tcd \"$cli\" &&\n+\t\tp4 revert ...\n+\t)\n+'\n+\n+create_kw_file() {\n+\tcat <<\\EOF >\"$1\"\n+/* A file\n+\tId: $Id$\n+\tRevision: $Revision$\n+\tFile: $File$\n+ */\n+int main(int argc, const char **argv) {\n+\treturn 0;\n+}\n+EOF\n+}\n+\n+test_expect_success 'add kwfile' '\n+\t(\n+\t\tcd \"$cli\" &&\n+\t\techo file1 >file1 &&\n+\t\tp4 add file1 &&\n+\t\tp4 submit -d \"file 1\" &&\n+\t\tcreate_kw_file kwfile1.c &&\n+\t\tp4 add kwfile1.c &&\n+\t\tp4 submit -d \"Add rcw kw file\" kwfile1.c\n+\t)\n+'\n+\n+p4_append_to_file() {\n+\tf=$1 &&\n+\tp4 edit -t ktext \"$f\" &&\n+\techo \"/* $(date) */\" >>\"$f\" &&\n+\tp4 submit -d \"appending a line in p4\"\n+}\n+\n+# Create some files with RCS keywords. If they get modified\n+# elsewhere then the version number gets bumped which then\n+# results in a merge conflict if we touch the RCS kw lines,\n+# even though the change itself would otherwise apply cleanly.\n+test_expect_success 'cope with rcs keyword expansion damage' '\n+\ttest_when_finished cleanup_git &&\n+\t\"$GITP4\" clone --dest=\"$git\" //depot &&\n+\t(\n+\t\tcd \"$git\" &&\n+\t\tgit config git-p4.skipSubmitEdit true &&\n+\t\tgit config git-p4.attemptRCSCleanup true &&\n+\t\t(cd ../cli && p4_append_to_file kwfile1.c) &&\n+\t\told_lines=$(wc -l <kwfile1.c) &&\n+\t\tperl -n -i -e \"print unless m/Revision:/\" kwfile1.c &&\n+\t\tnew_lines=$(wc -l <kwfile1.c) &&\n+\t\texpr $new_lines == $old_lines - 1 &&\n+\n+\t\tgit add kwfile1.c &&\n+\t\tgit commit -m \"Zap an RCS kw line\" &&\n+\t\t\"$GITP4\" submit &&\n+\t\t\"$GITP4\" rebase &&\n+\t\tgit diff p4/master &&\n+\t\t\"$GITP4\" commit &&\n+\t\techo \"try modifying in both\" &&\n+\t\tcd \"$cli\" &&\n+\t\tp4 edit kwfile1.c &&\n+\t\techo \"line from p4\" >>kwfile1.c &&\n+\t\tp4 submit -d \"add a line in p4\" kwfile1.c &&\n+\t\tcd \"$git\" &&\n+\t\techo \"line from git at the top\" | cat - kwfile1.c >kwfile1.c.new &&\n+\t\tmv kwfile1.c.new kwfile1.c &&\n+\t\tgit commit -m \"Add line in git at the top\" kwfile1.c &&\n+\t\t\"$GITP4\" rebase &&\n+\t\t\"$GITP4\" submit\n+\t)\n+'\n+\n+test_expect_success 'cope with rcs keyword file deletion' '\n+\ttest_when_finished cleanup_git &&\n+\t(\n+\t\tcd \"$cli\" &&\n+\t\techo \"\\$Revision\\$\" >kwdelfile.c &&\n+\t\tp4 add -t ktext kwdelfile.c &&\n+\t\tp4 submit -d \"Add file to be deleted\" &&\n+\t\tcat kwdelfile.c &&\n+\t\tgrep -q 1 kwdelfile.c\n+\t) &&\n+\t\"$GITP4\" clone --dest=\"$git\" //depot &&\n+\t(\n+\t\tcd \"$git\" &&\n+\t\tgrep -q Revision kwdelfile.c &&\n+\t\tgit rm -f kwdelfile.c &&\n+\t\tgit commit -m \"Delete a file containing RCS keywords\" &&\n+\t\tgit config git-p4.skipSubmitEdit true &&\n+\t\tgit config git-p4.attemptRCSCleanup true &&\n+\t\t\"$GITP4\" submit\n+\t) &&\n+\t(\n+\t\tcd \"$cli\" &&\n+\t\tp4 sync &&\n+\t\t[ ! -f kwdelfile.c ]\n+\t)\n+'\n+\n+# If you add keywords in git of the form $Header$ then everything should\n+# work fine without any special handling.\n+test_expect_success 'Add keywords in git which match the default p4 values' '\n+\ttest_when_finished cleanup_git &&\n+\t\"$GITP4\" clone --dest=\"$git\" //depot &&\n+\t(\n+\t\tcd \"$git\" &&\n+\t\techo \"NewKW: \\$Revision\\$\" >>kwfile1.c &&\n+\t\tgit add kwfile1.c &&\n+\t\tgit commit -m \"Adding RCS keywords in git\" &&\n+\t\tgit config git-p4.skipSubmitEdit true &&\n+\t\tgit config git-p4.attemptRCSCleanup true &&\n+\t\t\"$GITP4\" submit\n+\t) &&\n+\t(\n+\t\tcd \"$cli\" &&\n+\t\tp4 sync &&\n+\t\t[ -f kwfile1.c ] &&\n+\t\tgrep 'NewKW.*Revision.*[0-9]' kwfile1.c\n+\n+\t)\n+'\n+\n+# If you add keywords in git of the form $Header:#1$ then things will fail\n+# unless git-p4 takes steps to scrub the *git* commit.\n+#\n+test_expect_failure 'Add keywords in git which do not match the default p4 values' '\n+\ttest_when_finished cleanup_git &&\n+\t\"$GITP4\" clone --dest=\"$git\" //depot &&\n+\t(\n+\t\tcd \"$git\" &&\n+\t\techo \"NewKW2: \\$Revision:1\\$\" >>kwfile1.c &&\n+\t\tgit add kwfile1.c &&\n+\t\tgit commit -m \"Adding RCS keywords in git\" &&\n+\t\tgit config git-p4.skipSubmitEdit true &&\n+\t\tgit config git-p4.attemptRCSCleanup true &&\n+\t\t\"$GITP4\" submit\n+\t) &&\n+\t(\n+\t\tcd \"$cli\" &&\n+\t\tp4 sync &&\n+\t\tgrep 'NewKW2.*Revision.*[0-9]' kwfile1.c\n+\n+\t)\n+'\n+\n+# Check that the existing merge conflict handling still works.\n+# Modify kwfile1.c in git, and delete in p4. We should be able\n+# to skip the git commit.\n+#\n+test_expect_success 'merge conflict handling still works' '\n+\ttest_when_finished cleanup_git &&\n+\t(\n+\t\tcd \"$cli\" &&\n+\t\techo \"Hello:\\$Id\\$\" >merge2.c &&\n+\t\techo \"World\" >>merge2.c &&\n+\t\tp4 add -t ktext merge2.c &&\n+\t\tp4 submit -d \"add merge test file\"\n+\t) &&\n+\t\"$GITP4\" clone --dest=\"$git\" //depot &&\n+\t(\n+\t\tcd \"$git\" &&\n+\t\tsed -e \"/Hello/d\" merge2.c >merge2.c.tmp &&\n+\t\tmv merge2.c.tmp merge2.c &&\n+\t\tgit add merge2.c &&\n+\t\tgit commit -m \"Modifying merge2.c\"\n+\t) &&\n+\t(\n+\t\tcd \"$cli\" &&\n+\t\tp4 delete merge2.c &&\n+\t\tp4 submit -d \"remove merge test file\"\n+\t) &&\n+\t(\n+\t\tcd \"$git\" &&\n+\t\t[ -f merge2.c ] &&\n+\t\tgit config git-p4.skipSubmitEdit true &&\n+\t\tgit config git-p4.attemptRCSCleanup true &&\n+\t\t!(echo \"s\" | \"$GITP4\" submit) &&\n+\t\tgit rebase --skip &&\n+\t\t[ ! -f merge2.c ]\n+\t)\n+'\n+\n+\n+test_expect_success 'kill p4d' '\n+\tkill_p4d\n+'\n+\n+test_done\n-- \n1.7.9.259.ga92e\n"},{"id":"185171","messageId":"20120222125327.GA2292@padd.com","threadId":"29690","inReplyTo":"1329905741-2092-2-git-send-email-luke@diamand.org","subject":"Re: [PATCHv4] git-p4: add initial support for RCS keywords","fromName":"Pete Wyckoff","fromEmail":"pw@padd.com","sentAt":"2012-02-22T12:53:27Z","receivedAt":"2012-02-22T12:53:27Z","isPatch":false,"sender":{"key":"pw@padd.com","avatar":null},"body":"luke@diamand.org wrote on Wed, 22 Feb 2012 10:15 +0000:\n> RCS keywords cause problems for git-p4 as perforce always\n> expands them (if +k is set) and so when applying the patch,\n> git reports that the files have been modified by both sides,\n> when in fact they haven't.\n> \n> This change means that when git-p4 detects a problem applying\n> a patch, it will check to see if keyword expansion could be\n> the culprit. If it is, it strips the keywords in the p4\n> repository so that they match what git is expecting. It then\n> has another go at applying the patch.\n> \n> This behaviour is enabled with a new git-p4 configuration\n> option and is off by default.\n> \n> Improved-by: Pete Wyckoff <pw@padd.com>\n> Signed-off-by: Luke Diamand <luke@diamand.org>\n\nLooks brilliant.  Ack.  Thanks for suffering through N rounds of\nreview.  :)\n\n\t\t-- Pete\n"},{"id":"185186","messageId":"7vy5ruacpa.fsf@alter.siamese.dyndns.org","threadId":"29690","inReplyTo":"20120222125327.GA2292@padd.com","subject":"Re: [PATCHv4] git-p4: add initial support for RCS keywords","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-02-22T19:29:53Z","receivedAt":"2012-02-22T19:29:53Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Pete Wyckoff <pw@padd.com> writes:\n\n>> Improved-by: Pete Wyckoff <pw@padd.com>\n>> Signed-off-by: Luke Diamand <luke@diamand.org>\n>\n> Looks brilliant.  Ack.  Thanks for suffering through N rounds of\n> review.  :)\n\nWell, I hate to say that I need to ask another round, to redo this patch\non top of ld/git-p4-expanded-keywords topic that has already been in\n'next'; a patch that replaces what is in 'next' will lose fix-ups for\nissues I pointed out in the first round that you forgot to follow and were\nfixed up locally by me when I queued the existing one.\n\nWhen working on an improvement to what you have sent out, please make it a\nhabit of comparing your result with what are already queued, even when the\nearlier patches are still in 'pu'.  They often are polished with trivial\nimprovements (both to the patch and the log message) based on review\ncomments from people when they are queued, which you do not want to lose.\n\nThanks.\n"},{"id":"185216","messageId":"4F456FC4.7060007@diamand.org","threadId":"29690","inReplyTo":"7vy5ruacpa.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCHv4] git-p4: add initial support for RCS keywords","fromName":"Luke Diamand","fromEmail":"luke@diamand.org","sentAt":"2012-02-22T22:44:20Z","receivedAt":"2012-02-22T22:44:20Z","isPatch":false,"sender":{"key":"luke@diamand.org","avatar":"https://avatars.githubusercontent.com/u/5330967?v=4"},"body":"On 22/02/12 19:29, Junio C Hamano wrote:\n> Pete Wyckoff<pw@padd.com>  writes:\n>\n>>> Improved-by: Pete Wyckoff<pw@padd.com>\n>>> Signed-off-by: Luke Diamand<luke@diamand.org>\n>>\n>> Looks brilliant.  Ack.  Thanks for suffering through N rounds of\n>> review.  :)\n>\n> Well, I hate to say that I need to ask another round, to redo this patch\n> on top of ld/git-p4-expanded-keywords topic that has already been in\n> 'next'; a patch that replaces what is in 'next' will lose fix-ups for\n> issues I pointed out in the first round that you forgot to follow and were\n> fixed up locally by me when I queued the existing one.\n>\n> When working on an improvement to what you have sent out, please make it a\n> habit of comparing your result with what are already queued, even when the\n> earlier patches are still in 'pu'.  They often are polished with trivial\n> improvements (both to the patch and the log message) based on review\n> comments from people when they are queued, which you do not want to lose.\n\nSorry - I had completely forgotten about that.\n\nNo need to apologize for asking me to rework this. I'm using this \namazing version control system that makes it really easy.\n\nNow, if I was using Perforce, then by now I would pretty unhappy.... P\n\n>\n> Thanks.\n"}]}