This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6215

localrepo: don't allow lookup of working directory revision
ClosedPublic

Authored by martinvonz on Apr 5 2019, 2:34 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGfcd7a91dec23: localrepo: don't allow lookup of working directory revision
Summary

It seems that repo.lookup(), which is what supports the "lookup" wire
protocol command, should not allow the working copy revision
input.

This fixes both the pull test and the convert test I just added.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Apr 5 2019, 2:34 PM
martinvonz updated this revision to Diff 14688.Apr 5 2019, 3:21 PM
Closed by commit rHGfcd7a91dec23: localrepo: don't allow lookup of working directory revision (authored by martinvonz). · Explain WhyApr 8 2019, 2:50 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 14685

mercurial/localrepo.py

return self.branchmap().branchtip(branch) return self.branchmap().branchtip(branch)
except KeyError: except KeyError:
if not ignoremissing: if not ignoremissing:
raise error.RepoLookupError(_("unknown branch '%s'") % branch) raise error.RepoLookupError(_("unknown branch '%s'") % branch)
else: else:
pass pass
def lookup(self, key): def lookup(self, key):
return scmutil.revsymbol(self, key).node() node = scmutil.revsymbol(self, key).node()
if node is None:
raise error.RepoLookupError(_("unknown revision '%s'") % key)
return node
def lookupbranch(self, key): def lookupbranch(self, key):
if self.branchmap().hasbranch(key): if self.branchmap().hasbranch(key):
return key return key
return scmutil.revsymbol(self, key).branch() return scmutil.revsymbol(self, key).branch()
def known(self, nodes): def known(self, nodes):

tests/test-convert-hg-source.t

$ echo a > a $ echo a > a
$ hg ci -Aqm initial $ hg ci -Aqm initial
$ echo b > b $ echo b > b
$ hg ci -Aqm 'the previous commit was 3ccbd4cbba95' $ hg ci -Aqm 'the previous commit was 3ccbd4cbba95'
$ echo c > c $ echo c > c
$ hg ci -Aqm 'the working copy is called ffffffffffff' $ hg ci -Aqm 'the working copy is called ffffffffffff'
$ cd .. $ cd ..
BROKEN: crashes when the "ffffffffffff" is encountered
$ hg convert commit-references new-commit-references -q \ $ hg convert commit-references new-commit-references -q \
> --config convert.hg.startrev=1 2>&1 | grep TypeError > --config convert.hg.startrev=1 2>&1
TypeError: b2a_hex() argument 1 must be string or buffer, not None
$ cd new-commit-references $ cd new-commit-references
$ hg log -T '{node|short} {desc}\n' $ hg log -T '{node|short} {desc}\n'
0becf8e61603 the working copy is called ffffffffffff
38a97fe212e7 the previous commit was 3cf70f7c1f3b 38a97fe212e7 the previous commit was 3cf70f7c1f3b
3cf70f7c1f3b initial 3cf70f7c1f3b initial

tests/test-pull.t

abort: unknown revision 'xxxxxxxxxxxxxxxxxxxy'! abort: unknown revision 'xxxxxxxxxxxxxxxxxxxy'!
[255] [255]
$ hg pull -r 'xxxxxxxxxxxxxxxxxx y' $ hg pull -r 'xxxxxxxxxxxxxxxxxx y'
pulling from http://foo@localhost:$HGPORT/ pulling from http://foo@localhost:$HGPORT/
abort: unknown revision 'xxxxxxxxxxxxxxxxxx y'! abort: unknown revision 'xxxxxxxxxxxxxxxxxx y'!
[255] [255]
Test pull of working copy revision Test pull of working copy revision
BROKEN: should give a better error message
$ hg pull -r 'ffffffffffff' $ hg pull -r 'ffffffffffff'
pulling from http://foo@localhost:$HGPORT/ pulling from http://foo@localhost:$HGPORT/
abort: b2a_hex() argument 1 must be string or buffer, not None! abort: unknown revision 'ffffffffffff'!
[255] [255]
Issue622: hg init && hg pull -u URL doesn't checkout default branch Issue622: hg init && hg pull -u URL doesn't checkout default branch
$ cd .. $ cd ..
$ hg init empty $ hg init empty
$ cd empty $ cd empty
$ hg pull -u ../test $ hg pull -u ../test