Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.7, 0.7.1, and 0.7.2

status: do not display chunks with special git headers

adds/removes/binaries/symlinks/permission changes
These are not changes that can be selected for commit (shelve/record)

Changeset c1bffe723a8b…

Parent 698370c24a1f…

by Steve Borho

Changes to one file · Browse files at c1bffe723a8b Showing diff from parent 698370c24a1f Diff from another changeset...

Change 1 of 3 Show Entire File hggtk/​status.py Stacked
 
673
674
675
 
 
 
676
677
678
 
772
773
774
 
775
776
777
 
778
779
780
 
782
783
784
785
 
 
 
786
787
 
788
789
790
 
673
674
675
676
677
678
679
680
681
 
775
776
777
778
779
780
 
781
782
783
784
 
786
787
788
 
789
790
791
792
 
793
794
795
796
@@ -673,6 +673,9 @@
  if file in self._filechunks:   row = self._filechunks[file][0]   self.diff_tree.scroll_to_cell((row, ), None, True) + selection = self.diff_tree.get_selection() + selection.unselect_all() + selection.select_path((row,))   return False     def _diff_tree_row_act(self, tree, path, column): @@ -772,9 +775,10 @@
  difftext.extend(s.splitlines(True))   difftext = cStringIO.StringIO(''.join(difftext))   difftext.seek(0) +   self._shelve_chunks = hgshelve.parsepatch(difftext)   self._filechunks = {} - + skip = False   for n, chunk in enumerate(self._shelve_chunks):   fp = cStringIO.StringIO()   chunk.pretty(fp) @@ -782,9 +786,11 @@
  isheader = isinstance(chunk, hgshelve.header)   if isheader:   self._filechunks[chunk.filename()] = [len(self.diff_model)] - else: + self.diff_model.append([False, markedup, False, True, n]) + skip = chunk.special() + elif skip != True:   self._filechunks[chunk.filename()].append(len(self.diff_model)) - self.diff_model.append([False, markedup, not isheader, isheader, n]) + self.diff_model.append([False, markedup, True, False, n])   finally:   difftext.close()