comparison mercurial/localrepo.py @ 4002:d7b9ec589546

symlinks: use is_link wherever is_exec is used

4001:dda03b2d9ef1

        # check in files
        new = {}
        linkrev = self.changelog.count()
        commit.sort()
        is_exec = util.execfunc(self.root, m1.execf)
        for f in commit:
            self.ui.note(f + "\n")
            try:
                new[f] = self.filecommit(f, m1, m2, linkrev, tr, changed)
                m1.set(f, is_exec(f))
            except IOError:
                if use_dirstate:
                    self.ui.warn(_("trouble committing %s!\n") % f)
                    raise
                else:

                # we are comparing working dir against non-parent
                # generate a pseudo-manifest for the working dir
                # XXX: create it in dirstate.py ?
                mf2 = mfmatches(self.dirstate.parents()[0])
                is_exec = util.execfunc(self.root, mf2.execf)
                for f in lookup + modified + added:
                    mf2[f] = ""
                    mf2.set(f, is_exec(f))
                for f in removed:
                    if f in mf2:
                        del mf2[f]
        else:
            # we are comparing two revisions

4002:d7b9ec589546

        # check in files
        new = {}
        linkrev = self.changelog.count()
        commit.sort()
        is_exec = util.execfunc(self.root, m1.execf)
        is_link = util.linkfunc(self.root, m1.linkf)
        for f in commit:
            self.ui.note(f + "\n")
            try:
                new[f] = self.filecommit(f, m1, m2, linkrev, tr, changed)
                m1.set(f, is_exec(f), is_link(f))
            except IOError:
                if use_dirstate:
                    self.ui.warn(_("trouble committing %s!\n") % f)
                    raise
                else:

                # we are comparing working dir against non-parent
                # generate a pseudo-manifest for the working dir
                # XXX: create it in dirstate.py ?
                mf2 = mfmatches(self.dirstate.parents()[0])
                is_exec = util.execfunc(self.root, mf2.execf)
                is_link = util.linkfunc(self.root, mf2.linkf)
                for f in lookup + modified + added:
                    mf2[f] = ""
                    mf2.set(f, is_exec(f), is_link(f))
                for f in removed:
                    if f in mf2:
                        del mf2[f]
        else:
            # we are comparing two revisions