comparison mercurial/localrepo.py @ 8501:ab0e3f7ea315

commit: some tidying

- simplify handling of 'close'
- kill silly wlock=None
- sort/uniq files later

8500:1024bef53d9e

        return fparent1

    def commit(self, files=None, text="", user=None, date=None, match=None,
               force=False, editor=False, extra={}):
        wlock = None
        if extra.get("close"):
            force = True
        if files:
            files = list(set(files))

        ret = None
        wlock = self.wlock()
        try:
            p1, p2 = self.dirstate.parents()

            if (not force and p2 != nullid and
                (match and (match.files() or match.anypats()))):
                raise util.Abort(_('cannot partially commit a merge '
                                   '(do not specify files or patterns)'))

            if files:
                modified, removed = [], []
                for f in files:
                    s = self.dirstate[f]
                    if s in 'nma':
                        modified.append(f)
                    elif s == 'r':
                        removed.append(f)

                        self.ui.warn(_("%s not tracked!\n") % f)
                changes = [modified, [], removed, [], []]
            else:
                changes = self.status(match=match)

            if (not (changes[0] or changes[1] or changes[2])
                and not force and p2 == nullid and
                self[None].branch() == self['.'].branch()):
                self.ui.status(_("nothing changed\n"))
                return None

            ms = merge_.mergestate(self)
            for f in changes[0]:

8501:ab0e3f7ea315

        return fparent1

    def commit(self, files=None, text="", user=None, date=None, match=None,
               force=False, editor=False, extra={}):
        ret = None
        wlock = self.wlock()
        try:
            p1, p2 = self.dirstate.parents()

            if (not force and p2 != nullid and match and
                (match.files() or match.anypats())):
                raise util.Abort(_('cannot partially commit a merge '
                                   '(do not specify files or patterns)'))

            if files:
                modified, removed = [], []
                for f in sorted(set(files)):
                    s = self.dirstate[f]
                    if s in 'nma':
                        modified.append(f)
                    elif s == 'r':
                        removed.append(f)

                        self.ui.warn(_("%s not tracked!\n") % f)
                changes = [modified, [], removed, [], []]
            else:
                changes = self.status(match=match)

            if (not force and not extra.get("close") and p2 == nullid
                and not (changes[0] or changes[1] or changes[2])
                and self[None].branch() == self['.'].branch()):
                self.ui.status(_("nothing changed\n"))
                return None

            ms = merge_.mergestate(self)
            for f in changes[0]: