Mercurial > public > mercurial-scm > hg

comparison hgext/extdiff.py @ 26229:d1530c6e8613

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extdiff: enable -I/-X with --patch Not sure how useful this really is, but it's trivial to add and ignoring the existing arguments supported seems like a bad UI.
author Matt Harbison <matt_harbison@yahoo.com>
date Wed, 09 Sep 2015 22:27:48 -0400
parents 0fd20a71abdb
children 56b2bcea2529
comparison
equal deleted inserted replaced
26228:0fd20a71abdb 26229:d1530c6e8613
221 if not os.path.isfile(dir1b): 221 if not os.path.isfile(dir1b):
222 dir1b = os.devnull 222 dir1b = os.devnull
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)
233 dir2 = repo.vfs.reljoin(tmproot, label2) 233 dir2 = repo.vfs.reljoin(tmproot, label2)
234 dir1b = None 234 dir1b = None