Mercurial > public > mercurial-scm > hg-stable
comparison hgext/git/gitlog.py @ 52654:7d2fc79a3e5a
git: consistify & fix LookupError messages
This includes 3 one-line fixes:
1. use the "no node" message instead of "no such node" for consistency
2. drop superfluous (and wrong & unused) %d format string token
3. correct one message to "no rev" since it indicates a rev that wasn't found
author | Josef 'Jeff' Sipek <jeffpc@josefsipek.net> |
---|---|
date | Sat, 04 Jan 2025 08:45:28 -0500 |
parents | 3865451a5fab |
children | d7368933f4b0 |
comparison
equal
deleted
inserted
replaced
52653:3865451a5fab | 52654:7d2fc79a3e5a |
---|---|
137 return -1 | 137 return -1 |
138 t = self._db.execute( | 138 t = self._db.execute( |
139 'SELECT rev FROM changelog WHERE node = ?', (gitutil.togitnode(n),) | 139 'SELECT rev FROM changelog WHERE node = ?', (gitutil.togitnode(n),) |
140 ).fetchone() | 140 ).fetchone() |
141 if t is None: | 141 if t is None: |
142 raise error.LookupError(n, b'00changelog.i', _(b'no node %d')) | 142 raise error.LookupError(n, b'00changelog.i', _(b'no node')) |
143 return t[0] | 143 return t[0] |
144 | 144 |
145 def node(self, r): | 145 def node(self, r): |
146 if r == nullrev: | 146 if r == nullrev: |
147 return sha1nodeconstants.nullid | 147 return sha1nodeconstants.nullid |
148 t = self._db.execute( | 148 t = self._db.execute( |
149 'SELECT node FROM changelog WHERE rev = ?', (r,) | 149 'SELECT node FROM changelog WHERE rev = ?', (r,) |
150 ).fetchone() | 150 ).fetchone() |
151 if t is None: | 151 if t is None: |
152 raise error.LookupError(r, b'00changelog.i', _(b'no node')) | 152 raise error.LookupError(r, b'00changelog.i', _(b'no rev')) |
153 return bin(t[0]) | 153 return bin(t[0]) |
154 | 154 |
155 def synthetic(self, n): | 155 def synthetic(self, n): |
156 """Map any node to a non-synthetic node. | 156 """Map any node to a non-synthetic node. |
157 | 157 |
631 INNER JOIN changedfiles ON changelog.node = changedfiles.node | 631 INNER JOIN changedfiles ON changelog.node = changedfiles.node |
632 WHERE changedfiles.filename = ? AND changedfiles.filenode = ?''', | 632 WHERE changedfiles.filename = ? AND changedfiles.filenode = ?''', |
633 (pycompat.fsdecode(self.path), gitutil.togitnode(node)), | 633 (pycompat.fsdecode(self.path), gitutil.togitnode(node)), |
634 ).fetchone() | 634 ).fetchone() |
635 if row is None: | 635 if row is None: |
636 raise error.LookupError(self.path, node, _(b'no such node')) | 636 raise error.LookupError(self.path, node, _(b'no node')) |
637 return int(row[0]) | 637 return int(row[0]) |
638 | 638 |
639 def node(self, rev): | 639 def node(self, rev): |
640 maybe = self._db.execute( | 640 maybe = self._db.execute( |
641 '''SELECT filenode FROM changedfiles | 641 '''SELECT filenode FROM changedfiles |