This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10522

git: make changelog.tiprev() return int instead of tuple (issue6510)
ClosedPublic

Authored by mharbison72 on Apr 27 2021, 7:52 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG497cedcb6504: git: make changelog.tiprev() return int instead of tuple (issue6510)

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mhgext/git/gitlog.py (7 lines)
Mtests/test-git-interop.t (31 lines)

Diff 27430

hgext/git/gitlog.py

'ORDER BY REV ASC', 'ORDER BY REV ASC',
(start, stop), (start, stop),
) )
return (int(r[0]) for r in t) return (int(r[0]) for r in t)
def tiprev(self): def tiprev(self):
t = self._db.execute( t = self._db.execute(
'SELECT rev FROM changelog ' 'ORDER BY REV DESC ' 'LIMIT 1' 'SELECT rev FROM changelog ' 'ORDER BY REV DESC ' 'LIMIT 1'
) ).fetchone()
return next(t)
if t is not None:
return t[0]
return -1
def _partialmatch(self, id): def _partialmatch(self, id):
if wdirhex.startswith(id): if wdirhex.startswith(id):
raise error.WdirUnsupported raise error.WdirUnsupported
candidates = [ candidates = [
bin(x[0]) bin(x[0])
for x in self._db.execute( for x in self._db.execute(
'SELECT node FROM changelog WHERE node LIKE ?', 'SELECT node FROM changelog WHERE node LIKE ?',

tests/test-git-interop.t

Now globally enable extension for the rest of the test: Now globally enable extension for the rest of the test:
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [extensions] > [extensions]
> git= > git=
> [git] > [git]
> log-index-cache-miss = yes > log-index-cache-miss = yes
> EOF > EOF
Test some edge cases around a commitless repo first
$ mkdir empty
$ cd empty
$ git init
Initialized empty Git repository in $TESTTMP/empty/.git/
$ hg init --git
$ hg heads
[1]
$ cd ..
Make a new repo with git: Make a new repo with git:
$ mkdir foo $ mkdir foo
$ cd foo $ cd foo
$ git init $ git init
Initialized empty Git repository in $TESTTMP/foo/.git/ Initialized empty Git repository in $TESTTMP/foo/.git/
Ignore the .hg directory within git: Ignore the .hg directory within git:
$ echo .hg >> .git/info/exclude $ echo .hg >> .git/info/exclude
$ echo alpha > alpha $ echo alpha > alpha
+bar +bar
Deleting files should also work (this was issue6398) Deleting files should also work (this was issue6398)
$ hg revert -r . --all $ hg revert -r . --all
reverting beta reverting beta
$ hg rm beta $ hg rm beta
$ hg ci -m 'remove beta' $ hg ci -m 'remove beta'
This covers changelog.tiprev() (issue6510)
$ hg log -r '(.^^):'
heads mismatch, rebuilding dagcache
changeset: 5:ae1ab744f95b
user: test <test>
date: Thu Jan 01 00:00:00 1970 +0000
summary: Introduce file a/mu
changeset: 6:80adc61cf57e
user: test <test>
date: Thu Jan 01 00:00:00 1970 +0000
summary: test interactive commit
changeset: 7:116aee5ecdff
bookmark: master
tag: tip
user: test <test>
date: Thu Jan 01 00:00:00 1970 +0000
summary: remove beta