Show More
@@ -225,13 +225,9 b' def getstandinmatcher(repo, pats=[], opt' | |||||
225 | standindir = repo.wjoin(shortname) |
|
225 | standindir = repo.wjoin(shortname) | |
226 | if pats: |
|
226 | if pats: | |
227 | pats = [os.path.join(standindir, pat) for pat in pats] |
|
227 | pats = [os.path.join(standindir, pat) for pat in pats] | |
228 | elif os.path.isdir(standindir): |
|
228 | else: | |
229 | # no patterns: relative to repo root |
|
229 | # no patterns: relative to repo root | |
230 | pats = [standindir] |
|
230 | pats = [standindir] | |
231 | else: |
|
|||
232 | # no patterns and no standin dir: return matcher that matches nothing |
|
|||
233 | return match_.match(repo.root, None, [], exact=True) |
|
|||
234 |
|
||||
235 | # no warnings about missing files or directories |
|
231 | # no warnings about missing files or directories | |
236 | match = scmutil.match(repo[None], pats, opts) |
|
232 | match = scmutil.match(repo[None], pats, opts) | |
237 | match.bad = lambda f, msg: None |
|
233 | match.bad = lambda f, msg: None |
@@ -31,6 +31,8 b' Normal file in the working copy, keeping' | |||||
31 | foo has been turned into a largefile |
|
31 | foo has been turned into a largefile | |
32 | use (l)argefile or keep as (n)ormal file? 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
32 | use (l)argefile or keep as (n)ormal file? 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
33 | (branch merge, don't forget to commit) |
|
33 | (branch merge, don't forget to commit) | |
|
34 | getting changed largefiles | |||
|
35 | 0 largefiles updated, 0 removed | |||
34 |
|
36 | |||
35 | $ hg status |
|
37 | $ hg status | |
36 | $ cat foo |
|
38 | $ cat foo |
@@ -73,6 +73,20 b' Update working directory to tip, again.' | |||||
73 | ! large |
|
73 | ! large | |
74 | $ cd .. |
|
74 | $ cd .. | |
75 |
|
75 | |||
|
76 | Verify that largefiles from pulled branchheads are fetched, also to an empty repo | |||
|
77 | ||||
|
78 | $ hg init mirror2 | |||
|
79 | $ hg -R mirror2 pull src -r0 | |||
|
80 | pulling from src | |||
|
81 | adding changesets | |||
|
82 | adding manifests | |||
|
83 | adding file changes | |||
|
84 | added 1 changesets with 1 changes to 1 files | |||
|
85 | (run 'hg update' to get a working copy) | |||
|
86 | caching new largefiles | |||
|
87 | abort: *: '$TESTTMP/mirror2/.hg/largefiles/.7f7097b041ccf68cc5561e9600da4655d21c6d18.*' (glob) | |||
|
88 | [255] | |||
|
89 | ||||
76 | #if unix-permissions |
|
90 | #if unix-permissions | |
77 |
|
91 | |||
78 | Portable way to print file permissions: |
|
92 | Portable way to print file permissions: |
General Comments 0
You need to be logged in to leave comments.
Login now