Show More
@@ -316,9 +316,14 b' def overridelog(orig, ui, repo, *pats, *' | |||
|
316 | 316 | |
|
317 | 317 | for i in range(0, len(m._files)): |
|
318 | 318 | standin = lfutil.standin(m._files[i]) |
|
319 | # If the "standin" is a directory, append instead of replace to | |
|
320 | # support naming a directory on the command line with only | |
|
321 | # largefiles. The original directory is kept to support normal | |
|
322 | # files. | |
|
319 | 323 | if standin in repo[ctx.node()]: |
|
320 | 324 | m._files[i] = standin |
|
321 |
elif m._files[i] not in repo[ctx.node()] |
|
|
325 | elif m._files[i] not in repo[ctx.node()] \ | |
|
326 | and repo.wvfs.isdir(standin): | |
|
322 | 327 | m._files.append(standin) |
|
323 | 328 | pats.add(standin) |
|
324 | 329 |
@@ -45,6 +45,13 b' changeset graph' | |||
|
45 | 45 | $ hg mv dir/b e |
|
46 | 46 | $ hg ci -me -d '5 0' |
|
47 | 47 | |
|
48 | Make sure largefiles doesn't interfere with logging a regular file | |
|
49 | $ hg log a --config extensions.largefiles= | |
|
50 | changeset: 0:9161b9aeaf16 | |
|
51 | user: test | |
|
52 | date: Thu Jan 01 00:00:01 1970 +0000 | |
|
53 | summary: a | |
|
54 | ||
|
48 | 55 | $ hg log a |
|
49 | 56 | changeset: 0:9161b9aeaf16 |
|
50 | 57 | user: test |
@@ -1629,6 +1636,12 b' hg log -f dir across branches' | |||
|
1629 | 1636 | | |
|
1630 | 1637 | o a |
|
1631 | 1638 | |
|
1639 | Ensure that largefiles doesn't intefere with following a normal file | |
|
1640 | $ hg --config extensions.largefiles= log -f d -T '{desc}' -G | |
|
1641 | @ c | |
|
1642 | | | |
|
1643 | o a | |
|
1644 | ||
|
1632 | 1645 | $ hg log -f d/a -T '{desc}' -G |
|
1633 | 1646 | @ c |
|
1634 | 1647 | | |
General Comments 0
You need to be logged in to leave comments.
Login now