equal
deleted
inserted
replaced
955 emptyremote = pushop.pushbranchmap is None |
955 emptyremote = pushop.pushbranchmap is None |
956 if not allowunrelated or emptyremote: |
956 if not allowunrelated or emptyremote: |
957 bundler.newpart(b'check:heads', data=iter(pushop.remoteheads)) |
957 bundler.newpart(b'check:heads', data=iter(pushop.remoteheads)) |
958 else: |
958 else: |
959 affected = set() |
959 affected = set() |
960 for branch, heads in pushop.pushbranchmap.iteritems(): |
960 for branch, heads in pycompat.iteritems(pushop.pushbranchmap): |
961 remoteheads, newheads, unsyncedheads, discardedheads = heads |
961 remoteheads, newheads, unsyncedheads, discardedheads = heads |
962 if remoteheads is not None: |
962 if remoteheads is not None: |
963 remote = set(remoteheads) |
963 remote = set(remoteheads) |
964 affected |= set(discardedheads) & remote |
964 affected |= set(discardedheads) & remote |
965 affected |= remote - set(newheads) |
965 affected |= remote - set(newheads) |
1258 k, v = raw.split(b'=', 1) |
1258 k, v = raw.split(b'=', 1) |
1259 shellvars[k] = v |
1259 shellvars[k] = v |
1260 |
1260 |
1261 part = bundler.newpart(b'pushvars') |
1261 part = bundler.newpart(b'pushvars') |
1262 |
1262 |
1263 for key, value in shellvars.iteritems(): |
1263 for key, value in pycompat.iteritems(shellvars): |
1264 part.addparam(key, value, mandatory=False) |
1264 part.addparam(key, value, mandatory=False) |
1265 |
1265 |
1266 |
1266 |
1267 def _pushbundle2(pushop): |
1267 def _pushbundle2(pushop): |
1268 """push data to the remote using bundle2 |
1268 """push data to the remote using bundle2 |