5 import sys, os, os.path
9 from optparse import OptionParser
11 # e.g. other_choices = [ ('d','iff') , ('g','uess') ] - lowercase
12 def prompt (question,default=True,other_choices=[],allow_outside=False):
13 if not isinstance (other_choices,list):
14 other_choices = [ other_choices ]
15 chars = [ c for (c,rest) in other_choices ]
19 if default is True: choices.append('[y]')
20 else : choices.append('y')
22 if default is False: choices.append('[n]')
23 else : choices.append('n')
25 for (char,choice) in other_choices:
27 choices.append("["+char+"]"+choice)
29 choices.append("<"+char+">"+choice)
31 answer=raw_input(question + " " + "/".join(choices) + " ? ")
34 answer=answer[0].lower()
36 if 'y' in chars: return 'y'
39 if 'n' in chars: return 'n'
42 for (char,choice) in other_choices:
47 return prompt(question,default,other_choices)
53 editor = os.environ['EDITOR']
61 def print_fold (line):
62 while len(line) >= fold_length:
63 print line[:fold_length],'\\'
64 line=line[fold_length:]
68 def __init__ (self,command,options):
71 self.tmp="/tmp/command-%d"%os.getpid()
74 if self.options.dry_run:
75 print 'dry_run',self.command
77 if self.options.verbose and self.options.mode not in Main.silent_modes:
78 print '+',self.command
80 return os.system(self.command)
82 def run_silent (self):
83 if self.options.dry_run:
84 print 'dry_run',self.command
86 if self.options.verbose:
87 print '+',self.command,' .. ',
89 retcod=os.system(self.command + " &> " + self.tmp)
91 print "FAILED ! -- out+err below (command was %s)"%self.command
92 os.system("cat " + self.tmp)
93 print "FAILED ! -- end of quoted output"
94 elif self.options.verbose:
100 if self.run_silent() !=0:
101 raise Exception,"Command %s failed"%self.command
103 # returns stdout, like bash's $(mycommand)
104 def output_of (self,with_stderr=False):
105 if self.options.dry_run:
106 print 'dry_run',self.command
107 return 'dry_run output'
108 tmp="/tmp/status-%d"%os.getpid()
109 if self.options.debug:
110 print '+',self.command,' .. ',
119 result=file(tmp).read()
121 if self.options.debug:
126 def __init__(self,path,options):
130 def url_exists (self):
131 return os.system("svn list %s &> /dev/null"%self.path) == 0
133 def dir_needs_revert (self):
134 command="svn status %s"%self.path
135 return len(Command(command,self.options).output_of(True)) != 0
136 # turns out it's the same implem.
137 def file_needs_commit (self):
138 command="svn status %s"%self.path
139 return len(Command(command,self.options).output_of(True)) != 0
141 # support for tagged module is minimal, and is for the Build class only
144 svn_magic_line="--This line, and those below, will be ignored--"
145 setting_tag_format = "Setting tag %s"
147 redirectors=[ # ('module_name_varname','name'),
148 ('module_version_varname','version'),
149 ('module_taglevel_varname','taglevel'), ]
151 # where to store user's config
152 config_storage="CONFIG"
157 configKeys=[ ('svnpath',"Enter your toplevel svnpath",
158 "svn+ssh://%s@svn.planet-lab.org/svn/"%commands.getoutput("id -un")),
159 ("build", "Enter the name of your build module","build"),
160 ('username',"Enter your firstname and lastname for changelogs",""),
161 ("email","Enter your email address for changelogs",""),
165 def prompt_config ():
166 for (key,message,default) in Module.configKeys:
167 Module.config[key]=""
168 while not Module.config[key]:
169 Module.config[key]=raw_input("%s [%s] : "%(message,default)).strip() or default
172 # for parsing module spec name:branch
173 matcher_branch_spec=re.compile("\A(?P<name>[\w\.-]+):(?P<branch>[\w\.-]+)\Z")
174 # special form for tagged module - for Build
175 matcher_tag_spec=re.compile("\A(?P<name>[\w-]+)@(?P<tagname>[\w\.-]+)\Z")
177 matcher_rpm_define=re.compile("%(define|global)\s+(\S+)\s+(\S*)\s*")
179 def __init__ (self,module_spec,options):
181 attempt=Module.matcher_branch_spec.match(module_spec)
183 self.name=attempt.group('name')
184 self.branch=attempt.group('branch')
186 attempt=Module.matcher_tag_spec.match(module_spec)
188 self.name=attempt.group('name')
189 self.tagname=attempt.group('tagname')
191 self.name=module_spec
194 self.module_dir="%s/%s"%(options.workdir,self.name)
196 def friendly_name (self):
197 if hasattr(self,'branch'):
198 return "%s:%s"%(self.name,self.branch)
199 elif hasattr(self,'tagname'):
200 return "%s@%s"%(self.name,self.tagname)
205 if hasattr(self,'branch'):
206 return "%s/branches/%s"%(self.module_dir,self.branch)
207 elif hasattr(self,'tagname'):
208 return "%s/tags/%s"%(self.module_dir,self.tagname)
210 return "%s/trunk"%(self.module_dir)
213 return "%s/tags"%(self.module_dir)
215 def run (self,command):
216 return Command(command,self.options).run()
217 def run_fatal (self,command):
218 return Command(command,self.options).run_fatal()
219 def run_prompt (self,message,command):
220 if not self.options.verbose:
222 choice=prompt(message,True,('s','how'))
226 elif choice is False:
229 print 'About to run:',command
231 question=message+" - want to run " + command
232 if prompt(question,True):
236 # store and restitute html fragments
238 def html_href (url,text): return '<a href="%s">%s</a>'%(url,text)
240 def html_anchor (url,text): return '<a name="%s">%s</a>'%(url,text)
241 # there must be some smarter means to do that - dirty for now
243 def html_quote (text):
244 return text.replace('&','&').replace('<','<').replace('>','>')
246 # only the fake error module has multiple titles
247 def html_store_title (self, title):
248 if not hasattr(self,'titles'): self.titles=[]
249 self.titles.append(title)
250 def html_store_raw (self, html):
251 if not hasattr(self,'body'): self.body=''
253 def html_store_pre (self, text):
254 if not hasattr(self,'body'): self.body=''
255 self.body += '<pre>' + self.html_quote(text) + '</pre>'
257 def html_print (self, txt):
258 if not self.options.www:
261 if not hasattr(self,'in_list') or not self.in_list:
262 self.html_store_raw('<ul>')
264 self.html_store_raw('<li>'+txt+'</li>')
265 def html_print_end (self):
267 self.html_store_raw ('</ul>')
270 def html_dump_header(title):
271 nowdate=time.strftime("%Y-%m-%d")
272 nowtime=time.strftime("%H:%M")
274 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
275 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
278 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
279 <style type="text/css">
280 body { font-family:georgia, serif; }
281 h1 {font-size: large; }
282 p.title {font-size: x-large; }
283 span.error {text-weight:bold; color: red; }
287 <p class='title'> %s - status on %s at %s</p>
289 """%(title,title,nowdate,nowtime)
292 def html_dump_middle():
296 def html_dump_footer():
297 print "</body></html"
299 def html_dump_toc(self):
300 if hasattr(self,'titles'):
301 for title in self.titles:
302 print '<li>',self.html_href ('#'+self.friendly_name(),title),'</li>'
304 def html_dump_body(self):
305 if hasattr(self,'titles'):
306 for title in self.titles:
307 print '<hr /><h1>',self.html_anchor(self.friendly_name(),title),'</h1>'
308 if hasattr(self,'body'):
310 print '<p class="top">',self.html_href('#','Back to top'),'</p>'
314 def init_homedir (options):
315 topdir=options.workdir
316 if options.verbose and options.mode not in Main.silent_modes:
317 print 'Checking for',topdir
318 storage="%s/%s"%(topdir,Module.config_storage)
319 # sanity check. Either the topdir exists AND we have a config/storage
320 # or topdir does not exist and we create it
321 # to avoid people use their own daily svn repo
322 if os.path.isdir(topdir) and not os.path.isfile(storage):
323 print """The directory %s exists and has no CONFIG file
324 If this is your regular working directory, please provide another one as the
325 module-* commands need a fresh working dir. Make sure that you do not use
326 that for other purposes than tagging"""%topdir
328 if not os.path.isdir (topdir):
329 print "Cannot find",topdir,"let's create it"
330 Module.prompt_config()
331 print "Checking ...",
332 Command("svn co -N %s %s"%(Module.config['svnpath'],topdir),options).run_fatal()
333 Command("svn co %s/%s %s/%s"%(Module.config['svnpath'],
334 Module.config['build'],
336 Module.config['build']),options).run_fatal()
341 for (key,message,default) in Module.configKeys:
342 f.write("%s=%s\n"%(key,Module.config[key]))
345 print 'Stored',storage
346 Command("cat %s"%storage,options).run()
350 for line in f.readlines():
351 (key,value)=re.compile("^(.+)=(.+)$").match(line).groups()
352 Module.config[key]=value
354 if options.verbose and options.mode not in Main.silent_modes:
355 print '******** Using config'
356 for (key,message,default) in Module.configKeys:
357 print '\t',key,'=',Module.config[key]
359 def init_module_dir (self):
360 if self.options.verbose:
361 print 'Checking for',self.module_dir
362 if not os.path.isdir (self.module_dir):
363 self.run_fatal("svn update -N %s"%self.module_dir)
364 if not os.path.isdir (self.module_dir):
365 raise Exception, 'Cannot find %s - check module name'%self.module_dir
367 def init_subdir (self,fullpath, deep=False):
368 if self.options.verbose:
369 print 'Checking for',fullpath
371 if not deep: opt="-N"
372 if not os.path.isdir (fullpath):
373 self.run_fatal("svn update %s %s"%(opt,fullpath))
375 def revert_subdir (self,fullpath):
376 if self.options.fast_checks:
377 if self.options.verbose: print 'Skipping revert of %s'%fullpath
379 if self.options.verbose:
380 print 'Checking whether',fullpath,'needs being reverted'
381 if Svnpath(fullpath,self.options).dir_needs_revert():
382 self.run_fatal("svn revert -R %s"%fullpath)
384 def update_subdir (self,fullpath):
385 if self.options.fast_checks:
386 if self.options.verbose: print 'Skipping update of %s'%fullpath
388 if self.options.verbose:
389 print 'Updating',fullpath
390 self.run_fatal("svn update %s"%fullpath)
392 def init_edge_dir (self):
393 # if branch, edge_dir is two steps down
394 if hasattr(self,'branch'):
395 self.init_subdir("%s/branches"%self.module_dir,deep=False)
396 elif hasattr(self,'tagname'):
397 self.init_subdir("%s/tags"%self.module_dir,deep=False)
398 self.init_subdir(self.edge_dir(),deep=True)
400 def revert_edge_dir (self):
401 self.revert_subdir(self.edge_dir())
403 def update_edge_dir (self):
404 self.update_subdir(self.edge_dir())
406 def main_specname (self):
407 attempt="%s/%s.spec"%(self.edge_dir(),self.name)
408 if os.path.isfile (attempt):
410 pattern1="%s/*.spec"%self.edge_dir()
411 level1=glob(pattern1)
414 pattern2="%s/*/*.spec"%self.edge_dir()
415 level2=glob(pattern2)
418 raise Exception, 'Cannot guess specfile for module %s -- patterns were %s or %s'%(self.name,pattern1,pattern2)
420 def all_specnames (self):
421 level1=glob("%s/*.spec"%self.edge_dir())
422 if level1: return level1
423 level2=glob("%s/*/*.spec"%self.edge_dir())
426 def parse_spec (self, specfile, varnames):
427 if self.options.verbose:
428 print 'Parsing',specfile,
434 for line in f.readlines():
435 attempt=Module.matcher_rpm_define.match(line)
437 (define,var,value)=attempt.groups()
441 if self.options.debug:
442 print 'found',len(result),'keys'
443 for (k,v) in result.iteritems():
447 # stores in self.module_name_varname the rpm variable to be used for the module's name
448 # and the list of these names in self.varnames
449 def spec_dict (self):
450 specfile=self.main_specname()
451 redirector_keys = [ varname for (varname,default) in Module.redirectors]
452 redirect_dict = self.parse_spec(specfile,redirector_keys)
453 if self.options.debug:
454 print '1st pass parsing done, redirect_dict=',redirect_dict
456 for (varname,default) in Module.redirectors:
457 if redirect_dict.has_key(varname):
458 setattr(self,varname,redirect_dict[varname])
459 varnames += [redirect_dict[varname]]
461 setattr(self,varname,default)
462 varnames += [ default ]
463 self.varnames = varnames
464 result = self.parse_spec (specfile,self.varnames)
465 if self.options.debug:
466 print '2st pass parsing done, varnames=',varnames,'result=',result
469 def patch_spec_var (self, patch_dict,define_missing=False):
470 for specfile in self.all_specnames():
471 # record the keys that were changed
472 changed = dict ( [ (x,False) for x in patch_dict.keys() ] )
473 newspecfile=specfile+".new"
474 if self.options.verbose:
475 print 'Patching',specfile,'for',patch_dict.keys()
477 new=open(newspecfile,"w")
479 for line in spec.readlines():
480 attempt=Module.matcher_rpm_define.match(line)
482 (define,var,value)=attempt.groups()
483 if var in patch_dict.keys():
484 if self.options.debug:
485 print 'rewriting %s as %s'%(var,patch_dict[var])
486 new.write('%%%s %s %s\n'%(define,var,patch_dict[var]))
491 for (key,was_changed) in changed.iteritems():
493 if self.options.debug:
494 print 'rewriting missing %s as %s'%(key,patch_dict[key])
495 new.write('\n%%define %s %s\n'%(key,patch_dict[key]))
498 os.rename(newspecfile,specfile)
500 # returns all lines until the magic line
501 def unignored_lines (self, logfile):
503 white_line_matcher = re.compile("\A\s*\Z")
504 for logline in file(logfile).readlines():
505 if logline.strip() == Module.svn_magic_line:
507 elif white_line_matcher.match(logline):
510 result.append(logline.strip()+'\n')
513 # creates a copy of the input with only the unignored lines
514 def stripped_magic_line_filename (self, filein, fileout ,new_tag_name):
516 f.write(self.setting_tag_format%new_tag_name + '\n')
517 for line in self.unignored_lines(filein):
521 def insert_changelog (self, logfile, oldtag, newtag):
522 for specfile in self.all_specnames():
523 newspecfile=specfile+".new"
524 if self.options.verbose:
525 print 'Inserting changelog from %s into %s'%(logfile,specfile)
527 new=open(newspecfile,"w")
528 for line in spec.readlines():
530 if re.compile('%changelog').match(line):
531 dateformat="* %a %b %d %Y"
532 datepart=time.strftime(dateformat)
533 logpart="%s <%s> - %s"%(Module.config['username'],
534 Module.config['email'],
536 new.write(datepart+" "+logpart+"\n")
537 for logline in self.unignored_lines(logfile):
538 new.write("- " + logline)
542 os.rename(newspecfile,specfile)
544 def show_dict (self, spec_dict):
545 if self.options.verbose:
546 for (k,v) in spec_dict.iteritems():
550 return "%s/%s"%(Module.config['svnpath'],self.name)
553 if hasattr(self,'branch'):
554 return "%s/branches/%s"%(self.mod_url(),self.branch)
555 elif hasattr(self,'tagname'):
556 return "%s/tags/%s"%(self.mod_url(),self.tagname)
558 return "%s/trunk"%(self.mod_url())
560 def last_tag (self, spec_dict):
561 return "%s-%s"%(spec_dict[self.module_version_varname],spec_dict[self.module_taglevel_varname])
563 def tag_name (self, spec_dict):
565 return "%s-%s"%(self.name,
566 self.last_tag(spec_dict))
568 raise Exception, 'Something is wrong with module %s, cannot determine %s - exiting'%(self.name,err)
570 def tag_url (self, spec_dict):
571 return "%s/tags/%s"%(self.mod_url(),self.tag_name(spec_dict))
573 def check_svnpath_exists (self, url, message):
574 if self.options.fast_checks:
576 if self.options.verbose:
577 print 'Checking url (%s) %s'%(url,message),
578 ok=Svnpath(url,self.options).url_exists()
580 if self.options.verbose: print 'exists - OK'
582 if self.options.verbose: print 'KO'
583 raise Exception, 'Could not find %s URL %s'%(message,url)
585 def check_svnpath_not_exists (self, url, message):
586 if self.options.fast_checks:
588 if self.options.verbose:
589 print 'Checking url (%s) %s'%(url,message),
590 ok=not Svnpath(url,self.options).url_exists()
592 if self.options.verbose: print 'does not exist - OK'
594 if self.options.verbose: print 'KO'
595 raise Exception, '%s URL %s already exists - exiting'%(message,url)
597 # locate specfile, parse it, check it and show values
599 ##############################
600 def do_version (self):
601 self.init_module_dir()
603 self.revert_edge_dir()
604 self.update_edge_dir()
605 spec_dict = self.spec_dict()
607 self.html_store_title('Version for module %s (%s)' % (self.friendly_name(),self.last_tag(spec_dict)))
608 for varname in self.varnames:
609 if not spec_dict.has_key(varname):
610 self.html_print ('Could not find %%define for %s'%varname)
613 self.html_print ("%-16s %s"%(varname,spec_dict[varname]))
614 if self.options.show_urls:
615 self.html_print ("%-16s %s"%('edge url',self.edge_url()))
616 self.html_print ("%-16s %s"%('latest tag url',self.tag_url(spec_dict)))
617 if self.options.verbose:
618 self.html_print ("%-16s %s"%('main specfile:',self.main_specname()))
619 self.html_print ("%-16s %s"%('specfiles:',self.all_specnames()))
620 self.html_print_end()
622 ##############################
624 # print 'verbose',self.options.verbose
625 # print 'list_tags',self.options.list_tags
626 # print 'list_branches',self.options.list_branches
627 # print 'all_modules',self.options.all_modules
629 (verbose,branches,pattern,exact) = (self.options.verbose,self.options.list_branches,
630 self.options.list_pattern,self.options.list_exact)
634 if hasattr(self,'branch'):
638 if verbose: grep="%s/$"%exact
639 else: grep="^%s$"%exact
642 extra_command=" | grep %s"%grep
643 extra_message=" matching %s"%grep
646 message="==================== tags for %s"%self.friendly_name()
648 if verbose: command+="--verbose "
649 command += "%s/tags"%self.mod_url()
650 command += extra_command
651 message += extra_message
652 if verbose: print message
656 message="==================== branches for %s"%self.friendly_name()
658 if verbose: command+="--verbose "
659 command += "%s/branches"%self.mod_url()
660 command += extra_command
661 message += extra_message
662 if verbose: print message
665 ##############################
666 sync_warning="""*** WARNING
667 The module-sync function has the following limitations
668 * it does not handle changelogs
669 * it does not scan the -tags*.mk files to adopt the new tags"""
672 if self.options.verbose:
673 print Module.sync_warning
674 if not prompt('Want to proceed anyway'):
677 self.init_module_dir()
679 self.revert_edge_dir()
680 self.update_edge_dir()
681 spec_dict = self.spec_dict()
683 edge_url=self.edge_url()
684 tag_name=self.tag_name(spec_dict)
685 tag_url=self.tag_url(spec_dict)
686 # check the tag does not exist yet
687 self.check_svnpath_not_exists(tag_url,"new tag")
689 if self.options.message:
690 svnopt='--message "%s"'%self.options.message
692 svnopt='--editor-cmd=%s'%self.options.editor
693 self.run_prompt("Create initial tag",
694 "svn copy %s %s %s"%(svnopt,edge_url,tag_url))
696 ##############################
697 def do_diff (self,compute_only=False):
698 self.init_module_dir()
700 self.revert_edge_dir()
701 self.update_edge_dir()
702 spec_dict = self.spec_dict()
703 self.show_dict(spec_dict)
705 edge_url=self.edge_url()
706 tag_url=self.tag_url(spec_dict)
707 self.check_svnpath_exists(edge_url,"edge track")
708 self.check_svnpath_exists(tag_url,"latest tag")
709 command="svn diff %s %s"%(tag_url,edge_url)
711 if self.options.verbose:
712 print 'Getting diff with %s'%command
713 diff_output = Command(command,self.options).output_of()
714 # if used as a utility
716 return (spec_dict,edge_url,tag_url,diff_output)
717 # otherwise print the result
718 if self.options.list:
722 thename=self.friendly_name()
724 if self.options.www and diff_output:
725 self.html_store_title("Diffs in module %s (%s) : %d chars"%(\
726 thename,self.last_tag(spec_dict),len(diff_output)))
727 link=self.html_href(tag_url,tag_url)
728 self.html_store_raw ('<p> < (left) %s </p>'%link)
729 link=self.html_href(edge_url,edge_url)
730 self.html_store_raw ('<p> > (right) %s </p>'%link)
731 self.html_store_pre (diff_output)
732 elif not self.options.www:
733 print 'x'*30,'module',thename
734 print 'x'*20,'<',tag_url
735 print 'x'*20,'>',edge_url
738 ##############################
739 # using fine_grain means replacing only those instances that currently refer to this tag
740 # otherwise, <module>-SVNPATH is replaced unconditionnally
741 def patch_tags_file (self, tagsfile, oldname, newname,fine_grain=True):
742 newtagsfile=tagsfile+".new"
744 new=open(newtagsfile,"w")
747 # fine-grain : replace those lines that refer to oldname
749 if self.options.verbose:
750 print 'Replacing %s into %s\n\tin %s .. '%(oldname,newname,tagsfile),
751 matcher=re.compile("^(.*)%s(.*)"%oldname)
752 for line in tags.readlines():
753 if not matcher.match(line):
756 (begin,end)=matcher.match(line).groups()
757 new.write(begin+newname+end+"\n")
759 # brute-force : change uncommented lines that define <module>-SVNPATH
761 if self.options.verbose:
762 print 'Searching for -SVNPATH lines referring to /%s/\n\tin %s .. '%(self.name,tagsfile),
763 pattern="\A\s*(?P<make_name>[^\s]+)-SVNPATH\s*(=|:=)\s*(?P<url_main>[^\s]+)/%s/[^\s]+"\
765 matcher_module=re.compile(pattern)
766 for line in tags.readlines():
767 attempt=matcher_module.match(line)
769 svnpath="%s-SVNPATH"%(attempt.group('make_name'))
770 if self.options.verbose:
772 replacement = "%-32s:= %s/%s/tags/%s\n"%(svnpath,attempt.group('url_main'),self.name,newname)
773 new.write(replacement)
779 os.rename(newtagsfile,tagsfile)
780 if self.options.verbose: print "%d changes"%matches
784 self.init_module_dir()
786 self.revert_edge_dir()
787 self.update_edge_dir()
789 spec_dict = self.spec_dict()
790 self.show_dict(spec_dict)
793 edge_url=self.edge_url()
794 old_tag_name = self.tag_name(spec_dict)
795 old_tag_url=self.tag_url(spec_dict)
796 if (self.options.new_version):
797 # new version set on command line
798 spec_dict[self.module_version_varname] = self.options.new_version
799 spec_dict[self.module_taglevel_varname] = 0
802 new_taglevel = str ( int (spec_dict[self.module_taglevel_varname]) + 1)
803 spec_dict[self.module_taglevel_varname] = new_taglevel
806 new_tag_name = self.tag_name(spec_dict)
807 new_tag_url=self.tag_url(spec_dict)
808 self.check_svnpath_exists (edge_url,"edge track")
809 self.check_svnpath_exists (old_tag_url,"previous tag")
810 self.check_svnpath_not_exists (new_tag_url,"new tag")
813 diff_output=Command("svn diff %s %s"%(old_tag_url,edge_url),
814 self.options).output_of()
815 if len(diff_output) == 0:
816 if not prompt ("No pending difference in module %s, want to tag anyway"%self.name,False):
819 # side effect in trunk's specfile
820 self.patch_spec_var(spec_dict)
822 # prepare changelog file
823 # we use the standard subversion magic string (see svn_magic_line)
824 # so we can provide useful information, such as version numbers and diff
826 changelog="/tmp/%s-%d.edit"%(self.name,os.getpid())
827 changelog_svn="/tmp/%s-%d.svn"%(self.name,os.getpid())
828 setting_tag_line=Module.setting_tag_format%new_tag_name
829 file(changelog,"w").write("""
832 Please write a changelog for this new tag in the section above
833 """%(Module.svn_magic_line,setting_tag_line))
835 if not self.options.verbose or prompt('Want to see diffs while writing changelog',True):
836 file(changelog,"a").write('DIFF=========\n' + diff_output)
838 if self.options.debug:
842 self.run("%s %s"%(self.options.editor,changelog))
843 # strip magic line in second file - looks like svn has changed its magic line with 1.6
844 # so we do the job ourselves
845 self.stripped_magic_line_filename(changelog,changelog_svn,new_tag_name)
846 # insert changelog in spec
847 if self.options.changelog:
848 self.insert_changelog (changelog,old_tag_name,new_tag_name)
852 buildname=Module.config['build']
855 if self.options.build_branch:
856 buildname+=":"+self.options.build_branch
857 build = Module(buildname,self.options)
858 build.init_module_dir()
859 build.init_edge_dir()
860 build.revert_edge_dir()
861 build.update_edge_dir()
863 tagsfiles=glob(build.edge_dir()+"/*-tags*.mk")
864 tagsdict=dict( [ (x,'todo') for x in tagsfiles ] )
868 for tagsfile in tagsfiles:
869 status=tagsdict[tagsfile]
870 basename=os.path.basename(tagsfile)
871 print ".................... Dealing with %s"%basename
872 while tagsdict[tagsfile] == 'todo' :
873 choice = prompt ("insert %s in %s "%(new_tag_name,basename),default_answer,
874 [ ('y','es'), ('n', 'ext'), ('f','orce'),
875 ('d','iff'), ('r','evert'), ('c', 'at'), ('h','elp') ] ,
878 self.patch_tags_file(tagsfile,old_tag_name,new_tag_name,fine_grain=True)
880 print 'Done with %s'%os.path.basename(tagsfile)
881 tagsdict[tagsfile]='done'
883 self.patch_tags_file(tagsfile,old_tag_name,new_tag_name,fine_grain=False)
885 self.run("svn diff %s"%tagsfile)
887 self.run("svn revert %s"%tagsfile)
889 self.run("cat %s"%tagsfile)
892 print """y: change %(name)s-SVNPATH only if it currently refers to %(old_tag_name)s
893 f: unconditionnally change any line that assigns %(name)s-SVNPATH to using %(new_tag_name)s
894 d: show current diff for this tag file
895 r: revert that tag file
896 c: cat the current tag file
897 n: move to next file"""%locals()
899 if prompt("Want to review changes on tags files",False):
900 tagsdict = dict ( [ (x, 'todo') for x in tagsfiles ] )
906 paths += self.edge_dir() + " "
907 paths += build.edge_dir() + " "
908 self.run_prompt("Review module and build","svn diff " + paths)
909 self.run_prompt("Commit module and build","svn commit --file %s %s"%(changelog_svn,paths))
910 self.run_prompt("Create tag","svn copy --file %s %s %s"%(changelog_svn,edge_url,new_tag_url))
912 if self.options.debug:
913 print 'Preserving',changelog,'and stripped',changelog_svn
916 os.unlink(changelog_svn)
918 ##############################
919 def do_branch (self):
921 # save self.branch if any, as a hint for the new branch
922 # do this before anything else and restore .branch to None,
923 # as this is part of the class's logic
925 if hasattr(self,'branch'):
926 new_trunk_name=self.branch
928 elif self.options.new_version:
929 new_trunk_name = self.options.new_version
931 # compute diff - a way to initialize the whole stuff
932 # do_diff already does edge_dir initialization
933 # and it checks that edge_url and tag_url exist as well
934 (spec_dict,edge_url,tag_url,diff_listing) = self.do_diff(compute_only=True)
936 # the version name in the trunk becomes the new branch name
937 branch_name = spec_dict[self.module_version_varname]
939 # figure new branch name (the one for the trunk) if not provided on the command line
940 if not new_trunk_name:
941 # heuristic is to assume 'version' is a dot-separated name
942 # we isolate the rightmost part and try incrementing it by 1
943 version=spec_dict[self.module_version_varname]
945 m=re.compile("\A(?P<leftpart>.+)\.(?P<rightmost>[^\.]+)\Z")
946 (leftpart,rightmost)=m.match(version).groups()
947 incremented = int(rightmost)+1
948 new_trunk_name="%s.%d"%(leftpart,incremented)
950 raise Exception, 'Cannot figure next branch name from %s - exiting'%version
952 # record starting point tagname
953 latest_tag_name = self.tag_name(spec_dict)
956 print "Using starting point %s (%s)"%(tag_url,latest_tag_name)
957 print "Creating branch %s & moving trunk to %s"%(branch_name,new_trunk_name)
960 # print warning if pending diffs
962 print """*** WARNING : Module %s has pending diffs on its trunk
963 It is safe to proceed, but please note that branch %s
964 will be based on latest tag %s and *not* on the current trunk"""%(self.name,branch_name,latest_tag_name)
966 answer = prompt ('Are you sure you want to proceed with branching',True,('d','iff'))
969 elif answer is False:
970 raise Exception,"User quit"
972 print '<<<< %s'%tag_url
973 print '>>>> %s'%edge_url
976 branch_url = "%s/%s/branches/%s"%(Module.config['svnpath'],self.name,branch_name)
977 self.check_svnpath_not_exists (branch_url,"new branch")
980 spec_dict[self.module_version_varname]=new_trunk_name
981 spec_dict[self.module_taglevel_varname]='0'
982 # remember this in the trunk for easy location of the current branch
983 spec_dict['module_current_branch']=branch_name
984 self.patch_spec_var(spec_dict,True)
986 # create commit log file
987 tmp="/tmp/branching-%d"%os.getpid()
989 f.write("Branch %s for module %s created (as new trunk) from tag %s\n"%(new_trunk_name,self.name,latest_tag_name))
992 # review the renumbering changes in trunk
993 command="svn diff %s"%self.edge_dir()
994 self.run_prompt("Review (renumbering) changes in trunk",command)
996 command="svn copy --file %s %s %s"%(tmp,tag_url,branch_url)
997 self.run_prompt("Create branch",command)
999 command="svn commit --file %s %s"%(tmp,self.edge_dir())
1000 self.run_prompt("Commit trunk",command)
1001 # create initial tag for the new trunk
1002 new_tag_url=self.tag_url(spec_dict)
1003 command="svn copy --file %s %s %s"%(tmp,tag_url,new_tag_url)
1004 self.run_prompt("Create initial tag in trunk",command)
1006 # print message about SVNBRANCH
1007 print """You might now wish to review your tags files
1008 Please make sure you mention as appropriate
1009 %s-SVNBRANCH := %s""" %(self.name,branch_name)
1011 ##############################
1014 def __init__(self, package, module, svnpath, spec,options):
1015 self.package=package
1018 self.svnpath=svnpath
1019 if svnpath.rfind('@') > 0:
1020 self.svnpath, self.svnrev = svnpath.split('@')
1022 self.specpath="%s/%s"%(self.svnpath,self.spec)
1024 self.specpath += "@%s" % self.svnrev
1025 self.basename=os.path.basename(svnpath)
1026 self.options=options
1028 # returns a http URL to the trac path where full diff can be viewed (between self and pkg)
1029 # typically http://svn.planet-lab.org/changeset?old_path=Monitor%2Ftags%2FMonitor-1.0-7&new_path=Monitor%2Ftags%2FMonitor-1.0-13
1030 # xxx quick & dirty: rough url parsing
1031 def trac_full_diff (self, pkg):
1032 matcher=re.compile("\A(?P<method>.*)://(?P<hostname>[^/]+)/(svn/)?(?P<path>.*)\Z")
1033 self_match=matcher.match(self.svnpath)
1034 pkg_match=matcher.match(pkg.svnpath)
1035 if self_match and pkg_match:
1036 (method,hostname,svn,path)=self_match.groups()
1037 self_path=path.replace("/","%2F")
1038 pkg_path=pkg_match.group('path').replace("/","%2F")
1039 return "%s://%s/changeset?old_path=%s&new_path=%s"%(method,hostname,self_path,pkg_path)
1043 def inline_full_diff (self, pkg):
1045 command='svn diff %s %s'%(self.svnpath,pkg.svnpath)
1046 Command(command,self.options).run()
1050 return "[%s %s] [%s (spec)]"%(self.svnpath,self.basename,self.specpath)
1052 class Build (Module):
1054 # we cannot get build's svnpath as for other packages as we'd get something in svn+ssh
1056 def __init__ (self, buildtag, options):
1057 self.buildtag=buildtag
1058 if buildtag == "trunk":
1060 self.display="trunk"
1061 self.svnpath="http://svn.planet-lab.org/svn/build/trunk"
1062 # if the buildtag start with a : (to use a branch rather than a tag)
1063 elif buildtag.find(':') == 0 :
1064 module_name="build%(buildtag)s"%locals()
1065 self.display=buildtag[1:]
1066 self.svnpath="http://svn.planet-lab.org/svn/build/branches/%s"%self.display
1068 module_name="build@%(buildtag)s"%locals()
1069 self.display=buildtag
1070 self.svnpath="http://svn.planet-lab.org/svn/build/tags/%s"%self.buildtag
1071 Module.__init__(self,module_name,options)
1074 def get_distro_from_distrotag (distrotag):
1075 # mhh: remove -tag* from distrotags to get distro
1076 n=distrotag.find('-tag')
1078 return distrotag[:n]
1082 def get_packages (self,distrotag):
1084 distro=Build.get_distro_from_distrotag(distrotag)
1087 make_options="--no-print-directory -C %s stage1=true PLDISTRO=%s PLDISTROTAGS=%s 2> /dev/null"%(self.edge_dir(),distro,distrotag)
1088 command="make %s packages"%make_options
1089 make_packages=Command(command,self.options).output_of()
1090 if self.options.verbose:
1091 print 'obtaining packages information with command:'
1093 pkg_line=re.compile("\Apackage=(?P<package>[^\s]+)\s+ref_module=(?P<module>[^\s]+)\s.*\Z")
1094 for line in make_packages.split("\n"):
1097 attempt=pkg_line.match(line)
1098 if line and not attempt:
1100 print "WARNING: line not understood from make packages"
1101 print "in dir %s"%self.edge_dir
1102 print "with options",make_options
1106 (package,module) = (attempt.group('package'),attempt.group('module'))
1107 command="make %s +%s-SVNPATH"%(make_options,module)
1108 svnpath=Command(command,self.options).output_of().strip()
1109 command="make %s +%s-SPEC"%(make_options,package)
1110 spec=Command(command,self.options).output_of().strip()
1111 result[module]=Package(package,module,svnpath,spec,self.options)
1114 def get_distrotags (self):
1115 return [os.path.basename(p) for p in glob("%s/*tags*mk"%self.edge_dir())]
1119 def __init__ (self):
1122 def key(self, frompath,topath):
1123 return frompath+'-to-'+topath
1125 def fetch (self, frompath, topath):
1126 key=self.key(frompath,topath)
1127 if not self._cache.has_key(key):
1129 return self._cache[key]
1131 def store (self, frompath, topath, diff):
1132 key=self.key(frompath,topath)
1133 self._cache[key]=diff
1137 # header in diff output
1138 discard_matcher=re.compile("\A(\+\+\+|---).*")
1141 def do_changelog (buildtag_new,buildtag_old,options):
1145 (build_new,build_old) = (Build (buildtag_new,options), Build (buildtag_old,options))
1146 print "= build tag %s to %s = #build-%s"%(build_old.display,build_new.display,build_new.display)
1147 for b in (build_new,build_old):
1151 # find out the tags files that are common, unless option was specified
1152 if options.distrotags:
1153 distrotags=options.distrotags
1155 distrotags_new=build_new.get_distrotags()
1156 distrotags_old=build_old.get_distrotags()
1157 distrotags = list(set(distrotags_new).intersection(set(distrotags_old)))
1159 if options.verbose: print "Found distrotags",distrotags
1160 first_distrotag=True
1161 diffcache = DiffCache()
1162 for distrotag in distrotags:
1163 distro=Build.get_distro_from_distrotag(distrotag)
1167 first_distrotag=False
1170 print '== distro %s (%s to %s) == #distro-%s-%s'%(distrotag,build_old.display,build_new.display,distro,build_new.display)
1171 print ' * from %s/%s'%(build_old.svnpath,distrotag)
1172 print ' * to %s/%s'%(build_new.svnpath,distrotag)
1174 # parse make packages
1175 packages_new=build_new.get_packages(distrotag)
1176 pnames_new=set(packages_new.keys())
1177 packages_old=build_old.get_packages(distrotag)
1178 pnames_old=set(packages_old.keys())
1180 # get names of created, deprecated, and preserved modules
1181 pnames_created = list(pnames_new-pnames_old)
1182 pnames_deprecated = list(pnames_old-pnames_new)
1183 pnames = list(pnames_new.intersection(pnames_old))
1185 pnames_created.sort()
1186 pnames_deprecated.sort()
1190 print '--------------------'
1191 print 'got packages for ',build_new.display
1193 print '--------------------'
1194 print 'got packages for ',build_old.display
1196 print '--------------------'
1197 print "Found new modules",pnames_created
1198 print '--------------------'
1199 print "Found deprecated modules",pnames_deprecated
1200 print '--------------------'
1201 print "Found preserved modules",pnames
1202 print '--------------------'
1204 # display created and deprecated
1205 for name in pnames_created:
1206 print '=== %s : new package %s -- appeared in %s === #package-%s-%s-%s'%(
1207 distrotag,name,build_new.display,name,distro,build_new.display)
1208 pobj=packages_new[name]
1209 print ' * %s'%pobj.details()
1210 for name in pnames_deprecated:
1211 print '=== %s : package %s -- deprecated, last occurrence in %s === #package-%s-%s-%s'%(
1212 distrotag,name,build_old.display,name,distro,build_new.display)
1213 pobj=packages_old[name]
1214 if not pobj.svnpath:
1215 print ' * codebase stored in CVS, specfile is %s'%pobj.spec
1217 print ' * %s'%pobj.details()
1219 # display other packages
1221 (pobj_new,pobj_old)=(packages_new[name],packages_old[name])
1222 if options.verbose: print "Dealing with package",name
1223 if pobj_old.specpath == pobj_new.specpath:
1225 specdiff = diffcache.fetch(pobj_old.specpath,pobj_new.specpath)
1226 if specdiff is None:
1227 command="svn diff %s %s"%(pobj_old.specpath,pobj_new.specpath)
1228 specdiff=Command(command,options).output_of()
1229 diffcache.store(pobj_old.specpath,pobj_new.specpath,specdiff)
1231 if options.verbose: print 'got diff from cache'
1234 print '=== %s - %s to %s : package %s === #package-%s-%s-%s'%(
1235 distrotag,build_old.display,build_new.display,name,name,distro,build_new.display)
1236 print ' * from %s to %s'%(pobj_old.details(),pobj_new.details())
1237 if options.inline_diff:
1238 pobj_old.inline_full_diff(pobj_new)
1240 trac_diff_url=pobj_old.trac_full_diff(pobj_new)
1242 print ' * [%s View full diff]'%trac_diff_url
1244 print ' * No full diff available'
1246 for line in specdiff.split('\n'):
1249 if Release.discard_matcher.match(line):
1251 if line[0] in ['@']:
1253 elif line[0] in ['+','-']:
1257 ##############################
1260 module_usage="""Usage: %prog [options] module_desc [ .. module_desc ]
1261 Revision: $Revision$
1263 module-tools : a set of tools to manage subversion tags and specfile
1264 requires the specfile to either
1265 * define *version* and *taglevel*
1267 * define redirection variables module_version_varname / module_taglevel_varname
1269 by default, the trunk of modules is taken into account
1270 in this case, just mention the module name as <module_desc>
1272 if you wish to work on a branch rather than on the trunk,
1273 you can use something like e.g. Mom:2.1 as <module_desc>
1275 release_usage="""Usage: %prog [options] tag1 .. tagn
1276 Extract release notes from the changes in specfiles between several build tags, latest first
1278 release-changelog 4.2-rc25 4.2-rc24 4.2-rc23 4.2-rc22
1279 You can refer to a (build) branch by prepending a colon, like in
1280 release-changelog :4.2 4.2-rc25
1281 You can refer to the build trunk by just mentioning 'trunk', e.g.
1282 release-changelog -t coblitz-tags.mk coblitz-2.01-rc6 trunk
1284 common_usage="""More help:
1285 see http://svn.planet-lab.org/wiki/ModuleTools"""
1288 'list' : "displays a list of available tags or branches",
1289 'version' : "check latest specfile and print out details",
1290 'diff' : "show difference between module (trunk or branch) and latest tag",
1291 'tag' : """increment taglevel in specfile, insert changelog in specfile,
1292 create new tag and and monitor its adoption in build/*-tags*.mk""",
1293 'branch' : """create a branch for this module, from the latest tag on the trunk,
1294 and change trunk's version number to reflect the new branch name;
1295 you can specify the new branch name by using module:branch""",
1296 'sync' : """create a tag from the module
1297 this is a last resort option, mostly for repairs""",
1298 'changelog' : """extract changelog between build tags
1299 expected arguments are a list of tags""",
1302 silent_modes = ['list']
1303 release_modes = ['changelog']
1306 def optparse_list (option, opt, value, parser):
1308 setattr(parser.values,option.dest,getattr(parser.values,option.dest)+value.split())
1310 setattr(parser.values,option.dest,value.split())
1315 for function in Main.modes.keys():
1316 if sys.argv[0].find(function) >= 0:
1320 print "Unsupported command",sys.argv[0]
1321 print "Supported commands:" + " ".join(Main.modes.keys())
1324 if mode not in Main.release_modes:
1325 usage = Main.module_usage
1326 usage += Main.common_usage
1327 usage += "\nmodule-%s : %s"%(mode,Main.modes[mode])
1329 usage = Main.release_usage
1330 usage += Main.common_usage
1332 parser=OptionParser(usage=usage,version=subversion_id)
1335 parser.add_option("-b","--branches",action="store_true",dest="list_branches",default=False,
1336 help="list branches")
1337 parser.add_option("-t","--tags",action="store_false",dest="list_branches",
1339 parser.add_option("-m","--match",action="store",dest="list_pattern",default=None,
1340 help="grep pattern for filtering output")
1341 parser.add_option("-x","--exact-match",action="store",dest="list_exact",default=None,
1342 help="exact grep pattern for filtering output")
1343 if mode == "tag" or mode == 'branch':
1344 parser.add_option("-s","--set-version",action="store",dest="new_version",default=None,
1345 help="set new version and reset taglevel to 0")
1347 parser.add_option("-c","--no-changelog", action="store_false", dest="changelog", default=True,
1348 help="do not update changelog section in specfile when tagging")
1349 parser.add_option("-b","--build-branch", action="store", dest="build_branch", default=None,
1350 help="specify a build branch; used for locating the *tags*.mk files where adoption is to take place")
1351 if mode == "tag" or mode == "sync" :
1352 parser.add_option("-e","--editor", action="store", dest="editor", default=default_editor(),
1353 help="specify editor")
1355 parser.add_option("-m","--message", action="store", dest="message", default=None,
1356 help="specify log message")
1357 if mode in ["diff","version"] :
1358 parser.add_option("-W","--www", action="store", dest="www", default=False,
1359 help="export diff in html format, e.g. -W trunk")
1361 parser.add_option("-l","--list", action="store_true", dest="list", default=False,
1362 help="just list modules that exhibit differences")
1364 if mode == 'version':
1365 parser.add_option("-u","--url", action="store_true", dest="show_urls", default=False,
1366 help="display URLs")
1368 default_modules_list=os.path.dirname(sys.argv[0])+"/modules.list"
1369 if mode not in Main.release_modes:
1370 parser.add_option("-a","--all",action="store_true",dest="all_modules",default=False,
1371 help="run on all modules as found in %s"%default_modules_list)
1372 parser.add_option("-f","--file",action="store",dest="modules_list",default=None,
1373 help="run on all modules found in specified file")
1375 parser.add_option("-n","--dry-run",action="store_true",dest="dry_run",default=False,
1376 help="dry run - shell commands are only displayed")
1377 parser.add_option("-i","--inline-diff",action="store_true",dest="inline_diff",default=False,
1378 help="calls svn diff on whole module, not just only the spec file")
1379 parser.add_option("-t","--distrotags",action="callback",callback=Main.optparse_list, dest="distrotags",
1380 default=[], nargs=1,type="string",
1381 help="""specify distro-tags files, e.g. onelab-tags-4.2.mk
1382 -- can be set multiple times, or use quotes""")
1384 parser.add_option("-w","--workdir", action="store", dest="workdir",
1385 default="%s/%s"%(os.getenv("HOME"),"modules"),
1386 help="""name for dedicated working dir - defaults to ~/modules
1387 ** THIS MUST NOT ** be your usual working directory""")
1388 parser.add_option("-F","--fast-checks",action="store_true",dest="fast_checks",default=False,
1389 help="skip safety checks, such as svn updates -- use with care")
1391 # default verbosity depending on function - temp
1392 verbose_modes= ['tag', 'sync', 'branch']
1394 if mode not in verbose_modes:
1395 parser.add_option("-v","--verbose", action="store_true", dest="verbose", default=False,
1396 help="run in verbose mode")
1398 parser.add_option("-q","--quiet", action="store_false", dest="verbose", default=True,
1399 help="run in quiet (non-verbose) mode")
1400 # parser.add_option("-d","--debug", action="store_true", dest="debug", default=False,
1401 # help="debug mode - mostly more verbose")
1402 (options, args) = parser.parse_args()
1404 if not hasattr(options,'dry_run'):
1405 options.dry_run=False
1406 if not hasattr(options,'www'):
1410 ########## release-*
1411 if mode in Main.release_modes :
1412 ########## changelog
1416 Module.init_homedir(options)
1417 for n in range(len(args)-1):
1418 [t_new,t_old]=args[n:n+2]
1419 Release.do_changelog (t_new,t_old,options)
1423 if options.all_modules:
1424 options.modules_list=default_modules_list
1425 if options.modules_list:
1426 args=Command("grep -v '#' %s"%options.modules_list,options).output_of().split()
1430 Module.init_homedir(options)
1432 # 2 passes for www output
1433 modules=[ Module(modname,options) for modname in args ]
1434 # hack: create a dummy Module to store errors/warnings
1435 error_module = Module('__errors__',options)
1437 # pass 1 : do it, except if options.www
1438 for module in modules:
1439 if len(args)>1 and mode not in Main.silent_modes and not options.www:
1440 print '========================================',module.friendly_name()
1441 # call the method called do_<mode>
1442 method=Module.__dict__["do_%s"%mode]
1447 title='<span class="error"> Skipping module %s - failure: %s </span>'%\
1448 (module.friendly_name(), str(e))
1449 error_module.html_store_title(title)
1451 print 'Skipping module %s: '%modname,e
1453 # in which case we do the actual printing in the second pass
1456 modetitle="Changes to tag in %s"%options.www
1457 elif mode == "version":
1458 modetitle="Latest tags in %s"%options.www
1459 modules.append(error_module)
1460 error_module.html_dump_header(modetitle)
1461 for module in modules:
1462 module.html_dump_toc()
1463 Module.html_dump_middle()
1464 for module in modules:
1465 module.html_dump_body()
1466 Module.html_dump_footer()
1468 ####################
1469 if __name__ == "__main__" :
1472 except KeyboardInterrupt: