{"thread":{"id":"2239","subject":"[PATCH 1/2] Parse /top.old with id and when requesting diffs","startedAt":"2005-10-27T08:56:22Z","lastAt":"2005-10-27T08:56:34Z","messageCount":2,"participants":["Paolo 'Blaisorblade' Giarrusso"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"10695","messageId":"20051027085622.2482.22005.stgit@zion.home.lan","threadId":"2239","inReplyTo":null,"subject":"[PATCH 1/2] Parse /top.old with id and when requesting diffs","fromName":"Paolo 'Blaisorblade' Giarrusso","fromEmail":"blaisorblade@yahoo.it","sentAt":"2005-10-27T08:56:22Z","receivedAt":"2005-10-27T08:56:22Z","isPatch":true,"sender":{"key":"blaisorblade@yahoo.it","avatar":null},"body":"From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>\n\nComparing a patch after and before a merge is very important, and looking into\n.git/patches by hand is not the nicer way to do it.\n\nSigned-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>\n---\n\n stgit/commands/common.py |    5 +++++\n stgit/stack.py           |    6 ++++++\n 2 files changed, 11 insertions(+), 0 deletions(-)\n\ndiff --git a/stgit/commands/common.py b/stgit/commands/common.py\n--- a/stgit/commands/common.py\n+++ b/stgit/commands/common.py\n@@ -68,6 +68,11 @@ def git_id(string):\n             return series.get_patch(patch_name).get_top()\n         elif patch_id == 'bottom':\n             return series.get_patch(patch_name).get_bottom()\n+        # Note we can return None here.\n+        elif patch_id == 'top.old':\n+            return series.get_patch(patch_name).get_old_top()\n+        elif patch_id == 'bottom.old':\n+            return series.get_patch(patch_name).get_old_bottom()\n \n     # base\n     if patch_name == 'base' and len(string_list) == 1:\ndiff --git a/stgit/stack.py b/stgit/stack.py\n--- a/stgit/stack.py\n+++ b/stgit/stack.py\n@@ -165,6 +165,9 @@ class Patch:\n         elif os.path.isfile(fname):\n             os.remove(fname)\n \n+    def get_old_bottom(self):\n+        return self.__get_field('bottom.old')\n+\n     def get_bottom(self):\n         return self.__get_field('bottom')\n \n@@ -177,6 +180,9 @@ class Patch:\n                 self.__set_field('bottom.old', None)\n         self.__set_field('bottom', string)\n \n+    def get_old_top(self):\n+        return self.__get_field('top.old')\n+\n     def get_top(self):\n         return self.__get_field('top')\n \n"},{"id":"10696","messageId":"20051027085634.2482.34870.stgit@zion.home.lan","threadId":"2239","inReplyTo":"20051027085622.2482.22005.stgit@zion.home.lan","subject":"[PATCH 2/2] Ask vim to avoid backup copies of .stgit.msg","fromName":"Paolo 'Blaisorblade' Giarrusso","fromEmail":"blaisorblade@yahoo.it","sentAt":"2005-10-27T08:56:34Z","receivedAt":"2005-10-27T08:56:34Z","isPatch":true,"sender":{"key":"blaisorblade@yahoo.it","avatar":null},"body":"From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>\n\nDo this by adding nobackup to the modeline.\n\nSigned-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>\n---\n\n stgit/stack.py |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/stgit/stack.py b/stgit/stack.py\n--- a/stgit/stack.py\n+++ b/stgit/stack.py\n@@ -88,7 +88,7 @@ def edit_file(series, string, comment, s\n        git.diff([], series.get_patch(series.get_current()).get_bottom(), None, f)\n \n     #Vim modeline must be near the end.\n-    print >> f, __comment_prefix, 'vi: set textwidth=75 filetype=diff:'\n+    print >> f, __comment_prefix, 'vi: set textwidth=75 filetype=diff nobackup:'\n     f.close()\n \n     # the editor\n"}]}