Mercurial > public > mercurial-scm > hg-stable
diff hgext/extdiff.py @ 5143:d4fa6bafc43a
Remove trailing spaces, fix indentation
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 07 Aug 2007 10:28:43 +0200 |
parents | 2be225ea5722 |
children | c80af96943aa |
line wrap: on
line diff
--- a/hgext/extdiff.py Tue Aug 07 10:28:14 2007 +0200 +++ b/hgext/extdiff.py Tue Aug 07 10:28:43 2007 +0200 @@ -64,7 +64,7 @@ base = os.path.join(tmproot, dirname) os.mkdir(base) ui.note(_('making snapshot of %d files from rev %s\n') % - (len(files), short(node))) + (len(files), short(node))) for fn in files: if not fn in mf: # skipping new file after a merge ? @@ -90,7 +90,7 @@ base = os.path.join(tmproot, dirname) os.mkdir(base) ui.note(_('making snapshot of %d files from working dir\n') % - (len(files))) + (len(files))) for fn in files: wfn = util.pconvert(fn) ui.note(' %s\n' % wfn) @@ -102,7 +102,7 @@ for chunk in util.filechunkiter(repo.wopener(wfn)): fp.write(chunk) return dirname - + def dodiff(ui, repo, diffcmd, diffopts, pats, opts): node1, node2 = cmdutil.revpair(repo, opts['rev']) @@ -133,14 +133,14 @@ if changes == 1 : if len(modified): dir1 = os.path.join(dir1, util.localpath(modified[0])) - dir2 = os.path.join(dir2root, dir2, util.localpath(modified[0])) + dir2 = os.path.join(dir2root, dir2, util.localpath(modified[0])) elif len(removed) : dir1 = os.path.join(dir1, util.localpath(removed[0])) dir2 = os.devnull else: dir1 = os.devnull - dir2 = os.path.join(dir2root, dir2, util.localpath(added[0])) - + dir2 = os.path.join(dir2root, dir2, util.localpath(added[0])) + cmdline = ('%s %s %s %s' % (util.shellquote(diffcmd), ' '.join(diffopts), util.shellquote(dir1), util.shellquote(dir2)))