This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6217

remotefilelog: correctly reject wdir filenodes
ClosedPublic

Authored by durin42 on Apr 8 2019, 10:59 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG864f9f63d3ed: remotefilelog: correctly reject wdir filenodes
Summary

This fixes hg grep -r 'wdir()' when remotefilelog is enabled and the working
directory contains uncommitted modifications.

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.

Event Timeline

durin42 created this revision.Apr 8 2019, 10:59 AM
martinvonz added a subscriber: martinvonz.Apr 8 2019, 6:07 PM
martinvonz added inline comments.
tests/test-remotefilelog-blame.t
40

dropping the leading + in flight :)

Closed by commit rHG864f9f63d3ed: remotefilelog: correctly reject wdir filenodes (authored by durin42). · Explain WhyApr 8 2019, 6:09 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 14700

hgext/remotefilelog/remotefilelog.py

# remotefilelog.py - filelog implementation where filelog history is stored # remotefilelog.py - filelog implementation where filelog history is stored
# remotely # remotely
# #
# Copyright 2013 Facebook, Inc. # Copyright 2013 Facebook, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import collections import collections
import os import os
from mercurial.node import bin, nullid from mercurial.node import (
bin,
nullid,
wdirfilenodeids,
wdirid,
)
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
ancestor, ancestor,
error, error,
mdiff, mdiff,
revlog, revlog,
) )
from mercurial.utils import storageutil from mercurial.utils import storageutil
this is generally only used for bundling and communicating with vanilla this is generally only used for bundling and communicating with vanilla
hg clients. hg clients.
""" """
if node == nullid: if node == nullid:
return "" return ""
if len(node) != 20: if len(node) != 20:
raise error.LookupError(node, self.filename, raise error.LookupError(node, self.filename,
_('invalid revision input')) _('invalid revision input'))
if node == wdirid or node in wdirfilenodeids:
raise error.WdirUnsupported
store = self.repo.contentstore store = self.repo.contentstore
rawtext = store.get(self.filename, node) rawtext = store.get(self.filename, node)
if raw: if raw:
return rawtext return rawtext
flags = store.getmeta(self.filename, node).get(constants.METAKEYFLAG, 0) flags = store.getmeta(self.filename, node).get(constants.METAKEYFLAG, 0)
if flags == 0: if flags == 0:
return rawtext return rawtext

tests/test-remotefilelog-blame.t

1: y 1: y
2: z 2: z
2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob) 2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
Test grepping the working directory. Test grepping the working directory.
$ hg grep --all-files x $ hg grep --all-files x
x:x x:x
BROKEN: modifications in the wdir tries to fetch from the server.
$ echo foo >> x $ echo foo >> x
$ hg grep --all-files x $ hg grep --all-files x
remote: abort: working directory revision cannot be specified x:x
martinvonzUnsubmitted
Not Done

dropping the leading + in flight :)

martinvonz: dropping the leading `+` in flight :)
1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
abort: error downloading file contents:
'connection closed early'
[255]