Revision e278c46e

b/devflow/flow.py
158 158 
        if not feature_upstream in repo.branches:
159 159 
            raise ValueError("Branch %s does not exist." % feature_upstream)
160 160 
        feature_debian = "debian-%s" % feature_upstream
161 
        self.edit_changelog(feature_upstream)
161 162 
        repo.git.checkout("develop")
162 163 
        with conflicts():
163 164 
            repo.git.merge(feature_upstream)
......
171 172 
        if feature_debian in repo.branches:
172 173 
            print "git branch -D %s" % feature_debian
173 174 

  		





  
  175
  
    
    def edit_changelog(self, branch):


  		





  
  176
  
    
        repo = self.repo


  		





  
  177
  
    
        if not branch in repo.branches:


  		





  
  178
  
    
            raise ValueError("Branch %s does not exist." % branch)


  		





  
  179
  
    

  		





  
  180
  
    
        repo.git.checkout(branch)


  		





  
  181
  
    
        topdir = repo.working_dir


  		





  
  182
  
    
        changelog = os.path.join(topdir, "Changelog")


  		





  
  183
  
    
        editor = os.getenv('EDITOR')


  		





  
  184
  
    
        if not editor:


  		





  
  185
  
    
            editor = 'vim'


  		





  
  186
  
    
        call("%s %s" % (editor, changelog))


  		





  
  187
  
    
        repo.git.add(changelog)


  		





  
  188
  
    
        repo.git.commit(m="Update changelog")


  		





  
  189
  
    
        print "Updated changelog on branch %s" % branch


  		





  
  190
  
    

  		





  174
  191
  
    
    def end_common(self, mode, version):


  		





  175
  192
  
    
        pass


  		





  176
  193
  
    

  		












Also available in:
  Unified diff