Mercurial > public > mercurial-scm > hg

comparison hgext/extdiff.py @ 28970:4f86c3bed63b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: make extdiff use absolute_import
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 17 Apr 2016 02:15:05 +0530
parents 174069440929
children 67b180c0e263
comparison
equal deleted inserted replaced
28969:cca011fd1ea7 28970:4f86c3bed63b
58 :hg:`diff` command. The extdiff extension makes snapshots of only 58 :hg:`diff` command. The extdiff extension makes snapshots of only
59 needed files, so running the external diff program will actually be 59 needed files, so running the external diff program will actually be
60 pretty fast (at least faster than having to compare the entire tree). 60 pretty fast (at least faster than having to compare the entire tree).
61 ''' 61 '''
62 62
63 from __future__ import absolute_import
64
65 import os
66 import re
67 import shlex
68 import shutil
69 import tempfile
63 from mercurial.i18n import _ 70 from mercurial.i18n import _
64 from mercurial.node import short, nullid 71 from mercurial.node import (
65 from mercurial import cmdutil, scmutil, util, commands, encoding, filemerge 72 nullid,
66 from mercurial import archival, error 73 short,
67 import os, shlex, shutil, tempfile, re 74 )
75 from mercurial import (
76 archival,
77 cmdutil,
78 commands,
79 encoding,
80 error,
81 filemerge,
82 scmutil,
83 util,
84 )
68 85
69 cmdtable = {} 86 cmdtable = {}
70 command = cmdutil.command(cmdtable) 87 command = cmdutil.command(cmdtable)
71 # Note for extension authors: ONLY specify testedwith = 'internal' for 88 # Note for extension authors: ONLY specify testedwith = 'internal' for
72 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should 89 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should