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

wctxactions: rename other to viewother

Changeset 3aab2ae731cc

Parent d9f84c04d83c

by Steve Borho

Changes to one file · Browse files at 3aab2ae731cc Showing diff from parent d9f84c04d83c Diff from another changeset...

 
39
40
41
42
 
43
44
45
 
131
132
133
134
 
135
136
137
 
39
40
41
 
42
43
44
45
 
131
132
133
 
134
135
136
137
@@ -39,7 +39,7 @@
  make(_('Edit'), edit, frozenset('MACI?'))   make(_('View missing'), viewmissing, frozenset('R!'))   if len(repo.parents()) > 1: - make(_('View other'), other, frozenset('MA')) + make(_('View other'), viewother, frozenset('MA'))   menu.addSeparator()   make(_('&Revert'), revert, frozenset('MAR!'))   menu.addSeparator() @@ -131,7 +131,7 @@
  base, _ = visdiff.snapshot(repo, files, repo['.'])   edit(parent, ui, repo, [os.path.join(base, f) for f in files])   -def other(parent, ui, repo, files): +def viewother(parent, ui, repo, files):   wctx = repo[None]   assert bool(wctx.p2())   base, _ = visdiff.snapshot(repo, files, wctx.p2())