##// END OF EJS Templates
fix(mercurial): fixed issue with rebase logic after bump to mercurial 6.3...
super-admin -
r1171:19ccbbc7 default
parent child Browse files
Show More
@@ -1125,6 +1125,7 b' class HgRemote(RemoteBase):'
1125 1125
1126 1126 @reraise_safe_exceptions
1127 1127 def rebase(self, wire, source='', dest='', abort=False):
1128
1128 1129 repo = self._factory.repo(wire)
1129 1130 baseui = self._factory._create_config(wire['config'])
1130 1131 repo.ui.setconfig(b'ui', b'merge', b'internal:dump')
@@ -1134,8 +1135,19 b' class HgRemote(RemoteBase):'
1134 1135 # used but instead uses a default value.
1135 1136 repo.ui.setconfig(b'ui', b'interactive', False)
1136 1137
1137 rebase.rebase(baseui, repo, base=safe_bytes(source or ''), dest=safe_bytes(dest or ''),
1138 abort=abort, keep=not abort)
1138 rebase_kws = dict(
1139 keep=not abort,
1140 abort=abort
1141 )
1142
1143 if source:
1144 source = repo[source]
1145 rebase_kws['base'] = [source.hex()]
1146 if dest:
1147 dest = repo[dest]
1148 rebase_kws['dest'] = dest.hex()
1149
1150 rebase.rebase(baseui, repo, **rebase_kws)
1139 1151
1140 1152 @reraise_safe_exceptions
1141 1153 def tag(self, wire, name, revision, message, local, user, tag_time, tag_timezone):
General Comments 0
You need to be logged in to leave comments. Login now