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 resolve, resolve_with, mark, unmark

Changeset 41d4aa3aec01…

Parent 546a9d8cd282…

by Steve Borho

Changes to one file · Browse files at 41d4aa3aec01 Showing diff from parent 546a9d8cd282 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​wctxactions.py Stacked
 
173
174
175
176
 
 
 
 
 
 
177
178
179
 
 
 
 
180
181
182
 
 
 
 
183
184
185
 
 
 
 
 
 
 
 
 
173
174
175
 
176
177
178
179
180
181
182
183
 
184
185
186
187
188
189
 
190
191
192
193
194
195
 
196
197
198
199
200
201
202
203
@@ -173,13 +173,31 @@
  raise NotImplementedError()    def resolve(parent, ui, repo, files): - raise NotImplementedError() + wctx = repo[None] + mctx = wctx.parents()[-1] + ms = merge.mergestate(repo) + for wfile in files: + ms.resolve(wfile, wctx, mctx) + return True    def unmark(parent, ui, repo, files): - raise NotImplementedError() + ms = merge.mergestate(repo) + for wfile in files: + ms.mark(wfile, 'u') + return True    def mark(parent, ui, repo, files): - raise NotImplementedError() + ms = merge.mergestate(repo) + for wfile in files: + ms.mark(wfile, 'r') + return True    def resolve_with(tool, repo, files): - raise NotImplementedError() + oldmergeenv = os.environ.get('HGMERGE') + os.environ['HGMERGE'] = tool + resolve(None, None, repo, files) + if oldmergeenv: + os.environ['HGMERGE'] = oldmergeenv + else: + del os.environ['HGMERGE'] + return True