Пример #1
0
 def merge(self, revision, no_commit, squash):
     msg = gitcmds.merge_message(revision)
     status, output = self.model.git.merge('-m'+msg,
                                           revision,
                                           no_commit=no_commit,
                                           squash=squash,
                                           with_stderr=True,
                                           with_status=True)
     return status, output
Пример #2
0
 def merge(self, revision, no_commit, squash):
     msg = gitcmds.merge_message(revision)
     status, output = self.model.git.merge('-m' + msg,
                                           revision,
                                           no_commit=no_commit,
                                           squash=squash,
                                           with_stderr=True,
                                           with_status=True)
     return status, output
Пример #3
0
    def do(self):
        squash = self.squash
        revision = self.revision
        no_commit = self.no_commit
        msg = gitcmds.merge_message(revision)

        status, output = self.model.git.merge(
            "-m", msg, revision, no_commit=no_commit, squash=squash, with_stderr=True, with_status=True
        )

        Interaction.log_status(status, output, "")
        self.model.update_status()
Пример #4
0
    def do(self):
        squash = self.squash
        revision = self.revision
        no_commit = self.no_commit
        msg = gitcmds.merge_message(revision)

        status, out, err = self.model.git.merge('-m', msg,
                                                revision,
                                                no_commit=no_commit,
                                                squash=squash)

        Interaction.log_status(status, out, err)
        self.model.update_status()
Пример #5
0
    def do(self):
        squash = self.squash
        revision = self.revision
        no_ff = self.no_ff
        no_commit = self.no_commit
        sign = self.sign
        msg = gitcmds.merge_message(revision)

        status, out, err = self.model.git.merge(
            "-m", msg, revision, gpg_sign=sign, no_ff=no_ff, no_commit=no_commit, squash=squash
        )
        Interaction.log_status(status, out, err)
        self.model.update_status()
Пример #6
0
    def do(self):
        squash = self.squash
        revision = self.revision
        no_commit = self.no_commit
        msg = gitcmds.merge_message(revision)

        status, out, err = self.model.git.merge('-m',
                                                msg,
                                                revision,
                                                no_commit=no_commit,
                                                squash=squash)

        Interaction.log_status(status, out, err)
        self.model.update_status()
Пример #7
0
    def merge_revision(self):
        """Merge the selected revision/branch"""
        revision = self.model.revision
        if not revision:
            qtutils.information('No Revision Specified',
                                'You must specify a revision to merge')
            return

        no_commit = not(self.view.checkbox_commit.isChecked())
        squash = self.view.checkbox_squash.isChecked()
        msg = gitcmds.merge_message()
        qtutils.log(*self.model.git.merge('-m'+msg,
                                         revision,
                                         strategy='recursive',
                                         no_commit=no_commit,
                                         squash=squash,
                                         with_stderr=True,
                                         with_status=True))
        self.view.accept()