mercurial/rewriteutil.py
changeset 45711 3d68b47e461b
parent 45427 78861610ded8
child 45853 b4694ef45db5
equal deleted inserted replaced
45710:510995e249c0 45711:3d68b47e461b
   109             successors = obsutil.successorssets(repo, ctx.node(), cache=cache)
   109             successors = obsutil.successorssets(repo, ctx.node(), cache=cache)
   110 
   110 
   111         # We can't make any assumptions about how to update the hash if the
   111         # We can't make any assumptions about how to update the hash if the
   112         # cset in question was split or diverged.
   112         # cset in question was split or diverged.
   113         if len(successors) == 1 and len(successors[0]) == 1:
   113         if len(successors) == 1 and len(successors[0]) == 1:
   114             newhash = node.hex(successors[0][0])
   114             successor = successors[0][0]
   115             commitmsg = commitmsg.replace(h, newhash[: len(h)])
   115             if successor is not None:
       
   116                 newhash = node.hex(successor)
       
   117                 commitmsg = commitmsg.replace(h, newhash[: len(h)])
       
   118             else:
       
   119                 repo.ui.note(
       
   120                     _(
       
   121                         b'The stale commit message reference to %s could '
       
   122                         b'not be updated\n(The referenced commit was dropped)\n'
       
   123                     )
       
   124                     % h
       
   125                 )
   116         else:
   126         else:
   117             repo.ui.note(
   127             repo.ui.note(
   118                 _(
   128                 _(
   119                     b'The stale commit message reference to %s could '
   129                     b'The stale commit message reference to %s could '
   120                     b'not be updated\n'
   130                     b'not be updated\n'