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

status: check for large and binary files, skip diffs

Changeset 403130ae46a2…

Parent 6ccd63fa0a10…

by Steve Borho

Changes to 2 files · Browse files at 403130ae46a2 Showing diff from parent 6ccd63fa0a10 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​chunkselect.py Stacked
 
13
14
15
16
 
 
17
18
19
 
13
14
15
 
16
17
18
19
20
@@ -13,7 +13,8 @@
   from mercurial import hg, commands, util, cmdutil, mdiff, error, patch   -from tortoisehg.util import hgshelve +from tortoisehg.util import hgshelve, hglib +from tortoisehg.util.i18n import _  from tortoisehg.hgqt.htmllistview import HtmlListView  from tortoisehg.hgqt import htmlui  
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
8
9
10
11
 
12
13
14
 
21
22
23
24
 
 
25
26
27
 
 
28
29
30
31
32
 
124
125
126
 
 
 
 
 
 
 
127
128
129
 
8
9
10
 
11
12
13
14
 
21
22
23
 
24
25
26
27
28
29
30
31
 
32
33
34
 
126
127
128
129
130
131
132
133
134
135
136
137
138
@@ -8,7 +8,7 @@
 import os    from mercurial import ui, hg, util, patch, cmdutil, error, mdiff, context -from tortoisehg.hgqt import qtlib, htmlui +from tortoisehg.hgqt import qtlib, htmlui, chunkselect  from tortoisehg.util import paths, hglib  from tortoisehg.util.i18n import _   @@ -21,12 +21,14 @@
 # working copy browser.    # Technical Debt -# Handle large files, binary files, subrepos better +# Show diffs to both parents, when applicable +# Show merge status column, when appropriate  # Thread refreshWctx, connect to an external progress bar  # Thread rowSelected, connect to an external progress bar  # Need mechanisms to clear pats and toggle visibility options +# Need mechanism to override file size/binary check +# Show subrepos better  # Save splitter position to parent's QSetting -# Show merge status column, when appropriate  # Context menu, toolbar  # Sorting, filtering of working files  # Chunk selection @@ -124,6 +126,13 @@
  'Connected to treeview "clicked" signal'   pfile = index.model().getPath(index)   wfile = util.pconvert(pfile) + + warnings = chunkselect.check_max_diff(self.wctx, wfile) + if warnings: + text = '<b>Diffs not displayed: %s</b>' % warnings[1] + self.te.setHtml(text) + return +   hu = htmlui.htmlui()   try:   m = cmdutil.matchfiles(self.repo, [wfile])