equal
deleted
inserted
replaced
2237 phasecache = unfi._phasecache |
2237 phasecache = unfi._phasecache |
2238 msg = ( |
2238 msg = ( |
2239 b'remote repository changed while pushing - please try again ' |
2239 b'remote repository changed while pushing - please try again ' |
2240 b'(%s is %s expected %s)' |
2240 b'(%s is %s expected %s)' |
2241 ) |
2241 ) |
2242 for expectedphase, nodes in pycompat.iteritems(phasetonodes): |
2242 for expectedphase, nodes in phasetonodes.items(): |
2243 for n in nodes: |
2243 for n in nodes: |
2244 actualphase = phasecache.phase(unfi, cl.rev(n)) |
2244 actualphase = phasecache.phase(unfi, cl.rev(n)) |
2245 if actualphase != expectedphase: |
2245 if actualphase != expectedphase: |
2246 finalmsg = msg % ( |
2246 finalmsg = msg % ( |
2247 short(n), |
2247 short(n), |