Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1.2 and tip

stable filedata: handle 'removed and dirty' subrepo state (closes #934)

We were not handling the 'removed and dirty' state of subrepos. I've decided
to consider this case the same as the 'removed' state, since if a remo is
removed, it does not matter whether it is dirty or not.

Changeset 34ddbc96f980

Parent ddd32324a2dd

by Angel Ezquerra

Changes to one file · Browse files at 34ddbc96f980 Showing diff from parent ddd32324a2dd Diff from another changeset...

 
138
139
140
141
 
142
143
144
 
271
272
273
274
 
 
275
276
277
 
138
139
140
 
141
142
143
144
 
271
272
273
 
274
275
276
277
278
@@ -138,7 +138,7 @@
  commands.log(_ui, srepo, **opts)   logOutput += _ui.popbuffer()   return logOutput - +   opts = {'date':None, 'user':None, 'rev':[sfrom]}   subabspath = os.path.join(repo.root, subrelpath)   missingsub = not os.path.isdir(subabspath) @@ -271,7 +271,8 @@
  'new': _('(is a new sub-repository)'),   'removed': _('(is a removed sub-repository)'),   'changed and dirty': _('(is a changed and dirty sub-repository)'), - 'new and dirty': _('(is a new and dirty sub-repository)') + 'new and dirty': _('(is a new and dirty sub-repository)'), + 'removed and dirty': _('(is a removed sub-repository)')   }[sstatedesc]   self.flabel += ' <i>' + lbl + '</i>'   if sactual: