Merge lp:~openerp-dev/openerp-tools/trunk-bzr-export into lp:openerp-tools

[Antony Lesuisse (OpenERP)]

bzr export

Unmerged revisions

182. By Antony Lesuisse (OpenERP) on 2012-04-25

runbot bzr export fix for revno

181. By Antony Lesuisse (OpenERP) on 2012-04-25

runbot use bzr export

180. By OpenERP Online on 2012-04-25

packaging 6.1 cleanup client

179. By OpenERP Online on 2012-04-19

[IMP] runbot: added favicon.

=== modified file 'openerp-runbot/openerprunbot/core.py'
--- openerp-runbot/openerprunbot/core.py	2012-04-19 14:46:42 +0000
+++ openerp-runbot/openerprunbot/core.py	2012-04-25 22:55:22 +0000
@@ -418,6 +418,7 @@
         self.subdomain = "%s-%s-%s"%(self.team_name, self.name.replace('_','-').replace('.','-'),self.job_id)
         self.running_path = os.path.join(g.runbot.wd,'static',self.subdomain)
         self.json_path = g.json_path
+        self.tmp_path = os.path.join(self.running_path,'tmp')
         self.log_path = os.path.join(self.running_path,'logs')
         self.flags_path = os.path.join(self.running_path,'flags')
 
@@ -485,10 +486,11 @@
         for b in self.repo_updates:
             log("branch-update",branch=b.unique_name)
             if os.path.exists(b.repo_path):
-                run(["bzr", "pull", "-d", b.repo_path, "--overwrite"])
+                run(["bzr", "pull", "-d", b.repo_path])
             else:
-                run(["bzr", "branch", "lp:%s"%b.unique_name, b.repo_path])
-            run(["bzr", "update", "-r", str(b.local_revision_count), b.repo_path])
+                run(["bzr", "branch", "--no-tree", "lp:%s"%b.unique_name, b.repo_path])
+            #run(["bzr", "update", "-r", str(b.local_revision_count), b.repo_path])
+            # this should be passed at bzr export
 
             committer_name, committer_xgram, committer_email = \
                 get_committer_info(b.repo_path)
@@ -496,13 +498,19 @@
             b.committer_xgram = committer_xgram
             b.committer_email = committer_email
 
+    def move_files(self,src,dest):
+        for i in os.listdir(src):
+            os.rename(os.path.join(src,i),os.path.join(dest,i))
+        
     def start_rsync(self):
         log("job-start-rsync",branch=self.name)
         for i in [self.running_path,self.log_path,self.flags_path,self.client_web_doc_path]:
             if not os.path.exists(i):
                 os.makedirs(i)
         # copy server
-        run(["rsync","-a","--exclude",".bzr","--delete", "%s/"%self.server_src, self.server_path])
+        #run(["rsync","-a","--exclude",".bzr","--delete", "%s/"%self.server_src, self.server_path])
+        revno = str([b.local_revision_count for b in self.repo_updates if b.repo_path == self.server_src][0])
+        run(["bzr","-r",revno,"export",self.server_path,self.server_src])
 
         # copy addons (6.0 uses bin/addons, 6.1 and trunk use openerp/addons)
         addons_dest = "openerp/addons"
@@ -510,9 +518,15 @@
             addons_dest = "bin/addons"
         addons_path = os.path.join(self.server_path,addons_dest)
         for a in self.addons_src:
-            run(["rsync","-a","--exclude",".bzr", "%s/"%a, addons_path])
+            #run(["rsync","-a","--exclude",".bzr", "%s/"%a, addons_path])
+            revno = str([b.local_revision_count for b in self.repo_updates if b.repo_path == a][0])
+            run(["bzr","r",revno,"export",self.tmp_path,a])
+            self.move_files(self.tmp_path,addons_path)
         if self.web_src and self.version != '6.0':
-            run(["rsync","-a","--exclude",".bzr", "%s/addons/"%self.web_src, addons_path])
+            #run(["rsync","-a","--exclude",".bzr", "%s/addons/"%self.web_src, addons_path])
+            revno = str([b.local_revision_count for b in self.repo_updates if b.repo_path == self.web_src][0])
+            run(["bzr","r",revno,"export",self.tmp_path,self.web_src])
+            self.move_files(self.tmp_path,addons_path)
 
         # copy web-client
         if self.client_web_src: