##// END OF EJS Templates
record: remove dependency on hg module in record...
Laurent Charignon -
r24271:18792f2e default
parent child Browse files
Show More
@@ -8,8 +8,9 b''
8 '''commands to interactively select changes for commit/qrefresh'''
8 '''commands to interactively select changes for commit/qrefresh'''
9
9
10 from mercurial.i18n import _
10 from mercurial.i18n import _
11 from mercurial import cmdutil, commands, extensions, hg, patch
11 from mercurial import cmdutil, commands, extensions, patch
12 from mercurial import util
12 from mercurial import util
13 from mercurial import merge as mergemod
13 import cStringIO, errno, os, shutil, tempfile
14 import cStringIO, errno, os, shutil, tempfile
14
15
15 cmdtable = {}
16 cmdtable = {}
@@ -205,8 +206,10 b' def dorecord(ui, repo, commitfunc, cmdsu'
205
206
206 # 3a. apply filtered patch to clean repo (clean)
207 # 3a. apply filtered patch to clean repo (clean)
207 if backups:
208 if backups:
208 hg.revert(repo, repo.dirstate.p1(),
209 # Equivalent to hg.revert
209 lambda key: key in backups)
210 choices = lambda key: key in backups
211 mergemod.update(repo, repo.dirstate.p1(),
212 False, True, choices)
210
213
211 # 3b. (apply)
214 # 3b. (apply)
212 if dopatch:
215 if dopatch:
General Comments 0
You need to be logged in to leave comments. Login now