equal
deleted
inserted
replaced
570 return [] |
570 return [] |
571 |
571 |
572 def shortid(self, revid): |
572 def shortid(self, revid): |
573 return revid |
573 return revid |
574 |
574 |
|
575 def verify(self): |
|
576 '''verify the integrity of the repository. Return 0 on success or |
|
577 warning, 1 on any error. |
|
578 ''' |
|
579 return 0 |
|
580 |
575 @propertycache |
581 @propertycache |
576 def wvfs(self): |
582 def wvfs(self): |
577 """return vfs to access the working directory of this subrepository |
583 """return vfs to access the working directory of this subrepository |
578 """ |
584 """ |
579 return scmutil.vfs(self._ctx.repo().wvfs.join(self._path)) |
585 return scmutil.vfs(self._ctx.repo().wvfs.join(self._path)) |
1008 pats = [] |
1014 pats = [] |
1009 cmdutil.revert(self.ui, self._repo, ctx, parents, *pats, **opts) |
1015 cmdutil.revert(self.ui, self._repo, ctx, parents, *pats, **opts) |
1010 |
1016 |
1011 def shortid(self, revid): |
1017 def shortid(self, revid): |
1012 return revid[:12] |
1018 return revid[:12] |
|
1019 |
|
1020 def verify(self): |
|
1021 try: |
|
1022 rev = self._state[1] |
|
1023 ctx = self._repo.unfiltered()[rev] |
|
1024 if ctx.hidden(): |
|
1025 # Since hidden revisions aren't pushed/pulled, it seems worth an |
|
1026 # explicit warning. |
|
1027 ui = self._repo.ui |
|
1028 ui.warn(_("subrepo '%s' is hidden in revision %s\n") % |
|
1029 (self._relpath, node.short(self._ctx.node()))) |
|
1030 return 0 |
|
1031 except error.RepoLookupError: |
|
1032 # A missing subrepo revision may be a case of needing to pull it, so |
|
1033 # don't treat this as an error. |
|
1034 self._repo.ui.warn(_("subrepo '%s' not found in revision %s\n") % |
|
1035 (self._relpath, node.short(self._ctx.node()))) |
|
1036 return 0 |
1013 |
1037 |
1014 @propertycache |
1038 @propertycache |
1015 def wvfs(self): |
1039 def wvfs(self): |
1016 """return own wvfs for efficiency and consitency |
1040 """return own wvfs for efficiency and consitency |
1017 """ |
1041 """ |