D6042: py3: convert filtername to str if it's None
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Sun Mar 3 16:02:04 EST 2019
pulkit updated this revision to Diff 14320.
pulkit edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6042?vs=14285&id=14320
REVISION DETAIL
https://phab.mercurial-scm.org/D6042
AFFECTED FILES
mercurial/branchmap.py
CHANGE DETAILS
diff --git a/mercurial/branchmap.py b/mercurial/branchmap.py
--- a/mercurial/branchmap.py
+++ b/mercurial/branchmap.py
@@ -359,8 +359,11 @@
self.filteredhash = scmutil.filteredhash(repo, self.tiprev)
duration = util.timer() - starttime
+ filtername = repo.filtername
+ if filtername is None:
+ filtername = 'None'
repo.ui.log('branchcache', 'updated %s branch cache in %.4f seconds\n',
- repo.filtername, duration)
+ repo.filtername or b'None', duration)
self.write(repo)
To: pulkit, #hg-reviewers
Cc: yuja, mercurial-devel
More information about the Mercurial-devel
mailing list