Mercurial > hg
changeset 22238:c894fdff56d1
pushbookmark: split an ultra-long line into a saner version
We make a temporary variable for the remote bookmark data and we do not expand
all elements from `bookmark.compare` since we are going to use only one.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Fri, 15 Aug 2014 18:02:54 -0700 |
| parents | 808926c76cac |
| children | 0688010ee38f |
| files | mercurial/exchange.py |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/exchange.py Wed Jun 25 00:02:17 2014 +0100 +++ b/mercurial/exchange.py Fri Aug 15 18:02:54 2014 -0700 @@ -623,10 +623,9 @@ if pushop.revs: revnums = map(repo.changelog.rev, pushop.revs) ancestors = repo.changelog.ancestors(revnums, inclusive=True) - (addsrc, adddst, advsrc, advdst, diverge, differ, invalid - ) = bookmarks.compare(repo, repo._bookmarks, remote.listkeys('bookmarks'), - srchex=hex) - + remotebookmark = remote.listkeys('bookmarks') + comp = bookmarks.compare(repo, repo._bookmarks, remotebookmark, srchex=hex) + (addsrc, adddst, advsrc, advdst, diverge, differ, invalid) = comp for b, scid, dcid in advsrc: if ancestors and repo[scid].rev() not in ancestors: continue