Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0, 2.0.1, and 2.0.2

stable patchctx: fix patch context display after merge improvements

Changeset dd0d41322283…

Parent a71eec775f3b…

by Steve Borho

Changes to 2 files · Browse files at dd0d41322283 Showing diff from parent a71eec775f3b Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​filelistmodel.py Stacked
 
82
83
84
85
86
 
 
87
88
89
 
82
83
84
 
 
85
86
87
88
89
@@ -82,8 +82,8 @@
    def revFromIndex(self, index):   'return revision for index. index is guarunteed to be valid' - if not bool(self._ctx.p2()): - return self._ctx.p1().rev() + if len(self._ctx.parents()) < 2: + return None   row = index.row()   data = self._files[row]   if (data['wasmerged'] and self._secondParent) or \
Change 1 of 1 Show Entire File tortoisehg/​util/​patchctx.py Stacked
 
88
89
90
 
 
91
92
93
 
88
89
90
91
92
93
94
95
@@ -88,6 +88,8 @@
  def bookmarks(self): return ()   def children(self): return ()   def extra(self): return {} + def p1(self): return None + def p2(self): return None     def flags(self, wfile):   if wfile in self._files: