##// END OF EJS Templates
pull request: shuffle different-repo and hg-git conditionals around, no code change
Mads Kiilerich -
r3300:2c0208bd beta
parent child Browse files
Show More
@@ -172,6 +172,9 b' class PullRequestModel(BaseModel):'
172 """
172 """
173
173
174 changesets = []
174 changesets = []
175
176 if alias == 'hg':
177
175 #case two independent repos
178 #case two independent repos
176 if org_repo != other_repo:
179 if org_repo != other_repo:
177 revs = [
180 revs = [
@@ -194,9 +197,9 b' class PullRequestModel(BaseModel):'
194 start = org_ref[1]
197 start = org_ref[1]
195 stop = other_ref[1]
198 stop = other_ref[1]
196 changesets = changesets[revs.index(start):revs.index(stop) + 1]
199 changesets = changesets[revs.index(start):revs.index(stop) + 1]
197 else:
200
198 #no remote compare do it on the same repository
201 #no remote compare do it on the same repository
199 if alias == 'hg':
202 else:
200 _revset_predicates = {
203 _revset_predicates = {
201 'branch': 'branch',
204 'branch': 'branch',
202 'book': 'bookmark',
205 'book': 'bookmark',
@@ -214,7 +217,9 b' class PullRequestModel(BaseModel):'
214 out = scmutil.revrange(org_repo._repo, revs)
217 out = scmutil.revrange(org_repo._repo, revs)
215 for cs in (out):
218 for cs in (out):
216 changesets.append(org_repo.get_changeset(cs))
219 changesets.append(org_repo.get_changeset(cs))
220
217 elif alias == 'git':
221 elif alias == 'git':
222 assert org_repo == other_repo, (org_repo, other_repo) # no git support for different repos
218 so, se = org_repo.run_git_command(
223 so, se = org_repo.run_git_command(
219 'log --reverse --pretty="format: %%H" -s -p %s..%s' % (org_ref[1],
224 'log --reverse --pretty="format: %%H" -s -p %s..%s' % (org_ref[1],
220 other_ref[1])
225 other_ref[1])
General Comments 0
You need to be logged in to leave comments. Login now