Mercurial > public > mercurial-scm > hg-stable

diff mercurial/subrepo.py @ 22914:c95db3208a33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
status: update various other methods to return new class
author Martin von Zweigbergk <martinvonz@gmail.com>
date Tue, 14 Oct 2014 00:52:27 -0500
parents 15a70ca40b22
children 7d754b7acd55
line wrap: on
line diff
--- a/mercurial/subrepo.py	Fri Oct 10 14:32:36 2014 -0700
+++ b/mercurial/subrepo.py	Tue Oct 14 00:52:27 2014 -0500
@@ -9,7 +9,7 @@
 import xml.dom.minidom
 import stat, subprocess, tarfile
 from i18n import _
-import config, util, node, error, cmdutil, match as matchmod
+import config, util, node, error, cmdutil, scmutil, match as matchmod
 import phases
 import pathutil
 import exchange
@@ -448,7 +448,7 @@
         return 1
 
     def status(self, rev2, **opts):
-        return [], [], [], [], [], [], []
+        return scmutil.status([], [], [], [], [], [], [])
 
     def diff(self, ui, diffopts, node2, match, prefix, **opts):
         pass
@@ -650,7 +650,7 @@
         except error.RepoLookupError, inst:
             self._repo.ui.warn(_('warning: error "%s" in subrepository "%s"\n')
                                % (inst, subrelpath(self)))
-            return [], [], [], [], [], [], []
+            return scmutil.status([], [], [], [], [], [], [])
 
     @annotatesubrepoerror
     def diff(self, ui, diffopts, node2, match, prefix, **opts):
@@ -1583,7 +1583,8 @@
                 removed.append(f)
 
         deleted = unknown = ignored = clean = []
-        return modified, added, removed, deleted, unknown, ignored, clean
+        return scmutil.status(modified, added, removed, deleted,
+                              unknown, ignored, clean)
 
     def shortid(self, revid):
         return revid[:7]