Backed out changeset fc317bd5b637

mercurial/hg.py

@@ -1420,58 +1420,44 b' def incoming(ui, repo, source, opts, sub'
     )
 
 
-_no_subtoppath = object()
-
-
 def _outgoing(ui, repo, dests, opts, subpath=None):
     out = set()
     others = []
     for path in urlutil.get_push_paths(repo, ui, dests):
         dest = path.loc
-        prev_subtopath = getattr(repo, "_subtoppath", _no_subtoppath)
-        try:
-            repo._subtoppath = dest
-            if subpath is not None:
-                subpath = urlutil.url(subpath)
-                if subpath.isabs():
-                    dest = bytes(subpath)
+        repo._subtoppath = dest
+        if subpath is not None:
+            subpath = urlutil.url(subpath)
+            if subpath.isabs():
+                dest = bytes(subpath)
+            else:
+                p = urlutil.url(dest)
+                if p.islocal():
+                    normpath = os.path.normpath
                 else:
-                    p = urlutil.url(dest)
-                    if p.islocal():
-                        normpath = os.path.normpath
-                    else:
-                        normpath = posixpath.normpath
-                    p.path = normpath(b'%s/%s' % (p.path, subpath))
-                    dest = bytes(p)
-            branches = path.branch, opts.get(b'branch') or []
+                    normpath = posixpath.normpath
+                p.path = normpath(b'%s/%s' % (p.path, subpath))
+                dest = bytes(p)
+        branches = path.branch, opts.get(b'branch') or []
 
-            ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(dest))
-            revs, checkout = addbranchrevs(
-                repo, repo, branches, opts.get(b'rev')
+        ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(dest))
+        revs, checkout = addbranchrevs(repo, repo, branches, opts.get(b'rev'))
+        if revs:
+            revs = [repo[rev].node() for rev in logcmdutil.revrange(repo, revs)]
+
+        other = peer(repo, opts, dest)
+        try:
+            outgoing = discovery.findcommonoutgoing(
+                repo, other, revs, force=opts.get(b'force')
             )
-            if revs:
-                revs = [
-                    repo[rev].node() for rev in logcmdutil.revrange(repo, revs)
-                ]
-
-            other = peer(repo, opts, dest)
-            try:
-                outgoing = discovery.findcommonoutgoing(
-                    repo, other, revs, force=opts.get(b'force')
-                )
-                o = outgoing.missing
-                out.update(o)
-                if not o:
-                    scmutil.nochangesfound(repo.ui, repo, outgoing.excluded)
-                others.append(other)
-            except:  # re-raises
-                other.close()
-                raise
-        finally:
-            if prev_subtopath is _no_subtoppath:
-                del repo._subtoppath
-            else:
-                repo._subtoppath = prev_subtopath
+            o = outgoing.missing
+            out.update(o)
+            if not o:
+                scmutil.nochangesfound(repo.ui, repo, outgoing.excluded)
+            others.append(other)
+        except:  # re-raises
+            other.close()
+            raise
     # make sure this is ordered by revision number
     outgoing_revs = list(out)
     cl = repo.changelog
@@ -1543,6 +1529,7 b' def outgoing(ui, repo, dests, opts, subp'
     finally:
         for oth in others:
             oth.close()
+        del repo._subtoppath
 
 
 def verify(repo, level=None):