Skip to content
Snippets Groups Projects
Commit c5d35995d192 authored by Mads Kiilerich's avatar Mads Kiilerich
Browse files

largefiles: better handling of log from other working directory (issue4236)

When invoked from another directory, the matchers m._cwd will be the absolute
path. The code for calculating relative path to .hglf did not consider that and
log would fail with weird errors and paths.

For now, just don't do any largefile magic when invoked from other directories.
parent 0e1cbd3d52f7
No related branches found
No related tags found
No related merge requests found
...@@ -270,6 +270,9 @@ ...@@ -270,6 +270,9 @@
pats = set(p) pats = set(p)
# TODO: handling of patterns in both cases below # TODO: handling of patterns in both cases below
if m._cwd: if m._cwd:
if os.path.isabs(m._cwd):
# TODO: handle largefile magic when invoked from other cwd
return matchandpats
back = (m._cwd.count('/') + 1) * '../' back = (m._cwd.count('/') + 1) * '../'
pats.update(back + lfutil.standin(m._cwd + '/' + f) for f in p) pats.update(back + lfutil.standin(m._cwd + '/' + f) for f in p)
else: else:
......
...@@ -773,6 +773,18 @@ ...@@ -773,6 +773,18 @@
@ 7:daea875e9014 @ 7:daea875e9014
| |
$ cd .. $ cd ..
Test log from outside repo
$ hg log b/sub -T '{rev}:{node|short} {desc|firstline}\n'
6:4355d653f84f edit files yet again
5:9d5af5072dbd edit files again
4:74c02385b94c move files
1:ce8896473775 edit files
0:30d30fe6a5be add files
Test clone at revision
$ hg clone a -r 3 c $ hg clone a -r 3 c
adding changesets adding changesets
adding manifests adding manifests
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment