Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

merge: confirm when the user close dialog without committing

Changeset 8aa5f3e68c95…

Parent 3ae42cbed919…

by Yuki KODAMA

Changes to one file · Browse files at 8aa5f3e68c95 Showing diff from parent 3ae42cbed919 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​merge.py Stacked
 
121
122
123
124
125
 
 
 
 
 
 
 
 
 
 
 
 
126
127
128
 
121
122
123
 
 
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
@@ -121,8 +121,18 @@
  if ret == gtk.RESPONSE_YES:   abort()   else: - self.destroy() - return + repo = hg.repository(ui.ui(), path=paths.find_root()) + if len(repo.parents()) == 2: + ret = gdialog.Confirm(_('Confirm Exit'), [], self, + _('To complete merging, you need to commit' + ' merged files in working directory.\n\n' + 'Do you want to exit?')).run() + if ret == gtk.RESPONSE_YES: + self.destroy() + return # close dialog + else: + self.destroy() + return # close dialog   # Abort button   elif response_id == gtk.RESPONSE_CANCEL:   abort()