| SConstruct (8121:457c24115bde) | SConstruct (8122:159c07f22c8e) |
|---|---|
| 1# -*- mode:python -*- 2 3# Copyright (c) 2011 Advanced Micro Devices, Inc. 4# Copyright (c) 2009 The Hewlett-Packard Development Company 5# Copyright (c) 2004-2005 The Regents of The University of Michigan 6# All rights reserved. 7# 8# Redistribution and use in source and binary forms, with or without --- 225 unchanged lines hidden (view full) --- 234 try: 235 hg_info = readCommand(cmd, cwd=main.root.abspath).strip() 236 except OSError: 237 print mercurial_bin_not_found 238 239 # 2) Ensure that the style hook is in place. 240 try: 241 ui = None | 1# -*- mode:python -*- 2 3# Copyright (c) 2011 Advanced Micro Devices, Inc. 4# Copyright (c) 2009 The Hewlett-Packard Development Company 5# Copyright (c) 2004-2005 The Regents of The University of Michigan 6# All rights reserved. 7# 8# Redistribution and use in source and binary forms, with or without --- 225 unchanged lines hidden (view full) --- 234 try: 235 hg_info = readCommand(cmd, cwd=main.root.abspath).strip() 236 except OSError: 237 print mercurial_bin_not_found 238 239 # 2) Ensure that the style hook is in place. 240 try: 241 ui = None |
| 242 if GetOption('ignore_style'): | 242 if not GetOption('ignore_style'): |
| 243 from mercurial import ui 244 ui = ui.ui() 245 except ImportError: 246 print mercurial_lib_not_found 247 248 if ui is not None: 249 ui.readconfig(hgdir.File('hgrc').abspath) 250 style_hook = ui.config('hooks', 'pretxncommit.style', None) --- 804 unchanged lines hidden --- | 243 from mercurial import ui 244 ui = ui.ui() 245 except ImportError: 246 print mercurial_lib_not_found 247 248 if ui is not None: 249 ui.readconfig(hgdir.File('hgrc').abspath) 250 style_hook = ui.config('hooks', 'pretxncommit.style', None) --- 804 unchanged lines hidden --- |