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

status: show subrepo status, when the user asks nicely

Changeset 122baf1b6ec2…

Parent 9091c6f0c342…

by Steve Borho

Changes to one file · Browse files at 122baf1b6ec2 Showing diff from parent 9091c6f0c342 Diff from another changeset...

Change 1 of 5 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
8
9
10
11
 
12
13
14
 
22
23
24
25
26
27
28
 
277
278
279
 
280
281
282
 
307
308
309
 
 
 
 
 
 
 
 
 
 
 
 
 
 
310
311
312
 
318
319
320
321
322
323
324
 
8
9
10
 
11
12
13
14
 
22
23
24
 
25
26
27
 
276
277
278
279
280
281
282
 
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
 
332
333
334
 
335
336
337
@@ -8,7 +8,7 @@
 import os    from mercurial import ui, hg, util, patch, cmdutil, error, mdiff -from mercurial import context, merge +from mercurial import context, merge, commands  from tortoisehg.hgqt import qtlib, htmlui, chunkselect, wctxactions, visdiff  from tortoisehg.util import paths, hglib  from tortoisehg.hgqt.i18n import _ @@ -22,7 +22,6 @@
 # Technical Debt  # We need a real icon set for file status types  # Thread rowSelected, connect to an external progress bar -# Show subrepos better  # Chunk selection, tri-state checkboxes for commit  # Maybe, Maybe Not  # Investigate folding/nesting of files @@ -277,6 +276,7 @@
  wfile = util.pconvert(path)   self.fnamelabel.setText(statusMessage(status, mst, upath))   showanyway = self.override.isChecked() + hu = htmlui.htmlui()     if status in '?I':   if showanyway: @@ -307,6 +307,20 @@
  self.te.setHtml(diff)   self.override.setEnabled(True)   return + elif status in 'S': + if showanyway: + try: + sroot = self.repo.wjoin(path) + srepo = hg.repository(hu, path=sroot) + commands.status(hu, srepo) + diff = hu.getdata()[0] + except error.RepoError: + diff = _('<b>Not an hg subrepo, not previewable</b>') + else: + diff = _('<b>Subrepository status not displayed</b>') + self.te.setHtml(diff) + self.override.setEnabled(True) + return     warnings = chunkselect.check_max_diff(self.wctx, wfile)   if warnings and not showanyway: @@ -318,7 +332,6 @@
  self.override.setEnabled(False)     # Generate diffs to first parent - hu = htmlui.htmlui()   m = cmdutil.matchfiles(self.repo, [wfile])   try:   for s, l in patch.difflabel(self.wctx.diff, match=m, git=True):