Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

status: restore partial state of file

We were keeping track of the chunk state, so a file could transition from
'checked' to 'partial' just by selecting it in the file list and forcing
the dialog to read the chunk states. With this change, we recover the old
partial state.

Changeset 24cbfed52a35…

Parent b35f5051e8c5…

by Steve Borho

Changes to one file · Browse files at 24cbfed52a35 Showing diff from parent b35f5051e8c5 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​status.py Stacked
 
589
590
591
592
593
 
 
594
595
596
 
605
606
607
608
609
 
 
610
611
612
 
589
590
591
 
 
592
593
594
595
596
 
605
606
607
 
 
608
609
610
611
612
@@ -589,8 +589,8 @@
  model, tpaths = selection.get_selected_rows()   reselect = [model[path][FM_PATH] for path in tpaths]   waschecked = {} - for entry in model: - waschecked[entry[FM_PATH]] = entry[FM_CHECKED] + for row in model: + waschecked[row[FM_PATH]] = row[FM_CHECKED], row[FM_PARTIAL_SELECTED]     # merge-state of files   ms = merge_.mergestate(repo) @@ -605,8 +605,8 @@
  for wfile in wfiles:   mst = wfile in ms and ms[wfile].upper() or ""   wfile = util.localpath(wfile) - ck = waschecked.get(wfile, stat in 'MAR') - model.append([ck, stat, hglib.toutf(wfile), wfile, mst, False]) + ck, p = waschecked.get(wfile, (stat in 'MAR', False)) + model.append([ck, stat, hglib.toutf(wfile), wfile, mst, p])     self.auto_check() # may check more files