René's URL Explorer Experiment

{"@context":"https://schema.org","@type":"DiscussionForumPosting","headline":"Unable to apply patches with trailing blank line removed","articleBody":"Given `a.txt`:\r\n\r\n```\r\n1\r\n2\r\n3\r\n\r\n```\r\n\r\nand `broken.patch` (note that it's missing the third line of context):\r\n\r\n```\r\n--- a.txt\t2019-03-28 17:02:04.832004033 -0700\r\n+++ b.txt\t2019-03-28 17:02:34.999576803 -0700\r\n@@ -1,4 +1,4 @@\r\n-1\r\n+0\r\n 2\r\n 3\r\n```\r\n\r\none can get to `b.txt`:\r\n\r\n```\r\n0\r\n2\r\n3\r\n\r\n```\r\n\r\nusing `patch -p0 \u003c broken.patch` but not with python-patch:\r\n\r\n```\r\n$ ./patch.py --debug broken.patch \r\n   DEBUG reading broken.patch\r\n WARNING error: patch stream is incomplete!\r\n   DEBUG -  0 hunks for a.txt\r\n   DEBUG total files: 1  total hunks: 0\r\n   DEBUG normalize filenames\r\n   DEBUG     patch type = plain\r\n   DEBUG     source = a.txt\r\n   DEBUG     target = b.txt\r\nTraceback (most recent call last):\r\n  File \"./patch.py\", line 1193, in \u003cmodule\u003e\r\n    main()\r\n  File \"./patch.py\", line 1186, in main\r\n    patch.apply(options.strip, root=options.directory) or sys.exit(-1)\r\nAttributeError: 'bool' object has no attribute 'apply'\r\n```\r\n\r\nTo patch `a.txt` correctly using python-patch, one needs to provide the non-truncated patch file which contains the full three lines of context (with the last line consisting of a single trailing space):\r\n\r\n```\r\n--- a.txt\t2019-03-28 17:02:04.832004033 -0700\r\n+++ b.txt\t2019-03-28 17:02:34.999576803 -0700\r\n@@ -1,4 +1,4 @@\r\n-1\r\n+0\r\n 2\r\n 3\r\n \r\n```\r\n\r\nThis can be a problem since `git` is commonly configured to remove \"unnecessary trailing whitespace\" via the following option in `~/.gitconfig`:\r\n\r\n```\r\n[apply]\r\n        whitespace = fix\r\n```","author":{"url":"https://github.com/fmarier","@type":"Person","name":"fmarier"},"datePublished":"2019-03-29T00:13:21.000Z","interactionStatistic":{"@type":"InteractionCounter","interactionType":"https://schema.org/CommentAction","userInteractionCount":2},"url":"https://github.com/59/python-patch/issues/59"}