Refactor stgit.commands.edit

[stgit] / stgit / commands / common.py

diff --git a/stgit/commands/common.py b/stgit/commands/common.py
index 3cecec074a24880e6dc4e20097a91703b79b4066..15fdde2517a7248a2cb3bc86647b34ef74c5e53d 100644 (file)
--- a/stgit/commands/common.py
+++ b/stgit/commands/common.py
@@ -27,6 +27,7 @@ from stgit import stack, git, basedir
 from stgit.config import config, file_extensions
 from stgit.lib import stack as libstack
 from stgit.lib import git as libgit
 from stgit.config import config, file_extensions
 from stgit.lib import stack as libstack
 from stgit.lib import git as libgit

+from stgit.lib import log

 
 # Command exception class
 class CmdException(StgException):
 
 # Command exception class
 class CmdException(StgException):


@@ -418,12 +419,15 @@ def parse_mail(msg):
 
     return (descr, authname, authemail, authdate, diff)
 
 
     return (descr, authname, authemail, authdate, diff)
 

-def parse_patch(text):
+def parse_patch(text, contains_diff):

     """Parse the input text and return (description, authname,
     authemail, authdate, diff)
     """
     """Parse the input text and return (description, authname,
     authemail, authdate, diff)
     """

-    descr, diff = __split_descr_diff(text)
-    descr, authname, authemail, authdate = __parse_description(descr)
+    if contains_diff:
+        (text, diff) = __split_descr_diff(text)
+    else:
+        diff = None
+    (descr, authname, authemail, authdate) = __parse_description(text)

 
     # we don't yet have an agreed place for the creation date.
     # Just return None
 
     # we don't yet have an agreed place for the creation date.
     # Just return None


@@ -444,8 +448,9 @@ class DirectoryException(StgException):
     pass
 
 class _Directory(object):
     pass
 
 class _Directory(object):

-    def __init__(self, needs_current_series = True):
+    def __init__(self, needs_current_series = True, log = True):

         self.needs_current_series =  needs_current_series
         self.needs_current_series =  needs_current_series

+        self.log = log

     @readonly_constant_property
     def git_dir(self):
         try:
     @readonly_constant_property
     def git_dir(self):
         try:


@@ -478,6 +483,9 @@ class _Directory(object):
                        ).output_one_line()]
     def cd_to_topdir(self):
         os.chdir(self.__topdir_path)
                        ).output_one_line()]
     def cd_to_topdir(self):
         os.chdir(self.__topdir_path)

+    def write_log(self, msg):
+        if self.log:
+            log.compat_log_entry(msg)

 
 class DirectoryAnywhere(_Directory):
     def setup(self):
 
 class DirectoryAnywhere(_Directory):
     def setup(self):


@@ -486,6 +494,7 @@ class DirectoryAnywhere(_Directory):
 class DirectoryHasRepository(_Directory):
     def setup(self):
         self.git_dir # might throw an exception
 class DirectoryHasRepository(_Directory):
     def setup(self):
         self.git_dir # might throw an exception

+        log.compat_log_external_mods()

 
 class DirectoryInWorktree(DirectoryHasRepository):
     def setup(self):
 
 class DirectoryInWorktree(DirectoryHasRepository):
     def setup(self):


@@ -502,6 +511,7 @@ class DirectoryHasRepositoryLib(_Directory):
     """For commands that use the new infrastructure in stgit.lib.*."""
     def __init__(self):
         self.needs_current_series = False
     """For commands that use the new infrastructure in stgit.lib.*."""
     def __init__(self):
         self.needs_current_series = False

+        self.log = False # stgit.lib.transaction handles logging

     def setup(self):
         # This will throw an exception if we don't have a repository.
         self.repository = libstack.Repository.default()
     def setup(self):
         # This will throw an exception if we don't have a repository.
         self.repository = libstack.Repository.default()