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