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

status: fix resolve and unmark in context menu

(broken since 0dbc7cd494a8)

Changeset 60224a69d48a…

Parent 76c7c2b1e9a9…

by Simon Heimberg

Changes to one file · Browse files at 60224a69d48a Showing diff from parent 76c7c2b1e9a9 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​status.py Stacked
 
1263
1264
1265
1266
 
1267
1268
1269
 
1301
1302
1303
1304
1305
 
 
1306
1307
1308
 
1263
1264
1265
 
1266
1267
1268
1269
 
1301
1302
1303
 
 
1304
1305
1306
1307
1308
@@ -1263,7 +1263,7 @@
  for wfile in files:   ms.mark(util.pconvert(wfile), "r")   self.reload_status() - def resolve(self, stat, wfile): + def resolve(stat, files):   wctx = self.repo[None]   mctx = wctx.parents()[-1]   for wfile in files: @@ -1301,8 +1301,8 @@
  if len(all) == 1:   make(_('_copy'), copy, 'MC')   make(_('rename'), rename, 'MC') - make(_('restart merge'), resolve, 'r') - make(_('mark unresolved'), mark, 'r') + make(_('restart merge'), resolve, 'u') + make(_('mark unresolved'), unmark, 'r')   make(_('mark resolved'), mark, 'u')     for label, func, stats in self.get_custom_menus():