diff -r 8197b395710e -r 4aa72cdf616f hgext/journal.py --- a/hgext/journal.py Tue Oct 08 19:35:30 2019 -0700 +++ b/hgext/journal.py Sun Oct 06 20:17:41 2019 -0700 @@ -102,7 +102,7 @@ def wrapdirstate(orig, repo): """Make journal storage available to the dirstate object""" dirstate = orig(repo) - if util.safehasattr(repo, b'journal'): + if util.safehasattr(repo, 'journal'): _setupdirstate(repo, dirstate) return dirstate @@ -111,7 +111,7 @@ """Records all dirstate parent changes in the journal.""" old = list(old) new = list(new) - if util.safehasattr(dirstate, b'journalstorage'): + if util.safehasattr(dirstate, 'journalstorage'): # only record two hashes if there was a merge oldhashes = old[:1] if old[1] == node.nullid else old newhashes = new[:1] if new[1] == node.nullid else new @@ -124,7 +124,7 @@ def recordbookmarks(orig, store, fp): """Records all bookmark changes in the journal.""" repo = store._repo - if util.safehasattr(repo, b'journal'): + if util.safehasattr(repo, 'journal'): oldmarks = bookmarks.bmstore(repo) for mark, value in pycompat.iteritems(store): oldvalue = oldmarks.get(mark, node.nullid) @@ -186,7 +186,7 @@ if ( repo.path == repopath and repo.shared() - and util.safehasattr(repo, b'journal') + and util.safehasattr(repo, 'journal') ): sharedrepo = hg.sharedreposource(repo) sharedfeatures = _readsharedfeatures(repo)