Skip to content
Snippets Groups Projects
Commit c894fdff56d1 authored by Pierre-Yves David's avatar Pierre-Yves David
Browse files

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.
parent 808926c76cac
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment