Patchwork [2,of,3] subrepo: always return scmutil.status() from gitsubrepo.status()

login
register
mail settings
Submitter Matt Harbison
Date March 4, 2015, 2:44 a.m.
Message ID <d9d38d9d0be0c2ccd16e.1425437081@Envy>
Download mbox | patch
Permalink /patch/7893/
State Accepted
Headers show

Comments

Matt Harbison - March 4, 2015, 2:44 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1425435856 18000
#      Tue Mar 03 21:24:16 2015 -0500
# Node ID d9d38d9d0be0c2ccd16e85ae7b42dcb52697648b
# Parent  6ea246c0b6db75b5891bc7e0b9bde880475a5253
subrepo: always return scmutil.status() from gitsubrepo.status()

This was accidentally left out of c95db3208a33.

Patch

diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py
--- a/mercurial/subrepo.py
+++ b/mercurial/subrepo.py
@@ -1640,7 +1640,7 @@ 
         rev1 = self._state[1]
         if self._gitmissing() or not rev1:
             # if the repo is missing, return no results
-            return [], [], [], [], [], [], []
+            return scmutil.status([], [], [], [], [], [], [])
         modified, added, removed = [], [], []
         self._gitupdatestat()
         if rev2: