##// END OF EJS Templates
extdiff: enable -I/-X with --patch...
Matt Harbison -
r26229:d1530c6e default
parent child Browse files
Show More
@@ -223,10 +223,10 b' def dodiff(ui, repo, cmdline, pats, opts'
223 dir2 = os.path.join(dir2root, dir2, common_file)
223 dir2 = os.path.join(dir2root, dir2, common_file)
224 label2 = common_file + rev2
224 label2 = common_file + rev2
225 else:
225 else:
226 # XXX: export doesn't support -I/-X like extdiff does
227 template = 'hg-%h.patch'
226 template = 'hg-%h.patch'
228 cmdutil.export(repo, [repo[node1a].rev(), repo[node2].rev()],
227 cmdutil.export(repo, [repo[node1a].rev(), repo[node2].rev()],
229 template=repo.vfs.reljoin(tmproot, template))
228 template=repo.vfs.reljoin(tmproot, template),
229 match=matcher)
230 label1a = cmdutil.makefilename(repo, template, node1a)
230 label1a = cmdutil.makefilename(repo, template, node1a)
231 label2 = cmdutil.makefilename(repo, template, node2)
231 label2 = cmdutil.makefilename(repo, template, node2)
232 dir1a = repo.vfs.reljoin(tmproot, label1a)
232 dir1a = repo.vfs.reljoin(tmproot, label1a)
@@ -992,7 +992,7 b' def tryimportone(ui, repo, hunk, parents'
992 os.unlink(tmpname)
992 os.unlink(tmpname)
993
993
994 def export(repo, revs, template='hg-%h.patch', fp=None, switch_parent=False,
994 def export(repo, revs, template='hg-%h.patch', fp=None, switch_parent=False,
995 opts=None):
995 opts=None, match=None):
996 '''export changesets as hg patches.'''
996 '''export changesets as hg patches.'''
997
997
998 total = len(revs)
998 total = len(revs)
@@ -1043,7 +1043,7 b" def export(repo, revs, template='hg-%h.p"
1043 write(ctx.description().rstrip())
1043 write(ctx.description().rstrip())
1044 write("\n\n")
1044 write("\n\n")
1045
1045
1046 for chunk, label in patch.diffui(repo, prev, node, opts=opts):
1046 for chunk, label in patch.diffui(repo, prev, node, match, opts=opts):
1047 write(chunk, label=label)
1047 write(chunk, label=label)
1048
1048
1049 if shouldclose:
1049 if shouldclose:
@@ -363,6 +363,22 b' Disallow grafting an already grafted cse'
363 ++a
363 ++a
364 [1]
364 [1]
365
365
366 $ hg extdiff --config extensions.extdiff= --patch -r 2 -r 13 -X .
367 --- */hg-5c095ad7e90f.patch * +0000 (glob)
368 +++ */hg-7a4785234d87.patch * +0000 (glob)
369 @@ -1,8 +1,8 @@
370 # HG changeset patch
371 -# User test
372 +# User foo
373 # Date 0 0
374 # Thu Jan 01 00:00:00 1970 +0000
375 -# Node ID 5c095ad7e90f871700f02dd1fa5012cb4498a2d4
376 -# Parent 5d205f8b35b66bc36375c9534ffd3237730e8f04
377 +# Node ID 7a4785234d87ec1aa420ed6b11afe40fa73e12a9
378 +# Parent b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f
379 2
380
381 [1]
366
382
367 Disallow grafting already grafted csets with the same origin onto each other
383 Disallow grafting already grafted csets with the same origin onto each other
368 $ hg up -q 13
384 $ hg up -q 13
General Comments 0
You need to be logged in to leave comments. Login now