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

wctxactions: implement viewmissing and viewother methods

Changeset d9f84c04d83c…

Parent b38c3e6b4beb…

by Steve Borho

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

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​wctxactions.py Stacked
 
9
10
11
12
 
13
14
15
 
99
100
101
102
103
 
104
105
106
 
119
120
121
122
123
 
124
125
126
 
128
129
130
 
131
132
 
 
133
134
135
 
 
 
 
136
137
138
 
9
10
11
 
12
13
14
15
 
99
100
101
 
 
102
103
104
105
 
118
119
120
 
 
121
122
123
124
 
126
127
128
129
130
 
131
132
133
134
 
135
136
137
138
139
140
141
@@ -9,7 +9,7 @@
 import subprocess    from mercurial import util, cmdutil, error, merge, commands -from tortoisehg.hgqt import qtlib, htmlui +from tortoisehg.hgqt import qtlib, htmlui, visdiff  from tortoisehg.util import hglib, shlib  from tortoisehg.util.i18n import _   @@ -99,8 +99,7 @@
  return notify    def vdiff(parent, ui, repo, files): - from tortoisehg.hgqt.visdiff import visualdiff - visualdiff(ui, repo, files, {}) + visdiff.visualdiff(ui, repo, files, {})    def edit(parent, ui, repo, files):   editor = (ui.config('tortoisehg', 'editor') or @@ -119,8 +118,7 @@
  cmdline = ' '.join([editor] + [util.localpath(f) for f in files])   cmdline = util.quotecommand(cmdline)   try: - from tortoisehg.hgqt.visdiff import openflags - subprocess.Popen(cmdline, shell=True, creationflags=openflags, + subprocess.Popen(cmdline, shell=True, creationflags=visdiff.openflags,   stderr=None, stdout=None, stdin=None)   except (OSError, EnvironmentError), e:   QtGui.QMessageBox.warning(parent, @@ -128,11 +126,16 @@
  _('%s : %s') % (cmd, str(e)))   return False   +  def viewmissing(parent, ui, repo, files): - raise NotImplementedError() + 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): - raise NotImplementedError() + wctx = repo[None] + assert bool(wctx.p2()) + base, _ = visdiff.snapshot(repo, files, wctx.p2()) + edit(parent, ui, repo, [os.path.join(base, f) for f in files])    def revert(parent, ui, repo, files):   revertopts = {'date': None, 'rev': '.'}