Changeset - 2bb58ce6adbf
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Manuel Jacob - 7 years ago 2019-02-18 23:50:43
me@manueljacob.de
hg: rename `precursors` property of MercurialChangeset to `predecessors`

Mercurial changed the terminology around version 4.4.
2 files changed with 7 insertions and 7 deletions:
kallithea/lib/vcs/backends/hg/changeset.py
1
1
kallithea/templates/changeset/changeset.html
6
6
0 comments (0 inline, 0 general)
kallithea/lib/vcs/backends/hg/changeset.py
➞
Show inline comments
 
@@ -52,97 +52,97 @@ class MercurialChangeset(BaseChangeset):
 
    def obsolete(self):
 
        return self._ctx.obsolete()
 

			




	
	
	
		
 
    @LazyProperty

			




	
	
	
		
 
    def bumped(self):

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            return self._ctx.phasedivergent()

			




	
	
	
		
 
        except AttributeError: # renamed in Mercurial 4.6 (9fa874fb34e1)

			




	
	
	
		
 
            return self._ctx.bumped()

			




	
	
	
		
 

			




	
	
	
		
 
    @LazyProperty

			




	
	
	
		
 
    def divergent(self):

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            return self._ctx.contentdivergent()

			




	
	
	
		
 
        except AttributeError: # renamed in Mercurial 4.6 (8b2d7684407b)

			




	
	
	
		
 
            return self._ctx.divergent()

			




	
	
	
		
 

			




	
	
	
		
 
    @LazyProperty

			




	
	
	
		
 
    def extinct(self):

			




	
	
	
		
 
        return self._ctx.extinct()

			




	
	
	
		
 

			




	
	
	
		
 
    @LazyProperty

			




	
	
	
		
 
    def unstable(self):

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            return self._ctx.orphan()

			




	
	
	
		
 
        except AttributeError: # renamed in Mercurial 4.6 (03039ff3082b)

			




	
	
	
		
 
            return self._ctx.unstable()

			




	
	
	
		
 

			




	
	
	
		
 
    @LazyProperty

			




	
	
	
		
 
    def phase(self):

			




	
	
	
		
 
        if(self._ctx.phase() == 1):

			




	
	
	
		
 
            return 'Draft'

			




	
	
	
		
 
        elif(self._ctx.phase() == 2):

			




	
	
	
		
 
            return 'Secret'

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            return ''

			




	
	
	
		
 

			




	
	
	
		
 
    @LazyProperty

			




	
	
	
		
 
    def successors(self):

			




	
	
	
		
 
        successors = obsolete.successorssets(self._ctx._repo, self._ctx.node())

			




	
	
	
		
 
        if successors:

			




	
	
	
		
 
            # flatten the list here handles both divergent (len > 1)

			




	
	
	
		
 
            # and the usual case (len = 1)

			




	
	
	
		
 
            successors = [hex(n)[:12] for sub in successors for n in sub if n != self._ctx.node()]

			




	
	
	
		
 

			




	
	
	
		
 
        return successors

			




	
	
	
		
 

			




	
	
	
		
 
    @LazyProperty

			




	
	
	
		
 
    def precursors(self):

			




	
	
	
		
 
    def predecessors(self):

			




	
	
	
		
 
        precursors = set()

			




	
	
	
		
 
        nm = self._ctx._repo.changelog.nodemap

			




	
	
	
		
 
        for p in self._ctx._repo.obsstore.precursors.get(self._ctx.node(), ()):

			




	
	
	
		
 
            pr = nm.get(p[0])

			




	
	
	
		
 
            if pr is not None:

			




	
	
	
		
 
                precursors.add(hex(p[0])[:12])

			




	
	
	
		
 
        return precursors

			




	
	
	
		
 

			




	
	
	
		
 
    @LazyProperty

			




	
	
	
		
 
    def bookmarks(self):

			




	
	
	
		
 
        return map(safe_unicode, self._ctx.bookmarks())

			




	
	
	
		
 

			




	
	
	
		
 
    @LazyProperty

			




	
	
	
		
 
    def message(self):

			




	
	
	
		
 
        return safe_unicode(self._ctx.description())

			




	
	
	
		
 

			




	
	
	
		
 
    @LazyProperty

			




	
	
	
		
 
    def committer(self):

			




	
	
	
		
 
        return safe_unicode(self.author)

			




	
	
	
		
 

			




	
	
	
		
 
    @LazyProperty

			




	
	
	
		
 
    def author(self):

			




	
	
	
		
 
        return safe_unicode(self._ctx.user())

			




	
	
	
		
 

			




	
	
	
		
 
    @LazyProperty

			




	
	
	
		
 
    def date(self):

			




	
	
	
		
 
        return date_fromtimestamp(*self._ctx.date())

			




	
	
	
		
 

			




	
	
	
		
 
    @LazyProperty

			




	
	
	
		
 
    def _timestamp(self):

			




	
	
	
		
 
        return self._ctx.date()[0]

			




	
	
	
		
 

			




	
	
	
		
 
    @LazyProperty

			




	
	
	
		
 
    def status(self):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Returns modified, added, removed, deleted files for current changeset

			




	
	
	
		
 
        """

			




	
	
	
		
 
        return self.repository._repo.status(self._ctx.p1().node(),

			




	
	
	
		
 
                                            self._ctx.node())

			




	
	
	
		
 

			




	
	
	
		
 
    @LazyProperty

			




	
	
	
		
 
    def _file_paths(self):

			




	
	
	
		
 
        return list(self._ctx)

			




	
	
	
		
 

			




	
	
	
		
 
    @LazyProperty

			




	
	
	
		
 
    def _dir_paths(self):

			




	
	
	
		
 
        p = list(set(get_dirs_for_path(*self._file_paths)))

			




	
	
	
		
 
        p.insert(0, '')

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -72,106 +72,106 @@ ${self.repo_context_bar('changelog', c.c

			




	
	
	
		
 
                        %endfor

			




	
	
	
		
 
                    </span>

			




	
	
	
		
 

			




	
	
	
		
 
                    <div class="changes">

			




	
	
	
		
 
                        % if (len(c.changeset.affected_files) <= c.affected_files_cut_off) or c.fulldiff:

			




	
	
	
		
 
                         <span class="label deleted" title="${_('Removed')}">${len(c.changeset.removed)}</span>

			




	
	
	
		
 
                         <span class="label changed" title="${_('Changed')}">${len(c.changeset.changed)}</span>

			




	
	
	
		
 
                         <span class="label added" title="${_('Added')}">${len(c.changeset.added)}</span>

			




	
	
	
		
 
                        % else:

			




	
	
	
		
 
                         <span class="label deleted" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>

			




	
	
	
		
 
                         <span class="label changed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>

			




	
	
	
		
 
                         <span class="label added"   title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>

			




	
	
	
		
 
                        % endif

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="pull-left">

			




	
	
	
		
 
                     <div class="author">

			




	
	
	
		
 
                         ${h.gravatar_div(h.email_or_none(c.changeset.author), size=20)}

			




	
	
	
		
 
                         <span><b>${h.person(c.changeset.author,'full_name_and_username')}</b> - ${h.age(c.changeset.date,True)} ${h.fmt_date(c.changeset.date)}</span><br/>

			




	
	
	
		
 
                         <span>${h.email_or_none(c.changeset.author)}</span><br/>

			




	
	
	
		
 
                     </div>

			




	
	
	
		
 
                     <% rev = c.changeset.extra.get('source') %>

			




	
	
	
		
 
                     %if rev:

			




	
	
	
		
 
                     <div>

			




	
	
	
		
 
                       ${_('Grafted from:')} ${h.link_to(h.short_id(rev),h.url('changeset_home',repo_name=c.repo_name,revision=rev), class_="changeset_hash")}

			




	
	
	
		
 
                     </div>

			




	
	
	
		
 
                     %endif

			




	
	
	
		
 
                     <% rev = c.changeset.extra.get('transplant_source', '').encode('hex') %>

			




	
	
	
		
 
                     %if rev:

			




	
	
	
		
 
                     <div>

			




	
	
	
		
 
                       ${_('Transplanted from:')} ${h.link_to(h.short_id(rev),h.url('changeset_home',repo_name=c.repo_name,revision=rev), class_="changeset_hash")}

			




	
	
	
		
 
                     </div>

			




	
	
	
		
 
                     %endif

			




	
	
	
		
 

			




	
	
	
		
 
                     % if hasattr(c.changeset, 'successors') and c.changeset.successors:

			




	
	
	
		
 
                     <div class='successors'>

			




	
	
	
		
 
                       <span class='successors_header'>${_('Replaced by:')} </span>

			




	
	
	
		
 
                       % for i, s in enumerate(c.changeset.successors):

			




	
	
	
		
 
                           <%

			




	
	
	
		
 
                           comma = ""

			




	
	
	
		
 
                           if i != len(c.changeset.successors)-1:

			




	
	
	
		
 
                             comma = ", "

			




	
	
	
		
 
                           %>

			




	
	
	
		
 
                         <a class='successors_hash' href="${h.url('changeset_home',repo_name=c.repo_name, revision=s)}">${s}</a>${comma}

			




	
	
	
		
 
                       % endfor

			




	
	
	
		
 
                     </div>

			




	
	
	
		
 
                     % endif

			




	
	
	
		
 

			




	
	
	
		
 
                     % if hasattr(c.changeset, 'precursors') and c.changeset.precursors:

			




	
	
	
		
 
                     <div class='precursors'>

			




	
	
	
		
 
                       <span class='precursors_header'>${_('Preceded by:')} </span>

			




	
	
	
		
 
                       % for i, s in enumerate(c.changeset.precursors):

			




	
	
	
		
 
                     % if hasattr(c.changeset, 'predecessors') and c.changeset.predecessors:

			




	
	
	
		
 
                     <div class='predecessors'>

			




	
	
	
		
 
                       <span class='predecessors_header'>${_('Preceded by:')} </span>

			




	
	
	
		
 
                       % for i, s in enumerate(c.changeset.predecessors):

			




	
	
	
		
 
                           <%

			




	
	
	
		
 
                           comma = ""

			




	
	
	
		
 
                           if i != len(c.changeset.precursors)-1:

			




	
	
	
		
 
                           if i != len(c.changeset.predecessors)-1:

			




	
	
	
		
 
                             comma = ", "

			




	
	
	
		
 
                           %>

			




	
	
	
		
 
                           <a class="precursors_hash" href="${h.url('changeset_home',repo_name=c.repo_name, revision=s)}">${s}</a>${comma}

			




	
	
	
		
 
                           <a class="predecessors_hash" href="${h.url('changeset_home',repo_name=c.repo_name, revision=s)}">${s}</a>${comma}

			




	
	
	
		
 
                       % endfor

			




	
	
	
		
 
                     </div>

			




	
	
	
		
 
                     % endif

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="form-group formatted-fixed">${h.urlify_text(c.changeset.message, c.repo_name)}</div>

			




	
	
	
		
 
            <div>

			




	
	
	
		
 
              <% a_rev, cs_rev, file_diff_data = c.changes[c.changeset.raw_id] %>

			




	
	
	
		
 
              % if c.limited_diff:

			




	
	
	
		
 
                  ${ungettext('%s file changed', '%s files changed', len(file_diff_data)) % len(file_diff_data)}:

			




	
	
	
		
 
              % else:

			




	
	
	
		
 
                  ${ungettext('%s file changed with %s insertions and %s deletions', '%s files changed with %s insertions and %s deletions', len(file_diff_data)) % (len(file_diff_data), c.lines_added, c.lines_deleted)}:

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="cs_files">

			




	
	
	
		
 
                %for fid, url_fid, op, a_path, path, diff, stats in file_diff_data:

			




	
	
	
		
 
                    <div class="cs_${op} clearfix">

			




	
	
	
		
 
                      <span class="node">

			




	
	
	
		
 
                          <i class="icon-diff-${op}"></i>${h.link_to(h.safe_unicode(path), '#%s' % fid)}

			




	
	
	
		
 
                      </span>

			




	
	
	
		
 
                      <div class="changes">${h.fancy_file_stats(stats)}</div>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                %if c.limited_diff:

			




	
	
	
		
 
                  <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h5>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="comments-number">

			




	
	
	
		
 
                ${comment.comment_count(c.inline_cnt, len(c.comments))}

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    ## diff block

			




	
	
	
		
 

			




	
	
	
		
 
    <div class="commentable-diff">

			




	
	
	
		
 
    <%namespace name="diff_block" file="/changeset/diff_block.html"/>

			




	
	
	
		
 
    ${diff_block.diff_block_js()}

			




	
	
	
		
 
    <% a_rev, cs_rev, file_diff_data = c.changes[c.changeset.raw_id] %>

			




	
	
	
		
 
    ${diff_block.diff_block(c.repo_name, 'rev', a_rev, a_rev,

			




	
	
	
		
 
                            c.repo_name, 'rev', cs_rev, cs_rev, file_diff_data)}

			




	
	
	
		
 
    % if c.limited_diff:

			




	
	
	
		
 
      <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h4>

			




	
	
	
		
 
    % endif

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    ## template for inline comment form

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.