Merge lp:~mterry/quickly/revert-bzr into lp:quickly

[Michael Terry]

The change to use bzr internal bindings caused some issues (bug 648496, bug 642455, perhaps others?). This close to Ubuntu 10.10, it would be nice to go back to known-working code. This branch reverts the bzr changes.

[Didier Roche-Tolomelli (didrocks)]

looks good. Will give extend testing before releasing 0.6.1

review: Approve

=== modified file 'NEWS'
--- NEWS	2010-09-25 13:27:43 +0000
+++ NEWS	2010-09-28 13:10:59 +0000
@@ -1,11 +1,12 @@
 Quickly 0.6.1
 ------------------------------------
 
+  quickly core:
+  - revert internal bzr calls to use subprocess calls again (Michael Terry)
   ubuntu-application-template and derivatives:
-  - fix release command crashing and revert to get back lost features from
-    previous version (LP: #642455)
   - don't overwrite files in add command if already exists (Tony Byrne)
     (LP: #645490)
+  - revert internal bzr calls to use subprocess calls again (Michael Terry)
 
 Quickly 0.6
 ------------------------------------

=== modified file 'data/templates/ubuntu-application/create.py'
--- data/templates/ubuntu-application/create.py	2010-08-13 15:04:05 +0000
+++ data/templates/ubuntu-application/create.py	2010-09-28 13:10:59 +0000
@@ -18,6 +18,7 @@
 
 import sys
 import os
+import shutil
 import subprocess
 
 from quickly import templatetools
@@ -107,11 +108,11 @@
 
 # add it to revision control
 print _("Creating bzr repository and commiting")
-from bzrlib.bzrdir import BzrDir
-branch = BzrDir.create_branch_convenience(".")
-wt = branch.bzrdir.open_workingtree()
-wt.smart_add(["."])
-wt.commit("Initial project creation with Quickly!")
+bzr_instance = subprocess.Popen(["bzr", "init"], stdout=subprocess.PIPE)
+bzr_instance.wait()
+bzr_instance = subprocess.Popen(["bzr", "add"], stdout=subprocess.PIPE)
+bzr_instance.wait()
+subprocess.Popen(["bzr", "commit", "-m", "Initial project creation with Quickly!"], stderr=subprocess.PIPE)
 
 # run the new application if X display
 if templatetools.is_X_display() and os.path.isfile(exec_file):

=== modified file 'data/templates/ubuntu-application/internal/packaging.py'
--- data/templates/ubuntu-application/internal/packaging.py	2010-08-13 15:04:05 +0000
+++ data/templates/ubuntu-application/internal/packaging.py	2010-09-28 13:10:59 +0000
@@ -19,8 +19,8 @@
 import re
 import subprocess
 import sys
+from launchpadlib.errors import HTTPError
 
-from bzrlib.workingtree import WorkingTree
 
 from quickly import configurationhandler
 from quickly import launchpadaccess
@@ -193,11 +193,15 @@
 
     # check if first python-mkdebian (debian/ creation) to commit it
     # that means debian/ under unknown
-    wt = WorkingTree.open(".")
+    bzr_instance = subprocess.Popen(["bzr", "status"], stdout=subprocess.PIPE)
+    bzr_status, err = bzr_instance.communicate()
+    if bzr_instance.returncode != 0:
+        return(bzr_instance.returncode)
 
-    if any(filter(lambda x: x.startswith("debian/"), wt.unknowns())):
-        wt.smart_add(["."])
-        wt.commit('Creating ubuntu package')
+    if re.match('(.|\n)*unknown:\n.*debian/(.|\n)*', bzr_status):
+        return_code = filter_exec_command(["bzr", "add"])
+        if return_code == 0:
+            return_code = filter_exec_command(["bzr", "commit", "-m", 'Creating ubuntu package'])
 
     return(return_code)
 

=== modified file 'data/templates/ubuntu-application/internal/quicklyutils.py'
--- data/templates/ubuntu-application/internal/quicklyutils.py	2010-09-25 13:26:58 +0000
+++ data/templates/ubuntu-application/internal/quicklyutils.py	2010-09-28 13:10:59 +0000
@@ -15,15 +15,8 @@
 #You should have received a copy of the GNU General Public License along 
 #with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from bzrlib.config import (
-    GlobalConfig,
-    extract_email_address,
-    )
-from bzrlib.errors import (
-    NoEmailInUsername,
-    )
-
 import os
+import re
 import sys
 import subprocess
 from xml.etree import ElementTree as etree
@@ -216,6 +209,7 @@
             buffered_message +=' %s' % line
     return(changelog)
 
+
 def get_quickly_editors():
     '''Return prefered editor for ubuntu-application template'''
 
@@ -227,30 +221,32 @@
        editor = default_editor
     return editor
 
-def append_email_address(email_list, name):
-    '''Append email adress if something to append'''
-
-    email = None
-    if name:
-         email = extract_email_address(name)
-    if email:
-        email_list.append(email)
-    return email_list
+
+def take_email_from_string(value):
+    '''Try to take an email from a string'''
+
+    if value is not None:
+        result = re.match("(.*[< ]|^)(.+@[^ >]+\.[^ >]+).*", value)
+        if result:
+            return result.groups()[1]
+    return value
 
 def get_all_emails(launchpad=None):
     '''Return a list with all available email in preference order'''
 
     email_list = []
-    email_list = append_email_address(email_list, os.getenv("DEBEMAIL"))
+    email_list.append(take_email_from_string(os.getenv("DEBEMAIL")))
 
-    bzr_config = GlobalConfig()
-    email_list.append(bzr_config.user_email())
-    email_list = append_email_address(email_list, os.getenv("EMAIL"))
+    bzr_instance = subprocess.Popen(["bzr", "whoami"], stdout=subprocess.PIPE)
+    bzr_user, err = bzr_instance.communicate()
+    if bzr_instance.returncode == 0:
+        email_list.append(take_email_from_string(bzr_user))
+    email_list.append(take_email_from_string(os.getenv("EMAIL")))
     
     # those information can be missing if there were no packaging or license
     # command before
     try:
-        email_list = append_email_address(email_list, get_setup_value('author_email'))
+        email_list.append(take_email_from_string(get_setup_value('author_email')))
     except cant_deal_with_setup_value:
         pass
 
@@ -258,7 +254,7 @@
     fauthors_name = 'AUTHORS'
     for line in file(fauthors_name, 'r'):
         if not "<Your E-mail>" in line:
-            email_list = append_email_address(email_list, line)
+            email_list.append(take_email_from_string(line))
 
     # LP adresses
     if launchpad:
@@ -271,7 +267,7 @@
         raise gpg_error(err)
     for line in result.splitlines():
         if 'sec' in line or 'uid' in line:
-            email_list = append_email_address(email_list, line.split(':')[9])
+            email_list.append(take_email_from_string(line.split(':')[9]))
 
     # return email list without None elem
     return [email for email in email_list if email]
@@ -343,22 +339,16 @@
             secret_key_id = line.split(':')[4][-8:]
             if verbose:
                 print "found secret gpg key. id: %s" % secret_key_id
-        try:
-            candidate_string = line.split(':')[9]
-            if candidate_string:
-                candidate_email = extract_email_address(candidate_string)
-        except NoEmailInUsername:
-            pass
-        else:
-            if verbose:
-                print "candidate email: %s" % candidate_email
-            if candidate_email in prefered_emails:
-                # create candidate_key_ids[candidate_email] if needed
-                try:
-                    candidate_key_ids[candidate_email]
-                except KeyError:
-                    candidate_key_ids[candidate_email] = []
-                candidate_key_ids[candidate_email].append(secret_key_id)
+        candidate_email = take_email_from_string(line.split(':')[9])
+        if verbose:
+            print "candidate email: %s" % candidate_email
+        if candidate_email and candidate_email in prefered_emails:
+            # create candidate_key_ids[candidate_email] if needed
+            try:
+                candidate_key_ids[candidate_email]
+            except KeyError:
+                candidate_key_ids[candidate_email] = []
+            candidate_key_ids[candidate_email].append(secret_key_id)
     if not candidate_key_ids:
         candidate_key_ids[prefered_emails[0]] = [create_gpg_key(
                                  launchpad.me.display_name, prefered_emails[0])]

=== modified file 'data/templates/ubuntu-application/save.py'
--- data/templates/ubuntu-application/save.py	2010-08-13 15:04:05 +0000
+++ data/templates/ubuntu-application/save.py	2010-09-28 13:10:59 +0000
@@ -18,6 +18,7 @@
 
 
 import sys
+import subprocess
 
 import gettext
 from gettext import gettext as _
@@ -25,9 +26,6 @@
 
 from quickly import templatetools
 
-from bzrlib.errors import PointlessCommit
-from bzrlib.workingtree import WorkingTree
-
 def help():
     print _("""Usage:
 $quickly save notes about changes
@@ -46,14 +44,11 @@
 if commit_msg == "":
    commit_msg = _('quickly saved')
 
-wt = WorkingTree.open(".")
-
 #save away
-wt.smart_add(["."])
-try:
-    wt.commit(commit_msg)
-except PointlessCommit:
+subprocess.call(["bzr", "add"])
+return_code = subprocess.call(["bzr", "commit", "-m" + commit_msg])
+if return_code == 3:
     print _("It seems that you have no change to record.")
-    sys.exit(1)
-
-sys.exit(0)
+
+sys.exit(return_code)
+

=== modified file 'data/templates/ubuntu-application/upgrade.py'
--- data/templates/ubuntu-application/upgrade.py	2010-08-13 18:59:56 +0000
+++ data/templates/ubuntu-application/upgrade.py	2010-09-28 13:10:59 +0000
@@ -17,12 +17,12 @@
 #with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
+import shutil
+import subprocess
 import sys
 
 import internal.apportutils
 
-from bzrlib.workingtree import WorkingTree
-
 from internal import quicklyutils
 from quickly import configurationhandler, templatetools
 
@@ -53,15 +53,17 @@
 
 ##### 0.4 update
 if project_version < '0.4':
-    wt = WorkingTree.open('.')
     ## new licensing format
     if os.path.isfile("LICENSE"):
-        try:
-            wt.rename_one("LICENSE", "COPYING")
-        except OSError, e:
-            if e.errno == 13:
-                sys.stderr.write(_("Can't rename LICENSE file, check your file permission\n"))
-                sys.exit(1)
+        bzr_instance = subprocess.Popen(["bzr", "mv", "LICENSE", "COPYING"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        # if file not versionned, try traditional move, (bzr returncode is None if dir not writable)
+        if bzr_instance.returncode == 3 or bzr_instance.returncode is None:
+            try:
+                os.rename('LICENSE', 'COPYING')
+            except OSError, e:
+                if e.errno == 13:
+                    sys.stderr.write(_("Can't rename LICENSE file, check your file permission\n"))
+                    sys.exit(1)
     # transition Copyright -> AUTHORS
     if os.path.isfile('AUTHORS'):
         source_file = 'AUTHORS'

=== modified file 'quickly/bzrbinding.py'
--- quickly/bzrbinding.py	2010-08-13 15:50:57 +0000
+++ quickly/bzrbinding.py	2010-09-28 13:10:59 +0000
@@ -15,7 +15,8 @@
 #You should have received a copy of the GNU General Public License along 
 #with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from gettext import gettext as _
+import socket
+import subprocess
 
 def bzr_set_login(display_name, preferred_email_adress, launchpad_name=None):
     ''' try to setup bzr whoami for commit and sshing and bzr launchpad_login if provided
@@ -23,44 +24,31 @@
         launchpadname is optional if you don't want user to use launchpad in your template
         if already setup, it will not overwrite existing data
     '''
-    try:
-        import bzrlib.config
-        from bzrlib.errors import (
-            BzrError,
-            )
-    except ImportError, e:
-        return (1, _("Bzr not properly installed %s" % e))
-
-    config = bzrlib.config.GlobalConfig()
-
-    # retrieve the current bzr login
-    try:
-        bzr_user = config.username()
-    except BzrError, err:
-        try:
-            from bzrlib.errors import NoWhoami
-        except ImportError:
+
+    try:
+
+        # retreive the current bzr login
+        bzr_instance = subprocess.Popen(["bzr", "whoami"], stdout=subprocess.PIPE)
+        bzr_user, err = bzr_instance.communicate()
+        if bzr_instance.returncode != 0:
             return (1, err)
-        else:
-            if isinstance(err, NoWhoami):
-                # no bzr whoami set
-                identifier = display_name + ' <' + preferred_email_adress + '>'
-                config.set_user_option("email", identifier)
-            else:
+
+        # if no bzr whoami set, the default contain the @hostname string
+        if '@' + socket.gethostname() in bzr_user:
+            identifier = display_name + ' <' + preferred_email_adress + '>'
+            subprocess.call(["bzr", "whoami", identifier])
+
+        # if no bzr launchpad-login set, set it now !
+        if launchpad_name:
+            bzr_instance = subprocess.Popen(["bzr", "launchpad-login"], stdout=subprocess.PIPE)
+            bzr_id, err = bzr_instance.communicate()
+            if bzr_instance.returncode == 1: # no user configured
+                subprocess.call(["bzr", "launchpad-login", launchpad_name])
+            elif bzr_instance.returncode != 0: # other errors
                 return (1, err)
 
-    # if no bzr launchpad-login set, set it now !
-    if launchpad_name:
-        from bzrlib.plugins.launchpad import account
-        stored_username = account.get_lp_login()
-        if stored_username is not None:
-            # No account set yet
-            launchpad_name = launchpad_name.lower()
-            account.check_lp_login(launchpad_name)
-            account.set_lp_login(launchpad_name)
-        elif stored_username != launchpad_name:
-            return (1,
-                _("Stored username %s and specified username %s mismatch." % (
-                    stored_username, launchpad_name)))
+    except OSError:
+        return (1, _("Bzr not properly installed"))
+    
     return (0, "")