{"thread":{"id":"9603","subject":"[StGIT PATCH] Make use of the get_patch() utility function","startedAt":"2007-08-21T20:39:11Z","lastAt":"2007-08-22T21:54:16Z","messageCount":3,"participants":["Karl Hasselström","Catalin Marinas"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"51197","messageId":"20070821203757.9118.30049.stgit@yoghurt","threadId":"9603","inReplyTo":null,"subject":"[StGIT PATCH] Make use of the get_patch() utility function","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2007-08-21T20:39:11Z","receivedAt":"2007-08-21T20:39:11Z","isPatch":true,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"We already had it, but no one was using it\n\nSigned-off-by: Karl Hasselström <kha@treskal.com>\n\n---\n\nCatalin, would you consider taking this cleanup? It was hidden at the\nbeginning of my DAG series, so you probably didn't notice it.\n\n stgit/stack.py |   29 ++++++++++++++---------------\n 1 files changed, 14 insertions(+), 15 deletions(-)\n\ndiff --git a/stgit/stack.py b/stgit/stack.py\nindex 9c15b3f..c7569b2 100644\n--- a/stgit/stack.py\n+++ b/stgit/stack.py\n@@ -466,7 +466,7 @@ class Series(PatchSet):\n         crt = self.get_current()\n         if not crt:\n             return None\n-        return Patch(crt, self.__patch_dir, self.__refs_dir)\n+        return self.get_patch(crt)\n \n     def get_current(self):\n         \"\"\"Return the name of the topmost patch, or None if there is\n@@ -684,7 +684,7 @@ class Series(PatchSet):\n                 raise StackException, \\\n                       'Cannot delete: the series still contains patches'\n             for p in patches:\n-                Patch(p, self.__patch_dir, self.__refs_dir).delete()\n+                self.get_patch(p).delete()\n \n             # remove the trash directory if any\n             if os.path.exists(self.__trash_dir):\n@@ -741,7 +741,7 @@ class Series(PatchSet):\n         if not name:\n             raise StackException, 'No patches applied'\n \n-        patch = Patch(name, self.__patch_dir, self.__refs_dir)\n+        patch = self.get_patch(name)\n \n         descr = patch.get_description()\n         if not (message or descr):\n@@ -807,7 +807,7 @@ class Series(PatchSet):\n         name = self.get_current()\n         assert(name)\n \n-        patch = Patch(name, self.__patch_dir, self.__refs_dir)\n+        patch = self.get_patch(name)\n         old_bottom = patch.get_old_bottom()\n         old_top = patch.get_old_top()\n \n@@ -848,7 +848,7 @@ class Series(PatchSet):\n         if name == None:\n             name = make_patch_name(descr, self.patch_exists)\n \n-        patch = Patch(name, self.__patch_dir, self.__refs_dir)\n+        patch = self.get_patch(name)\n         patch.create()\n \n         if not bottom:\n@@ -903,7 +903,7 @@ class Series(PatchSet):\n         \"\"\"Deletes a patch\n         \"\"\"\n         self.__patch_name_valid(name)\n-        patch = Patch(name, self.__patch_dir, self.__refs_dir)\n+        patch = self.get_patch(name)\n \n         if self.__patch_is_current(patch):\n             self.pop_patch(name)\n@@ -936,7 +936,7 @@ class Series(PatchSet):\n         for name in names:\n             assert(name in unapplied)\n \n-            patch = Patch(name, self.__patch_dir, self.__refs_dir)\n+            patch = self.get_patch(name)\n \n             head = top\n             bottom = patch.get_bottom()\n@@ -1002,8 +1002,7 @@ class Series(PatchSet):\n         patches detected to have been applied. The state of the tree\n         is restored to the original one\n         \"\"\"\n-        patches = [Patch(name, self.__patch_dir, self.__refs_dir)\n-                   for name in names]\n+        patches = [self.get_patch(name) for name in names]\n         patches.reverse()\n \n         merged = []\n@@ -1022,7 +1021,7 @@ class Series(PatchSet):\n         unapplied = self.get_unapplied()\n         assert(name in unapplied)\n \n-        patch = Patch(name, self.__patch_dir, self.__refs_dir)\n+        patch = self.get_patch(name)\n \n         head = git.get_head()\n         bottom = patch.get_bottom()\n@@ -1096,7 +1095,7 @@ class Series(PatchSet):\n         name = self.get_current()\n         assert(name)\n \n-        patch = Patch(name, self.__patch_dir, self.__refs_dir)\n+        patch = self.get_patch(name)\n         old_bottom = patch.get_old_bottom()\n         old_top = patch.get_old_top()\n \n@@ -1122,7 +1121,7 @@ class Series(PatchSet):\n         applied.reverse()\n         assert(name in applied)\n \n-        patch = Patch(name, self.__patch_dir, self.__refs_dir)\n+        patch = self.get_patch(name)\n \n         if git.get_head_file() == self.get_name():\n             if keep and not git.apply_diff(git.get_head(), patch.get_bottom()):\n@@ -1148,7 +1147,7 @@ class Series(PatchSet):\n         \"\"\"Returns True if the patch is empty\n         \"\"\"\n         self.__patch_name_valid(name)\n-        patch = Patch(name, self.__patch_dir, self.__refs_dir)\n+        patch = self.get_patch(name)\n         bottom = patch.get_bottom()\n         top = patch.get_top()\n \n@@ -1173,11 +1172,11 @@ class Series(PatchSet):\n             raise StackException, 'Patch \"%s\" already exists' % newname\n \n         if oldname in unapplied:\n-            Patch(oldname, self.__patch_dir, self.__refs_dir).rename(newname)\n+            self.get_patch(oldname).rename(newname)\n             unapplied[unapplied.index(oldname)] = newname\n             write_strings(self.__unapplied_file, unapplied)\n         elif oldname in applied:\n-            Patch(oldname, self.__patch_dir, self.__refs_dir).rename(newname)\n+            self.get_patch(oldname).rename(newname)\n \n             applied[applied.index(oldname)] = newname\n             write_strings(self.__applied_file, applied)\n"},{"id":"51207","messageId":"20070821215658.GB20965@diana.vm.bytemark.co.uk","threadId":"9603","inReplyTo":"20070821203757.9118.30049.stgit@yoghurt","subject":"Re: [StGIT PATCH] Make use of the get_patch() utility function","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2007-08-21T21:56:58Z","receivedAt":"2007-08-21T21:56:58Z","isPatch":true,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"On 2007-08-21 22:39:11 +0200, Karl Hasselström wrote:\n\n> Catalin, would you consider taking this cleanup? It was hidden at the\n> beginning of my DAG series, so you probably didn't notice it.\n\nIf you like, you can pull this one, plus a fix from Yann and a fix\nfrom David that you seem to have missed, from the fixes branch at\ngit://repo.or.cz/stgit/kha.git.\n\n-- \nKarl Hasselström, kha@treskal.com\n      www.treskal.com/kalle\n"},{"id":"51297","messageId":"b0943d9e0708221454s44bfa754t9e0d857015d4ca93@mail.gmail.com","threadId":"9603","inReplyTo":"20070821215658.GB20965@diana.vm.bytemark.co.uk","subject":"Re: [StGIT PATCH] Make use of the get_patch() utility function","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2007-08-22T21:54:16Z","receivedAt":"2007-08-22T21:54:16Z","isPatch":true,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"On 21/08/07, Karl Hasselström <kha@treskal.com> wrote:\n> On 2007-08-21 22:39:11 +0200, Karl Hasselström wrote:\n>\n> > Catalin, would you consider taking this cleanup? It was hidden at the\n> > beginning of my DAG series, so you probably didn't notice it.\n>\n> If you like, you can pull this one, plus a fix from Yann and a fix\n> from David that you seem to have missed, from the fixes branch at\n> git://repo.or.cz/stgit/kha.git.\n\nMuch easier :-), thanks.\n\n-- \nCatalin\n"}]}