Mercurial > hg-git

annotate hggit/gitdirstate.py @ 1046:cf982a23e15c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gitdirstate: show pattern error in hgignore file as expected Before this revision, invalid pattern in hgignore file causes unintentional failure for UnboundLocalError of ignorefunc, if hggit is used with Mercurial 3.5 or later. In such case: - checking source of invalid pattern at failure uses "pats" list for hgignore files, but - "pats" list is empty, if ignoremod is None (= Mercurial 3.5 or later) - therefore, checking with matchmod.match() overlooks invalid pattern Then, "return ignorefunc" is executed without assignment to ignorefunc, and causes UnboundLocalError. To show pattern error in hgignore file as expected even with Mercurial 3.5 or later, this revision puts '(FILE, ["include: FILE"])' tuples into "pats" (to avoid code duplication, putting into allpats is shared, too). This makes checking source of invalid pattern at failure work as expected for hgignore files. Fixes #197
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sat, 05 Aug 2017 02:13:11 +0900
parents e3dab807e38c
children 94aaea5c65f7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
893
0d258c2d0e91 gitdirstate: flake8 cleanup
Sean Farley <sean@farley.io>
parents: 872
diff changeset
1 import os
0d258c2d0e91 gitdirstate: flake8 cleanup
Sean Farley <sean@farley.io>
parents: 872
diff changeset
2 import stat
0d258c2d0e91 gitdirstate: flake8 cleanup
Sean Farley <sean@farley.io>
parents: 872
diff changeset
3 import re
0d258c2d0e91 gitdirstate: flake8 cleanup
Sean Farley <sean@farley.io>
parents: 872
diff changeset
4 import errno
615
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
5
963
5db7e2be619e gitdirstate: regularize mercurial imports
Siddharth Agarwal <sid0@fb.com>
parents: 910
diff changeset
6 from mercurial import (
5db7e2be619e gitdirstate: regularize mercurial imports
Siddharth Agarwal <sid0@fb.com>
parents: 910
diff changeset
7 dirstate,
5db7e2be619e gitdirstate: regularize mercurial imports
Siddharth Agarwal <sid0@fb.com>
parents: 910
diff changeset
8 match as matchmod,
5db7e2be619e gitdirstate: regularize mercurial imports
Siddharth Agarwal <sid0@fb.com>
parents: 910
diff changeset
9 scmutil,
5db7e2be619e gitdirstate: regularize mercurial imports
Siddharth Agarwal <sid0@fb.com>
parents: 910
diff changeset
10 util,
5db7e2be619e gitdirstate: regularize mercurial imports
Siddharth Agarwal <sid0@fb.com>
parents: 910
diff changeset
11 )
5db7e2be619e gitdirstate: regularize mercurial imports
Siddharth Agarwal <sid0@fb.com>
parents: 910
diff changeset
12
907
e5b10a710036 ignore: update ignore logic to match upstream
Durham Goode <durham@fb.com>
parents: 893
diff changeset
13 try:
e5b10a710036 ignore: update ignore logic to match upstream
Durham Goode <durham@fb.com>
parents: 893
diff changeset
14 from mercurial import ignore
909
67b27ec080ae ignore: evaluate ignore.readpats to see if ignore module really exists
Yuya Nishihara <yuya@tcha.org>
parents: 907
diff changeset
15 ignore.readpats
907
e5b10a710036 ignore: update ignore logic to match upstream
Durham Goode <durham@fb.com>
parents: 893
diff changeset
16 ignoremod = True
956
06385a2b30f3 init: handle AttributeError in addition to ImportError
timeless@gmail.com
parents: 910
diff changeset
17 except (AttributeError, ImportError):
907
e5b10a710036 ignore: update ignore logic to match upstream
Durham Goode <durham@fb.com>
parents: 893
diff changeset
18 # ignore module was removed in Mercurial 3.5
e5b10a710036 ignore: update ignore logic to match upstream
Durham Goode <durham@fb.com>
parents: 893
diff changeset
19 ignoremod = False
967
1bdabf776172 gitdirstate: fix up compat comment
Siddharth Agarwal <sid0@fb.com>
parents: 965
diff changeset
20 # pathauditor moved to pathutil in 2.9
615
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
21 try:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
22 from mercurial import pathutil
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
23 pathutil.pathauditor
956
06385a2b30f3 init: handle AttributeError in addition to ImportError
timeless@gmail.com
parents: 910
diff changeset
24 except (AttributeError, ImportError):
615
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
25 pathutil = scmutil
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
26 from mercurial.i18n import _
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
27
893
0d258c2d0e91 gitdirstate: flake8 cleanup
Sean Farley <sean@farley.io>
parents: 872
diff changeset
28 def gignorepats(orig, lines, root=None):
615
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
29 '''parse lines (iterable) of .gitignore text, returning a tuple of
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
30 (patterns, parse errors). These patterns should be given to compile()
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
31 to be validated and converted into a match function.'''
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
32 syntaxes = {'re': 'relre:', 'regexp': 'relre:', 'glob': 'relglob:'}
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
33 syntax = 'glob:'
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
34
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
35 patterns = []
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
36 warnings = []
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
37
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
38 for line in lines:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
39 if "#" in line:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
40 _commentre = re.compile(r'((^|[^\\])(\\\\)*)#.*')
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
41 # remove comments prefixed by an even number of escapes
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
42 line = _commentre.sub(r'\1', line)
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
43 # fixup properly escaped comments that survived the above
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
44 line = line.replace("\\#", "#")
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
45 line = line.rstrip()
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
46 if not line:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
47 continue
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
48
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
49 if line.startswith('!'):
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
50 warnings.append(_("unsupported ignore pattern '%s'") % line)
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
51 continue
718
9c6f083eecad gignore: remove illegal components (issue92)
Takumi IINO <trot.thunder@gmail.com>
parents: 632
diff changeset
52 if re.match(r'(:?.*/)?\.hg(:?/|$)', line):
9c6f083eecad gignore: remove illegal components (issue92)
Takumi IINO <trot.thunder@gmail.com>
parents: 632
diff changeset
53 continue
615
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
54 rootprefix = '%s/' % root if root else ''
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
55 if line.startswith('/'):
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
56 line = line[1:]
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
57 rootsuffixes = ['']
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
58 else:
893
0d258c2d0e91 gitdirstate: flake8 cleanup
Sean Farley <sean@farley.io>
parents: 872
diff changeset
59 rootsuffixes = ['', '**/']
615
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
60 for rootsuffix in rootsuffixes:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
61 pat = syntax + rootprefix + rootsuffix + line
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
62 for s, rels in syntaxes.iteritems():
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
63 if line.startswith(rels):
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
64 pat = line
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
65 break
893
0d258c2d0e91 gitdirstate: flake8 cleanup
Sean Farley <sean@farley.io>
parents: 872
diff changeset
66 elif line.startswith(s + ':'):
615
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
67 pat = rels + line[len(s) + 1:]
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
68 break
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
69 patterns.append(pat)
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
70
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
71 return patterns, warnings
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
72
907
e5b10a710036 ignore: update ignore logic to match upstream
Durham Goode <durham@fb.com>
parents: 893
diff changeset
73 def gignore(root, files, warn, extrapatterns=None):
615
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
74 allpats = []
907
e5b10a710036 ignore: update ignore logic to match upstream
Durham Goode <durham@fb.com>
parents: 893
diff changeset
75 pats = []
e5b10a710036 ignore: update ignore logic to match upstream
Durham Goode <durham@fb.com>
parents: 893
diff changeset
76 if ignoremod:
e5b10a710036 ignore: update ignore logic to match upstream
Durham Goode <durham@fb.com>
parents: 893
diff changeset
77 pats = ignore.readpats(root, files, warn)
e5b10a710036 ignore: update ignore logic to match upstream
Durham Goode <durham@fb.com>
parents: 893
diff changeset
78 else:
1046
cf982a23e15c gitdirstate: show pattern error in hgignore file as expected
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1037
diff changeset
79 pats = [(f, ['include:%s' % f]) for f in files]
cf982a23e15c gitdirstate: show pattern error in hgignore file as expected
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1037
diff changeset
80 for f, patlist in pats:
cf982a23e15c gitdirstate: show pattern error in hgignore file as expected
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1037
diff changeset
81 allpats.extend(patlist)
907
e5b10a710036 ignore: update ignore logic to match upstream
Durham Goode <durham@fb.com>
parents: 893
diff changeset
82
615
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
83 if extrapatterns:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
84 allpats.extend(extrapatterns)
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
85 if not allpats:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
86 return util.never
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
87 try:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
88 ignorefunc = matchmod.match(root, '', [], allpats)
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
89 except util.Abort:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
90 for f, patlist in pats:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
91 try:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
92 matchmod.match(root, '', [], patlist)
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
93 except util.Abort, inst:
1046
cf982a23e15c gitdirstate: show pattern error in hgignore file as expected
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1037
diff changeset
94 if not ignoremod:
cf982a23e15c gitdirstate: show pattern error in hgignore file as expected
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1037
diff changeset
95 # in this case, patlist is ['include: FILE'], and
cf982a23e15c gitdirstate: show pattern error in hgignore file as expected
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1037
diff changeset
96 # inst[0] should already include FILE
cf982a23e15c gitdirstate: show pattern error in hgignore file as expected
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1037
diff changeset
97 raise
615
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
98 raise util.Abort('%s: %s' % (f, inst[0]))
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
99 if extrapatterns:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
100 try:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
101 matchmod.match(root, '', [], extrapatterns)
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
102 except util.Abort, inst:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
103 raise util.Abort('%s: %s' % ('extra patterns', inst[0]))
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
104 return ignorefunc
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
105
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
106 class gitdirstate(dirstate.dirstate):
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
107 @dirstate.rootcache('.hgignore')
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
108 def _ignore(self):
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
109 files = [self._join('.hgignore')]
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
110 for name, path in self._ui.configitems("ui"):
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
111 if name == 'ignore' or name.startswith('ignore.'):
893
0d258c2d0e91 gitdirstate: flake8 cleanup
Sean Farley <sean@farley.io>
parents: 872
diff changeset
112 files.append(util.expandpath(path))
615
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
113 patterns = []
871
c1c2af8aecb3 gitdirstate: fix whitespace
Siddharth Agarwal <sid0@fb.com>
parents: 860
diff changeset
114 # Only use .gitignore if there's no .hgignore
615
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
115 try:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
116 fp = open(files[0])
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
117 fp.close()
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
118 except:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
119 fns = self._finddotgitignores()
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
120 for fn in fns:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
121 d = os.path.dirname(fn)
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
122 fn = self.pathto(fn)
860
cdf46071a83f gitdirstate: avoid an abort when a .gitignore is missing
Mathias De Maré <mathias.demare@gmail.com>
parents: 718
diff changeset
123 if not os.path.exists(fn):
cdf46071a83f gitdirstate: avoid an abort when a .gitignore is missing
Mathias De Maré <mathias.demare@gmail.com>
parents: 718
diff changeset
124 continue
615
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
125 fp = open(fn)
893
0d258c2d0e91 gitdirstate: flake8 cleanup
Sean Farley <sean@farley.io>
parents: 872
diff changeset
126 pats, warnings = gignorepats(None, fp, root=d)
615
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
127 for warning in warnings:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
128 self._ui.warn("%s: %s\n" % (fn, warning))
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
129 patterns.extend(pats)
907
e5b10a710036 ignore: update ignore logic to match upstream
Durham Goode <durham@fb.com>
parents: 893
diff changeset
130 return gignore(self._root, files, self._ui.warn,
893
0d258c2d0e91 gitdirstate: flake8 cleanup
Sean Farley <sean@farley.io>
parents: 872
diff changeset
131 extrapatterns=patterns)
871
c1c2af8aecb3 gitdirstate: fix whitespace
Siddharth Agarwal <sid0@fb.com>
parents: 860
diff changeset
132
615
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
133 def _finddotgitignores(self):
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
134 """A copy of dirstate.walk. This is called from the new _ignore method,
871
c1c2af8aecb3 gitdirstate: fix whitespace
Siddharth Agarwal <sid0@fb.com>
parents: 860
diff changeset
135 which is called by dirstate.walk, which would cause infinite recursion,
615
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
136 except _finddotgitignores calls the superclass _ignore directly."""
893
0d258c2d0e91 gitdirstate: flake8 cleanup
Sean Farley <sean@farley.io>
parents: 872
diff changeset
137 match = matchmod.match(self._root, self.getcwd(),
0d258c2d0e91 gitdirstate: flake8 cleanup
Sean Farley <sean@farley.io>
parents: 872
diff changeset
138 ['relglob:.gitignore'])
0d258c2d0e91 gitdirstate: flake8 cleanup
Sean Farley <sean@farley.io>
parents: 872
diff changeset
139 # TODO: need subrepos?
615
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
140 subrepos = []
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
141 unknown = True
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
142 ignored = False
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
143
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
144 def fwarn(f, msg):
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
145 self._ui.warn('%s: %s\n' % (self.pathto(f), msg))
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
146 return False
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
147
893
0d258c2d0e91 gitdirstate: flake8 cleanup
Sean Farley <sean@farley.io>
parents: 872
diff changeset
148 ignore = super(gitdirstate, self)._ignore
615
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
149 dirignore = self._dirignore
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
150 if ignored:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
151 ignore = util.never
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
152 dirignore = util.never
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
153 elif not unknown:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
154 # if unknown and ignored are False, skip step 2
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
155 ignore = util.always
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
156 dirignore = util.always
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
157
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
158 matchfn = match.matchfn
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
159 matchalways = match.always()
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
160 matchtdir = match.traversedir
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
161 dmap = self._map
1037
e3dab807e38c compat: delay importing osutil until we know we need it
Kevin Bullock <kbullock@ringworld.org>
parents: 1022
diff changeset
162 # osutil moved in hg 4.3, but util re-exports listdir
1022
006c837f9181 gitdirstate: use util.listdir if available
Kevin Bullock <kbullock@ringworld.org>
parents: 967
diff changeset
163 try:
006c837f9181 gitdirstate: use util.listdir if available
Kevin Bullock <kbullock@ringworld.org>
parents: 967
diff changeset
164 listdir = util.listdir
006c837f9181 gitdirstate: use util.listdir if available
Kevin Bullock <kbullock@ringworld.org>
parents: 967
diff changeset
165 except AttributeError:
1037
e3dab807e38c compat: delay importing osutil until we know we need it
Kevin Bullock <kbullock@ringworld.org>
parents: 1022
diff changeset
166 from mercurial import osutil
1022
006c837f9181 gitdirstate: use util.listdir if available
Kevin Bullock <kbullock@ringworld.org>
parents: 967
diff changeset
167 listdir = osutil.listdir
615
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
168 lstat = os.lstat
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
169 dirkind = stat.S_IFDIR
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
170 regkind = stat.S_IFREG
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
171 lnkkind = stat.S_IFLNK
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
172 join = self._join
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
173
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
174 exact = skipstep3 = False
893
0d258c2d0e91 gitdirstate: flake8 cleanup
Sean Farley <sean@farley.io>
parents: 872
diff changeset
175 if matchfn == match.exact: # match.exact
615
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
176 exact = True
893
0d258c2d0e91 gitdirstate: flake8 cleanup
Sean Farley <sean@farley.io>
parents: 872
diff changeset
177 dirignore = util.always # skip step 2
0d258c2d0e91 gitdirstate: flake8 cleanup
Sean Farley <sean@farley.io>
parents: 872
diff changeset
178 elif match.files() and not match.anypats(): # match.match, no patterns
615
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
179 skipstep3 = True
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
180
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
181 if not exact and self._checkcase:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
182 normalize = self._normalize
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
183 skipstep3 = False
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
184 else:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
185 normalize = None
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
186
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
187 # step 1: find all explicit files
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
188 results, work, dirsnotfound = self._walkexplicit(match, subrepos)
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
189
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
190 skipstep3 = skipstep3 and not (work or dirsnotfound)
872
da01212cd53a gitdirstate: use normalized path from _walkexplicit
Siddharth Agarwal <sid0@fb.com>
parents: 871
diff changeset
191 if work and isinstance(work[0], tuple):
da01212cd53a gitdirstate: use normalized path from _walkexplicit
Siddharth Agarwal <sid0@fb.com>
parents: 871
diff changeset
192 # Mercurial >= 3.3.3
da01212cd53a gitdirstate: use normalized path from _walkexplicit
Siddharth Agarwal <sid0@fb.com>
parents: 871
diff changeset
193 work = [nd for nd, d in work if not dirignore(d)]
da01212cd53a gitdirstate: use normalized path from _walkexplicit
Siddharth Agarwal <sid0@fb.com>
parents: 871
diff changeset
194 else:
da01212cd53a gitdirstate: use normalized path from _walkexplicit
Siddharth Agarwal <sid0@fb.com>
parents: 871
diff changeset
195 work = [d for d in work if not dirignore(d)]
615
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
196 wadd = work.append
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
197
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
198 # step 2: visit subdirectories
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
199 while work:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
200 nd = work.pop()
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
201 skip = None
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
202 if nd == '.':
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
203 nd = ''
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
204 else:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
205 skip = '.hg'
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
206 try:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
207 entries = listdir(join(nd), stat=True, skip=skip)
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
208 except OSError, inst:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
209 if inst.errno in (errno.EACCES, errno.ENOENT):
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
210 fwarn(nd, inst.strerror)
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
211 continue
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
212 raise
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
213 for f, kind, st in entries:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
214 if normalize:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
215 nf = normalize(nd and (nd + "/" + f) or f, True, True)
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
216 else:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
217 nf = nd and (nd + "/" + f) or f
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
218 if nf not in results:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
219 if kind == dirkind:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
220 if not ignore(nf):
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
221 if matchtdir:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
222 matchtdir(nf)
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
223 wadd(nf)
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
224 if nf in dmap and (matchalways or matchfn(nf)):
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
225 results[nf] = None
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
226 elif kind == regkind or kind == lnkkind:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
227 if nf in dmap:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
228 if matchalways or matchfn(nf):
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
229 results[nf] = st
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
230 elif (matchalways or matchfn(nf)) and not ignore(nf):
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
231 results[nf] = st
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
232 elif nf in dmap and (matchalways or matchfn(nf)):
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
233 results[nf] = None
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
234
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
235 for s in subrepos:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
236 del results[s]
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
237 del results['.hg']
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
238
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
239 # step 3: report unseen items in the dmap hash
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
240 if not skipstep3 and not exact:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
241 if not results and matchalways:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
242 visit = dmap.keys()
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
243 else:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
244 visit = [f for f in dmap if f not in results and matchfn(f)]
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
245 visit.sort()
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
246
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
247 if unknown:
893
0d258c2d0e91 gitdirstate: flake8 cleanup
Sean Farley <sean@farley.io>
parents: 872
diff changeset
248 # unknown == True means we walked the full directory tree
0d258c2d0e91 gitdirstate: flake8 cleanup
Sean Farley <sean@farley.io>
parents: 872
diff changeset
249 # above. So if a file is not seen it was either a) not matching
0d258c2d0e91 gitdirstate: flake8 cleanup
Sean Farley <sean@farley.io>
parents: 872
diff changeset
250 # matchfn b) ignored, c) missing, or d) under a symlink
0d258c2d0e91 gitdirstate: flake8 cleanup
Sean Farley <sean@farley.io>
parents: 872
diff changeset
251 # directory.
615
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
252 audit_path = pathutil.pathauditor(self._root)
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
253
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
254 for nf in iter(visit):
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
255 # Report ignored items in the dmap as long as they are not
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
256 # under a symlink directory.
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
257 if audit_path.check(nf):
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
258 try:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
259 results[nf] = lstat(join(nf))
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
260 except OSError:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
261 # file doesn't exist
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
262 results[nf] = None
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
263 else:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
264 # It's either missing or under a symlink directory
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
265 results[nf] = None
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
266 else:
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
267 # We may not have walked the full directory tree above,
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
268 # so stat everything we missed.
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
269 nf = iter(visit).next
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
270 for st in util.statfiles([join(i) for i in visit]):
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
271 results[nf()] = st
503d403fc040 Fix for #68 | Use .gitignore files (with proper semantics)
Ben Kehoe <benk@berkeley.edu>
parents:
diff changeset
272 return results.keys()