Show More
@@ -111,8 +111,18 b' def update_hash_refs(repo, commitmsg, pe' | |||||
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 |
|
|
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 | _( |
General Comments 0
You need to be logged in to leave comments.
Login now