##// END OF EJS Templates
transplant: use match object rather than files for commit
Matt Mackall -
r8703:8676dd81 default
parent child Browse files
Show More
@@ -15,7 +15,7 b' map from a changeset hash to its hash in'
15
15
16 from mercurial.i18n import _
16 from mercurial.i18n import _
17 import os, tempfile
17 import os, tempfile
18 from mercurial import bundlerepo, changegroup, cmdutil, hg, merge
18 from mercurial import bundlerepo, changegroup, cmdutil, hg, merge, match
19 from mercurial import patch, revlog, util, error
19 from mercurial import patch, revlog, util, error
20
20
21 class transplantentry:
21 class transplantentry:
@@ -242,8 +242,11 b' class transplanter:'
242 if merge:
242 if merge:
243 p1, p2 = repo.dirstate.parents()
243 p1, p2 = repo.dirstate.parents()
244 repo.dirstate.setparents(p1, node)
244 repo.dirstate.setparents(p1, node)
245 m = match.always(repo.root, '')
246 else:
247 m = match.exact(repo.root, '', files)
245
248
246 n = repo.commit(files, message, user, date, extra=extra)
249 n = repo.commit(None, message, user, date, extra=extra, match=m)
247 if not merge:
250 if not merge:
248 self.transplants.set(n, node)
251 self.transplants.set(n, node)
249
252
General Comments 0
You need to be logged in to leave comments. Login now