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: use util.pconvert() consistently in context menu handlers

Changeset 1b62565e5b39…

Parent c3e667f164d0…

by Steve Borho

Changes to one file · Browse files at 1b62565e5b39 Showing diff from parent c3e667f164d0 Diff from another changeset...

Change 1 of 3 Show Entire File hggtk/​status.py Stacked
 
1299
1300
1301
1302
 
1303
1304
1305
 
1346
1347
1348
1349
 
1350
1351
1352
1353
1354
 
1355
1356
1357
1358
1359
1360
1361
 
1362
1363
1364
 
1379
1380
1381
1382
1383
 
1384
1385
1386
 
1299
1300
1301
 
1302
1303
1304
1305
 
1346
1347
1348
 
1349
1350
1351
1352
1353
 
1354
1355
1356
1357
1358
1359
1360
 
1361
1362
1363
1364
 
1379
1380
1381
 
 
1382
1383
1384
1385
@@ -1299,7 +1299,7 @@
  all = []   for p in tpaths:   row = model[p] - file = row[FM_PATH] + file = util.pconvert(row[FM_PATH])   ms = row[FM_MERGE_STATUS]   if ms == 'R':   types['r'].append(file) @@ -1346,19 +1346,19 @@
  def unmark(menuitem, files):   ms = merge_.mergestate(self.repo)   for wfile in files: - ms.mark(util.pconvert(wfile), "u") + ms.mark(wfile, "u")   self.reload_status()   def mark(menuitem, files):   ms = merge_.mergestate(self.repo)   for wfile in files: - ms.mark(util.pconvert(wfile), "r") + ms.mark(wfile, "r")   self.reload_status()   def resolve(stat, files):   wctx = self.repo[None]   mctx = wctx.parents()[-1]   for wfile in files:   ms = merge_.mergestate(self.repo) - ms.resolve(util.pconvert(wfile), wctx, mctx) + ms.resolve(wfile, wctx, mctx)   self.reload_status()   def resolve_with(stat, tool, files):   if tool: @@ -1379,8 +1379,7 @@
  dlg.show_all()   dlg.set_notify_func(self.ignoremask_updated)   def ignore(menuitem, files): - wfile = util.pconvert(files[0]) - dlg = hgignore.HgIgnoreDialog(self.repo.root, wfile) + dlg = hgignore.HgIgnoreDialog(files[0])   dlg.show_all()   dlg.set_notify_func(self.ignoremask_updated)