Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
exchange: import bookmarks as bookmod
authorPierre-Yves David <pierre-yves.david@fb.com>
Thu, 25 Sep 2014 15:26:09 -0700
changeset 22622 ce6b9edee725
parent 22621 76a43e0db516
child 22623 cd7e17aa6040
exchange: import bookmarks as bookmod Using the original names makes it difficult to use `bookmarks` as a variable name.
mercurial/exchange.py file | annotate | diff | comparison | revisions 
--- a/mercurial/exchange.py	Thu Sep 25 02:53:49 2014 -0700
+++ b/mercurial/exchange.py	Thu Sep 25 15:26:09 2014 -0700
@@ -9,7 +9,7 @@
 from node import hex, nullid
 import errno, urllib
 import util, scmutil, changegroup, base85, error
-import discovery, phases, obsolete, bookmarks, bundle2, pushkey
+import discovery, phases, obsolete, bookmarks as bookmod, bundle2, pushkey
 
 def readbundle(ui, fh, fname, vfs=None):
     header = changegroup.readexactly(fh, 4)
@@ -315,7 +315,7 @@
         ancestors = repo.changelog.ancestors(revnums, inclusive=True)
     remotebookmark = remote.listkeys('bookmarks')
 
-    comp = bookmarks.compare(repo, repo._bookmarks, remotebookmark, srchex=hex)
+    comp = bookmod.compare(repo, repo._bookmarks, remotebookmark, srchex=hex)
     addsrc, adddst, advsrc, advdst, diverge, differ, invalid = comp
     for b, scid, dcid in advsrc:
         if not ancestors or repo[scid].rev() in ancestors:
mercurial