diff options
| author | Joshua M. Clulow <jmc@joyent.com> | 2013-01-17 22:26:21 +0000 |
|---|---|---|
| committer | Joshua M. Clulow <jmc@joyent.com> | 2013-01-24 04:02:34 +0000 |
| commit | bfb56a46ed22310699783e45d5a609dd541bb536 (patch) | |
| tree | 4cd6dfd2678712c1bc1b9019399b1a31656e9c43 /usr/src/tools/onbld/hgext/cdm.py | |
| parent | cbe84e2625d7e7a63fe63490cc6785655cac9148 (diff) | |
| download | illumos-joyent-release-20130124.tar.gz | |
OS-1823 git-pbchk should not depend on mercurial20130124release-20130124
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/tools/onbld/hgext/cdm.py')
| -rw-r--r-- | usr/src/tools/onbld/hgext/cdm.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr/src/tools/onbld/hgext/cdm.py b/usr/src/tools/onbld/hgext/cdm.py index 0ce41d4dad..a04317fff9 100644 --- a/usr/src/tools/onbld/hgext/cdm.py +++ b/usr/src/tools/onbld/hgext/cdm.py @@ -16,6 +16,7 @@ # # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2008, 2011 Richard Lowe +# Copyright (c) 2013, Joyent Inc. All rights reserved. # '''OpenSolaris extensions to Mercurial @@ -92,6 +93,7 @@ sys.path.insert(1, os.path.join(os.path.dirname(__file__), "..", "..", "..", sys.path.insert(2, os.path.join(os.path.dirname(__file__), "..", "..")) from onbld.Scm import Version +from onbld.Scm import Ignore from mercurial import util try: @@ -99,7 +101,7 @@ try: except Version.VersionMismatch, badversion: raise util.Abort("Version Mismatch:\n %s\n" % badversion) -from mercurial import cmdutil, ignore, node, patch +from mercurial import cmdutil, node, patch from onbld.Scm.WorkSpace import WorkSpace, WorkList from onbld.Scm.Backup import CdmBackup @@ -167,7 +169,7 @@ def not_check(repo, cmd): ignorefiles.append(f) if ignorefiles: - ign = ignore.ignore(repo.root, ignorefiles, repo.ui.warn) + ign = Ignore.ignore(repo.root, ignorefiles) return canonified_check(ign) else: return util.never |