# HG changeset patch # User Greg Ward # Date 1312237104 14400 # Node ID e827bffa5fc5bd154e4c2317ca348f9040f8e993 # Parent 9275d497b7ea9ccda3de6e8b78051e065e1ee25d Rename local variable committish to commitref. diff -r 9275d497b7ea -r e827bffa5fc5 hgfastimport/hgimport.py --- a/hgfastimport/hgimport.py Mon Aug 01 17:26:50 2011 -0400 +++ b/hgfastimport/hgimport.py Mon Aug 01 18:18:24 2011 -0400 @@ -200,19 +200,19 @@ # This command means nothing to us pass - def _getcommit(self, committish): + def _getcommit(self, commitref): """Given a mark reference or a branch name, return the appropriate commit object. Return None if committish is a branch with no commits. Raises KeyError if anything else is out of whack. """ - if committish.startswith(":"): + if commitref.startswith(":"): # KeyError here indicates the input stream is broken. - return self.commitmap[committish] + return self.commitmap[commitref] else: - branch = self._getbranch(committish) + branch = self._getbranch(commitref) if branch is None: - raise ValueError("invalid committish: %r" % committish) + raise ValueError("invalid commit ref: %r" % commitref) heads = self.branchmap.get(branch) if heads is None: