Mercurial > hg

diff mercurial/scmutil.py @ 38575:152f4822d210

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pycompat: move rapply() from util I want to use rapply() in utils.* modules, but that would introduce a reference cycle util -> utils.* -> util. Moving rapply() to pycompat should be okay since it mostly serves as a compatibility helper.
author Yuya Nishihara <yuya@tcha.org>
date Sun, 10 Jun 2018 17:07:29 +0900
parents 077301ac69dc
children 85c74c5a1590
line wrap: on
line diff
--- a/mercurial/scmutil.py	Thu Jul 05 09:53:00 2018 +0530
+++ b/mercurial/scmutil.py	Sun Jun 10 17:07:29 2018 +0900
@@ -865,7 +865,7 @@
                 continue
             from . import bookmarks # avoid import cycle
             repo.ui.debug('moving bookmarks %r from %s to %s\n' %
-                          (util.rapply(pycompat.maybebytestr, oldbmarks),
+                          (pycompat.rapply(pycompat.maybebytestr, oldbmarks),
                            hex(oldnode), hex(newnode)))
             # Delete divergent bookmarks being parents of related newnodes
             deleterevs = repo.revs('parents(roots(%ln & (::%n))) - parents(%n)',