subrepo: backout f02d7a562a21

backing out f02d7a562a21 because it introduced a bug in
.hgsubstate handling.

mercurial/localrepo.py

@@ -949,7 +949,6 b' class localrepository(repo.repository):'
 
             # commit subs
             if subs or removedsubs:
-                pstate = subrepo.substate(self['.'])
                 state = wctx.substate.copy()
                 for s in sorted(subs):
                     sub = wctx.sub(s)
@@ -957,19 +956,7 b' class localrepository(repo.repository):'
                         subrepo.subrelpath(sub))
                     sr = sub.commit(cctx._text, user, date)
                     state[s] = (state[s][0], sr)
-
-                changed = False
-                if len(pstate) != len(state):
-                    changed = True
-                if not changed:
-                    for newstate in state:
-                        if state[newstate][1] != pstate[newstate]:
-                            changed = True
-                if changed:
-                    subrepo.writestate(self, state)
-                elif (changes[0] == ['.hgsubstate'] and changes[1] == [] and
-                     changes[2] == []):
-                    return None
+                subrepo.writestate(self, state)
 
             # Save commit message in case this transaction gets rolled back
             # (e.g. by a pretxncommit hook).  Leave the content alone on

mercurial/subrepo.py

@@ -13,19 +13,6 b' hg = None'
 
 nullstate = ('', '', 'empty')
 
-
-def substate(ctx):
-    rev = {}
-    if '.hgsubstate' in ctx:
-        try:
-            for l in ctx['.hgsubstate'].data().splitlines():
-                revision, path = l.split(" ", 1)
-                rev[path] = revision
-        except IOError, err:
-            if err.errno != errno.ENOENT:
-                raise
-    return rev
-
 def state(ctx, ui):
     """return a state dict, mapping subrepo paths configured in .hgsub
     to tuple: (source from .hgsub, revision from .hgsubstate, kind
@@ -52,7 +39,15 b' def state(ctx, ui):'
     for path, src in ui.configitems('subpaths'):
         p.set('subpaths', path, src, ui.configsource('subpaths', path))
 
-    rev = substate(ctx)
+    rev = {}
+    if '.hgsubstate' in ctx:
+        try:
+            for l in ctx['.hgsubstate'].data().splitlines():
+                revision, path = l.split(" ", 1)
+                rev[path] = revision
+        except IOError, err:
+            if err.errno != errno.ENOENT:
+                raise
 
     state = {}
     for path, src in p[''].items():