Mercurial > hg
annotate hgext/imerge.py @ 6003:7855b88ba838
filemerge: pull file-merging code into its own module
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 03 Feb 2008 19:29:05 -0600 |
parents | 3786ef8877d5 |
children | f89fd07fc51d |
rev | line source |
---|---|
5044 | 1 # Copyright (C) 2007 Brendan Cully <brendan@kublai.com> |
2 # Published under the GNU GPL | |
3 | |
4 ''' | |
5 imerge - interactive merge | |
6 ''' | |
7 | |
8 from mercurial.i18n import _ | |
9 from mercurial.node import * | |
6003
7855b88ba838
filemerge: pull file-merging code into its own module
Matt Mackall <mpm@selenic.com>
parents:
5241
diff
changeset
|
10 from mercurial import commands, cmdutil, dispatch, fancyopts |
7855b88ba838
filemerge: pull file-merging code into its own module
Matt Mackall <mpm@selenic.com>
parents:
5241
diff
changeset
|
11 from mercurial import hg, filemerge, util |
5044 | 12 import os, tarfile |
13 | |
14 class InvalidStateFileException(Exception): pass | |
15 | |
16 class ImergeStateFile(object): | |
17 def __init__(self, im): | |
18 self.im = im | |
19 | |
20 def save(self, dest): | |
21 tf = tarfile.open(dest, 'w:gz') | |
22 | |
23 st = os.path.join(self.im.path, 'status') | |
24 tf.add(st, os.path.join('.hg', 'imerge', 'status')) | |
25 | |
26 for f in self.im.resolved: | |
5109 | 27 (fd, fo) = self.im.conflicts[f] |
28 abssrc = self.im.repo.wjoin(fd) | |
29 tf.add(abssrc, fd) | |
5044 | 30 |
31 tf.close() | |
32 | |
33 def load(self, source): | |
34 wlock = self.im.repo.wlock() | |
35 lock = self.im.repo.lock() | |
36 | |
37 tf = tarfile.open(source, 'r') | |
38 contents = tf.getnames() | |
5164
1d5ebb0d366f
imerge: fix status file lookups
Patrick Mezard <pmezard@gmail.com>
parents:
5143
diff
changeset
|
39 # tarfile normalizes path separators to '/' |
5165
ec24bfd852ab
imerge: simplify 1d5ebb0d366f
Brendan Cully <brendan@kublai.com>
parents:
5164
diff
changeset
|
40 statusfile = '.hg/imerge/status' |
5044 | 41 if statusfile not in contents: |
42 raise InvalidStateFileException('no status file') | |
43 | |
44 tf.extract(statusfile, self.im.repo.root) | |
5109 | 45 p1, p2 = self.im.load() |
46 if self.im.repo.dirstate.parents()[0] != p1.node(): | |
47 hg.clean(self.im.repo, p1.node()) | |
48 self.im.start(p2.node()) | |
5055
56d48aed1f69
imerge: tarfile.extractall is only available in python2.5
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5054
diff
changeset
|
49 for tarinfo in tf: |
56d48aed1f69
imerge: tarfile.extractall is only available in python2.5
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5054
diff
changeset
|
50 tf.extract(tarinfo, self.im.repo.root) |
5044 | 51 self.im.load() |
52 | |
53 class Imerge(object): | |
54 def __init__(self, ui, repo): | |
55 self.ui = ui | |
56 self.repo = repo | |
57 | |
58 self.path = repo.join('imerge') | |
59 self.opener = util.opener(self.path) | |
60 | |
5109 | 61 self.wctx = self.repo.workingctx() |
5044 | 62 self.conflicts = {} |
63 self.resolved = [] | |
64 | |
65 def merging(self): | |
5109 | 66 return len(self.wctx.parents()) > 1 |
5044 | 67 |
68 def load(self): | |
69 # status format. \0-delimited file, fields are | |
70 # p1, p2, conflict count, conflict filenames, resolved filenames | |
5054
ec70fd08e16c
Update imerge for new filemerge interface
Brendan Cully <brendan@kublai.com>
parents:
5044
diff
changeset
|
71 # conflict filenames are tuples of localname, remoteorig, remotenew |
5044 | 72 |
73 statusfile = self.opener('status') | |
74 | |
75 status = statusfile.read().split('\0') | |
76 if len(status) < 3: | |
77 raise util.Abort('invalid imerge status file') | |
78 | |
79 try: | |
5109 | 80 parents = [self.repo.changectx(n) for n in status[:2]] |
5044 | 81 except LookupError: |
82 raise util.Abort('merge parent %s not in repository' % short(p)) | |
83 | |
84 status = status[2:] | |
5054
ec70fd08e16c
Update imerge for new filemerge interface
Brendan Cully <brendan@kublai.com>
parents:
5044
diff
changeset
|
85 conflicts = int(status.pop(0)) * 3 |
5044 | 86 self.resolved = status[conflicts:] |
5054
ec70fd08e16c
Update imerge for new filemerge interface
Brendan Cully <brendan@kublai.com>
parents:
5044
diff
changeset
|
87 for i in xrange(0, conflicts, 3): |
ec70fd08e16c
Update imerge for new filemerge interface
Brendan Cully <brendan@kublai.com>
parents:
5044
diff
changeset
|
88 self.conflicts[status[i]] = (status[i+1], status[i+2]) |
5044 | 89 |
5109 | 90 return parents |
91 | |
5044 | 92 def save(self): |
93 lock = self.repo.lock() | |
94 | |
95 if not os.path.isdir(self.path): | |
96 os.mkdir(self.path) | |
5056
34a54cc5df1b
imerge: sorted() is only available in python2.4 and above
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5055
diff
changeset
|
97 statusfile = self.opener('status', 'wb') |
5044 | 98 |
5109 | 99 out = [hex(n.node()) for n in self.wctx.parents()] |
5044 | 100 out.append(str(len(self.conflicts))) |
5056
34a54cc5df1b
imerge: sorted() is only available in python2.4 and above
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5055
diff
changeset
|
101 conflicts = self.conflicts.items() |
34a54cc5df1b
imerge: sorted() is only available in python2.4 and above
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5055
diff
changeset
|
102 conflicts.sort() |
34a54cc5df1b
imerge: sorted() is only available in python2.4 and above
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5055
diff
changeset
|
103 for fw, fd_fo in conflicts: |
34a54cc5df1b
imerge: sorted() is only available in python2.4 and above
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5055
diff
changeset
|
104 out.append(fw) |
34a54cc5df1b
imerge: sorted() is only available in python2.4 and above
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5055
diff
changeset
|
105 out.extend(fd_fo) |
5044 | 106 out.extend(self.resolved) |
107 | |
5056
34a54cc5df1b
imerge: sorted() is only available in python2.4 and above
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5055
diff
changeset
|
108 statusfile.write('\0'.join(out)) |
5044 | 109 |
110 def remaining(self): | |
111 return [f for f in self.conflicts if f not in self.resolved] | |
112 | |
5241
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
113 def filemerge(self, fn, interactive=True): |
5044 | 114 wlock = self.repo.wlock() |
115 | |
5054
ec70fd08e16c
Update imerge for new filemerge interface
Brendan Cully <brendan@kublai.com>
parents:
5044
diff
changeset
|
116 (fd, fo) = self.conflicts[fn] |
5239
8860f29447c1
imerge: fix ancestor calculation
Brendan Cully <brendan@kublai.com>
parents:
5165
diff
changeset
|
117 p1, p2 = self.wctx.parents() |
5241
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
118 |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
119 # this could be greatly improved |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
120 realmerge = os.environ.get('HGMERGE') |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
121 if not interactive: |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
122 os.environ['HGMERGE'] = 'merge' |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
123 |
5239
8860f29447c1
imerge: fix ancestor calculation
Brendan Cully <brendan@kublai.com>
parents:
5165
diff
changeset
|
124 # The filemerge ancestor algorithm does not work if self.wctx |
8860f29447c1
imerge: fix ancestor calculation
Brendan Cully <brendan@kublai.com>
parents:
5165
diff
changeset
|
125 # already has two parents (in normal merge it doesn't yet). But |
8860f29447c1
imerge: fix ancestor calculation
Brendan Cully <brendan@kublai.com>
parents:
5165
diff
changeset
|
126 # this is very dirty. |
8860f29447c1
imerge: fix ancestor calculation
Brendan Cully <brendan@kublai.com>
parents:
5165
diff
changeset
|
127 self.wctx._parents.pop() |
8860f29447c1
imerge: fix ancestor calculation
Brendan Cully <brendan@kublai.com>
parents:
5165
diff
changeset
|
128 try: |
5241
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
129 # TODO: we should probably revert the file if merge fails |
6003
7855b88ba838
filemerge: pull file-merging code into its own module
Matt Mackall <mpm@selenic.com>
parents:
5241
diff
changeset
|
130 return filemerge.filemerge(self.repo, fn, fd, fo, self.wctx, p2) |
5239
8860f29447c1
imerge: fix ancestor calculation
Brendan Cully <brendan@kublai.com>
parents:
5165
diff
changeset
|
131 finally: |
8860f29447c1
imerge: fix ancestor calculation
Brendan Cully <brendan@kublai.com>
parents:
5165
diff
changeset
|
132 self.wctx._parents.append(p2) |
5241
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
133 if realmerge: |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
134 os.environ['HGMERGE'] = realmerge |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
135 elif not interactive: |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
136 del os.environ['HGMERGE'] |
5044 | 137 |
138 def start(self, rev=None): | |
6003
7855b88ba838
filemerge: pull file-merging code into its own module
Matt Mackall <mpm@selenic.com>
parents:
5241
diff
changeset
|
139 _filemerge = filemerge.filemerge |
7855b88ba838
filemerge: pull file-merging code into its own module
Matt Mackall <mpm@selenic.com>
parents:
5241
diff
changeset
|
140 def filemerge_(repo, fw, fd, fo, wctx, mctx): |
5054
ec70fd08e16c
Update imerge for new filemerge interface
Brendan Cully <brendan@kublai.com>
parents:
5044
diff
changeset
|
141 self.conflicts[fw] = (fd, fo) |
5044 | 142 |
6003
7855b88ba838
filemerge: pull file-merging code into its own module
Matt Mackall <mpm@selenic.com>
parents:
5241
diff
changeset
|
143 filemerge.filemerge = filemerge_ |
5044 | 144 commands.merge(self.ui, self.repo, rev=rev) |
6003
7855b88ba838
filemerge: pull file-merging code into its own module
Matt Mackall <mpm@selenic.com>
parents:
5241
diff
changeset
|
145 filemerge.filemerge = _filemerge |
5044 | 146 |
5109 | 147 self.wctx = self.repo.workingctx() |
5044 | 148 self.save() |
149 | |
150 def resume(self): | |
151 self.load() | |
152 | |
153 dp = self.repo.dirstate.parents() | |
5109 | 154 p1, p2 = self.wctx.parents() |
155 if p1.node() != dp[0] or p2.node() != dp[1]: | |
5044 | 156 raise util.Abort('imerge state does not match working directory') |
157 | |
158 def next(self): | |
159 remaining = self.remaining() | |
160 return remaining and remaining[0] | |
161 | |
162 def resolve(self, files): | |
163 resolved = dict.fromkeys(self.resolved) | |
164 for fn in files: | |
165 if fn not in self.conflicts: | |
166 raise util.Abort('%s is not in the merge set' % fn) | |
167 resolved[fn] = True | |
5056
34a54cc5df1b
imerge: sorted() is only available in python2.4 and above
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5055
diff
changeset
|
168 self.resolved = resolved.keys() |
34a54cc5df1b
imerge: sorted() is only available in python2.4 and above
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5055
diff
changeset
|
169 self.resolved.sort() |
5044 | 170 self.save() |
171 return 0 | |
172 | |
173 def unresolve(self, files): | |
174 resolved = dict.fromkeys(self.resolved) | |
175 for fn in files: | |
176 if fn not in resolved: | |
177 raise util.Abort('%s is not resolved' % fn) | |
178 del resolved[fn] | |
5056
34a54cc5df1b
imerge: sorted() is only available in python2.4 and above
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5055
diff
changeset
|
179 self.resolved = resolved.keys() |
34a54cc5df1b
imerge: sorted() is only available in python2.4 and above
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5055
diff
changeset
|
180 self.resolved.sort() |
5044 | 181 self.save() |
182 return 0 | |
183 | |
184 def pickle(self, dest): | |
185 '''write current merge state to file to be resumed elsewhere''' | |
186 state = ImergeStateFile(self) | |
187 return state.save(dest) | |
188 | |
189 def unpickle(self, source): | |
190 '''read merge state from file''' | |
191 state = ImergeStateFile(self) | |
192 return state.load(source) | |
193 | |
194 def load(im, source): | |
195 if im.merging(): | |
196 raise util.Abort('there is already a merge in progress ' | |
197 '(update -C <rev> to abort it)' ) | |
198 m, a, r, d = im.repo.status()[:4] | |
199 if m or a or r or d: | |
200 raise util.Abort('working directory has uncommitted changes') | |
201 | |
202 rc = im.unpickle(source) | |
203 if not rc: | |
5111
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
204 status(im) |
5044 | 205 return rc |
206 | |
5241
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
207 def merge_(im, filename=None, auto=False): |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
208 success = True |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
209 if auto and not filename: |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
210 for fn in im.remaining(): |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
211 rc = im.filemerge(fn, interactive=False) |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
212 if rc: |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
213 success = False |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
214 else: |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
215 im.resolve([fn]) |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
216 if success: |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
217 im.ui.write('all conflicts resolved\n') |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
218 else: |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
219 status(im) |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
220 return 0 |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
221 |
5044 | 222 if not filename: |
223 filename = im.next() | |
224 if not filename: | |
225 im.ui.write('all conflicts resolved\n') | |
226 return 0 | |
227 | |
5241
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
228 rc = im.filemerge(filename, interactive=not auto) |
5044 | 229 if not rc: |
230 im.resolve([filename]) | |
231 if not im.next(): | |
232 im.ui.write('all conflicts resolved\n') | |
233 return rc | |
234 | |
235 def next(im): | |
236 n = im.next() | |
237 if n: | |
238 im.ui.write('%s\n' % n) | |
239 else: | |
240 im.ui.write('all conflicts resolved\n') | |
241 return 0 | |
242 | |
243 def resolve(im, *files): | |
244 if not files: | |
245 raise util.Abort('resolve requires at least one filename') | |
246 return im.resolve(files) | |
247 | |
248 def save(im, dest): | |
249 return im.pickle(dest) | |
250 | |
5111
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
251 def status(im, **opts): |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
252 if not opts.get('resolved') and not opts.get('unresolved'): |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
253 opts['resolved'] = True |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
254 opts['unresolved'] = True |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
255 |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
256 if im.ui.verbose: |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
257 p1, p2 = [short(p.node()) for p in im.wctx.parents()] |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
258 im.ui.note(_('merging %s and %s\n') % (p1, p2)) |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
259 |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
260 conflicts = im.conflicts.keys() |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
261 conflicts.sort() |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
262 remaining = dict.fromkeys(im.remaining()) |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
263 st = [] |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
264 for fn in conflicts: |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
265 if opts.get('no_status'): |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
266 mode = '' |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
267 elif fn in remaining: |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
268 mode = 'U ' |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
269 else: |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
270 mode = 'R ' |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
271 if ((opts.get('resolved') and fn not in remaining) |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
272 or (opts.get('unresolved') and fn in remaining)): |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
273 st.append((mode, fn)) |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
274 st.sort() |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
275 for (mode, fn) in st: |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
276 if im.ui.verbose: |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
277 fo, fd = im.conflicts[fn] |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
278 if fd != fn: |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
279 fn = '%s (%s)' % (fn, fd) |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
280 im.ui.write('%s%s\n' % (mode, fn)) |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
281 if opts.get('unresolved') and not remaining: |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
282 im.ui.write(_('all conflicts resolved\n')) |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
283 |
5044 | 284 return 0 |
285 | |
286 def unresolve(im, *files): | |
287 if not files: | |
288 raise util.Abort('unresolve requires at least one filename') | |
289 return im.unresolve(files) | |
290 | |
291 subcmdtable = { | |
5111
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
292 'load': (load, []), |
5241
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
293 'merge': |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
294 (merge_, |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
295 [('a', 'auto', None, _('automatically resolve if possible'))]), |
5111
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
296 'next': (next, []), |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
297 'resolve': (resolve, []), |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
298 'save': (save, []), |
5241
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
299 'status': |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
300 (status, |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
301 [('n', 'no-status', None, _('hide status prefix')), |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
302 ('', 'resolved', None, _('only show resolved conflicts')), |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
303 ('', 'unresolved', None, _('only show unresolved conflicts'))]), |
5111
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
304 'unresolve': (unresolve, []) |
5044 | 305 } |
306 | |
5239
8860f29447c1
imerge: fix ancestor calculation
Brendan Cully <brendan@kublai.com>
parents:
5165
diff
changeset
|
307 def dispatch_(im, args, opts): |
5044 | 308 def complete(s, choices): |
309 candidates = [] | |
310 for choice in choices: | |
311 if choice.startswith(s): | |
312 candidates.append(choice) | |
313 return candidates | |
314 | |
5111
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
315 c, args = args[0], list(args[1:]) |
5044 | 316 cmd = complete(c, subcmdtable.keys()) |
317 if not cmd: | |
318 raise cmdutil.UnknownCommand('imerge ' + c) | |
319 if len(cmd) > 1: | |
5056
34a54cc5df1b
imerge: sorted() is only available in python2.4 and above
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5055
diff
changeset
|
320 cmd.sort() |
34a54cc5df1b
imerge: sorted() is only available in python2.4 and above
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5055
diff
changeset
|
321 raise cmdutil.AmbiguousCommand('imerge ' + c, cmd) |
5044 | 322 cmd = cmd[0] |
323 | |
5111
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
324 func, optlist = subcmdtable[cmd] |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
325 opts = {} |
5044 | 326 try: |
5111
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
327 args = fancyopts.fancyopts(args, optlist, opts) |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
328 return func(im, *args, **opts) |
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5110
diff
changeset
|
329 except fancyopts.getopt.GetoptError, inst: |
5239
8860f29447c1
imerge: fix ancestor calculation
Brendan Cully <brendan@kublai.com>
parents:
5165
diff
changeset
|
330 raise dispatch.ParseError('imerge', '%s: %s' % (cmd, inst)) |
5044 | 331 except TypeError: |
5239
8860f29447c1
imerge: fix ancestor calculation
Brendan Cully <brendan@kublai.com>
parents:
5165
diff
changeset
|
332 raise dispatch.ParseError('imerge', _('%s: invalid arguments') % cmd) |
5044 | 333 |
334 def imerge(ui, repo, *args, **opts): | |
335 '''interactive merge | |
336 | |
337 imerge lets you split a merge into pieces. When you start a merge | |
338 with imerge, the names of all files with conflicts are recorded. | |
339 You can then merge any of these files, and if the merge is | |
340 successful, they will be marked as resolved. When all files are | |
341 resolved, the merge is complete. | |
342 | |
343 If no merge is in progress, hg imerge [rev] will merge the working | |
344 directory with rev (defaulting to the other head if the repository | |
345 only has two heads). You may also resume a saved merge with | |
346 hg imerge load <file>. | |
347 | |
348 If a merge is in progress, hg imerge will default to merging the | |
349 next unresolved file. | |
350 | |
351 The following subcommands are available: | |
352 | |
353 status: | |
354 show the current state of the merge | |
5239
8860f29447c1
imerge: fix ancestor calculation
Brendan Cully <brendan@kublai.com>
parents:
5165
diff
changeset
|
355 options: |
8860f29447c1
imerge: fix ancestor calculation
Brendan Cully <brendan@kublai.com>
parents:
5165
diff
changeset
|
356 -n --no-status: do not print the status prefix |
8860f29447c1
imerge: fix ancestor calculation
Brendan Cully <brendan@kublai.com>
parents:
5165
diff
changeset
|
357 --resolved: only print resolved conflicts |
8860f29447c1
imerge: fix ancestor calculation
Brendan Cully <brendan@kublai.com>
parents:
5165
diff
changeset
|
358 --unresolved: only print unresolved conflicts |
5044 | 359 next: |
360 show the next unresolved file merge | |
361 merge [<file>]: | |
362 merge <file>. If the file merge is successful, the file will be | |
363 recorded as resolved. If no file is given, the next unresolved | |
364 file will be merged. | |
365 resolve <file>...: | |
366 mark files as successfully merged | |
367 unresolve <file>...: | |
368 mark files as requiring merging. | |
369 save <file>: | |
370 save the state of the merge to a file to be resumed elsewhere | |
371 load <file>: | |
372 load the state of the merge from a file created by save | |
373 ''' | |
374 | |
375 im = Imerge(ui, repo) | |
376 | |
377 if im.merging(): | |
378 im.resume() | |
379 else: | |
380 rev = opts.get('rev') | |
381 if rev and args: | |
382 raise util.Abort('please specify just one revision') | |
5143
d4fa6bafc43a
Remove trailing spaces, fix indentation
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5111
diff
changeset
|
383 |
5044 | 384 if len(args) == 2 and args[0] == 'load': |
385 pass | |
386 else: | |
387 if args: | |
388 rev = args[0] | |
389 im.start(rev=rev) | |
5241
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
390 if opts.get('auto'): |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
391 args = ['merge', '--auto'] |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
392 else: |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
393 args = ['status'] |
5044 | 394 |
395 if not args: | |
396 args = ['merge'] | |
397 | |
5239
8860f29447c1
imerge: fix ancestor calculation
Brendan Cully <brendan@kublai.com>
parents:
5165
diff
changeset
|
398 return dispatch_(im, args, opts) |
5044 | 399 |
400 cmdtable = { | |
401 '^imerge': | |
402 (imerge, | |
5241
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
403 [('r', 'rev', '', _('revision to merge')), |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
404 ('a', 'auto', None, _('automatically merge where possible'))], |
3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com>
parents:
5239
diff
changeset
|
405 'hg imerge [command]') |
5044 | 406 } |