Show More
@@ -1105,8 +1105,9 b' def analyzeremotephases(repo, subset, ro' | |||||
1105 | """ |
|
1105 | """ | |
1106 | repo = repo.unfiltered() |
|
1106 | repo = repo.unfiltered() | |
1107 | # build list from dictionary |
|
1107 | # build list from dictionary | |
1108 | draftroots = [] |
|
1108 | draft_roots = [] | |
1109 | has_node = repo.changelog.index.has_node # to filter unknown nodes |
|
1109 | to_rev = repo.changelog.index.get_rev | |
|
1110 | to_node = repo.changelog.node | |||
1110 | for nhex, phase in roots.items(): |
|
1111 | for nhex, phase in roots.items(): | |
1111 | if nhex == b'publishing': # ignore data related to publish option |
|
1112 | if nhex == b'publishing': # ignore data related to publish option | |
1112 | continue |
|
1113 | continue | |
@@ -1117,14 +1118,16 b' def analyzeremotephases(repo, subset, ro' | |||||
1117 | msg = _(b'ignoring inconsistent public root from remote: %s\n') |
|
1118 | msg = _(b'ignoring inconsistent public root from remote: %s\n') | |
1118 | repo.ui.warn(msg % nhex) |
|
1119 | repo.ui.warn(msg % nhex) | |
1119 | elif phase == draft: |
|
1120 | elif phase == draft: | |
1120 |
|
|
1121 | rev = to_rev(node) | |
1121 | draftroots.append(node) |
|
1122 | if rev is not None: # to filter unknown nodes | |
|
1123 | draft_roots.append(rev) | |||
1122 | else: |
|
1124 | else: | |
1123 | msg = _(b'ignoring unexpected root from remote: %i %s\n') |
|
1125 | msg = _(b'ignoring unexpected root from remote: %i %s\n') | |
1124 | repo.ui.warn(msg % (phase, nhex)) |
|
1126 | repo.ui.warn(msg % (phase, nhex)) | |
1125 | # compute heads |
|
1127 | # compute heads | |
1126 | publicheads = newheads(repo, subset, draftroots) |
|
1128 | draft_nodes = [to_node(r) for r in draft_roots] | |
1127 | return publicheads, draftroots |
|
1129 | publicheads = newheads(repo, subset, draft_nodes) | |
|
1130 | return publicheads, draft_nodes | |||
1128 |
|
1131 | |||
1129 |
|
1132 | |||
1130 | class remotephasessummary: |
|
1133 | class remotephasessummary: |
General Comments 0
You need to be logged in to leave comments.
Login now