Show More
@@ -0,0 +1,57 b'' | |||||
|
1 | #!/bin/sh | |||
|
2 | ||||
|
3 | echo % Preparing the subrepository 'sub2' | |||
|
4 | hg init sub2 | |||
|
5 | echo sub2 > sub2/sub2 | |||
|
6 | hg add -R sub2 | |||
|
7 | hg commit -R sub2 -m "sub2 import" | |||
|
8 | ||||
|
9 | echo % Preparing the 'sub1' repo which depends on the subrepo 'sub2' | |||
|
10 | hg init sub1 | |||
|
11 | echo sub1 > sub1/sub1 | |||
|
12 | echo "sub2 = ../sub2" > sub1/.hgsub | |||
|
13 | hg clone sub2 sub1/sub2 | sed 's/ .*sub/ ...sub/g' | |||
|
14 | hg add -R sub1 | |||
|
15 | hg commit -R sub1 -m "sub1 import" | |||
|
16 | ||||
|
17 | echo % Preparing the 'main' repo which depends on the subrepo 'sub1' | |||
|
18 | hg init main | |||
|
19 | echo main > main/main | |||
|
20 | echo "sub1 = ../sub1" > main/.hgsub | |||
|
21 | hg clone sub1 main/sub1 | sed 's/ .*sub/ ...sub/g' | |||
|
22 | hg add -R main | |||
|
23 | hg commit -R main -m "main import" | |||
|
24 | ||||
|
25 | echo % Cleaning both repositories, just as a clone -U | |||
|
26 | hg up -C -R sub2 null | |||
|
27 | hg up -C -R sub1 null | |||
|
28 | hg up -C -R main null | |||
|
29 | rm -rf main/sub1 | |||
|
30 | rm -rf sub1/sub2 | |||
|
31 | ||||
|
32 | echo % Clone main | |||
|
33 | hg clone main cloned | sed 's/ .*sub/ ...sub/g' | |||
|
34 | ||||
|
35 | echo % Checking cloned repo ids | |||
|
36 | printf "cloned " ; hg id -R cloned | |||
|
37 | printf "cloned/sub1 " ; hg id -R cloned/sub1 | |||
|
38 | printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2 | |||
|
39 | ||||
|
40 | echo % debugsub output for main and sub1 | |||
|
41 | hg debugsub -R cloned | |||
|
42 | hg debugsub -R cloned/sub1 | |||
|
43 | ||||
|
44 | echo % Modifying deeply nested 'sub2' | |||
|
45 | echo modified > cloned/sub1/sub2/sub2 | |||
|
46 | hg commit -m "deep nested modif should trigger a commit" -R cloned | |||
|
47 | ||||
|
48 | echo % Checking modified node ids | |||
|
49 | printf "cloned " ; hg id -R cloned | |||
|
50 | printf "cloned/sub1 " ; hg id -R cloned/sub1 | |||
|
51 | printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2 | |||
|
52 | ||||
|
53 | echo % debugsub output for main and sub1 | |||
|
54 | hg debugsub -R cloned | |||
|
55 | hg debugsub -R cloned/sub1 | |||
|
56 | ||||
|
57 | exit 0 |
@@ -0,0 +1,64 b'' | |||||
|
1 | % Preparing the subrepository sub2 | |||
|
2 | adding sub2/sub2 | |||
|
3 | % Preparing the sub1 repo which depends on the subrepo sub2 | |||
|
4 | updating to branch default | |||
|
5 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
6 | adding sub1/.hgsub | |||
|
7 | adding sub1/sub1 | |||
|
8 | committing subrepository sub2 | |||
|
9 | % Preparing the main repo which depends on the subrepo sub1 | |||
|
10 | updating to branch default | |||
|
11 | pulling ...sub2 | |||
|
12 | requesting all changes | |||
|
13 | adding changesets | |||
|
14 | adding manifests | |||
|
15 | adding file changes | |||
|
16 | added 1 changesets with 1 changes to 1 files | |||
|
17 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
18 | adding main/.hgsub | |||
|
19 | adding main/main | |||
|
20 | committing subrepository sub1 | |||
|
21 | % Cleaning both repositories, just as a clone -U | |||
|
22 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
23 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |||
|
24 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |||
|
25 | % Clone main | |||
|
26 | updating to branch default | |||
|
27 | pulling ...sub1 | |||
|
28 | requesting all changes | |||
|
29 | adding changesets | |||
|
30 | adding manifests | |||
|
31 | adding file changes | |||
|
32 | added 1 changesets with 3 changes to 3 files | |||
|
33 | pulling ...sub2 | |||
|
34 | requesting all changes | |||
|
35 | adding changesets | |||
|
36 | adding manifests | |||
|
37 | adding file changes | |||
|
38 | added 1 changesets with 1 changes to 1 files | |||
|
39 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
40 | % Checking cloned repo ids | |||
|
41 | cloned 7f491f53a367 tip | |||
|
42 | cloned/sub1 fc3b4ce2696f tip | |||
|
43 | cloned/sub1/sub2 c57a0840e3ba tip | |||
|
44 | % debugsub output for main and sub1 | |||
|
45 | path sub1 | |||
|
46 | source ../sub1 | |||
|
47 | revision fc3b4ce2696f7741438c79207583768f2ce6b0dd | |||
|
48 | path sub2 | |||
|
49 | source ../sub2 | |||
|
50 | revision c57a0840e3badd667ef3c3ef65471609acb2ba3c | |||
|
51 | % Modifying deeply nested sub2 | |||
|
52 | committing subrepository sub1 | |||
|
53 | committing subrepository sub2 | |||
|
54 | % Checking modified node ids | |||
|
55 | cloned ffe6649062fe tip | |||
|
56 | cloned/sub1 2ecb03bf44a9 tip | |||
|
57 | cloned/sub1/sub2 53dd3430bcaf tip | |||
|
58 | % debugsub output for main and sub1 | |||
|
59 | path sub1 | |||
|
60 | source ../sub1 | |||
|
61 | revision 2ecb03bf44a94e749e8669481dd9069526ce7cb9 | |||
|
62 | path sub2 | |||
|
63 | source ../sub2 | |||
|
64 | revision 53dd3430bcaf5ab4a7c48262bcad6d441f510487 |
@@ -1,969 +1,973 b'' | |||||
1 | # context.py - changeset and file context objects for mercurial |
|
1 | # context.py - changeset and file context objects for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | from node import nullid, nullrev, short, hex |
|
8 | from node import nullid, nullrev, short, hex | |
9 | from i18n import _ |
|
9 | from i18n import _ | |
10 | import ancestor, bdiff, error, util, subrepo, patch |
|
10 | import ancestor, bdiff, error, util, subrepo, patch | |
11 | import os, errno |
|
11 | import os, errno | |
12 |
|
12 | |||
13 | propertycache = util.propertycache |
|
13 | propertycache = util.propertycache | |
14 |
|
14 | |||
15 | class changectx(object): |
|
15 | class changectx(object): | |
16 | """A changecontext object makes access to data related to a particular |
|
16 | """A changecontext object makes access to data related to a particular | |
17 | changeset convenient.""" |
|
17 | changeset convenient.""" | |
18 | def __init__(self, repo, changeid=''): |
|
18 | def __init__(self, repo, changeid=''): | |
19 | """changeid is a revision number, node, or tag""" |
|
19 | """changeid is a revision number, node, or tag""" | |
20 | if changeid == '': |
|
20 | if changeid == '': | |
21 | changeid = '.' |
|
21 | changeid = '.' | |
22 | self._repo = repo |
|
22 | self._repo = repo | |
23 | if isinstance(changeid, (long, int)): |
|
23 | if isinstance(changeid, (long, int)): | |
24 | self._rev = changeid |
|
24 | self._rev = changeid | |
25 | self._node = self._repo.changelog.node(changeid) |
|
25 | self._node = self._repo.changelog.node(changeid) | |
26 | else: |
|
26 | else: | |
27 | self._node = self._repo.lookup(changeid) |
|
27 | self._node = self._repo.lookup(changeid) | |
28 | self._rev = self._repo.changelog.rev(self._node) |
|
28 | self._rev = self._repo.changelog.rev(self._node) | |
29 |
|
29 | |||
30 | def __str__(self): |
|
30 | def __str__(self): | |
31 | return short(self.node()) |
|
31 | return short(self.node()) | |
32 |
|
32 | |||
33 | def __int__(self): |
|
33 | def __int__(self): | |
34 | return self.rev() |
|
34 | return self.rev() | |
35 |
|
35 | |||
36 | def __repr__(self): |
|
36 | def __repr__(self): | |
37 | return "<changectx %s>" % str(self) |
|
37 | return "<changectx %s>" % str(self) | |
38 |
|
38 | |||
39 | def __hash__(self): |
|
39 | def __hash__(self): | |
40 | try: |
|
40 | try: | |
41 | return hash(self._rev) |
|
41 | return hash(self._rev) | |
42 | except AttributeError: |
|
42 | except AttributeError: | |
43 | return id(self) |
|
43 | return id(self) | |
44 |
|
44 | |||
45 | def __eq__(self, other): |
|
45 | def __eq__(self, other): | |
46 | try: |
|
46 | try: | |
47 | return self._rev == other._rev |
|
47 | return self._rev == other._rev | |
48 | except AttributeError: |
|
48 | except AttributeError: | |
49 | return False |
|
49 | return False | |
50 |
|
50 | |||
51 | def __ne__(self, other): |
|
51 | def __ne__(self, other): | |
52 | return not (self == other) |
|
52 | return not (self == other) | |
53 |
|
53 | |||
54 | def __nonzero__(self): |
|
54 | def __nonzero__(self): | |
55 | return self._rev != nullrev |
|
55 | return self._rev != nullrev | |
56 |
|
56 | |||
57 | @propertycache |
|
57 | @propertycache | |
58 | def _changeset(self): |
|
58 | def _changeset(self): | |
59 | return self._repo.changelog.read(self.node()) |
|
59 | return self._repo.changelog.read(self.node()) | |
60 |
|
60 | |||
61 | @propertycache |
|
61 | @propertycache | |
62 | def _manifest(self): |
|
62 | def _manifest(self): | |
63 | return self._repo.manifest.read(self._changeset[0]) |
|
63 | return self._repo.manifest.read(self._changeset[0]) | |
64 |
|
64 | |||
65 | @propertycache |
|
65 | @propertycache | |
66 | def _manifestdelta(self): |
|
66 | def _manifestdelta(self): | |
67 | return self._repo.manifest.readdelta(self._changeset[0]) |
|
67 | return self._repo.manifest.readdelta(self._changeset[0]) | |
68 |
|
68 | |||
69 | @propertycache |
|
69 | @propertycache | |
70 | def _parents(self): |
|
70 | def _parents(self): | |
71 | p = self._repo.changelog.parentrevs(self._rev) |
|
71 | p = self._repo.changelog.parentrevs(self._rev) | |
72 | if p[1] == nullrev: |
|
72 | if p[1] == nullrev: | |
73 | p = p[:-1] |
|
73 | p = p[:-1] | |
74 | return [changectx(self._repo, x) for x in p] |
|
74 | return [changectx(self._repo, x) for x in p] | |
75 |
|
75 | |||
76 | @propertycache |
|
76 | @propertycache | |
77 | def substate(self): |
|
77 | def substate(self): | |
78 | return subrepo.state(self) |
|
78 | return subrepo.state(self) | |
79 |
|
79 | |||
80 | def __contains__(self, key): |
|
80 | def __contains__(self, key): | |
81 | return key in self._manifest |
|
81 | return key in self._manifest | |
82 |
|
82 | |||
83 | def __getitem__(self, key): |
|
83 | def __getitem__(self, key): | |
84 | return self.filectx(key) |
|
84 | return self.filectx(key) | |
85 |
|
85 | |||
86 | def __iter__(self): |
|
86 | def __iter__(self): | |
87 | for f in sorted(self._manifest): |
|
87 | for f in sorted(self._manifest): | |
88 | yield f |
|
88 | yield f | |
89 |
|
89 | |||
90 | def changeset(self): |
|
90 | def changeset(self): | |
91 | return self._changeset |
|
91 | return self._changeset | |
92 | def manifest(self): |
|
92 | def manifest(self): | |
93 | return self._manifest |
|
93 | return self._manifest | |
94 | def manifestnode(self): |
|
94 | def manifestnode(self): | |
95 | return self._changeset[0] |
|
95 | return self._changeset[0] | |
96 |
|
96 | |||
97 | def rev(self): |
|
97 | def rev(self): | |
98 | return self._rev |
|
98 | return self._rev | |
99 | def node(self): |
|
99 | def node(self): | |
100 | return self._node |
|
100 | return self._node | |
101 | def hex(self): |
|
101 | def hex(self): | |
102 | return hex(self._node) |
|
102 | return hex(self._node) | |
103 | def user(self): |
|
103 | def user(self): | |
104 | return self._changeset[1] |
|
104 | return self._changeset[1] | |
105 | def date(self): |
|
105 | def date(self): | |
106 | return self._changeset[2] |
|
106 | return self._changeset[2] | |
107 | def files(self): |
|
107 | def files(self): | |
108 | return self._changeset[3] |
|
108 | return self._changeset[3] | |
109 | def description(self): |
|
109 | def description(self): | |
110 | return self._changeset[4] |
|
110 | return self._changeset[4] | |
111 | def branch(self): |
|
111 | def branch(self): | |
112 | return self._changeset[5].get("branch") |
|
112 | return self._changeset[5].get("branch") | |
113 | def extra(self): |
|
113 | def extra(self): | |
114 | return self._changeset[5] |
|
114 | return self._changeset[5] | |
115 | def tags(self): |
|
115 | def tags(self): | |
116 | return self._repo.nodetags(self._node) |
|
116 | return self._repo.nodetags(self._node) | |
117 |
|
117 | |||
118 | def parents(self): |
|
118 | def parents(self): | |
119 | """return contexts for each parent changeset""" |
|
119 | """return contexts for each parent changeset""" | |
120 | return self._parents |
|
120 | return self._parents | |
121 |
|
121 | |||
122 | def p1(self): |
|
122 | def p1(self): | |
123 | return self._parents[0] |
|
123 | return self._parents[0] | |
124 |
|
124 | |||
125 | def p2(self): |
|
125 | def p2(self): | |
126 | if len(self._parents) == 2: |
|
126 | if len(self._parents) == 2: | |
127 | return self._parents[1] |
|
127 | return self._parents[1] | |
128 | return changectx(self._repo, -1) |
|
128 | return changectx(self._repo, -1) | |
129 |
|
129 | |||
130 | def children(self): |
|
130 | def children(self): | |
131 | """return contexts for each child changeset""" |
|
131 | """return contexts for each child changeset""" | |
132 | c = self._repo.changelog.children(self._node) |
|
132 | c = self._repo.changelog.children(self._node) | |
133 | return [changectx(self._repo, x) for x in c] |
|
133 | return [changectx(self._repo, x) for x in c] | |
134 |
|
134 | |||
135 | def ancestors(self): |
|
135 | def ancestors(self): | |
136 | for a in self._repo.changelog.ancestors(self._rev): |
|
136 | for a in self._repo.changelog.ancestors(self._rev): | |
137 | yield changectx(self._repo, a) |
|
137 | yield changectx(self._repo, a) | |
138 |
|
138 | |||
139 | def descendants(self): |
|
139 | def descendants(self): | |
140 | for d in self._repo.changelog.descendants(self._rev): |
|
140 | for d in self._repo.changelog.descendants(self._rev): | |
141 | yield changectx(self._repo, d) |
|
141 | yield changectx(self._repo, d) | |
142 |
|
142 | |||
143 | def _fileinfo(self, path): |
|
143 | def _fileinfo(self, path): | |
144 | if '_manifest' in self.__dict__: |
|
144 | if '_manifest' in self.__dict__: | |
145 | try: |
|
145 | try: | |
146 | return self._manifest[path], self._manifest.flags(path) |
|
146 | return self._manifest[path], self._manifest.flags(path) | |
147 | except KeyError: |
|
147 | except KeyError: | |
148 | raise error.LookupError(self._node, path, |
|
148 | raise error.LookupError(self._node, path, | |
149 | _('not found in manifest')) |
|
149 | _('not found in manifest')) | |
150 | if '_manifestdelta' in self.__dict__ or path in self.files(): |
|
150 | if '_manifestdelta' in self.__dict__ or path in self.files(): | |
151 | if path in self._manifestdelta: |
|
151 | if path in self._manifestdelta: | |
152 | return self._manifestdelta[path], self._manifestdelta.flags(path) |
|
152 | return self._manifestdelta[path], self._manifestdelta.flags(path) | |
153 | node, flag = self._repo.manifest.find(self._changeset[0], path) |
|
153 | node, flag = self._repo.manifest.find(self._changeset[0], path) | |
154 | if not node: |
|
154 | if not node: | |
155 | raise error.LookupError(self._node, path, |
|
155 | raise error.LookupError(self._node, path, | |
156 | _('not found in manifest')) |
|
156 | _('not found in manifest')) | |
157 |
|
157 | |||
158 | return node, flag |
|
158 | return node, flag | |
159 |
|
159 | |||
160 | def filenode(self, path): |
|
160 | def filenode(self, path): | |
161 | return self._fileinfo(path)[0] |
|
161 | return self._fileinfo(path)[0] | |
162 |
|
162 | |||
163 | def flags(self, path): |
|
163 | def flags(self, path): | |
164 | try: |
|
164 | try: | |
165 | return self._fileinfo(path)[1] |
|
165 | return self._fileinfo(path)[1] | |
166 | except error.LookupError: |
|
166 | except error.LookupError: | |
167 | return '' |
|
167 | return '' | |
168 |
|
168 | |||
169 | def filectx(self, path, fileid=None, filelog=None): |
|
169 | def filectx(self, path, fileid=None, filelog=None): | |
170 | """get a file context from this changeset""" |
|
170 | """get a file context from this changeset""" | |
171 | if fileid is None: |
|
171 | if fileid is None: | |
172 | fileid = self.filenode(path) |
|
172 | fileid = self.filenode(path) | |
173 | return filectx(self._repo, path, fileid=fileid, |
|
173 | return filectx(self._repo, path, fileid=fileid, | |
174 | changectx=self, filelog=filelog) |
|
174 | changectx=self, filelog=filelog) | |
175 |
|
175 | |||
176 | def ancestor(self, c2): |
|
176 | def ancestor(self, c2): | |
177 | """ |
|
177 | """ | |
178 | return the ancestor context of self and c2 |
|
178 | return the ancestor context of self and c2 | |
179 | """ |
|
179 | """ | |
180 | # deal with workingctxs |
|
180 | # deal with workingctxs | |
181 | n2 = c2._node |
|
181 | n2 = c2._node | |
182 | if n2 == None: |
|
182 | if n2 == None: | |
183 | n2 = c2._parents[0]._node |
|
183 | n2 = c2._parents[0]._node | |
184 | n = self._repo.changelog.ancestor(self._node, n2) |
|
184 | n = self._repo.changelog.ancestor(self._node, n2) | |
185 | return changectx(self._repo, n) |
|
185 | return changectx(self._repo, n) | |
186 |
|
186 | |||
187 | def walk(self, match): |
|
187 | def walk(self, match): | |
188 | fset = set(match.files()) |
|
188 | fset = set(match.files()) | |
189 | # for dirstate.walk, files=['.'] means "walk the whole tree". |
|
189 | # for dirstate.walk, files=['.'] means "walk the whole tree". | |
190 | # follow that here, too |
|
190 | # follow that here, too | |
191 | fset.discard('.') |
|
191 | fset.discard('.') | |
192 | for fn in self: |
|
192 | for fn in self: | |
193 | for ffn in fset: |
|
193 | for ffn in fset: | |
194 | # match if the file is the exact name or a directory |
|
194 | # match if the file is the exact name or a directory | |
195 | if ffn == fn or fn.startswith("%s/" % ffn): |
|
195 | if ffn == fn or fn.startswith("%s/" % ffn): | |
196 | fset.remove(ffn) |
|
196 | fset.remove(ffn) | |
197 | break |
|
197 | break | |
198 | if match(fn): |
|
198 | if match(fn): | |
199 | yield fn |
|
199 | yield fn | |
200 | for fn in sorted(fset): |
|
200 | for fn in sorted(fset): | |
201 | if match.bad(fn, 'No such file in rev ' + str(self)) and match(fn): |
|
201 | if match.bad(fn, 'No such file in rev ' + str(self)) and match(fn): | |
202 | yield fn |
|
202 | yield fn | |
203 |
|
203 | |||
204 | def sub(self, path): |
|
204 | def sub(self, path): | |
205 | return subrepo.subrepo(self, path) |
|
205 | return subrepo.subrepo(self, path) | |
206 |
|
206 | |||
207 | def diff(self, ctx2=None, match=None, **opts): |
|
207 | def diff(self, ctx2=None, match=None, **opts): | |
208 | """Returns a diff generator for the given contexts and matcher""" |
|
208 | """Returns a diff generator for the given contexts and matcher""" | |
209 | if ctx2 is None: |
|
209 | if ctx2 is None: | |
210 | ctx2 = self.p1() |
|
210 | ctx2 = self.p1() | |
211 | if ctx2 is not None and not isinstance(ctx2, changectx): |
|
211 | if ctx2 is not None and not isinstance(ctx2, changectx): | |
212 | ctx2 = self._repo[ctx2] |
|
212 | ctx2 = self._repo[ctx2] | |
213 | diffopts = patch.diffopts(self._repo.ui, opts) |
|
213 | diffopts = patch.diffopts(self._repo.ui, opts) | |
214 | return patch.diff(self._repo, ctx2.node(), self.node(), |
|
214 | return patch.diff(self._repo, ctx2.node(), self.node(), | |
215 | match=match, opts=diffopts) |
|
215 | match=match, opts=diffopts) | |
216 |
|
216 | |||
217 | class filectx(object): |
|
217 | class filectx(object): | |
218 | """A filecontext object makes access to data related to a particular |
|
218 | """A filecontext object makes access to data related to a particular | |
219 | filerevision convenient.""" |
|
219 | filerevision convenient.""" | |
220 | def __init__(self, repo, path, changeid=None, fileid=None, |
|
220 | def __init__(self, repo, path, changeid=None, fileid=None, | |
221 | filelog=None, changectx=None): |
|
221 | filelog=None, changectx=None): | |
222 | """changeid can be a changeset revision, node, or tag. |
|
222 | """changeid can be a changeset revision, node, or tag. | |
223 | fileid can be a file revision or node.""" |
|
223 | fileid can be a file revision or node.""" | |
224 | self._repo = repo |
|
224 | self._repo = repo | |
225 | self._path = path |
|
225 | self._path = path | |
226 |
|
226 | |||
227 | assert (changeid is not None |
|
227 | assert (changeid is not None | |
228 | or fileid is not None |
|
228 | or fileid is not None | |
229 | or changectx is not None), \ |
|
229 | or changectx is not None), \ | |
230 | ("bad args: changeid=%r, fileid=%r, changectx=%r" |
|
230 | ("bad args: changeid=%r, fileid=%r, changectx=%r" | |
231 | % (changeid, fileid, changectx)) |
|
231 | % (changeid, fileid, changectx)) | |
232 |
|
232 | |||
233 | if filelog: |
|
233 | if filelog: | |
234 | self._filelog = filelog |
|
234 | self._filelog = filelog | |
235 |
|
235 | |||
236 | if changeid is not None: |
|
236 | if changeid is not None: | |
237 | self._changeid = changeid |
|
237 | self._changeid = changeid | |
238 | if changectx is not None: |
|
238 | if changectx is not None: | |
239 | self._changectx = changectx |
|
239 | self._changectx = changectx | |
240 | if fileid is not None: |
|
240 | if fileid is not None: | |
241 | self._fileid = fileid |
|
241 | self._fileid = fileid | |
242 |
|
242 | |||
243 | @propertycache |
|
243 | @propertycache | |
244 | def _changectx(self): |
|
244 | def _changectx(self): | |
245 | return changectx(self._repo, self._changeid) |
|
245 | return changectx(self._repo, self._changeid) | |
246 |
|
246 | |||
247 | @propertycache |
|
247 | @propertycache | |
248 | def _filelog(self): |
|
248 | def _filelog(self): | |
249 | return self._repo.file(self._path) |
|
249 | return self._repo.file(self._path) | |
250 |
|
250 | |||
251 | @propertycache |
|
251 | @propertycache | |
252 | def _changeid(self): |
|
252 | def _changeid(self): | |
253 | if '_changectx' in self.__dict__: |
|
253 | if '_changectx' in self.__dict__: | |
254 | return self._changectx.rev() |
|
254 | return self._changectx.rev() | |
255 | else: |
|
255 | else: | |
256 | return self._filelog.linkrev(self._filerev) |
|
256 | return self._filelog.linkrev(self._filerev) | |
257 |
|
257 | |||
258 | @propertycache |
|
258 | @propertycache | |
259 | def _filenode(self): |
|
259 | def _filenode(self): | |
260 | if '_fileid' in self.__dict__: |
|
260 | if '_fileid' in self.__dict__: | |
261 | return self._filelog.lookup(self._fileid) |
|
261 | return self._filelog.lookup(self._fileid) | |
262 | else: |
|
262 | else: | |
263 | return self._changectx.filenode(self._path) |
|
263 | return self._changectx.filenode(self._path) | |
264 |
|
264 | |||
265 | @propertycache |
|
265 | @propertycache | |
266 | def _filerev(self): |
|
266 | def _filerev(self): | |
267 | return self._filelog.rev(self._filenode) |
|
267 | return self._filelog.rev(self._filenode) | |
268 |
|
268 | |||
269 | @propertycache |
|
269 | @propertycache | |
270 | def _repopath(self): |
|
270 | def _repopath(self): | |
271 | return self._path |
|
271 | return self._path | |
272 |
|
272 | |||
273 | def __nonzero__(self): |
|
273 | def __nonzero__(self): | |
274 | try: |
|
274 | try: | |
275 | self._filenode |
|
275 | self._filenode | |
276 | return True |
|
276 | return True | |
277 | except error.LookupError: |
|
277 | except error.LookupError: | |
278 | # file is missing |
|
278 | # file is missing | |
279 | return False |
|
279 | return False | |
280 |
|
280 | |||
281 | def __str__(self): |
|
281 | def __str__(self): | |
282 | return "%s@%s" % (self.path(), short(self.node())) |
|
282 | return "%s@%s" % (self.path(), short(self.node())) | |
283 |
|
283 | |||
284 | def __repr__(self): |
|
284 | def __repr__(self): | |
285 | return "<filectx %s>" % str(self) |
|
285 | return "<filectx %s>" % str(self) | |
286 |
|
286 | |||
287 | def __hash__(self): |
|
287 | def __hash__(self): | |
288 | try: |
|
288 | try: | |
289 | return hash((self._path, self._filenode)) |
|
289 | return hash((self._path, self._filenode)) | |
290 | except AttributeError: |
|
290 | except AttributeError: | |
291 | return id(self) |
|
291 | return id(self) | |
292 |
|
292 | |||
293 | def __eq__(self, other): |
|
293 | def __eq__(self, other): | |
294 | try: |
|
294 | try: | |
295 | return (self._path == other._path |
|
295 | return (self._path == other._path | |
296 | and self._filenode == other._filenode) |
|
296 | and self._filenode == other._filenode) | |
297 | except AttributeError: |
|
297 | except AttributeError: | |
298 | return False |
|
298 | return False | |
299 |
|
299 | |||
300 | def __ne__(self, other): |
|
300 | def __ne__(self, other): | |
301 | return not (self == other) |
|
301 | return not (self == other) | |
302 |
|
302 | |||
303 | def filectx(self, fileid): |
|
303 | def filectx(self, fileid): | |
304 | '''opens an arbitrary revision of the file without |
|
304 | '''opens an arbitrary revision of the file without | |
305 | opening a new filelog''' |
|
305 | opening a new filelog''' | |
306 | return filectx(self._repo, self._path, fileid=fileid, |
|
306 | return filectx(self._repo, self._path, fileid=fileid, | |
307 | filelog=self._filelog) |
|
307 | filelog=self._filelog) | |
308 |
|
308 | |||
309 | def filerev(self): |
|
309 | def filerev(self): | |
310 | return self._filerev |
|
310 | return self._filerev | |
311 | def filenode(self): |
|
311 | def filenode(self): | |
312 | return self._filenode |
|
312 | return self._filenode | |
313 | def flags(self): |
|
313 | def flags(self): | |
314 | return self._changectx.flags(self._path) |
|
314 | return self._changectx.flags(self._path) | |
315 | def filelog(self): |
|
315 | def filelog(self): | |
316 | return self._filelog |
|
316 | return self._filelog | |
317 |
|
317 | |||
318 | def rev(self): |
|
318 | def rev(self): | |
319 | if '_changectx' in self.__dict__: |
|
319 | if '_changectx' in self.__dict__: | |
320 | return self._changectx.rev() |
|
320 | return self._changectx.rev() | |
321 | if '_changeid' in self.__dict__: |
|
321 | if '_changeid' in self.__dict__: | |
322 | return self._changectx.rev() |
|
322 | return self._changectx.rev() | |
323 | return self._filelog.linkrev(self._filerev) |
|
323 | return self._filelog.linkrev(self._filerev) | |
324 |
|
324 | |||
325 | def linkrev(self): |
|
325 | def linkrev(self): | |
326 | return self._filelog.linkrev(self._filerev) |
|
326 | return self._filelog.linkrev(self._filerev) | |
327 | def node(self): |
|
327 | def node(self): | |
328 | return self._changectx.node() |
|
328 | return self._changectx.node() | |
329 | def hex(self): |
|
329 | def hex(self): | |
330 | return hex(self.node()) |
|
330 | return hex(self.node()) | |
331 | def user(self): |
|
331 | def user(self): | |
332 | return self._changectx.user() |
|
332 | return self._changectx.user() | |
333 | def date(self): |
|
333 | def date(self): | |
334 | return self._changectx.date() |
|
334 | return self._changectx.date() | |
335 | def files(self): |
|
335 | def files(self): | |
336 | return self._changectx.files() |
|
336 | return self._changectx.files() | |
337 | def description(self): |
|
337 | def description(self): | |
338 | return self._changectx.description() |
|
338 | return self._changectx.description() | |
339 | def branch(self): |
|
339 | def branch(self): | |
340 | return self._changectx.branch() |
|
340 | return self._changectx.branch() | |
341 | def extra(self): |
|
341 | def extra(self): | |
342 | return self._changectx.extra() |
|
342 | return self._changectx.extra() | |
343 | def manifest(self): |
|
343 | def manifest(self): | |
344 | return self._changectx.manifest() |
|
344 | return self._changectx.manifest() | |
345 | def changectx(self): |
|
345 | def changectx(self): | |
346 | return self._changectx |
|
346 | return self._changectx | |
347 |
|
347 | |||
348 | def data(self): |
|
348 | def data(self): | |
349 | return self._filelog.read(self._filenode) |
|
349 | return self._filelog.read(self._filenode) | |
350 | def path(self): |
|
350 | def path(self): | |
351 | return self._path |
|
351 | return self._path | |
352 | def size(self): |
|
352 | def size(self): | |
353 | return self._filelog.size(self._filerev) |
|
353 | return self._filelog.size(self._filerev) | |
354 |
|
354 | |||
355 | def cmp(self, text): |
|
355 | def cmp(self, text): | |
356 | return self._filelog.cmp(self._filenode, text) |
|
356 | return self._filelog.cmp(self._filenode, text) | |
357 |
|
357 | |||
358 | def renamed(self): |
|
358 | def renamed(self): | |
359 | """check if file was actually renamed in this changeset revision |
|
359 | """check if file was actually renamed in this changeset revision | |
360 |
|
360 | |||
361 | If rename logged in file revision, we report copy for changeset only |
|
361 | If rename logged in file revision, we report copy for changeset only | |
362 | if file revisions linkrev points back to the changeset in question |
|
362 | if file revisions linkrev points back to the changeset in question | |
363 | or both changeset parents contain different file revisions. |
|
363 | or both changeset parents contain different file revisions. | |
364 | """ |
|
364 | """ | |
365 |
|
365 | |||
366 | renamed = self._filelog.renamed(self._filenode) |
|
366 | renamed = self._filelog.renamed(self._filenode) | |
367 | if not renamed: |
|
367 | if not renamed: | |
368 | return renamed |
|
368 | return renamed | |
369 |
|
369 | |||
370 | if self.rev() == self.linkrev(): |
|
370 | if self.rev() == self.linkrev(): | |
371 | return renamed |
|
371 | return renamed | |
372 |
|
372 | |||
373 | name = self.path() |
|
373 | name = self.path() | |
374 | fnode = self._filenode |
|
374 | fnode = self._filenode | |
375 | for p in self._changectx.parents(): |
|
375 | for p in self._changectx.parents(): | |
376 | try: |
|
376 | try: | |
377 | if fnode == p.filenode(name): |
|
377 | if fnode == p.filenode(name): | |
378 | return None |
|
378 | return None | |
379 | except error.LookupError: |
|
379 | except error.LookupError: | |
380 | pass |
|
380 | pass | |
381 | return renamed |
|
381 | return renamed | |
382 |
|
382 | |||
383 | def parents(self): |
|
383 | def parents(self): | |
384 | p = self._path |
|
384 | p = self._path | |
385 | fl = self._filelog |
|
385 | fl = self._filelog | |
386 | pl = [(p, n, fl) for n in self._filelog.parents(self._filenode)] |
|
386 | pl = [(p, n, fl) for n in self._filelog.parents(self._filenode)] | |
387 |
|
387 | |||
388 | r = self._filelog.renamed(self._filenode) |
|
388 | r = self._filelog.renamed(self._filenode) | |
389 | if r: |
|
389 | if r: | |
390 | pl[0] = (r[0], r[1], None) |
|
390 | pl[0] = (r[0], r[1], None) | |
391 |
|
391 | |||
392 | return [filectx(self._repo, p, fileid=n, filelog=l) |
|
392 | return [filectx(self._repo, p, fileid=n, filelog=l) | |
393 | for p, n, l in pl if n != nullid] |
|
393 | for p, n, l in pl if n != nullid] | |
394 |
|
394 | |||
395 | def children(self): |
|
395 | def children(self): | |
396 | # hard for renames |
|
396 | # hard for renames | |
397 | c = self._filelog.children(self._filenode) |
|
397 | c = self._filelog.children(self._filenode) | |
398 | return [filectx(self._repo, self._path, fileid=x, |
|
398 | return [filectx(self._repo, self._path, fileid=x, | |
399 | filelog=self._filelog) for x in c] |
|
399 | filelog=self._filelog) for x in c] | |
400 |
|
400 | |||
401 | def annotate(self, follow=False, linenumber=None): |
|
401 | def annotate(self, follow=False, linenumber=None): | |
402 | '''returns a list of tuples of (ctx, line) for each line |
|
402 | '''returns a list of tuples of (ctx, line) for each line | |
403 | in the file, where ctx is the filectx of the node where |
|
403 | in the file, where ctx is the filectx of the node where | |
404 | that line was last changed. |
|
404 | that line was last changed. | |
405 | This returns tuples of ((ctx, linenumber), line) for each line, |
|
405 | This returns tuples of ((ctx, linenumber), line) for each line, | |
406 | if "linenumber" parameter is NOT "None". |
|
406 | if "linenumber" parameter is NOT "None". | |
407 | In such tuples, linenumber means one at the first appearance |
|
407 | In such tuples, linenumber means one at the first appearance | |
408 | in the managed file. |
|
408 | in the managed file. | |
409 | To reduce annotation cost, |
|
409 | To reduce annotation cost, | |
410 | this returns fixed value(False is used) as linenumber, |
|
410 | this returns fixed value(False is used) as linenumber, | |
411 | if "linenumber" parameter is "False".''' |
|
411 | if "linenumber" parameter is "False".''' | |
412 |
|
412 | |||
413 | def decorate_compat(text, rev): |
|
413 | def decorate_compat(text, rev): | |
414 | return ([rev] * len(text.splitlines()), text) |
|
414 | return ([rev] * len(text.splitlines()), text) | |
415 |
|
415 | |||
416 | def without_linenumber(text, rev): |
|
416 | def without_linenumber(text, rev): | |
417 | return ([(rev, False)] * len(text.splitlines()), text) |
|
417 | return ([(rev, False)] * len(text.splitlines()), text) | |
418 |
|
418 | |||
419 | def with_linenumber(text, rev): |
|
419 | def with_linenumber(text, rev): | |
420 | size = len(text.splitlines()) |
|
420 | size = len(text.splitlines()) | |
421 | return ([(rev, i) for i in xrange(1, size + 1)], text) |
|
421 | return ([(rev, i) for i in xrange(1, size + 1)], text) | |
422 |
|
422 | |||
423 | decorate = (((linenumber is None) and decorate_compat) or |
|
423 | decorate = (((linenumber is None) and decorate_compat) or | |
424 | (linenumber and with_linenumber) or |
|
424 | (linenumber and with_linenumber) or | |
425 | without_linenumber) |
|
425 | without_linenumber) | |
426 |
|
426 | |||
427 | def pair(parent, child): |
|
427 | def pair(parent, child): | |
428 | for a1, a2, b1, b2 in bdiff.blocks(parent[1], child[1]): |
|
428 | for a1, a2, b1, b2 in bdiff.blocks(parent[1], child[1]): | |
429 | child[0][b1:b2] = parent[0][a1:a2] |
|
429 | child[0][b1:b2] = parent[0][a1:a2] | |
430 | return child |
|
430 | return child | |
431 |
|
431 | |||
432 | getlog = util.lrucachefunc(lambda x: self._repo.file(x)) |
|
432 | getlog = util.lrucachefunc(lambda x: self._repo.file(x)) | |
433 | def getctx(path, fileid): |
|
433 | def getctx(path, fileid): | |
434 | log = path == self._path and self._filelog or getlog(path) |
|
434 | log = path == self._path and self._filelog or getlog(path) | |
435 | return filectx(self._repo, path, fileid=fileid, filelog=log) |
|
435 | return filectx(self._repo, path, fileid=fileid, filelog=log) | |
436 | getctx = util.lrucachefunc(getctx) |
|
436 | getctx = util.lrucachefunc(getctx) | |
437 |
|
437 | |||
438 | def parents(f): |
|
438 | def parents(f): | |
439 | # we want to reuse filectx objects as much as possible |
|
439 | # we want to reuse filectx objects as much as possible | |
440 | p = f._path |
|
440 | p = f._path | |
441 | if f._filerev is None: # working dir |
|
441 | if f._filerev is None: # working dir | |
442 | pl = [(n.path(), n.filerev()) for n in f.parents()] |
|
442 | pl = [(n.path(), n.filerev()) for n in f.parents()] | |
443 | else: |
|
443 | else: | |
444 | pl = [(p, n) for n in f._filelog.parentrevs(f._filerev)] |
|
444 | pl = [(p, n) for n in f._filelog.parentrevs(f._filerev)] | |
445 |
|
445 | |||
446 | if follow: |
|
446 | if follow: | |
447 | r = f.renamed() |
|
447 | r = f.renamed() | |
448 | if r: |
|
448 | if r: | |
449 | pl[0] = (r[0], getlog(r[0]).rev(r[1])) |
|
449 | pl[0] = (r[0], getlog(r[0]).rev(r[1])) | |
450 |
|
450 | |||
451 | return [getctx(p, n) for p, n in pl if n != nullrev] |
|
451 | return [getctx(p, n) for p, n in pl if n != nullrev] | |
452 |
|
452 | |||
453 | # use linkrev to find the first changeset where self appeared |
|
453 | # use linkrev to find the first changeset where self appeared | |
454 | if self.rev() != self.linkrev(): |
|
454 | if self.rev() != self.linkrev(): | |
455 | base = self.filectx(self.filerev()) |
|
455 | base = self.filectx(self.filerev()) | |
456 | else: |
|
456 | else: | |
457 | base = self |
|
457 | base = self | |
458 |
|
458 | |||
459 | # find all ancestors |
|
459 | # find all ancestors | |
460 | needed = {base: 1} |
|
460 | needed = {base: 1} | |
461 | visit = [base] |
|
461 | visit = [base] | |
462 | files = [base._path] |
|
462 | files = [base._path] | |
463 | while visit: |
|
463 | while visit: | |
464 | f = visit.pop(0) |
|
464 | f = visit.pop(0) | |
465 | for p in parents(f): |
|
465 | for p in parents(f): | |
466 | if p not in needed: |
|
466 | if p not in needed: | |
467 | needed[p] = 1 |
|
467 | needed[p] = 1 | |
468 | visit.append(p) |
|
468 | visit.append(p) | |
469 | if p._path not in files: |
|
469 | if p._path not in files: | |
470 | files.append(p._path) |
|
470 | files.append(p._path) | |
471 | else: |
|
471 | else: | |
472 | # count how many times we'll use this |
|
472 | # count how many times we'll use this | |
473 | needed[p] += 1 |
|
473 | needed[p] += 1 | |
474 |
|
474 | |||
475 | # sort by revision (per file) which is a topological order |
|
475 | # sort by revision (per file) which is a topological order | |
476 | visit = [] |
|
476 | visit = [] | |
477 | for f in files: |
|
477 | for f in files: | |
478 | visit.extend(n for n in needed if n._path == f) |
|
478 | visit.extend(n for n in needed if n._path == f) | |
479 |
|
479 | |||
480 | hist = {} |
|
480 | hist = {} | |
481 | for f in sorted(visit, key=lambda x: x.rev()): |
|
481 | for f in sorted(visit, key=lambda x: x.rev()): | |
482 | curr = decorate(f.data(), f) |
|
482 | curr = decorate(f.data(), f) | |
483 | for p in parents(f): |
|
483 | for p in parents(f): | |
484 | curr = pair(hist[p], curr) |
|
484 | curr = pair(hist[p], curr) | |
485 | # trim the history of unneeded revs |
|
485 | # trim the history of unneeded revs | |
486 | needed[p] -= 1 |
|
486 | needed[p] -= 1 | |
487 | if not needed[p]: |
|
487 | if not needed[p]: | |
488 | del hist[p] |
|
488 | del hist[p] | |
489 | hist[f] = curr |
|
489 | hist[f] = curr | |
490 |
|
490 | |||
491 | return zip(hist[f][0], hist[f][1].splitlines(True)) |
|
491 | return zip(hist[f][0], hist[f][1].splitlines(True)) | |
492 |
|
492 | |||
493 | def ancestor(self, fc2): |
|
493 | def ancestor(self, fc2): | |
494 | """ |
|
494 | """ | |
495 | find the common ancestor file context, if any, of self, and fc2 |
|
495 | find the common ancestor file context, if any, of self, and fc2 | |
496 | """ |
|
496 | """ | |
497 |
|
497 | |||
498 | actx = self.changectx().ancestor(fc2.changectx()) |
|
498 | actx = self.changectx().ancestor(fc2.changectx()) | |
499 |
|
499 | |||
500 | # the trivial case: changesets are unrelated, files must be too |
|
500 | # the trivial case: changesets are unrelated, files must be too | |
501 | if not actx: |
|
501 | if not actx: | |
502 | return None |
|
502 | return None | |
503 |
|
503 | |||
504 | # the easy case: no (relevant) renames |
|
504 | # the easy case: no (relevant) renames | |
505 | if fc2.path() == self.path() and self.path() in actx: |
|
505 | if fc2.path() == self.path() and self.path() in actx: | |
506 | return actx[self.path()] |
|
506 | return actx[self.path()] | |
507 | acache = {} |
|
507 | acache = {} | |
508 |
|
508 | |||
509 | # prime the ancestor cache for the working directory |
|
509 | # prime the ancestor cache for the working directory | |
510 | for c in (self, fc2): |
|
510 | for c in (self, fc2): | |
511 | if c._filerev is None: |
|
511 | if c._filerev is None: | |
512 | pl = [(n.path(), n.filenode()) for n in c.parents()] |
|
512 | pl = [(n.path(), n.filenode()) for n in c.parents()] | |
513 | acache[(c._path, None)] = pl |
|
513 | acache[(c._path, None)] = pl | |
514 |
|
514 | |||
515 | flcache = {self._repopath:self._filelog, fc2._repopath:fc2._filelog} |
|
515 | flcache = {self._repopath:self._filelog, fc2._repopath:fc2._filelog} | |
516 | def parents(vertex): |
|
516 | def parents(vertex): | |
517 | if vertex in acache: |
|
517 | if vertex in acache: | |
518 | return acache[vertex] |
|
518 | return acache[vertex] | |
519 | f, n = vertex |
|
519 | f, n = vertex | |
520 | if f not in flcache: |
|
520 | if f not in flcache: | |
521 | flcache[f] = self._repo.file(f) |
|
521 | flcache[f] = self._repo.file(f) | |
522 | fl = flcache[f] |
|
522 | fl = flcache[f] | |
523 | pl = [(f, p) for p in fl.parents(n) if p != nullid] |
|
523 | pl = [(f, p) for p in fl.parents(n) if p != nullid] | |
524 | re = fl.renamed(n) |
|
524 | re = fl.renamed(n) | |
525 | if re: |
|
525 | if re: | |
526 | pl.append(re) |
|
526 | pl.append(re) | |
527 | acache[vertex] = pl |
|
527 | acache[vertex] = pl | |
528 | return pl |
|
528 | return pl | |
529 |
|
529 | |||
530 | a, b = (self._path, self._filenode), (fc2._path, fc2._filenode) |
|
530 | a, b = (self._path, self._filenode), (fc2._path, fc2._filenode) | |
531 | v = ancestor.ancestor(a, b, parents) |
|
531 | v = ancestor.ancestor(a, b, parents) | |
532 | if v: |
|
532 | if v: | |
533 | f, n = v |
|
533 | f, n = v | |
534 | return filectx(self._repo, f, fileid=n, filelog=flcache[f]) |
|
534 | return filectx(self._repo, f, fileid=n, filelog=flcache[f]) | |
535 |
|
535 | |||
536 | return None |
|
536 | return None | |
537 |
|
537 | |||
538 | def ancestors(self): |
|
538 | def ancestors(self): | |
539 | seen = set(str(self)) |
|
539 | seen = set(str(self)) | |
540 | visit = [self] |
|
540 | visit = [self] | |
541 | while visit: |
|
541 | while visit: | |
542 | for parent in visit.pop(0).parents(): |
|
542 | for parent in visit.pop(0).parents(): | |
543 | s = str(parent) |
|
543 | s = str(parent) | |
544 | if s not in seen: |
|
544 | if s not in seen: | |
545 | visit.append(parent) |
|
545 | visit.append(parent) | |
546 | seen.add(s) |
|
546 | seen.add(s) | |
547 | yield parent |
|
547 | yield parent | |
548 |
|
548 | |||
549 | class workingctx(changectx): |
|
549 | class workingctx(changectx): | |
550 | """A workingctx object makes access to data related to |
|
550 | """A workingctx object makes access to data related to | |
551 | the current working directory convenient. |
|
551 | the current working directory convenient. | |
552 | date - any valid date string or (unixtime, offset), or None. |
|
552 | date - any valid date string or (unixtime, offset), or None. | |
553 | user - username string, or None. |
|
553 | user - username string, or None. | |
554 | extra - a dictionary of extra values, or None. |
|
554 | extra - a dictionary of extra values, or None. | |
555 | changes - a list of file lists as returned by localrepo.status() |
|
555 | changes - a list of file lists as returned by localrepo.status() | |
556 | or None to use the repository status. |
|
556 | or None to use the repository status. | |
557 | """ |
|
557 | """ | |
558 | def __init__(self, repo, text="", user=None, date=None, extra=None, |
|
558 | def __init__(self, repo, text="", user=None, date=None, extra=None, | |
559 | changes=None): |
|
559 | changes=None): | |
560 | self._repo = repo |
|
560 | self._repo = repo | |
561 | self._rev = None |
|
561 | self._rev = None | |
562 | self._node = None |
|
562 | self._node = None | |
563 | self._text = text |
|
563 | self._text = text | |
564 | if date: |
|
564 | if date: | |
565 | self._date = util.parsedate(date) |
|
565 | self._date = util.parsedate(date) | |
566 | if user: |
|
566 | if user: | |
567 | self._user = user |
|
567 | self._user = user | |
568 | if changes: |
|
568 | if changes: | |
569 | self._status = list(changes[:4]) |
|
569 | self._status = list(changes[:4]) | |
570 | self._unknown = changes[4] |
|
570 | self._unknown = changes[4] | |
571 | self._ignored = changes[5] |
|
571 | self._ignored = changes[5] | |
572 | self._clean = changes[6] |
|
572 | self._clean = changes[6] | |
573 | else: |
|
573 | else: | |
574 | self._unknown = None |
|
574 | self._unknown = None | |
575 | self._ignored = None |
|
575 | self._ignored = None | |
576 | self._clean = None |
|
576 | self._clean = None | |
577 |
|
577 | |||
578 | self._extra = {} |
|
578 | self._extra = {} | |
579 | if extra: |
|
579 | if extra: | |
580 | self._extra = extra.copy() |
|
580 | self._extra = extra.copy() | |
581 | if 'branch' not in self._extra: |
|
581 | if 'branch' not in self._extra: | |
582 | branch = self._repo.dirstate.branch() |
|
582 | branch = self._repo.dirstate.branch() | |
583 | try: |
|
583 | try: | |
584 | branch = branch.decode('UTF-8').encode('UTF-8') |
|
584 | branch = branch.decode('UTF-8').encode('UTF-8') | |
585 | except UnicodeDecodeError: |
|
585 | except UnicodeDecodeError: | |
586 | raise util.Abort(_('branch name not in UTF-8!')) |
|
586 | raise util.Abort(_('branch name not in UTF-8!')) | |
587 | self._extra['branch'] = branch |
|
587 | self._extra['branch'] = branch | |
588 | if self._extra['branch'] == '': |
|
588 | if self._extra['branch'] == '': | |
589 | self._extra['branch'] = 'default' |
|
589 | self._extra['branch'] = 'default' | |
590 |
|
590 | |||
591 | def __str__(self): |
|
591 | def __str__(self): | |
592 | return str(self._parents[0]) + "+" |
|
592 | return str(self._parents[0]) + "+" | |
593 |
|
593 | |||
594 | def __nonzero__(self): |
|
594 | def __nonzero__(self): | |
595 | return True |
|
595 | return True | |
596 |
|
596 | |||
597 | def __contains__(self, key): |
|
597 | def __contains__(self, key): | |
598 | return self._repo.dirstate[key] not in "?r" |
|
598 | return self._repo.dirstate[key] not in "?r" | |
599 |
|
599 | |||
600 | @propertycache |
|
600 | @propertycache | |
601 | def _manifest(self): |
|
601 | def _manifest(self): | |
602 | """generate a manifest corresponding to the working directory""" |
|
602 | """generate a manifest corresponding to the working directory""" | |
603 |
|
603 | |||
604 | if self._unknown is None: |
|
604 | if self._unknown is None: | |
605 | self.status(unknown=True) |
|
605 | self.status(unknown=True) | |
606 |
|
606 | |||
607 | man = self._parents[0].manifest().copy() |
|
607 | man = self._parents[0].manifest().copy() | |
608 | copied = self._repo.dirstate.copies() |
|
608 | copied = self._repo.dirstate.copies() | |
609 | if len(self._parents) > 1: |
|
609 | if len(self._parents) > 1: | |
610 | man2 = self.p2().manifest() |
|
610 | man2 = self.p2().manifest() | |
611 | def getman(f): |
|
611 | def getman(f): | |
612 | if f in man: |
|
612 | if f in man: | |
613 | return man |
|
613 | return man | |
614 | return man2 |
|
614 | return man2 | |
615 | else: |
|
615 | else: | |
616 | getman = lambda f: man |
|
616 | getman = lambda f: man | |
617 | def cf(f): |
|
617 | def cf(f): | |
618 | f = copied.get(f, f) |
|
618 | f = copied.get(f, f) | |
619 | return getman(f).flags(f) |
|
619 | return getman(f).flags(f) | |
620 | ff = self._repo.dirstate.flagfunc(cf) |
|
620 | ff = self._repo.dirstate.flagfunc(cf) | |
621 | modified, added, removed, deleted = self._status |
|
621 | modified, added, removed, deleted = self._status | |
622 | unknown = self._unknown |
|
622 | unknown = self._unknown | |
623 | for i, l in (("a", added), ("m", modified), ("u", unknown)): |
|
623 | for i, l in (("a", added), ("m", modified), ("u", unknown)): | |
624 | for f in l: |
|
624 | for f in l: | |
625 | orig = copied.get(f, f) |
|
625 | orig = copied.get(f, f) | |
626 | man[f] = getman(orig).get(orig, nullid) + i |
|
626 | man[f] = getman(orig).get(orig, nullid) + i | |
627 | try: |
|
627 | try: | |
628 | man.set(f, ff(f)) |
|
628 | man.set(f, ff(f)) | |
629 | except OSError: |
|
629 | except OSError: | |
630 | pass |
|
630 | pass | |
631 |
|
631 | |||
632 | for f in deleted + removed: |
|
632 | for f in deleted + removed: | |
633 | if f in man: |
|
633 | if f in man: | |
634 | del man[f] |
|
634 | del man[f] | |
635 |
|
635 | |||
636 | return man |
|
636 | return man | |
637 |
|
637 | |||
638 | @propertycache |
|
638 | @propertycache | |
639 | def _status(self): |
|
639 | def _status(self): | |
640 | return self._repo.status()[:4] |
|
640 | return self._repo.status()[:4] | |
641 |
|
641 | |||
642 | @propertycache |
|
642 | @propertycache | |
643 | def _user(self): |
|
643 | def _user(self): | |
644 | return self._repo.ui.username() |
|
644 | return self._repo.ui.username() | |
645 |
|
645 | |||
646 | @propertycache |
|
646 | @propertycache | |
647 | def _date(self): |
|
647 | def _date(self): | |
648 | return util.makedate() |
|
648 | return util.makedate() | |
649 |
|
649 | |||
650 | @propertycache |
|
650 | @propertycache | |
651 | def _parents(self): |
|
651 | def _parents(self): | |
652 | p = self._repo.dirstate.parents() |
|
652 | p = self._repo.dirstate.parents() | |
653 | if p[1] == nullid: |
|
653 | if p[1] == nullid: | |
654 | p = p[:-1] |
|
654 | p = p[:-1] | |
655 | self._parents = [changectx(self._repo, x) for x in p] |
|
655 | self._parents = [changectx(self._repo, x) for x in p] | |
656 | return self._parents |
|
656 | return self._parents | |
657 |
|
657 | |||
658 | def status(self, ignored=False, clean=False, unknown=False): |
|
658 | def status(self, ignored=False, clean=False, unknown=False): | |
659 | """Explicit status query |
|
659 | """Explicit status query | |
660 | Unless this method is used to query the working copy status, the |
|
660 | Unless this method is used to query the working copy status, the | |
661 | _status property will implicitly read the status using its default |
|
661 | _status property will implicitly read the status using its default | |
662 | arguments.""" |
|
662 | arguments.""" | |
663 | stat = self._repo.status(ignored=ignored, clean=clean, unknown=unknown) |
|
663 | stat = self._repo.status(ignored=ignored, clean=clean, unknown=unknown) | |
664 | self._unknown = self._ignored = self._clean = None |
|
664 | self._unknown = self._ignored = self._clean = None | |
665 | if unknown: |
|
665 | if unknown: | |
666 | self._unknown = stat[4] |
|
666 | self._unknown = stat[4] | |
667 | if ignored: |
|
667 | if ignored: | |
668 | self._ignored = stat[5] |
|
668 | self._ignored = stat[5] | |
669 | if clean: |
|
669 | if clean: | |
670 | self._clean = stat[6] |
|
670 | self._clean = stat[6] | |
671 | self._status = stat[:4] |
|
671 | self._status = stat[:4] | |
672 | return stat |
|
672 | return stat | |
673 |
|
673 | |||
674 | def manifest(self): |
|
674 | def manifest(self): | |
675 | return self._manifest |
|
675 | return self._manifest | |
676 | def user(self): |
|
676 | def user(self): | |
677 | return self._user or self._repo.ui.username() |
|
677 | return self._user or self._repo.ui.username() | |
678 | def date(self): |
|
678 | def date(self): | |
679 | return self._date |
|
679 | return self._date | |
680 | def description(self): |
|
680 | def description(self): | |
681 | return self._text |
|
681 | return self._text | |
682 | def files(self): |
|
682 | def files(self): | |
683 | return sorted(self._status[0] + self._status[1] + self._status[2]) |
|
683 | return sorted(self._status[0] + self._status[1] + self._status[2]) | |
684 |
|
684 | |||
685 | def modified(self): |
|
685 | def modified(self): | |
686 | return self._status[0] |
|
686 | return self._status[0] | |
687 | def added(self): |
|
687 | def added(self): | |
688 | return self._status[1] |
|
688 | return self._status[1] | |
689 | def removed(self): |
|
689 | def removed(self): | |
690 | return self._status[2] |
|
690 | return self._status[2] | |
691 | def deleted(self): |
|
691 | def deleted(self): | |
692 | return self._status[3] |
|
692 | return self._status[3] | |
693 | def unknown(self): |
|
693 | def unknown(self): | |
694 | assert self._unknown is not None # must call status first |
|
694 | assert self._unknown is not None # must call status first | |
695 | return self._unknown |
|
695 | return self._unknown | |
696 | def ignored(self): |
|
696 | def ignored(self): | |
697 | assert self._ignored is not None # must call status first |
|
697 | assert self._ignored is not None # must call status first | |
698 | return self._ignored |
|
698 | return self._ignored | |
699 | def clean(self): |
|
699 | def clean(self): | |
700 | assert self._clean is not None # must call status first |
|
700 | assert self._clean is not None # must call status first | |
701 | return self._clean |
|
701 | return self._clean | |
702 | def branch(self): |
|
702 | def branch(self): | |
703 | return self._extra['branch'] |
|
703 | return self._extra['branch'] | |
704 | def extra(self): |
|
704 | def extra(self): | |
705 | return self._extra |
|
705 | return self._extra | |
706 |
|
706 | |||
707 | def tags(self): |
|
707 | def tags(self): | |
708 | t = [] |
|
708 | t = [] | |
709 | [t.extend(p.tags()) for p in self.parents()] |
|
709 | [t.extend(p.tags()) for p in self.parents()] | |
710 | return t |
|
710 | return t | |
711 |
|
711 | |||
712 | def children(self): |
|
712 | def children(self): | |
713 | return [] |
|
713 | return [] | |
714 |
|
714 | |||
715 | def flags(self, path): |
|
715 | def flags(self, path): | |
716 | if '_manifest' in self.__dict__: |
|
716 | if '_manifest' in self.__dict__: | |
717 | try: |
|
717 | try: | |
718 | return self._manifest.flags(path) |
|
718 | return self._manifest.flags(path) | |
719 | except KeyError: |
|
719 | except KeyError: | |
720 | return '' |
|
720 | return '' | |
721 |
|
721 | |||
722 | orig = self._repo.dirstate.copies().get(path, path) |
|
722 | orig = self._repo.dirstate.copies().get(path, path) | |
723 |
|
723 | |||
724 | def findflag(ctx): |
|
724 | def findflag(ctx): | |
725 | mnode = ctx.changeset()[0] |
|
725 | mnode = ctx.changeset()[0] | |
726 | node, flag = self._repo.manifest.find(mnode, orig) |
|
726 | node, flag = self._repo.manifest.find(mnode, orig) | |
727 | ff = self._repo.dirstate.flagfunc(lambda x: flag or None) |
|
727 | ff = self._repo.dirstate.flagfunc(lambda x: flag or None) | |
728 | try: |
|
728 | try: | |
729 | return ff(path) |
|
729 | return ff(path) | |
730 | except OSError: |
|
730 | except OSError: | |
731 | pass |
|
731 | pass | |
732 |
|
732 | |||
733 | flag = findflag(self._parents[0]) |
|
733 | flag = findflag(self._parents[0]) | |
734 | if flag is None and len(self.parents()) > 1: |
|
734 | if flag is None and len(self.parents()) > 1: | |
735 | flag = findflag(self._parents[1]) |
|
735 | flag = findflag(self._parents[1]) | |
736 | if flag is None or self._repo.dirstate[path] == 'r': |
|
736 | if flag is None or self._repo.dirstate[path] == 'r': | |
737 | return '' |
|
737 | return '' | |
738 | return flag |
|
738 | return flag | |
739 |
|
739 | |||
740 | def filectx(self, path, filelog=None): |
|
740 | def filectx(self, path, filelog=None): | |
741 | """get a file context from the working directory""" |
|
741 | """get a file context from the working directory""" | |
742 | return workingfilectx(self._repo, path, workingctx=self, |
|
742 | return workingfilectx(self._repo, path, workingctx=self, | |
743 | filelog=filelog) |
|
743 | filelog=filelog) | |
744 |
|
744 | |||
745 | def ancestor(self, c2): |
|
745 | def ancestor(self, c2): | |
746 | """return the ancestor context of self and c2""" |
|
746 | """return the ancestor context of self and c2""" | |
747 | return self._parents[0].ancestor(c2) # punt on two parents for now |
|
747 | return self._parents[0].ancestor(c2) # punt on two parents for now | |
748 |
|
748 | |||
749 | def walk(self, match): |
|
749 | def walk(self, match): | |
750 | return sorted(self._repo.dirstate.walk(match, self.substate.keys(), |
|
750 | return sorted(self._repo.dirstate.walk(match, self.substate.keys(), | |
751 | True, False)) |
|
751 | True, False)) | |
752 |
|
752 | |||
753 | def dirty(self, missing=False): |
|
753 | def dirty(self, missing=False): | |
754 | "check whether a working directory is modified" |
|
754 | "check whether a working directory is modified" | |
755 |
|
755 | # check subrepos first | ||
|
756 | for s in self.substate: | |||
|
757 | if self.sub(s).dirty(): | |||
|
758 | return True | |||
|
759 | # check current working dir | |||
756 | return (self.p2() or self.branch() != self.p1().branch() or |
|
760 | return (self.p2() or self.branch() != self.p1().branch() or | |
757 | self.modified() or self.added() or self.removed() or |
|
761 | self.modified() or self.added() or self.removed() or | |
758 | (missing and self.deleted())) |
|
762 | (missing and self.deleted())) | |
759 |
|
763 | |||
760 | class workingfilectx(filectx): |
|
764 | class workingfilectx(filectx): | |
761 | """A workingfilectx object makes access to data related to a particular |
|
765 | """A workingfilectx object makes access to data related to a particular | |
762 | file in the working directory convenient.""" |
|
766 | file in the working directory convenient.""" | |
763 | def __init__(self, repo, path, filelog=None, workingctx=None): |
|
767 | def __init__(self, repo, path, filelog=None, workingctx=None): | |
764 | """changeid can be a changeset revision, node, or tag. |
|
768 | """changeid can be a changeset revision, node, or tag. | |
765 | fileid can be a file revision or node.""" |
|
769 | fileid can be a file revision or node.""" | |
766 | self._repo = repo |
|
770 | self._repo = repo | |
767 | self._path = path |
|
771 | self._path = path | |
768 | self._changeid = None |
|
772 | self._changeid = None | |
769 | self._filerev = self._filenode = None |
|
773 | self._filerev = self._filenode = None | |
770 |
|
774 | |||
771 | if filelog: |
|
775 | if filelog: | |
772 | self._filelog = filelog |
|
776 | self._filelog = filelog | |
773 | if workingctx: |
|
777 | if workingctx: | |
774 | self._changectx = workingctx |
|
778 | self._changectx = workingctx | |
775 |
|
779 | |||
776 | @propertycache |
|
780 | @propertycache | |
777 | def _changectx(self): |
|
781 | def _changectx(self): | |
778 | return workingctx(self._repo) |
|
782 | return workingctx(self._repo) | |
779 |
|
783 | |||
780 | def __nonzero__(self): |
|
784 | def __nonzero__(self): | |
781 | return True |
|
785 | return True | |
782 |
|
786 | |||
783 | def __str__(self): |
|
787 | def __str__(self): | |
784 | return "%s@%s" % (self.path(), self._changectx) |
|
788 | return "%s@%s" % (self.path(), self._changectx) | |
785 |
|
789 | |||
786 | def data(self): |
|
790 | def data(self): | |
787 | return self._repo.wread(self._path) |
|
791 | return self._repo.wread(self._path) | |
788 | def renamed(self): |
|
792 | def renamed(self): | |
789 | rp = self._repo.dirstate.copied(self._path) |
|
793 | rp = self._repo.dirstate.copied(self._path) | |
790 | if not rp: |
|
794 | if not rp: | |
791 | return None |
|
795 | return None | |
792 | return rp, self._changectx._parents[0]._manifest.get(rp, nullid) |
|
796 | return rp, self._changectx._parents[0]._manifest.get(rp, nullid) | |
793 |
|
797 | |||
794 | def parents(self): |
|
798 | def parents(self): | |
795 | '''return parent filectxs, following copies if necessary''' |
|
799 | '''return parent filectxs, following copies if necessary''' | |
796 | def filenode(ctx, path): |
|
800 | def filenode(ctx, path): | |
797 | return ctx._manifest.get(path, nullid) |
|
801 | return ctx._manifest.get(path, nullid) | |
798 |
|
802 | |||
799 | path = self._path |
|
803 | path = self._path | |
800 | fl = self._filelog |
|
804 | fl = self._filelog | |
801 | pcl = self._changectx._parents |
|
805 | pcl = self._changectx._parents | |
802 | renamed = self.renamed() |
|
806 | renamed = self.renamed() | |
803 |
|
807 | |||
804 | if renamed: |
|
808 | if renamed: | |
805 | pl = [renamed + (None,)] |
|
809 | pl = [renamed + (None,)] | |
806 | else: |
|
810 | else: | |
807 | pl = [(path, filenode(pcl[0], path), fl)] |
|
811 | pl = [(path, filenode(pcl[0], path), fl)] | |
808 |
|
812 | |||
809 | for pc in pcl[1:]: |
|
813 | for pc in pcl[1:]: | |
810 | pl.append((path, filenode(pc, path), fl)) |
|
814 | pl.append((path, filenode(pc, path), fl)) | |
811 |
|
815 | |||
812 | return [filectx(self._repo, p, fileid=n, filelog=l) |
|
816 | return [filectx(self._repo, p, fileid=n, filelog=l) | |
813 | for p, n, l in pl if n != nullid] |
|
817 | for p, n, l in pl if n != nullid] | |
814 |
|
818 | |||
815 | def children(self): |
|
819 | def children(self): | |
816 | return [] |
|
820 | return [] | |
817 |
|
821 | |||
818 | def size(self): |
|
822 | def size(self): | |
819 | return os.stat(self._repo.wjoin(self._path)).st_size |
|
823 | return os.stat(self._repo.wjoin(self._path)).st_size | |
820 | def date(self): |
|
824 | def date(self): | |
821 | t, tz = self._changectx.date() |
|
825 | t, tz = self._changectx.date() | |
822 | try: |
|
826 | try: | |
823 | return (int(os.lstat(self._repo.wjoin(self._path)).st_mtime), tz) |
|
827 | return (int(os.lstat(self._repo.wjoin(self._path)).st_mtime), tz) | |
824 | except OSError, err: |
|
828 | except OSError, err: | |
825 | if err.errno != errno.ENOENT: |
|
829 | if err.errno != errno.ENOENT: | |
826 | raise |
|
830 | raise | |
827 | return (t, tz) |
|
831 | return (t, tz) | |
828 |
|
832 | |||
829 | def cmp(self, text): |
|
833 | def cmp(self, text): | |
830 | return self._repo.wread(self._path) == text |
|
834 | return self._repo.wread(self._path) == text | |
831 |
|
835 | |||
832 | class memctx(object): |
|
836 | class memctx(object): | |
833 | """Use memctx to perform in-memory commits via localrepo.commitctx(). |
|
837 | """Use memctx to perform in-memory commits via localrepo.commitctx(). | |
834 |
|
838 | |||
835 | Revision information is supplied at initialization time while |
|
839 | Revision information is supplied at initialization time while | |
836 | related files data and is made available through a callback |
|
840 | related files data and is made available through a callback | |
837 | mechanism. 'repo' is the current localrepo, 'parents' is a |
|
841 | mechanism. 'repo' is the current localrepo, 'parents' is a | |
838 | sequence of two parent revisions identifiers (pass None for every |
|
842 | sequence of two parent revisions identifiers (pass None for every | |
839 | missing parent), 'text' is the commit message and 'files' lists |
|
843 | missing parent), 'text' is the commit message and 'files' lists | |
840 | names of files touched by the revision (normalized and relative to |
|
844 | names of files touched by the revision (normalized and relative to | |
841 | repository root). |
|
845 | repository root). | |
842 |
|
846 | |||
843 | filectxfn(repo, memctx, path) is a callable receiving the |
|
847 | filectxfn(repo, memctx, path) is a callable receiving the | |
844 | repository, the current memctx object and the normalized path of |
|
848 | repository, the current memctx object and the normalized path of | |
845 | requested file, relative to repository root. It is fired by the |
|
849 | requested file, relative to repository root. It is fired by the | |
846 | commit function for every file in 'files', but calls order is |
|
850 | commit function for every file in 'files', but calls order is | |
847 | undefined. If the file is available in the revision being |
|
851 | undefined. If the file is available in the revision being | |
848 | committed (updated or added), filectxfn returns a memfilectx |
|
852 | committed (updated or added), filectxfn returns a memfilectx | |
849 | object. If the file was removed, filectxfn raises an |
|
853 | object. If the file was removed, filectxfn raises an | |
850 | IOError. Moved files are represented by marking the source file |
|
854 | IOError. Moved files are represented by marking the source file | |
851 | removed and the new file added with copy information (see |
|
855 | removed and the new file added with copy information (see | |
852 | memfilectx). |
|
856 | memfilectx). | |
853 |
|
857 | |||
854 | user receives the committer name and defaults to current |
|
858 | user receives the committer name and defaults to current | |
855 | repository username, date is the commit date in any format |
|
859 | repository username, date is the commit date in any format | |
856 | supported by util.parsedate() and defaults to current date, extra |
|
860 | supported by util.parsedate() and defaults to current date, extra | |
857 | is a dictionary of metadata or is left empty. |
|
861 | is a dictionary of metadata or is left empty. | |
858 | """ |
|
862 | """ | |
859 | def __init__(self, repo, parents, text, files, filectxfn, user=None, |
|
863 | def __init__(self, repo, parents, text, files, filectxfn, user=None, | |
860 | date=None, extra=None): |
|
864 | date=None, extra=None): | |
861 | self._repo = repo |
|
865 | self._repo = repo | |
862 | self._rev = None |
|
866 | self._rev = None | |
863 | self._node = None |
|
867 | self._node = None | |
864 | self._text = text |
|
868 | self._text = text | |
865 | self._date = date and util.parsedate(date) or util.makedate() |
|
869 | self._date = date and util.parsedate(date) or util.makedate() | |
866 | self._user = user |
|
870 | self._user = user | |
867 | parents = [(p or nullid) for p in parents] |
|
871 | parents = [(p or nullid) for p in parents] | |
868 | p1, p2 = parents |
|
872 | p1, p2 = parents | |
869 | self._parents = [changectx(self._repo, p) for p in (p1, p2)] |
|
873 | self._parents = [changectx(self._repo, p) for p in (p1, p2)] | |
870 | files = sorted(set(files)) |
|
874 | files = sorted(set(files)) | |
871 | self._status = [files, [], [], [], []] |
|
875 | self._status = [files, [], [], [], []] | |
872 | self._filectxfn = filectxfn |
|
876 | self._filectxfn = filectxfn | |
873 |
|
877 | |||
874 | self._extra = extra and extra.copy() or {} |
|
878 | self._extra = extra and extra.copy() or {} | |
875 | if 'branch' not in self._extra: |
|
879 | if 'branch' not in self._extra: | |
876 | self._extra['branch'] = 'default' |
|
880 | self._extra['branch'] = 'default' | |
877 | elif self._extra.get('branch') == '': |
|
881 | elif self._extra.get('branch') == '': | |
878 | self._extra['branch'] = 'default' |
|
882 | self._extra['branch'] = 'default' | |
879 |
|
883 | |||
880 | def __str__(self): |
|
884 | def __str__(self): | |
881 | return str(self._parents[0]) + "+" |
|
885 | return str(self._parents[0]) + "+" | |
882 |
|
886 | |||
883 | def __int__(self): |
|
887 | def __int__(self): | |
884 | return self._rev |
|
888 | return self._rev | |
885 |
|
889 | |||
886 | def __nonzero__(self): |
|
890 | def __nonzero__(self): | |
887 | return True |
|
891 | return True | |
888 |
|
892 | |||
889 | def __getitem__(self, key): |
|
893 | def __getitem__(self, key): | |
890 | return self.filectx(key) |
|
894 | return self.filectx(key) | |
891 |
|
895 | |||
892 | def p1(self): |
|
896 | def p1(self): | |
893 | return self._parents[0] |
|
897 | return self._parents[0] | |
894 | def p2(self): |
|
898 | def p2(self): | |
895 | return self._parents[1] |
|
899 | return self._parents[1] | |
896 |
|
900 | |||
897 | def user(self): |
|
901 | def user(self): | |
898 | return self._user or self._repo.ui.username() |
|
902 | return self._user or self._repo.ui.username() | |
899 | def date(self): |
|
903 | def date(self): | |
900 | return self._date |
|
904 | return self._date | |
901 | def description(self): |
|
905 | def description(self): | |
902 | return self._text |
|
906 | return self._text | |
903 | def files(self): |
|
907 | def files(self): | |
904 | return self.modified() |
|
908 | return self.modified() | |
905 | def modified(self): |
|
909 | def modified(self): | |
906 | return self._status[0] |
|
910 | return self._status[0] | |
907 | def added(self): |
|
911 | def added(self): | |
908 | return self._status[1] |
|
912 | return self._status[1] | |
909 | def removed(self): |
|
913 | def removed(self): | |
910 | return self._status[2] |
|
914 | return self._status[2] | |
911 | def deleted(self): |
|
915 | def deleted(self): | |
912 | return self._status[3] |
|
916 | return self._status[3] | |
913 | def unknown(self): |
|
917 | def unknown(self): | |
914 | return self._status[4] |
|
918 | return self._status[4] | |
915 | def ignored(self): |
|
919 | def ignored(self): | |
916 | return self._status[5] |
|
920 | return self._status[5] | |
917 | def clean(self): |
|
921 | def clean(self): | |
918 | return self._status[6] |
|
922 | return self._status[6] | |
919 | def branch(self): |
|
923 | def branch(self): | |
920 | return self._extra['branch'] |
|
924 | return self._extra['branch'] | |
921 | def extra(self): |
|
925 | def extra(self): | |
922 | return self._extra |
|
926 | return self._extra | |
923 | def flags(self, f): |
|
927 | def flags(self, f): | |
924 | return self[f].flags() |
|
928 | return self[f].flags() | |
925 |
|
929 | |||
926 | def parents(self): |
|
930 | def parents(self): | |
927 | """return contexts for each parent changeset""" |
|
931 | """return contexts for each parent changeset""" | |
928 | return self._parents |
|
932 | return self._parents | |
929 |
|
933 | |||
930 | def filectx(self, path, filelog=None): |
|
934 | def filectx(self, path, filelog=None): | |
931 | """get a file context from the working directory""" |
|
935 | """get a file context from the working directory""" | |
932 | return self._filectxfn(self._repo, self, path) |
|
936 | return self._filectxfn(self._repo, self, path) | |
933 |
|
937 | |||
934 | class memfilectx(object): |
|
938 | class memfilectx(object): | |
935 | """memfilectx represents an in-memory file to commit. |
|
939 | """memfilectx represents an in-memory file to commit. | |
936 |
|
940 | |||
937 | See memctx for more details. |
|
941 | See memctx for more details. | |
938 | """ |
|
942 | """ | |
939 | def __init__(self, path, data, islink, isexec, copied): |
|
943 | def __init__(self, path, data, islink, isexec, copied): | |
940 | """ |
|
944 | """ | |
941 | path is the normalized file path relative to repository root. |
|
945 | path is the normalized file path relative to repository root. | |
942 | data is the file content as a string. |
|
946 | data is the file content as a string. | |
943 | islink is True if the file is a symbolic link. |
|
947 | islink is True if the file is a symbolic link. | |
944 | isexec is True if the file is executable. |
|
948 | isexec is True if the file is executable. | |
945 | copied is the source file path if current file was copied in the |
|
949 | copied is the source file path if current file was copied in the | |
946 | revision being committed, or None.""" |
|
950 | revision being committed, or None.""" | |
947 | self._path = path |
|
951 | self._path = path | |
948 | self._data = data |
|
952 | self._data = data | |
949 | self._flags = (islink and 'l' or '') + (isexec and 'x' or '') |
|
953 | self._flags = (islink and 'l' or '') + (isexec and 'x' or '') | |
950 | self._copied = None |
|
954 | self._copied = None | |
951 | if copied: |
|
955 | if copied: | |
952 | self._copied = (copied, nullid) |
|
956 | self._copied = (copied, nullid) | |
953 |
|
957 | |||
954 | def __nonzero__(self): |
|
958 | def __nonzero__(self): | |
955 | return True |
|
959 | return True | |
956 | def __str__(self): |
|
960 | def __str__(self): | |
957 | return "%s@%s" % (self.path(), self._changectx) |
|
961 | return "%s@%s" % (self.path(), self._changectx) | |
958 | def path(self): |
|
962 | def path(self): | |
959 | return self._path |
|
963 | return self._path | |
960 | def data(self): |
|
964 | def data(self): | |
961 | return self._data |
|
965 | return self._data | |
962 | def flags(self): |
|
966 | def flags(self): | |
963 | return self._flags |
|
967 | return self._flags | |
964 | def isexec(self): |
|
968 | def isexec(self): | |
965 | return 'x' in self._flags |
|
969 | return 'x' in self._flags | |
966 | def islink(self): |
|
970 | def islink(self): | |
967 | return 'l' in self._flags |
|
971 | return 'l' in self._flags | |
968 | def renamed(self): |
|
972 | def renamed(self): | |
969 | return self._copied |
|
973 | return self._copied |
General Comments 0
You need to be logged in to leave comments.
Login now