Mercurial > hg

comparison mercurial/localrepo.py @ 6576:69f3e9ac7c56

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
walk: introduce match objects
author Matt Mackall <mpm@selenic.com>
date Mon, 12 May 2008 11:37:07 -0500
parents 4927cf61bdc1
children 569761919450
comparison
equal deleted inserted replaced
6575:e08e0367ba15 6576:69f3e9ac7c56
784 if use_dirstate: 784 if use_dirstate:
785 p1, p2 = self.dirstate.parents() 785 p1, p2 = self.dirstate.parents()
786 update_dirstate = True 786 update_dirstate = True
787 787
788 if (not force and p2 != nullid and 788 if (not force and p2 != nullid and
789 (files or match != util.always)): 789 (match.files() or match.anypats())):
790 raise util.Abort(_('cannot partially commit a merge ' 790 raise util.Abort(_('cannot partially commit a merge '
791 '(do not specify files or patterns)')) 791 '(do not specify files or patterns)'))
792 else: 792 else:
793 p1, p2 = p1, p2 or nullid 793 p1, p2 = p1, p2 or nullid
794 update_dirstate = (self.dirstate.parents()[0] == p1) 794 update_dirstate = (self.dirstate.parents()[0] == p1)