=== modified file 'pqm/__init__.py' --- pqm/__init__.py 2007-06-27 01:27:38 +0000 +++ pqm/__init__.py 2007-07-09 05:02:07 +0000 @@ -545,6 +545,20 @@ self.successful.append(line) self.output += ['\n', '%s succeeded at %s' % (merge_name, time.strftime('%c')), '\n'] self.get_vcs().commit(sender, dir, self.commitmsg, to_repo_revision, config) + # Now that we've committed to the branch, let's include the + # commit details in the output + try: + revno, commit_msg = self.get_vcs().latest_revision_info(to_repo_revision) + self.successful[-1] = ("%s\n" + "Revision: %s \n" + "Commit Message: %s" + % (line, revno, commit_msg)) + self.output += ["\n", "Revision Details:", "\n", + "Revision: %s" % revno, "\n", + "Commit Message: %s" % commit_msg, "\n"] + except PQMTlaFailure: + # If the latest_revision_info function isn't implemented + pass def get_arch_impl(self): if self.arch_impl is None: @@ -1222,6 +1236,9 @@ def make_local_dir(self, sender, branch, output_dir): raise PQMTlaFailure(sender, 'Unsupported operation') + def latest_revision_info(self, sender, branch): + raise PQMTlaFailure(sender, 'Unsupported operation') + class ArchHandler(VCSHandler): @@ -1439,6 +1456,11 @@ BranchReferenceFormat().initialize(checkout, branch) checkout.create_workingtree(branch.last_revision()) + def latest_revision_info(self, branch_location): + from bzrlib.branch import Branch + branch = Branch.open(branch_location) + return branch.revno(), branch.repository.get_revision(branch.last_revision()).message + class BranchSpecOptionHandler: """Configuration mechanism for a branch specifications.