Show More
@@ -1,198 +1,202 b'' | |||||
1 | # subrepo.py - sub-repository handling for Mercurial |
|
1 | # subrepo.py - sub-repository handling 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, incorporated herein by reference. |
|
6 | # GNU General Public License version 2, incorporated herein by reference. | |
7 |
|
7 | |||
8 | import errno, os |
|
8 | import errno, os | |
9 | from i18n import _ |
|
9 | from i18n import _ | |
10 | import config, util, node, error |
|
10 | import config, util, node, error | |
11 | localrepo = hg = None |
|
11 | localrepo = hg = None | |
12 |
|
12 | |||
13 | nullstate = ('', '') |
|
13 | nullstate = ('', '') | |
14 |
|
14 | |||
15 | def state(ctx): |
|
15 | def state(ctx): | |
16 | p = config.config() |
|
16 | p = config.config() | |
17 | def read(f, sections=None, remap=None): |
|
17 | def read(f, sections=None, remap=None): | |
18 | if f in ctx: |
|
18 | if f in ctx: | |
19 | try: |
|
19 | try: | |
20 | p.parse(f, ctx[f].data(), sections, remap) |
|
20 | p.parse(f, ctx[f].data(), sections, remap) | |
21 | except IOError, err: |
|
21 | except IOError, err: | |
22 | if err.errno != errno.ENOENT: |
|
22 | if err.errno != errno.ENOENT: | |
23 | raise |
|
23 | raise | |
24 | read('.hgsub') |
|
24 | read('.hgsub') | |
25 |
|
25 | |||
26 | rev = {} |
|
26 | rev = {} | |
27 | if '.hgsubstate' in ctx: |
|
27 | if '.hgsubstate' in ctx: | |
28 | try: |
|
28 | try: | |
29 | for l in ctx['.hgsubstate'].data().splitlines(): |
|
29 | for l in ctx['.hgsubstate'].data().splitlines(): | |
30 | revision, path = l.split() |
|
30 | revision, path = l.split() | |
31 | rev[path] = revision |
|
31 | rev[path] = revision | |
32 | except IOError, err: |
|
32 | except IOError, err: | |
33 | if err.errno != errno.ENOENT: |
|
33 | if err.errno != errno.ENOENT: | |
34 | raise |
|
34 | raise | |
35 |
|
35 | |||
36 | state = {} |
|
36 | state = {} | |
37 | for path, src in p[''].items(): |
|
37 | for path, src in p[''].items(): | |
38 | state[path] = (src, rev.get(path, '')) |
|
38 | state[path] = (src, rev.get(path, '')) | |
39 |
|
39 | |||
40 | return state |
|
40 | return state | |
41 |
|
41 | |||
42 | def writestate(repo, state): |
|
42 | def writestate(repo, state): | |
43 | repo.wwrite('.hgsubstate', |
|
43 | repo.wwrite('.hgsubstate', | |
44 | ''.join(['%s %s\n' % (state[s][1], s) |
|
44 | ''.join(['%s %s\n' % (state[s][1], s) | |
45 | for s in sorted(state)]), '') |
|
45 | for s in sorted(state)]), '') | |
46 |
|
46 | |||
47 | def submerge(repo, wctx, mctx, actx): |
|
47 | def submerge(repo, wctx, mctx, actx): | |
48 | if mctx == actx: # backwards? |
|
48 | if mctx == actx: # backwards? | |
49 | actx = wctx.p1() |
|
49 | actx = wctx.p1() | |
50 | s1 = wctx.substate |
|
50 | s1 = wctx.substate | |
51 | s2 = mctx.substate |
|
51 | s2 = mctx.substate | |
52 | sa = actx.substate |
|
52 | sa = actx.substate | |
53 | sm = {} |
|
53 | sm = {} | |
54 |
|
54 | |||
55 | for s, l in s1.items(): |
|
55 | for s, l in s1.items(): | |
56 | a = sa.get(s, nullstate) |
|
56 | a = sa.get(s, nullstate) | |
57 | if s in s2: |
|
57 | if s in s2: | |
58 | r = s2[s] |
|
58 | r = s2[s] | |
59 | if l == r or r == a: # no change or local is newer |
|
59 | if l == r or r == a: # no change or local is newer | |
60 | sm[s] = l |
|
60 | sm[s] = l | |
61 | continue |
|
61 | continue | |
62 | elif l == a: # other side changed |
|
62 | elif l == a: # other side changed | |
63 | wctx.sub(s).get(r) |
|
63 | wctx.sub(s).get(r) | |
64 | sm[s] = r |
|
64 | sm[s] = r | |
65 | elif l[0] != r[0]: # sources differ |
|
65 | elif l[0] != r[0]: # sources differ | |
66 | if repo.ui.prompt( |
|
66 | if repo.ui.prompt( | |
67 | _(' subrepository sources for %s differ\n' |
|
67 | _(' subrepository sources for %s differ\n' | |
68 | 'use (l)ocal source (%s) or (r)emote source (%s)?') |
|
68 | 'use (l)ocal source (%s) or (r)emote source (%s)?') | |
69 | % (s, l[0], r[0]), |
|
69 | % (s, l[0], r[0]), | |
70 | (_('&Local'), _('&Remote')), _('l')) == _('r'): |
|
70 | (_('&Local'), _('&Remote')), _('l')) == _('r'): | |
71 | wctx.sub(s).get(r) |
|
71 | wctx.sub(s).get(r) | |
72 | sm[s] = r |
|
72 | sm[s] = r | |
73 | elif l[1] == a[1]: # local side is unchanged |
|
73 | elif l[1] == a[1]: # local side is unchanged | |
74 | wctx.sub(s).get(r) |
|
74 | wctx.sub(s).get(r) | |
75 | sm[s] = r |
|
75 | sm[s] = r | |
76 | else: |
|
76 | else: | |
77 | wctx.sub(s).merge(r) |
|
77 | wctx.sub(s).merge(r) | |
78 | sm[s] = l |
|
78 | sm[s] = l | |
79 | elif l == a: # remote removed, local unchanged |
|
79 | elif l == a: # remote removed, local unchanged | |
80 | wctx.sub(s).remove() |
|
80 | wctx.sub(s).remove() | |
81 | else: |
|
81 | else: | |
82 | if repo.ui.prompt( |
|
82 | if repo.ui.prompt( | |
83 | _(' local changed subrepository %s which remote removed\n' |
|
83 | _(' local changed subrepository %s which remote removed\n' | |
84 | 'use (c)hanged version or (d)elete?') % s, |
|
84 | 'use (c)hanged version or (d)elete?') % s, | |
85 | (_('&Changed'), _('&Delete')), _('c')) == _('d'): |
|
85 | (_('&Changed'), _('&Delete')), _('c')) == _('d'): | |
86 | wctx.sub(s).remove() |
|
86 | wctx.sub(s).remove() | |
87 |
|
87 | |||
88 | for s, r in s2.items(): |
|
88 | for s, r in s2.items(): | |
89 | if s in s1: |
|
89 | if s in s1: | |
90 | continue |
|
90 | continue | |
91 | elif s not in sa: |
|
91 | elif s not in sa: | |
92 | wctx.sub(s).get(r) |
|
92 | wctx.sub(s).get(r) | |
93 | sm[s] = r |
|
93 | sm[s] = r | |
94 | elif r != sa[s]: |
|
94 | elif r != sa[s]: | |
95 | if repo.ui.prompt( |
|
95 | if repo.ui.prompt( | |
96 | _(' remote changed subrepository %s which local removed\n' |
|
96 | _(' remote changed subrepository %s which local removed\n' | |
97 | 'use (c)hanged version or (d)elete?') % s, |
|
97 | 'use (c)hanged version or (d)elete?') % s, | |
98 | (_('&Changed'), _('&Delete')), _('c')) == _('c'): |
|
98 | (_('&Changed'), _('&Delete')), _('c')) == _('c'): | |
99 | wctx.sub(s).get(r) |
|
99 | wctx.sub(s).get(r) | |
100 | sm[s] = r |
|
100 | sm[s] = r | |
101 |
|
101 | |||
102 | # record merged .hgsubstate |
|
102 | # record merged .hgsubstate | |
103 | writestate(repo, sm) |
|
103 | writestate(repo, sm) | |
104 |
|
104 | |||
105 | def _abssource(repo, push=False): |
|
105 | def _abssource(repo, push=False): | |
106 | if hasattr(repo, '_subparent'): |
|
106 | if hasattr(repo, '_subparent'): | |
107 | source = repo._subsource |
|
107 | source = repo._subsource | |
108 | if source.startswith('/') or '://' in source: |
|
108 | if source.startswith('/') or '://' in source: | |
109 | return source |
|
109 | return source | |
110 | parent = _abssource(repo._subparent) |
|
110 | parent = _abssource(repo._subparent) | |
111 | if '://' in parent: |
|
111 | if '://' in parent: | |
112 | if parent[-1] == '/': |
|
112 | if parent[-1] == '/': | |
113 | parent = parent[:-1] |
|
113 | parent = parent[:-1] | |
114 | return parent + '/' + source |
|
114 | return parent + '/' + source | |
115 | return os.path.join(parent, repo._subsource) |
|
115 | return os.path.join(parent, repo._subsource) | |
116 | if push and repo.ui.config('paths', 'default-push'): |
|
116 | if push and repo.ui.config('paths', 'default-push'): | |
117 | return repo.ui.config('paths', 'default-push', repo.root) |
|
117 | return repo.ui.config('paths', 'default-push', repo.root) | |
118 | return repo.ui.config('paths', 'default', repo.root) |
|
118 | return repo.ui.config('paths', 'default', repo.root) | |
119 |
|
119 | |||
120 | def subrepo(ctx, path): |
|
120 | def subrepo(ctx, path): | |
121 | # subrepo inherently violates our import layering rules |
|
121 | # subrepo inherently violates our import layering rules | |
122 | # because it wants to make repo objects from deep inside the stack |
|
122 | # because it wants to make repo objects from deep inside the stack | |
123 | # so we manually delay the circular imports to not break |
|
123 | # so we manually delay the circular imports to not break | |
124 | # scripts that don't use our demand-loading |
|
124 | # scripts that don't use our demand-loading | |
125 | global localrepo, hg |
|
125 | global localrepo, hg | |
126 | import localrepo as l, hg as h |
|
126 | import localrepo as l, hg as h | |
127 | localrepo = l |
|
127 | localrepo = l | |
128 | hg = h |
|
128 | hg = h | |
129 |
|
129 | |||
130 | util.path_auditor(ctx._repo.root)(path) |
|
130 | util.path_auditor(ctx._repo.root)(path) | |
131 | state = ctx.substate.get(path, nullstate) |
|
131 | state = ctx.substate.get(path, nullstate) | |
132 | if state[0].startswith('['): # future expansion |
|
132 | if state[0].startswith('['): # future expansion | |
133 | raise error.Abort('unknown subrepo source %s' % state[0]) |
|
133 | raise error.Abort('unknown subrepo source %s' % state[0]) | |
134 | return hgsubrepo(ctx, path, state) |
|
134 | return hgsubrepo(ctx, path, state) | |
135 |
|
135 | |||
136 | class hgsubrepo(object): |
|
136 | class hgsubrepo(object): | |
137 | def __init__(self, ctx, path, state): |
|
137 | def __init__(self, ctx, path, state): | |
138 | self._path = path |
|
138 | self._path = path | |
139 | self._state = state |
|
139 | self._state = state | |
140 | r = ctx._repo |
|
140 | r = ctx._repo | |
141 | root = r.wjoin(path) |
|
141 | root = r.wjoin(path) | |
142 | if os.path.exists(os.path.join(root, '.hg')): |
|
142 | if os.path.exists(os.path.join(root, '.hg')): | |
143 | self._repo = localrepo.localrepository(r.ui, root) |
|
143 | self._repo = localrepo.localrepository(r.ui, root) | |
144 | else: |
|
144 | else: | |
145 | util.makedirs(root) |
|
145 | util.makedirs(root) | |
146 | self._repo = localrepo.localrepository(r.ui, root, create=True) |
|
146 | self._repo = localrepo.localrepository(r.ui, root, create=True) | |
147 | self._repo._subparent = r |
|
147 | self._repo._subparent = r | |
148 | self._repo._subsource = state[0] |
|
148 | self._repo._subsource = state[0] | |
149 |
|
149 | |||
150 | def dirty(self): |
|
150 | def dirty(self): | |
151 | r = self._state[1] |
|
151 | r = self._state[1] | |
152 | if r == '': |
|
152 | if r == '': | |
153 | return True |
|
153 | return True | |
154 | w = self._repo[None] |
|
154 | w = self._repo[None] | |
155 | if w.p1() != self._repo[r]: # version checked out changed |
|
155 | if w.p1() != self._repo[r]: # version checked out changed | |
156 | return True |
|
156 | return True | |
157 | return w.dirty() # working directory changed |
|
157 | return w.dirty() # working directory changed | |
158 |
|
158 | |||
159 | def commit(self, text, user, date): |
|
159 | def commit(self, text, user, date): | |
160 | n = self._repo.commit(text, user, date) |
|
160 | n = self._repo.commit(text, user, date) | |
161 | if not n: |
|
161 | if not n: | |
162 | return self._repo['.'].hex() # different version checked out |
|
162 | return self._repo['.'].hex() # different version checked out | |
163 | return node.hex(n) |
|
163 | return node.hex(n) | |
164 |
|
164 | |||
165 | def remove(self): |
|
165 | def remove(self): | |
166 | # we can't fully delete the repository as it may contain |
|
166 | # we can't fully delete the repository as it may contain | |
167 | # local-only history |
|
167 | # local-only history | |
168 | self._repo.ui.note(_('removing subrepo %s\n') % self._path) |
|
168 | self._repo.ui.note(_('removing subrepo %s\n') % self._path) | |
169 | hg.clean(self._repo, node.nullid, False) |
|
169 | hg.clean(self._repo, node.nullid, False) | |
170 |
|
170 | |||
171 | def get(self, state): |
|
171 | def _get(self, state): | |
172 | source, revision = state |
|
172 | source, revision = state | |
173 | try: |
|
173 | try: | |
174 | self._repo.lookup(revision) |
|
174 | self._repo.lookup(revision) | |
175 | except error.RepoError: |
|
175 | except error.RepoError: | |
176 | self._repo._subsource = source |
|
176 | self._repo._subsource = source | |
177 | self._repo.ui.status(_('pulling subrepo %s\n') % self._path) |
|
177 | self._repo.ui.status(_('pulling subrepo %s\n') % self._path) | |
178 | srcurl = _abssource(self._repo) |
|
178 | srcurl = _abssource(self._repo) | |
179 | other = hg.repository(self._repo.ui, srcurl) |
|
179 | other = hg.repository(self._repo.ui, srcurl) | |
180 | self._repo.pull(other) |
|
180 | self._repo.pull(other) | |
181 |
|
181 | |||
|
182 | def get(self, state): | |||
|
183 | self._get(state) | |||
|
184 | source, revision = state | |||
182 | hg.clean(self._repo, revision, False) |
|
185 | hg.clean(self._repo, revision, False) | |
183 |
|
186 | |||
184 | def merge(self, state): |
|
187 | def merge(self, state): | |
|
188 | self._get(state) | |||
185 | hg.merge(self._repo, state[1], remind=False) |
|
189 | hg.merge(self._repo, state[1], remind=False) | |
186 |
|
190 | |||
187 | def push(self, force): |
|
191 | def push(self, force): | |
188 | # push subrepos depth-first for coherent ordering |
|
192 | # push subrepos depth-first for coherent ordering | |
189 | c = self._repo[''] |
|
193 | c = self._repo[''] | |
190 | subs = c.substate # only repos that are committed |
|
194 | subs = c.substate # only repos that are committed | |
191 | for s in sorted(subs): |
|
195 | for s in sorted(subs): | |
192 | c.sub(s).push(force) |
|
196 | c.sub(s).push(force) | |
193 |
|
197 | |||
194 | self._repo.ui.status(_('pushing subrepo %s\n') % self._path) |
|
198 | self._repo.ui.status(_('pushing subrepo %s\n') % self._path) | |
195 | dsturl = _abssource(self._repo, True) |
|
199 | dsturl = _abssource(self._repo, True) | |
196 | other = hg.repository(self._repo.ui, dsturl) |
|
200 | other = hg.repository(self._repo.ui, dsturl) | |
197 | self._repo.push(other, force) |
|
201 | self._repo.push(other, force) | |
198 |
|
202 |
General Comments 0
You need to be logged in to leave comments.
Login now