Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pushbookmark: split an ultra-long line into a saner version
authorPierre-Yves David <pierre-yves.david@fb.com>
Fri, 15 Aug 2014 18:02:54 -0700
changeset 22238 c894fdff56d1
parent 22237 808926c76cac
child 22239 0688010ee38f
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.
mercurial/exchange.py file | annotate | diff | comparison | revisions 
--- 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
Mercurial