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

chunks: use rejects dialog to resolve rejected patch chunks

Changeset 9188ea341423…

Parent e4749c1529d6…

by Steve Borho

Changes to one file · Browse files at 9188ea341423 Showing diff from parent e4749c1529d6 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​chunks.py Stacked
 
119
120
121
122
123
124
125
126
127
128
129
 
 
 
 
 
130
131
132
 
119
120
121
 
 
 
 
 
 
 
 
122
123
124
125
126
127
128
129
@@ -119,14 +119,11 @@
  unicode(line) + u'<br><br>' +   _('Edit patched file and rejects?'),   parent=self): - wctxactions.edit(self, repo.ui, repo, [wfile, wfile+'.rej']) - else: - return False - if qtlib.QuestionMsgBox(_('Were the rejected chunks resolved?'), - _('Remove these chunks from their source?'), - parent=self): - ok = True - else: + #wctxactions.edit(self, repo.ui, repo, [wfile, wfile+'.rej']) + from tortoisehg.hgqt import rejects + dlg = rejects.RejectsDialog(repo.wjoin(wfile), self) + if dlg.exec_() == QDialog.Accepted: + ok = True   break   if updatestate and ok:   # Apply operations specified in git diff headers