Mercurial > hg
comparison hgext/transplant.py @ 41676:0531dff73d0b
match: delete unused root and cwd arguments from {always,never,exact}() (API)
Differential Revision: https://phab.mercurial-scm.org/D5930
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Sat, 09 Feb 2019 22:50:53 -0800 |
| parents | 5cb8158a61f7 |
| children | 5f2f6912c9e6 |
comparison
equal
deleted
inserted
replaced
| 41675:ddbebce94665 | 41676:0531dff73d0b |
|---|---|
| 323 else: | 323 else: |
| 324 files = None | 324 files = None |
| 325 if merge: | 325 if merge: |
| 326 p1 = repo.dirstate.p1() | 326 p1 = repo.dirstate.p1() |
| 327 repo.setparents(p1, node) | 327 repo.setparents(p1, node) |
| 328 m = match.always(repo.root, '') | 328 m = match.always() |
| 329 else: | 329 else: |
| 330 m = match.exact(repo.root, '', files) | 330 m = match.exact(files) |
| 331 | 331 |
| 332 n = repo.commit(message, user, date, extra=extra, match=m, | 332 n = repo.commit(message, user, date, extra=extra, match=m, |
| 333 editor=self.getcommiteditor()) | 333 editor=self.getcommiteditor()) |
| 334 if not n: | 334 if not n: |
| 335 self.ui.warn(_('skipping emptied changeset %s\n') % | 335 self.ui.warn(_('skipping emptied changeset %s\n') % |