Mercurial > hg
comparison mercurial/exchange.py @ 22243:728669a41947
exchange: drop superfluous parens
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Mon, 18 Aug 2014 20:23:37 -0400 |
| parents | ed222ebd61be |
| children | 172036d60b22 |
comparison
equal
deleted
inserted
replaced
| 22242:ed222ebd61be | 22243:728669a41947 |
|---|---|
| 293 revnums = map(repo.changelog.rev, pushop.revs) | 293 revnums = map(repo.changelog.rev, pushop.revs) |
| 294 ancestors = repo.changelog.ancestors(revnums, inclusive=True) | 294 ancestors = repo.changelog.ancestors(revnums, inclusive=True) |
| 295 remotebookmark = remote.listkeys('bookmarks') | 295 remotebookmark = remote.listkeys('bookmarks') |
| 296 | 296 |
| 297 comp = bookmarks.compare(repo, repo._bookmarks, remotebookmark, srchex=hex) | 297 comp = bookmarks.compare(repo, repo._bookmarks, remotebookmark, srchex=hex) |
| 298 (addsrc, adddst, advsrc, advdst, diverge, differ, invalid) = comp | 298 addsrc, adddst, advsrc, advdst, diverge, differ, invalid = comp |
| 299 for b, scid, dcid in advsrc: | 299 for b, scid, dcid in advsrc: |
| 300 if not ancestors or repo[scid].rev() in ancestors: | 300 if not ancestors or repo[scid].rev() in ancestors: |
| 301 pushop.outbookmarks.append((b, dcid, scid)) | 301 pushop.outbookmarks.append((b, dcid, scid)) |
| 302 | 302 |
| 303 def _pushcheckoutgoing(pushop): | 303 def _pushcheckoutgoing(pushop): |