D768: blackbox: do not prevent 'chg init' from working
quark (Jun Wu)
phabricator at mercurial-scm.org
Fri Sep 22 12:50:43 UTC 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb1d4ac068961: blackbox: do not prevent 'chg init' from working (authored by quark, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D768?vs=1975&id=2009
REVISION DETAIL
https://phab.mercurial-scm.org/D768
AFFECTED FILES
hgext/blackbox.py
tests/test-blackbox.t
CHANGE DETAILS
diff --git a/tests/test-blackbox.t b/tests/test-blackbox.t
--- a/tests/test-blackbox.t
+++ b/tests/test-blackbox.t
@@ -293,6 +293,13 @@
$ cd ..
+With chg, blackbox should not create the log file if the repo is gone
+
+ $ hg init repo1
+ $ hg --config extensions.a=! -R repo1 log
+ $ rm -rf $TESTTMP/repo1
+ $ hg --config extensions.a=! init repo1
+
#endif
blackbox should work if repo.ui.log is not called (issue5518)
diff --git a/hgext/blackbox.py b/hgext/blackbox.py
--- a/hgext/blackbox.py
+++ b/hgext/blackbox.py
@@ -77,9 +77,13 @@
class blackboxui(ui.__class__):
@property
def _bbvfs(self):
+ vfs = None
repo = getattr(self, '_bbrepo', None)
if repo:
- return repo.vfs
+ vfs = repo.vfs
+ if not vfs.isdir('.'):
+ vfs = None
+ return vfs
@util.propertycache
def track(self):
@@ -136,6 +140,10 @@
if not ui:
return
+ vfs = ui._bbvfs
+ if not vfs:
+ return
+
repo = getattr(ui, '_bbrepo', None)
if not lastui or repo:
lastui = ui
To: quark, #hg-reviewers, akushner
Cc: akushner, mercurial-devel
More information about the Mercurial-devel
mailing list