Use the GIT-specific environment as default

[stgit] / stgit / stack.py

diff --git a/stgit/stack.py b/stgit/stack.py
index 89a2413..9aa5099 100644 (file)
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -216,38 +216,52 @@ class Patch:
         return self.__get_field('authname')
 
     def set_authname(self, name):
-        if not name and config.has_option('stgit', 'authname'):
-            name = config.get('stgit', 'authname')
+        if not name:
+            if config.has_option('stgit', 'authname'):
+                name = config.get('stgit', 'authname')
+            elif 'GIT_AUTHOR_NAME' in os.environ:
+                name = os.environ['GIT_AUTHOR_NAME']
         self.__set_field('authname', name)
 
     def get_authemail(self):
         return self.__get_field('authemail')
 
     def set_authemail(self, address):
-        if not address and config.has_option('stgit', 'authemail'):
-            address = config.get('stgit', 'authemail')
+        if not address:
+            if config.has_option('stgit', 'authemail'):
+                address = config.get('stgit', 'authemail')
+            elif 'GIT_AUTHOR_EMAIL' in os.environ:
+                address = os.environ['GIT_AUTHOR_EMAIL']
         self.__set_field('authemail', address)
 
     def get_authdate(self):
         return self.__get_field('authdate')
 
-    def set_authdate(self, authdate):
-        self.__set_field('authdate', authdate)
+    def set_authdate(self, date):
+        if not date and 'GIT_AUTHOR_DATE' in os.environ:
+            date = os.environ['GIT_AUTHOR_DATE']
+        self.__set_field('authdate', date)
 
     def get_commname(self):
         return self.__get_field('commname')
 
     def set_commname(self, name):
-        if not name and config.has_option('stgit', 'commname'):
-            name = config.get('stgit', 'commname')
+        if not name:
+            if config.has_option('stgit', 'commname'):
+                name = config.get('stgit', 'commname')
+            elif 'GIT_COMMITTER_NAME' in os.environ:
+                name = os.environ['GIT_COMMITTER_NAME']
         self.__set_field('commname', name)
 
     def get_commemail(self):
         return self.__get_field('commemail')
 
     def set_commemail(self, address):
-        if not address and config.has_option('stgit', 'commemail'):
-            address = config.get('stgit', 'commemail')
+        if not address:
+            if config.has_option('stgit', 'commemail'):
+                address = config.get('stgit', 'commemail')
+            elif 'GIT_COMMITTER_EMAIL' in os.environ:
+                address = os.environ['GIT_COMMITTER_EMAIL']
         self.__set_field('commemail', address)
 
 
@@ -410,6 +424,42 @@ class Series:
         os.makedirs(os.path.join(self.__series_dir, 'patches'))
         self.__begin_stack_check()
 
+    def convert(self):
+        """Either convert to use a separate patch directory, or
+        unconvert to place the patches in the same directory with
+        series control files
+        """
+        if self.__patch_dir == self.__series_dir:
+            print 'Converting old-style to new-style...',
+            sys.stdout.flush()
+
+            self.__patch_dir = os.path.join(self.__series_dir, 'patches')
+            os.makedirs(self.__patch_dir)
+
+            for p in self.get_applied() + self.get_unapplied():
+                src = os.path.join(self.__series_dir, p)
+                dest = os.path.join(self.__patch_dir, p)
+                os.rename(src, dest)
+
+            print 'done'
+
+        else:
+            print 'Converting new-style to old-style...',
+            sys.stdout.flush()
+
+            for p in self.get_applied() + self.get_unapplied():
+                src = os.path.join(self.__patch_dir, p)
+                dest = os.path.join(self.__series_dir, p)
+                os.rename(src, dest)
+
+            if not os.listdir(self.__patch_dir):
+                os.rmdir(self.__patch_dir)
+                print 'done'
+            else:
+                print 'Patch directory %s is not empty.' % self.__name
+
+            self.__patch_dir = self.__series_dir
+
     def rename(self, to_name):
         """Renames a series
         """