equal
deleted
inserted
replaced
1149 outdated = [c for c in outdated if c.node() not in pheads] |
1149 outdated = [c for c in outdated if c.node() not in pheads] |
1150 # fallback to independent pushkey command |
1150 # fallback to independent pushkey command |
1151 for newremotehead in outdated: |
1151 for newremotehead in outdated: |
1152 r = pushop.remote.pushkey('phases', |
1152 r = pushop.remote.pushkey('phases', |
1153 newremotehead.hex(), |
1153 newremotehead.hex(), |
1154 str(phases.draft), |
1154 ('%d' % phases.draft), |
1155 str(phases.public)) |
1155 ('%d' % phases.public)) |
1156 if not r: |
1156 if not r: |
1157 pushop.ui.warn(_('updating %s to public failed!\n') |
1157 pushop.ui.warn(_('updating %s to public failed!\n') |
1158 % newremotehead) |
1158 % newremotehead) |
1159 |
1159 |
1160 def _localphasemove(pushop, nodes, phase=phases.public): |
1160 def _localphasemove(pushop, nodes, phase=phases.public): |