We are currently indexing your data, so search results may be incomplete until we finish.
reporegistry: improvements to subrepo support
The addRepo local function was moved from the repoitem.undump method into the
repo tree model class. Also, the warning message that is shown when some subrepo
or repo cannot be accessed has been improved.
Changeset 0dbd5cfd9c54…
Parent a588ed5b336c…
by
Changes to 2 files · Browse files at 0dbd5cfd9c54 Showing diff from parent a588ed5b336c Diff from another changeset...
|
@@ -215,61 +215,6 @@ self._basenode = node.bin(str(a.value('', 'basenode').toString()))
RepoTreeItem.undump(self, xr)
- if self.model \
- and (self.model.showSubrepos \
- or (not self.model.showNetworkSubrepos
- and paths.netdrive_status(self._root))):
- def addSubrepos(ri, repo):
- invalidRepoList = []
- try:
- wctx = repo['.']
- for subpath in wctx.substate:
- # For now we only support showing mercurial subrepos
- subtype = wctx.substate[subpath][2]
- sctx = wctx.sub(subpath)
- ri.appendChild(
- SubrepoItem(self.model, sctx._repo.root, subtype=subtype))
- if subtype == 'hg':
- # Only recurse into mercurial subrepos
- if ri.childCount():
- invalidRepoList += \
- addSubrepos(
- ri.child(ri.childCount()-1), sctx._repo)
- except (EnvironmentError, error.RepoError, util.Abort), e:
- # Add the repo to the list of repos/subrepos
- # that could not be open
- invalidRepoList.append(repo.root)
-
- return invalidRepoList
-
- root = self.rootpath()
- try:
- repo = hg.repository(ui.ui(), root)
- except (EnvironmentError, error.RepoError, util.Abort), e:
- # Do not try to show the list of subrepos when the top repository
- # could not be open
- # TODO: Mark the repo with a "warning" icon or similar to indicate
- # that the repository cannot be open
- self._valid = False
- return
-
- invalidRepoList = \
- addSubrepos(self, repo)
-
- if invalidRepoList:
- self._valid = False
- if invalidRepoList[0] == root:
- qtlib.WarningMsgBox(_('Could not get subrepository list'),
- _('It was not possible to get the subrepository list for '
- 'the repository in:<br><br><i>%s</i>') % root)
- else:
- qtlib.WarningMsgBox(_('Could not open some subrepositories'),
- _('It was not possible to fully load the subrepository list '
- 'for the repository in:<br><br><i>%s</i><br><br>'
- 'The following subrepositories could not be accessed:'
- '<br><br><i>%s</i>') %
- (root, "<br>".join(invalidRepoList)))
-
def details(self):
return _('Local Repository %s') % hglib.tounicode(self._root)
@@ -278,6 +223,44 @@ return self
return None
+ def appendSubrepos(self, repo=None):
+ invalidRepoList = []
+ try:
+ sri = None
+ if repo is None:
+ repo = hg.repository(ui.ui(), self._root)
+ wctx = repo['.']
+ for subpath in wctx.substate:
+ sri = None
+ abssubpath = repo.wjoin(subpath)
+ subtype = wctx.substate[subpath][2]
+ sriIsValid = os.path.isdir(abssubpath)
+ sri = SubrepoItem(self.model, abssubpath, subtype=subtype)
+ sri._valid = False
+ self.appendChild(sri)
+
+ if not sriIsValid:
+ self._valid = False
+ sri._valid = False
+ invalidRepoList.append(repo.wjoin(subpath))
+ return invalidRepoList
+ continue
+
+ if subtype == 'hg':
+ # Only recurse into mercurial subrepos
+ sctx = wctx.sub(subpath)
+ invalidRepoList += \
+ sri.appendSubrepos(sctx._repo)
+ except (EnvironmentError, error.RepoError, util.Abort), e:
+ # Add the repo to the list of repos/subrepos
+ # that could not be open
+ self._valid = False
+ if sri:
+ sri._valid = False
+ invalidRepoList.append(abssubpath)
+ invalidRepoList.append(self._root)
+
+ return invalidRepoList
def _overlaidicon(base, overlay):
"""Generate overlaid icon"""
|
||
|
|
@@ -63,6 +63,18 @@ if t == QXmlStreamReader.StartElement and xr.name() == 'repo':
yield undumpObject(xr, model)
+def getRepoItemList(root):
+ repoItemList = []
+ if not isinstance(root, RepoTreeItem):
+ return repoItemList
+ for c in root.childs:
+ if isinstance(c, RepoItem):
+ repoItemList.append(c)
+ else:
+ repoItemList += getRepoItemList(c)
+ return repoItemList
+
+
class RepoTreeModel(QAbstractItemModel):
def __init__(self, filename, parent, showSubrepos=True,
@@ -86,6 +98,9 @@ all = c
break
+ if self.showSubrepos:
+ self.loadSubrepos(root)
+
if not root:
root = RepoTreeItem(self)
all = AllRepoGroupItem(self)
@@ -232,44 +247,15 @@ if row < 0:
row = rgi.childCount()
self.beginInsertRows(grp, row, row)
- rgi.insertChild(row, RepoItem(self, root))
+ ri = RepoItem(self, root)
+ rgi.insertChild(row, ri)
if not self.showSubrepos \
or (not self.showNetworkSubrepos and paths.netdrive_status(root)):
self.endInsertRows()
return
- def addSubrepos(ri, repo):
- invalidRepoList = []
- try:
- wctx = repo['.']
- for subpath in wctx.substate:
- # For now we only support showing mercurial subrepos
- subtype = wctx.substate[subpath][2]
- sctx = wctx.sub(subpath)
- ri.insertChild(row,
- SubrepoItem(self, sctx._repo.root, subtype=subtype))
- if subtype == 'hg':
- # Only recurse into mercurial subrepos
- if ri.childCount():
- invalidRepoList += \
- addSubrepos(
- ri.child(ri.childCount()-1), sctx._repo)
- except (EnvironmentError, error.RepoError, util.Abort), e:
- # Add the repo to the list of repos/subrepos
- # that could not be open
- invalidRepoList.append(repo.root)
-
- return invalidRepoList
-
- try:
- repo = hg.repository(ui.ui(), root)
- invalidRepoList = \
- addSubrepos(rgi.child(rgi.childCount()-1), repo)
- except (EnvironmentError, error.RepoError, util.Abort), e:
- # TODO: Mark the repo with a "warning" icon or similar to indicate
- # that the repository cannot be open
- invalidRepoList = [root]
+ invalidRepoList = ri.appendSubrepos()
self.endInsertRows()
@@ -280,10 +266,11 @@ 'the repository in:<br><br><i>%s</i>') % root)
else:
qtlib.WarningMsgBox(_('Could not open some subrepositories'),
- _('It was not possible to fully load the subrepository list '
- 'for the repository in:<br><br><i>%s</i><br><br>'
- 'The following subrepositories could not be accessed:'
- '<br><br><i>%s</i>') %
+ _('It was not possible to fully load the subrepository '
+ 'list for the repository in:<br><br><i>%s</i><br><br>'
+ 'The following subrepositories may be missing, broken or '
+ 'on an inconsistent state and cannot be accessed:'
+ '<br><br><i>%s</i>') %
(root, "<br>".join(invalidRepoList)))
def getRepoItem(self, reporoot):
@@ -309,3 +296,48 @@ if index.row() < 0:
return count
count += 1
+
+ def loadSubrepos(self, root):
+ globalInvalidRepoList = []
+ globalInvalidSubrepoList = []
+ warningmsg = ''
+ for c in getRepoItemList(root):
+ if self.showNetworkSubrepos \
+ or not paths.netdrive_status(c.rootpath()):
+
+ invalidRepoList = c.appendSubrepos()
+
+ if invalidRepoList:
+ # The top repo or some of its subrepos could not be loaded
+ warningmsg += "<li>" + c.rootpath()
+ if invalidRepoList[0] == c.rootpath():
+ invalidRepoList = invalidRepoList[1:]
+ if invalidRepoList:
+ warningmsg += "<ul><li>"
+ warningmsg += "<li>".join(invalidRepoList)
+ warningmsg += "</ul>"
+
+ # If some repos or subrepos could not be loaded, show a warning message
+ if False:
+ warningmsg = ''
+ if globalInvalidRepoList:
+ warningmsg = _('Some repos could not be fully loaded:')
+ warningmsg += "<ul><li>"
+ warningmsg += "<li>".join(globalInvalidRepoList)
+ warningmsg += "</ul><br>"
+
+ if globalInvalidSubrepoList:
+ if warningmsg:
+ warningmsg += "<br>"
+ warningmsg = _('Some subrepos could not be loaded:')
+ warningmsg += "<br>"
+ warningmsg += "<br>".join(globalInvalidSubrepoList)
+
+ if warningmsg:
+ warningmsg = _('Some repos could not be fully loaded:') + \
+ "<ul>" + warningmsg + '</ul>'
+ QTimer.singleShot(0, \
+ lambda: qtlib.WarningMsgBox(
+ _('Missing or invalid repos or subrepos '
+ 'on the repository registry'),
+ warningmsg))
|
|
Add a tag
Loading...