Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset 1aef589579fe…

Parents d5d83aaa82cc…

Parents 374d40d80501…

by Steve Borho

Changes to one file · Browse files at 1aef589579fe Showing diff from parent d5d83aaa82cc 374d40d80501 Diff from another changeset...

Change 1 of 5 Show Entire File tortoisehg/​hgtk/​status.py Stacked
 
86
87
88
 
89
90
91
 
703
704
705
 
706
707
708
 
722
723
724
 
725
726
727
 
828
829
830
 
 
831
832
833
 
1152
1153
1154
 
1155
1156
1157
 
86
87
88
89
90
91
92
 
704
705
706
707
708
709
710
 
724
725
726
727
728
729
730
 
831
832
833
834
835
836
837
838
 
1157
1158
1159
1160
1161
1162
1163
@@ -86,6 +86,7 @@
  self.mode = 'status'   self.ready = False   self.filechunks = {} + self.diffmodelfile = None   self.status = (None,) * 7   self.status_error = None   self.preview_tab_name_label = None @@ -703,6 +704,7 @@
  if row[FM_PARTIAL_SELECTED]:   self.update_hunk_model(i, self.filetree)   self.diffmodel.clear() + self.diffmodelfile = None     # recover selections   firstrow = None @@ -722,6 +724,7 @@
  self.preview_text.set_buffer(gtk.TextBuffer())   if not is_merge:   self.diffmodel.clear() + self.diffmodelfile = None     self.filetree.show()   if self.mode == 'commit': @@ -828,6 +831,8 @@
  chunks = self.filechunks[wfile]   for chunk in chunks:   chunk.active = selected + if wfile != self.diffmodelfile: + return   for n, chunk in enumerate(chunks):   if n == 0:   continue @@ -1152,6 +1157,7 @@
  # Read this file's diffs into hunk selection model   wfile = self.filemodel[path][FM_PATH]   self.diffmodel.clear() + self.diffmodelfile = wfile   if not self.is_merge():   self.append_diff_hunks(wfile)   if len(self.diffmodel):