Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

status: report log entries for old and new subrepo versions

Changeset fa305d406a78…

Parent ac488050194b…

by Steve Borho

Changes to one file · Browse files at fa305d406a78 Showing diff from parent ac488050194b Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
315
316
317
318
 
319
320
321
322
 
 
 
 
 
 
 
 
 
 
 
 
 
323
324
325
 
315
316
317
 
318
319
 
 
 
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
@@ -315,11 +315,21 @@
  srev = self.wctx.substate.get(path, subrepo.nullstate)[1]   sactual = srepo['.'].hex()   commands.status(hu, srepo) - diff = hu.getdata()[0] + out = [hu.getdata()[0]]   if srev != sactual: - diff += '<br>' - diff += _('revision changed from %s to %s') % ( - srev[:12], sactual[:12]) + out.append('<b>') + out.append(_('revision changed from:')) + out.append('</b><br>') + opts = {'date':None, 'user':None, 'rev':[srev]} + commands.log(hu, srepo, **opts) + out.append(hu.getdata()[0]) + out.append('<b>') + out.append(_('to:')) + out.append('</b><br>') + opts['rev'] = [sactual] + commands.log(hu, srepo, **opts) + out.append(hu.getdata()[0]) + diff = ''.join(out)   except error.RepoError:   diff = _('<b>Not an hg subrepo, not previewable</b>')   else: