equal
deleted
inserted
replaced
803 emptyremote = pushop.pushbranchmap is None |
803 emptyremote = pushop.pushbranchmap is None |
804 if not allowunrelated or emptyremote: |
804 if not allowunrelated or emptyremote: |
805 bundler.newpart(b'check:heads', data=iter(pushop.remoteheads)) |
805 bundler.newpart(b'check:heads', data=iter(pushop.remoteheads)) |
806 else: |
806 else: |
807 affected = set() |
807 affected = set() |
808 for branch, heads in pycompat.iteritems(pushop.pushbranchmap): |
808 for branch, heads in pushop.pushbranchmap.items(): |
809 remoteheads, newheads, unsyncedheads, discardedheads = heads |
809 remoteheads, newheads, unsyncedheads, discardedheads = heads |
810 if remoteheads is not None: |
810 if remoteheads is not None: |
811 remote = set(remoteheads) |
811 remote = set(remoteheads) |
812 affected |= set(discardedheads) & remote |
812 affected |= set(discardedheads) & remote |
813 affected |= remote - set(newheads) |
813 affected |= remote - set(newheads) |
1114 k, v = raw.split(b'=', 1) |
1114 k, v = raw.split(b'=', 1) |
1115 shellvars[k] = v |
1115 shellvars[k] = v |
1116 |
1116 |
1117 part = bundler.newpart(b'pushvars') |
1117 part = bundler.newpart(b'pushvars') |
1118 |
1118 |
1119 for key, value in pycompat.iteritems(shellvars): |
1119 for key, value in shellvars.items(): |
1120 part.addparam(key, value, mandatory=False) |
1120 part.addparam(key, value, mandatory=False) |
1121 |
1121 |
1122 |
1122 |
1123 def _pushbundle2(pushop): |
1123 def _pushbundle2(pushop): |
1124 """push data to the remote using bundle2 |
1124 """push data to the remote using bundle2 |