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

status: check newly discovered files if 'MAR' status

Problem reported by Yuki Kodama.

Changeset 65b380a3ec95…

Parent 4a7a4b6cb502…

by Steve Borho

Changes to one file · Browse files at 65b380a3ec95 Showing diff from parent 4a7a4b6cb502 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​status.py Stacked
 
588
589
590
 
591
592
 
593
594
595
 
604
605
606
607
608
 
 
609
610
611
 
588
589
590
591
592
 
593
594
595
596
 
605
606
607
 
 
608
609
610
611
612
@@ -588,8 +588,9 @@
  # List of the currently checked and selected files to pass on to   # the new data   model, tpaths = selection.get_selected_rows() + reselect = [model[path][FM_PATH] for path in tpaths]   recheck = [entry[FM_PATH] for entry in model if entry[FM_CHECKED]] - reselect = [model[path][FM_PATH] for path in tpaths] + old = [entry[FM_PATH] for entry in model]     # merge-state of files   ms = merge_.mergestate(repo) @@ -604,8 +605,8 @@
  for wfile in changes:   mst = wfile in ms and ms[wfile].upper() or ""   wfile = util.localpath(wfile) - model.append([wfile in recheck, char, - hglib.toutf(wfile), wfile, mst, False]) + ck = wfile in recheck or (wfile not in old and char in 'MAR') + model.append([ck, char, hglib.toutf(wfile), wfile, mst, False])     self.auto_check()