Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.3, 2.0.4, and 2.0.5

stable filelistmodel: Show list of removed subrepos

Support for merge revisions is missing (i.e. it does not check subrepos that are
missing from the second parent)

Changeset 462bed1ecf51…

Parent fdd30e1ca71e…

by Angel Ezquerra

Changes to one file · Browse files at 462bed1ecf51 Showing diff from parent fdd30e1ca71e Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​filelistmodel.py Stacked
 
121
122
123
 
124
125
126
 
130
131
132
133
 
 
 
 
 
 
 
 
 
134
135
136
 
121
122
123
124
125
126
127
 
131
132
133
 
134
135
136
137
138
139
140
141
142
143
144
145
@@ -121,6 +121,7 @@
  if not isinstance(self._ctx, patchctx.patchctx):   if ".hgsubstate" in ctxfiles or ".hgsub" in ctxfiles:   from mercurial import subrepo + # Add the list of modified subrepos   for s, sd in self._ctx.substate.items():   srev = self._ctx.substate.get(s, subrepo.nullstate)[1]   sp1rev = self._ctx.p1().substate.get(s, subrepo.nullstate)[1] @@ -130,7 +131,15 @@
  if srev != sp1rev or (sp2rev != '' and srev != sp2rev):   wasmerged = ismerge and s in ctxfiles   files.append({'path': s, 'status': 'S', 'parent': parent, - 'wasmerged': wasmerged}) + 'wasmerged': wasmerged}) + # Add the list of missing subrepos + subreposet = set(self._ctx.substate.keys()) + subrepoparent1set = set(self._ctx.p1().substate.keys()) + missingsubreposet = subrepoparent1set.difference(subreposet) + for s in missingsubreposet: + wasmerged = ismerge and s in ctxfiles + files.append({'path': s, 'status': 'S', 'parent': parent, + 'wasmerged': wasmerged})     if self._fulllist and ismerge:   func = lambda x: True