Mercurial > hg
comparison mercurial/localrepo.py @ 24382:5859af34c5a6
localrepo: remove check for matcher object that's never None
author | Martin von Zweigbergk <martinvonz@gmail.com> |
---|---|
date | Tue, 30 Sep 2014 16:40:15 -0700 |
parents | 9347c15d8136 |
children | 521cecb4a3f1 |
comparison
equal
deleted
inserted
replaced
24381:82b82168d045 | 24382:5859af34c5a6 |
---|---|
1313 wlock = self.wlock() | 1313 wlock = self.wlock() |
1314 try: | 1314 try: |
1315 wctx = self[None] | 1315 wctx = self[None] |
1316 merge = len(wctx.parents()) > 1 | 1316 merge = len(wctx.parents()) > 1 |
1317 | 1317 |
1318 if (not force and merge and match and | 1318 if (not force and merge and (match.files() or match.anypats())): |
1319 (match.files() or match.anypats())): | |
1320 raise util.Abort(_('cannot partially commit a merge ' | 1319 raise util.Abort(_('cannot partially commit a merge ' |
1321 '(do not specify files or patterns)')) | 1320 '(do not specify files or patterns)')) |
1322 | 1321 |
1323 status = self.status(match=match, clean=force) | 1322 status = self.status(match=match, clean=force) |
1324 if force: | 1323 if force: |