Submitter:	Marc Hedlund	Reviewers
Branch:		Groups:	reviewboard
Bugs:		People:
Change Number:	None	Repository:	Review Board SVN

Description:

Currently, if you call post-review outside of a checkout directory (somewhere that no SCM info is available), and you do not have Mercurial installed, you will see this error (using a bash shell):

Failed to execute command: hg root
/bin/sh: hg: command not found

That's not a very helpful or clear error message.  This patch causes the following error message to appear instead:

The current directory does not contain a checkout from a
supported source code repository.

That's much more clear and is a correct statement of the problem.

It looks like the Mercurial code was only tested on machines where Mercurial is installed.  I think the code as written would work fine in that case -- but, not all of us have it installed.

Testing Done:

I don't have Mercurial installed (hence this patch), but I have tested that post-review still works outside of a source controlled directory (giving a valid error), and inside of a Subversion checkout directory.

Diff revision 3 (Latest)

Jump to revision:	1 2 3
Changes between r3 and:	1 2 3

Files Changed:

/trunk/reviewboard/contrib/tools/post-review: 5 changes [ 1 2 3 4 5 ]

Expand changes

     """
     A wrapper around the svn Subversion tool that fetches repository
     information and generates compatible diffs.
     """
     def get_repository_info(self):
         if not check_install('svn help'):
             return None
         data = execute('svn info', ignore_errors=True)
         m = re.search(r'^Repository Root: (.+)$', data, re.M)
         if not m:
             return None
     """
     A wrapper around the p4 Perforce tool that fetches repository information
     and generates compatible diffs.
     """
     def get_repository_info(self):
         if not check_install('p4 help'):
             return None
         data = execute('p4 info', ignore_errors=True)
         m = re.search(r'^Server address: (.+)$', data, re.M)
         if not m:
             return None
     """
     A wrapper around the hg Mercurial tool that fetches repository
     information and generates compatible diffs.
     """
     def get_repository_info(self):
         if not check_install('hg --help'):
             return None
         data = execute('hg root', ignore_errors=True)
         if data.startswith('abort:'):
             # hg aborted => no mercurial repository here.
             return None
     A wrapper around git that fetches repository information and generates
     compatible diffs. This will attempt to generate a diff suitable for the
     remote repository, whether git, SVN or Perforce.
     """
     def get_repository_info(self):
         if not check_install('git --help'):
             return None
         git_dir = execute('git rev-parse --git-dir', ignore_errors=True).strip()
         if git_dir.startswith("fatal:") or not os.path.isdir(git_dir):
             return None
     fd, tmpfile = mkstemp()
     os.close(fd)
     tempfiles.append(tmpfile)
     return tmpfile
 def check_install(command):
     """
     Try executing an external command and return a boolean indicating whether
     that command is installed or not.  The 'command' argument should be something
     that executes quickly, without hitting the network (for instance, 'svn help'
     or 'git --version').
     """
     try:
         p = subprocess.Popen(command.split(' '),
                              stdin=subprocess.PIPE,
                              stdout=subprocess.PIPE,
                              stderr=subprocess.PIPE)
         return True
     except OSError:
         return False
 def execute(command, split_lines=False, ignore_errors=False, extra_ignore_errors=()):
     """
     Utility function to execute a command and return the output.
     """

/trunk/reviewboard/contrib/tools/post-review: 5 changes [ 1 2 3 4 5 ]

Review Board

beta

This change has been marked as submitted.

Correct post-review error messages when run outside of a checkout directory, when Mercurial is not installed

Diff revision 3 (Latest)

Other reviews

Your comment