cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Loweimport atexit, os, re, sys, stat, termios

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

87ab362234f761757d96ff1a758ab5c3bd85ed83Richard Lowe

87ab362234f761757d96ff1a758ab5c3bd85ed83Richard Lowesys.path.insert(1, os.path.join(os.path.dirname(__file__), "..", "..", "..",

87ab362234f761757d96ff1a758ab5c3bd85ed83Richard Lowe "python%d.%d" % sys.version_info[:2]))

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

87ab362234f761757d96ff1a758ab5c3bd85ed83Richard Lowesys.path.insert(2, os.path.join(os.path.dirname(__file__), "..", ".."))

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsonfrom onbld.Scm import Version

e55874358132a4aa6132178335bf567ca79c87c3Joshua M. Clulowfrom onbld.Scm import Ignore

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsonfrom mercurial import util

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsontry:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson Version.check_version()

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsonexcept Version.VersionMismatch, badversion:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson raise util.Abort("Version Mismatch:\n %s\n" % badversion)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

e55874358132a4aa6132178335bf567ca79c87c3Joshua M. Clulowfrom mercurial import cmdutil, node, patch

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowefrom onbld.Scm.WorkSpace import WorkSpace, WorkList

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsonfrom onbld.Scm.Backup import CdmBackup

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsonfrom onbld.Checks import Cddl, Comments, Copyright, CStyle, HdrChk

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amorefrom onbld.Checks import JStyle, Keywords, ManLint, Mapfile

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsondef yes_no(ui, msg, default):

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson if default:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson prompt = ' [Y/n]:'

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson defanswer = 'y'

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson else:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson prompt = ' [y/N]:'

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson defanswer = 'n'

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe if Version.at_least("1.4"):

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe index = ui.promptchoice(msg + prompt, ['&yes', '&no'],

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe default=['y', 'n'].index(defanswer))

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe resp = ('y', 'n')[index]

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson else:

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe resp = ui.prompt(msg + prompt, ['&yes', '&no'], default=defanswer)

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe return resp[0] in ('Y', 'y')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowedef buildfilelist(ws, parent, files):

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe '''Build a list of files in which we're interested.

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe if files:

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe return [(path, None) for path in sorted(files)]

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson else:

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe active = ws.active(parent=parent)

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe return [(ws.filepath(e.name), e) for e in sorted(active)]

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowebuildfilelist = util.cachefunc(buildfilelist)

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelsondef not_check(repo, cmd):

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson '''return a function which returns boolean indicating whether a file

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami #

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami # The ignore routines need a canonical path to the file (relative to the

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami # repo root), whereas the check commands get paths relative to the cwd.

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami #

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami # Wrap our argument such that the path is canonified before it is checked.

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami #

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami def canonified_check(ignfunc):

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami def f(path):

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami cpath = util.canonpath(repo.root, repo.getcwd(), path)

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami return ignfunc(cpath)

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami return f

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami ignorefiles = []

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami

2b5878de2735cb61d008168e1f27e390d2edf915Rich Lowe for f in [repo.join('cdm/%s.NOT' % cmd),

2b5878de2735cb61d008168e1f27e390d2edf915Rich Lowe repo.wjoin('exception_lists/%s' % cmd)]:

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami if os.path.exists(f):

2b5878de2735cb61d008168e1f27e390d2edf915Rich Lowe ignorefiles.append(f)

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami if ignorefiles:

e55874358132a4aa6132178335bf567ca79c87c3Joshua M. Clulow ign = Ignore.ignore(repo.root, ignorefiles)

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami return canonified_check(ign)

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson else:

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson return util.never

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowedef abort_if_dirty(ws):

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe '''Abort if the workspace has uncommitted changes, merges,

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe if ws.modified():

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe raise util.Abort('workspace has uncommitted changes')

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe if ws.merged():

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe raise util.Abort('workspace contains uncommitted merge')

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe if ws.branched():

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe raise util.Abort('workspace contains uncommitted branch')

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe if ws.mq_applied():

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe raise util.Abort('workspace has Mq patches applied')

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsonwslist = {}

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

2b5878de2735cb61d008168e1f27e390d2edf915Rich Lowe

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsondef reposetup(ui, repo):

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson if repo.local() and repo not in wslist:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson wslist[repo] = WorkSpace(repo)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe if ui.interactive() and sys.stdin.isatty():

2b5878de2735cb61d008168e1f27e390d2edf915Rich Lowe ui.setconfig('hooks', 'preoutgoing.cdm_pbconfirm',

2b5878de2735cb61d008168e1f27e390d2edf915Rich Lowe 'python:hgext_cdm.pbconfirm')

2b5878de2735cb61d008168e1f27e390d2edf915Rich Lowe

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelsondef pbconfirm(ui, repo, hooktype, source):

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson def wrapper(settings=None):

2b5878de2735cb61d008168e1f27e390d2edf915Rich Lowe termios.tcsetattr(sys.stdin.fileno(), termios.TCSANOW, settings)

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson if source == 'push':

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson if not yes_no(ui, "Are you sure you wish to push?", False):

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson return 1

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson else:

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson settings = termios.tcgetattr(sys.stdin.fileno())

2b5878de2735cb61d008168e1f27e390d2edf915Rich Lowe orig = list(settings)

2b5878de2735cb61d008168e1f27e390d2edf915Rich Lowe atexit.register(wrapper, orig)

2b5878de2735cb61d008168e1f27e390d2edf915Rich Lowe settings[3] = settings[3] & (~termios.ISIG) # c_lflag

2b5878de2735cb61d008168e1f27e390d2edf915Rich Lowe termios.tcsetattr(sys.stdin.fileno(), termios.TCSANOW, settings)

2b5878de2735cb61d008168e1f27e390d2edf915Rich Lowe

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelsondef cdm_pdiffs(ui, repo, *pats, **opts):

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe '''diff workspace against its parent

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe act = wslist[repo].active(opts.get('parent'))

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe if not act.revs:

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe return

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe #

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe # If no patterns were specified, either explicitly or via -I or -X

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe # use the active list files to avoid a workspace walk.

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe #

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe if pats or opts.get('include') or opts.get('exclude'):

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe matchfunc = wslist[repo].matcher(pats=pats, opts=opts)

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe else:

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe matchfunc = wslist[repo].matcher(files=act.files())

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe opts = patch.diffopts(ui, opts)

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe diffs = wslist[repo].diff(act.parenttip.node(), act.localtip.node(),

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe match=matchfunc, opts=opts)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson if diffs:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write(diffs)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsondef cdm_list(ui, repo, **opts):

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe '''list active files (those changed in this workspace)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson act = wslist[repo].active(opts['parent'])

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe wanted = set(x for x in ('added', 'modified', 'removed') if opts[x])

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe changes = {}

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson for entry in act:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson if wanted and (entry.change not in wanted):

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson continue

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe if entry.change not in changes:

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe changes[entry.change] = []

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe changes[entry.change].append(entry)

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe for change in sorted(changes.keys()):

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe ui.write(change + ':\n')

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe for entry in sorted(changes[change]):

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe if entry.is_renamed():

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe ui.write('\t%s (renamed from %s)\n' % (entry.name,

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe entry.parentname))

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe elif entry.is_copied():

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe ui.write('\t%s (copied from %s)\n' % (entry.name,

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe entry.parentname))

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson else:

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe ui.write('\t%s\n' % entry.name)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsondef cdm_bugs(ui, repo, parent=None):

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe '''show all bug IDs referenced in changeset comments'''

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson act = wslist[repo].active(parent)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson for elt in set(filter(Comments.isBug, act.comments())):

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write(elt + '\n')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsondef cdm_comments(ui, repo, parent=None):

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe '''show changeset commentary for all active changesets'''

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson act = wslist[repo].active(parent)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson for elt in act.comments():

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write(elt + '\n')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsondef cdm_renamed(ui, repo, parent=None):

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson '''show renamed active files

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson act = wslist[repo].active(parent)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson for entry in sorted(filter(lambda x: x.is_renamed(), act)):

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write('%s %s\n' % (entry.name, entry.parentname))

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsondef cdm_comchk(ui, repo, **opts):

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe '''check active changeset comment formatting

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson active = wslist[repo].active(opts.get('parent'))

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write('Comments check:\n')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson check_db = not opts.get('nocheck')

2f54b716e4d3cb0dc99066638fed631e3cbec97cRichard Lowe return Comments.comchk(active.comments(), check_db=check_db, output=ui)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelsondef cdm_cddlchk(ui, repo, *args, **opts):

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe '''check for a valid CDDL header comment in all active files.

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe filelist = buildfilelist(wslist[repo], opts.get('parent'), args)

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe exclude = not_check(repo, 'cddlchk')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson lenient = True

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ret = 0

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe ui.write('CDDL block check:\n')

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe for f, e in filelist:

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson if e and e.is_removed():

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson continue

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson elif (e or opts.get('honour_nots')) and exclude(f):

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson ui.status('Skipping %s...\n' % f)

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson continue

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson elif e and e.is_added():

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson lenient = False

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson else:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson lenient = True

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson fh = open(f, 'r')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ret |= Cddl.cddlchk(fh, lenient=lenient, output=ui)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson fh.close()

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson return ret

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amoredef cdm_manlintchk(ui, repo, *args, **opts):

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore '''check for mandoc lint

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore filelist = buildfilelist(wslist[repo], opts.get('parent'), args)

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore exclude = not_check(repo, 'manlint')

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore ret = 0

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore # Man pages are identified as having a suffix starting with a digit.

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore ManfileRE = re.compile(r'.*\.[0-9][a-z]*$', re.IGNORECASE)

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore ui.write('Man format check:\n')

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore for f, e in filelist:

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore if e and e.is_removed():

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore continue

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore elif (not ManfileRE.match(f)):

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore continue

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore elif (e or opts.get('honour_nots')) and exclude(f):

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore ui.status('Skipping %s...\n' % f)

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore continue

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore fh = open(f, 'r')

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore ret |= ManLint.manlint(fh, output=ui, picky=True)

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore fh.close()

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore return ret

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahramidef cdm_mapfilechk(ui, repo, *args, **opts):

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe '''check for a valid mapfile header block in active files

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe filelist = buildfilelist(wslist[repo], opts.get('parent'), args)

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe exclude = not_check(repo, 'mapfilechk')

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe ret = 0

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami

cd3e933325e68e23516a196a8fea7f49b1e497c3Ali Bahrami # We are interested in examining any file that has the following

cd3e933325e68e23516a196a8fea7f49b1e497c3Ali Bahrami # in its final path segment:

cd3e933325e68e23516a196a8fea7f49b1e497c3Ali Bahrami # - Contains the word 'mapfile'

cd3e933325e68e23516a196a8fea7f49b1e497c3Ali Bahrami # - Begins with 'map.'

cd3e933325e68e23516a196a8fea7f49b1e497c3Ali Bahrami # - Ends with '.map'

cd3e933325e68e23516a196a8fea7f49b1e497c3Ali Bahrami # We don't want to match unless these things occur in final path segment

cd3e933325e68e23516a196a8fea7f49b1e497c3Ali Bahrami # because directory names with these strings don't indicate a mapfile.

d24e1a1da37e9f5e4c5b11a5da612fdd70d873f0Ali Bahrami # We also ignore files with suffixes that tell us that the files

d24e1a1da37e9f5e4c5b11a5da612fdd70d873f0Ali Bahrami # are not mapfiles.

d24e1a1da37e9f5e4c5b11a5da612fdd70d873f0Ali Bahrami MapfileRE = re.compile(r'.*((mapfile[^/]*)|(/map\.+[^/]*)|(\.map))$',

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe re.IGNORECASE)

d24e1a1da37e9f5e4c5b11a5da612fdd70d873f0Ali Bahrami NotMapSuffixRE = re.compile(r'.*\.[ch]$', re.IGNORECASE)

cd3e933325e68e23516a196a8fea7f49b1e497c3Ali Bahrami

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami ui.write('Mapfile comment check:\n')

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe for f, e in filelist:

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami if e and e.is_removed():

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami continue

d24e1a1da37e9f5e4c5b11a5da612fdd70d873f0Ali Bahrami elif (not MapfileRE.match(f)) or NotMapSuffixRE.match(f):

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami continue

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami elif (e or opts.get('honour_nots')) and exclude(f):

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami ui.status('Skipping %s...\n' % f)

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami continue

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami fh = open(f, 'r')

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami ret |= Mapfile.mapfilechk(fh, output=ui)

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami fh.close()

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami return ret

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelsondef cdm_copyright(ui, repo, *args, **opts):

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe '''check each active file for a current and correct copyright notice

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe filelist = buildfilelist(wslist[repo], opts.get('parent'), args)

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe exclude = not_check(repo, 'copyright')

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe ret = 0

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write('Copyright check:\n')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe for f, e in filelist:

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson if e and e.is_removed():

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson continue

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson elif (e or opts.get('honour_nots')) and exclude(f):

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson ui.status('Skipping %s...\n' % f)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson continue

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson fh = open(f, 'r')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ret |= Copyright.copyright(fh, output=ui)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson fh.close()

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson return ret

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelsondef cdm_hdrchk(ui, repo, *args, **opts):

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe '''check active C header files conform to the O/N header rules

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe filelist = buildfilelist(wslist[repo], opts.get('parent'), args)

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe exclude = not_check(repo, 'hdrchk')

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe ret = 0

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write('Header format check:\n')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe for f, e in filelist:

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson if e and e.is_removed():

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson continue

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson elif not f.endswith('.h'):

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson continue

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson elif (e or opts.get('honour_nots')) and exclude(f):

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson ui.status('Skipping %s...\n' % f)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson continue

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson fh = open(f, 'r')

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson ret |= HdrChk.hdrchk(fh, lenient=True, output=ui)

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson fh.close()

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson return ret

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelsondef cdm_cstyle(ui, repo, *args, **opts):

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson '''check active C source files conform to the C Style Guide

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe filelist = buildfilelist(wslist[repo], opts.get('parent'), args)

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe exclude = not_check(repo, 'cstyle')

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe ret = 0

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write('C style check:\n')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe for f, e in filelist:

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson if e and e.is_removed():

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson continue

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson elif not (f.endswith('.c') or f.endswith('.h')):

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson continue

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson elif (e or opts.get('honour_nots')) and exclude(f):

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson ui.status('Skipping %s...\n' % f)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson continue

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson fh = open(f, 'r')

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson ret |= CStyle.cstyle(fh, output=ui,

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson picky=True, check_posix_types=True,

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson check_continuation=True)

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson fh.close()

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson return ret

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelsondef cdm_jstyle(ui, repo, *args, **opts):

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe '''check active Java source files for common stylistic errors

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe filelist = buildfilelist(wslist[repo], opts.get('parent'), args)

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe exclude = not_check(repo, 'jstyle')

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe ret = 0

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write('Java style check:\n')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe for f, e in filelist:

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson if e and e.is_removed():

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson continue

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson elif not f.endswith('.java'):

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson continue

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson elif (e or opts.get('honour_nots')) and exclude(f):

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson ui.status('Skipping %s...\n' % f)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson continue

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson fh = open(f, 'r')

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson ret |= JStyle.jstyle(fh, output=ui, picky=True)

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson fh.close()

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson return ret

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelsondef cdm_permchk(ui, repo, *args, **opts):

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe '''check the permissions of each active file

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe filelist = buildfilelist(wslist[repo], opts.get('parent'), args)

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe exclude = not_check(repo, 'permchk')

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe exeFiles = []

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write('File permission check:\n')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe for f, e in filelist:

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson if e and e.is_removed():

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson continue

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson elif (e or opts.get('honour_nots')) and exclude(f):

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson ui.status('Skipping %s...\n' % f)

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson continue

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson mode = stat.S_IMODE(os.stat(f)[stat.ST_MODE])

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson if mode & stat.S_IEXEC:

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson exeFiles.append(f)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson if len(exeFiles) > 0:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write('Warning: the following active file(s) have executable mode '

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson '(+x) permission set,\nremove unless intentional:\n')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson for fname in exeFiles:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write(" %s\n" % fname)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson return len(exeFiles) > 0

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsondef cdm_tagchk(ui, repo, **opts):

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe '''check modification of workspace tags

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson active = wslist[repo].active(opts.get('parent'))

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write('Checking for new tags:\n')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson if ".hgtags" in active:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson tfile = wslist[repo].filepath('.hgtags')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ptip = active.parenttip.rev()

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write('Warning: Workspace contains new non-local tags.\n'

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson 'Only gatekeepers should add or modify such tags.\n'

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson 'Use the following commands to revert these changes:\n'

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ' hg revert -r%d %s\n'

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ' hg commit %s\n'

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson 'You should also recommit before integration\n' %

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson (ptip, tfile, tfile))

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson return 1

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson return 0

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsondef cdm_branchchk(ui, repo, **opts):

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe '''check for changes in number or name of branches

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write('Checking for multiple heads (or branches):\n')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson heads = set(repo.heads())

2b5878de2735cb61d008168e1f27e390d2edf915Rich Lowe parents = set([x.node() for x in wslist[repo].workingctx().parents()])

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson #

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson # We care if there's more than one head, and those heads aren't

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson # identical to the dirstate parents (if they are identical, it's

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson # an uncommitted merge which mergechk will catch, no need to

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson # complain twice).

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson #

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson if len(heads) > 1 and heads != parents:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write('Workspace has multiple heads (or branches):\n')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson for head in [repo.changectx(head) for head in heads]:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write(" %d:%s\t%s\n" %

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson (head.rev(), str(head), head.description().splitlines()[0]))

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write('You must merge and recommit.\n')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson return 1

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write('\nChecking for branch changes:\n')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

ca0ac9825c08d047acccfa75c372cc572a321063mjnelson if repo.dirstate.branch() != 'default':

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write("Warning: Workspace tip has named branch: '%s'\n"

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson "Only gatekeepers should push new branches.\n"

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson "Use the following commands to restore the branch name:\n"

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson " hg branch [-f] default\n"

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson " hg commit\n"

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson "You should also recommit before integration\n" %

ca0ac9825c08d047acccfa75c372cc572a321063mjnelson (repo.dirstate.branch()))

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson return 1

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson branches = repo.branchtags().keys()

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson if len(branches) > 1:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write('Warning: Workspace has named branches:\n')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson for t in branches:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson if t == 'default':

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson continue

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write("\t%s\n" % t)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write("Only gatekeepers should push new branches.\n"

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson "Use the following commands to remove extraneous branches.\n"

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson " hg branch [-f] default\n"

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson " hg commit"

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson "You should also recommit before integration\n")

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson return 1

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson return 0

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelsondef cdm_keywords(ui, repo, *args, **opts):

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe '''check active files for SCCS keywords

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe filelist = buildfilelist(wslist[repo], opts.get('parent'), args)

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe exclude = not_check(repo, 'keywords')

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe ret = 0

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write('Keywords check:\n')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe for f, e in filelist:

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson if e and e.is_removed():

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson continue

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson elif (e or opts.get('honour_nots')) and exclude(f):

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson ui.status('Skipping %s...\n' % f)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson continue

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson fh = open(f, 'r')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ret |= Keywords.keywords(fh, output=ui)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson fh.close()

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson return ret

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsondef cdm_outchk(ui, repo, **opts):

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson '''Warn the user if they have uncommitted changes'''

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write('Checking for uncommitted changes:\n')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson st = wslist[repo].modified()

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson if st:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write('Warning: the following files have uncommitted changes:\n')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson for elt in st:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write(' %s\n' % elt)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson return 1

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson return 0

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsondef cdm_mergechk(ui, repo, **opts):

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson '''Warn the user if their workspace contains merges'''

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson active = wslist[repo].active(opts.get('parent'))

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write('Checking for merges:\n')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson merges = filter(lambda x: len(x.parents()) == 2 and x.parents()[1],

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson active.revs)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson if merges:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write('Workspace contains the following merges:\n')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson for rev in merges:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson desc = rev.description().splitlines()

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write(' %s:%s\t%s\n' %

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson (rev.rev() or "working", str(rev),

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson desc and desc[0] or "*** uncommitted change ***"))

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson return 1

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson return 0

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelsondef run_checks(ws, cmds, *args, **opts):

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson '''Run CMDS (with OPTS) over active files in WS'''

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ret = 0

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson for cmd in cmds:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson name = cmd.func_name.split('_')[1]

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson if not ws.ui.configbool('cdm', name, True):

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ws.ui.status('Skipping %s check...\n' % name)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson else:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ws.ui.pushbuffer()

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe result = cmd(ws.ui, ws.repo, honour_nots=True, *args, **opts)

0df7087fda4bb16f7e1cf07d1b90fcf070c19484Richard Lowe output = ws.ui.popbuffer()

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ret |= result

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson if not ws.ui.quiet or result != 0:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ws.ui.write(output, '\n')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson return ret

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelsondef cdm_nits(ui, repo, *args, **opts):

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson '''check for stylistic nits in active files

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

2f54b716e4d3cb0dc99066638fed631e3cbec97cRichard Lowe cmds = [cdm_copyright,

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson cdm_cstyle,

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson cdm_hdrchk,

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson cdm_jstyle,

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore cmd_manlintchk,

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami cdm_mapfilechk,

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson cdm_permchk,

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson cdm_keywords]

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

9a70fc3be3b1e966bf78825cdb8d509963a6f0a1Mark J. Nelson return run_checks(wslist[repo], cmds, *args, **opts)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

05945f8bf9e004c8feb0e1f01f574f2cbb5a485bRich Lowedef cdm_pbchk(ui, repo, **opts):

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe '''run pre-integration checks on this workspace

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson #

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson # The current ordering of these is that the commands from cdm_nits

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe # run first in the same order as they would in cdm_nits, then the

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe # pbchk specifics are run.

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson #

2f54b716e4d3cb0dc99066638fed631e3cbec97cRichard Lowe cmds = [cdm_copyright,

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson cdm_cstyle,

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson cdm_hdrchk,

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson cdm_jstyle,

95c635efb7c3b86efc493e0447eaec7aecca3f0fGarrett D'Amore cdm_manlintchk,

bfed486ad8de8b8ebc6345a8e10accae08bf2f45Ali Bahrami cdm_mapfilechk,

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson cdm_permchk,

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson cdm_keywords,

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson cdm_comchk,

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson cdm_tagchk,

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson cdm_branchchk,

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson cdm_outchk,

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson cdm_mergechk]

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

05945f8bf9e004c8feb0e1f01f574f2cbb5a485bRich Lowe return run_checks(wslist[repo], cmds, **opts)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsondef cdm_recommit(ui, repo, **opts):

c7f512e49da83ae2cd3d4b339e1a8366544471e2jmcp '''replace outgoing changesets with a single equivalent changeset

c7f512e49da83ae2cd3d4b339e1a8366544471e2jmcp

c7f512e49da83ae2cd3d4b339e1a8366544471e2jmcp ws = wslist[repo]

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson if not os.getcwd().startswith(repo.root):

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson raise util.Abort('recommit is not safe to run with -R')

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

c7f512e49da83ae2cd3d4b339e1a8366544471e2jmcp abort_if_dirty(ws)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe wlock = repo.wlock()

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe lock = repo.lock()

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe try:

c7f512e49da83ae2cd3d4b339e1a8366544471e2jmcp parent = ws.parent(opts['parent'])

c7f512e49da83ae2cd3d4b339e1a8366544471e2jmcp between = repo.changelog.nodesbetween(ws.findoutgoing(parent))[2]

c7f512e49da83ae2cd3d4b339e1a8366544471e2jmcp heads = set(between) & set(repo.heads())

c7f512e49da83ae2cd3d4b339e1a8366544471e2jmcp

c7f512e49da83ae2cd3d4b339e1a8366544471e2jmcp if len(heads) > 1:

c7f512e49da83ae2cd3d4b339e1a8366544471e2jmcp ui.warn('Workspace has multiple outgoing heads (or branches):\n')

c7f512e49da83ae2cd3d4b339e1a8366544471e2jmcp for head in sorted(map(repo.changelog.rev, heads), reverse=True):

c7f512e49da83ae2cd3d4b339e1a8366544471e2jmcp ui.warn('\t%d\n' % head)

c7f512e49da83ae2cd3d4b339e1a8366544471e2jmcp raise util.Abort('you must merge before recommitting')

c7f512e49da83ae2cd3d4b339e1a8366544471e2jmcp

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe #

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe # We can safely use the worklist here, as we know (from the

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe # abort_if_dirty() check above) that the working copy has not been

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe # modified.

605a716e6d38b3af09034c254382d0ae3b7d5f70Richard Lowe #

c7f512e49da83ae2cd3d4b339e1a8366544471e2jmcp active = ws.active(parent)

c7f512e49da83ae2cd3d4b339e1a8366544471e2jmcp

c7f512e49da83ae2cd3d4b339e1a8366544471e2jmcp if filter(lambda b: len(b.parents()) > 1, active.bases()):

c7f512e49da83ae2cd3d4b339e1a8366544471e2jmcp raise util.Abort('Cannot recommit a merge of two non-outgoing '

c7f512e49da83ae2cd3d4b339e1a8366544471e2jmcp 'changesets')

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe if len(active.revs) <= 0:

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe raise util.Abort("no changes to recommit")

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe if len(active.files()) <= 0:

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe ui.warn("Recommitting %d active changesets, but no active files\n" %

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe len(active.revs))

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe #

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe # During the course of a recommit, any file bearing a name

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe # matching the source name of any renamed file will be

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe # clobbered by the operation.

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe #

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe # As such, we ask the user before proceeding.

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe #

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe bogosity = [f.parentname for f in active if f.is_renamed() and

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe os.path.exists(repo.wjoin(f.parentname))]

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe if bogosity:

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe ui.warn("The following file names are the original name of a "

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe "rename and also present\n"

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe "in the working directory:\n")

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe for fname in bogosity:

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe ui.warn(" %s\n" % fname)

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe if not yes_no(ui, "These files will be removed by recommit."

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe " Continue?",

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe False):

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe raise util.Abort("recommit would clobber files")

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe user = opts['user'] or ui.username()

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe comments = '\n'.join(active.comments())

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe message = cmdutil.logmessage(opts) or ui.edit(comments, user)

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe if not message:

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe raise util.Abort('empty commit message')

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c7f512e49da83ae2cd3d4b339e1a8366544471e2jmcp bk = CdmBackup(ui, ws, backup_name(repo.root))

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe if bk.need_backup():

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe if yes_no(ui, 'Do you want to backup files first?', True):

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe bk.backup()

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe oldtags = repo.tags()

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe clearedtags = [(name, nd, repo.changelog.rev(nd), local)

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe for name, nd, local in active.tags()]

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c7f512e49da83ae2cd3d4b339e1a8366544471e2jmcp ws.squishdeltas(active, message, user=user)

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe finally:

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe lock.release()

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe wlock.release()

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson if clearedtags:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson ui.write("Removed tags:\n")

cf4134fe6ab2c92c4811c4af7dd391469c72bf73Rich Lowe for name, nd, rev, local in sorted(clearedtags,

cf4134fe6ab2c92c4811c4af7dd391469c72bf73Rich Lowe key=lambda x: x[0].lower()):

cf4134fe6ab2c92c4811c4af7dd391469c72bf73Rich Lowe ui.write(" %5s:%s:\t%s%s\n" % (rev, node.short(nd),

cf4134fe6ab2c92c4811c4af7dd391469c72bf73Rich Lowe name, (local and ' (local)' or '')))

cf4134fe6ab2c92c4811c4af7dd391469c72bf73Rich Lowe

cf4134fe6ab2c92c4811c4af7dd391469c72bf73Rich Lowe for ntag, nnode in sorted(repo.tags().items(),

cf4134fe6ab2c92c4811c4af7dd391469c72bf73Rich Lowe key=lambda x: x[0].lower()):

cf4134fe6ab2c92c4811c4af7dd391469c72bf73Rich Lowe if ntag in oldtags and ntag != "tip":

cf4134fe6ab2c92c4811c4af7dd391469c72bf73Rich Lowe if oldtags[ntag] != nnode:

cf4134fe6ab2c92c4811c4af7dd391469c72bf73Rich Lowe ui.write("tag '%s' now refers to revision %d:%s\n" %

cf4134fe6ab2c92c4811c4af7dd391469c72bf73Rich Lowe (ntag, repo.changelog.rev(nnode),

cf4134fe6ab2c92c4811c4af7dd391469c72bf73Rich Lowe node.short(nnode)))

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsondef do_eval(cmd, files, root, changedir=True):

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson if not changedir:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson os.chdir(root)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson for path in sorted(files):

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson dirn, base = os.path.split(path)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson if changedir:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson os.chdir(os.path.join(root, dirn))

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson os.putenv('workspace', root)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson os.putenv('filepath', path)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson os.putenv('dir', dirn)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson os.putenv('file', base)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson os.system(cmd)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsondef cdm_eval(ui, repo, *command, **opts):

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe '''run specified command for each active file

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson act = wslist[repo].active(opts['parent'])

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson cmd = ' '.join(command)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson files = [x.name for x in act if not x.is_removed()]

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson do_eval(cmd, files, repo.root, not opts['remain'])

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsondef cdm_apply(ui, repo, *command, **opts):

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe '''apply specified command to all active files

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson act = wslist[repo].active(opts['parent'])

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson if opts['remain']:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson appnd = ' $filepath'

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson else:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson appnd = ' $file'

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson cmd = ' '.join(command) + appnd

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson files = [x.name for x in act if not x.is_removed()]

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson do_eval(cmd, files, repo.root, not opts['remain'])

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowedef cdm_reparent(ui, repo, parent):

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe '''reparent your workspace

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe def append_new_parent(parent):

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe fp = None

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe try:

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe fp = repo.opener('hgrc', 'a', atomictemp=True)

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe if fp.tell() != 0:

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe fp.write('\n')

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe fp.write('[paths]\n'

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe 'default = %s\n\n' % parent)

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe fp.rename()

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe finally:

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe if fp and not fp.closed:

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe fp.close()

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe def update_parent(path, line, parent):

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe line = line - 1 # The line number we're passed will be 1-based

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe fp = None

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe try:

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe fp = open(path)

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe data = fp.readlines()

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe finally:

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe if fp and not fp.closed:

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe fp.close()

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe #

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe # line will be the last line of any continued block, go back

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe # to the first removing the continuation as we go.

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe #

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe while data[line][0].isspace():

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe data.pop(line)

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe line -= 1

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe assert data[line].startswith('default')

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe data[line] = "default = %s\n" % parent

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe if data[-1] != '\n':

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe data.append('\n')

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe try:

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe fp = util.atomictempfile(path, 'w', 0644)

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe fp.writelines(data)

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe fp.rename()

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe finally:

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe if fp and not fp.closed:

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe fp.close()

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe from mercurial import config

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe parent = ui.expandpath(parent)

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe if not os.path.exists(repo.join('hgrc')):

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe append_new_parent(parent)

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe return

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe cfg = config.config()

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe cfg.read(repo.join('hgrc'))

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe source = cfg.source('paths', 'default')

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe if not source:

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe append_new_parent(parent)

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe return

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe else:

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe path, target = source.rsplit(':', 1)

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe if path != repo.join('hgrc'):

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe raise util.Abort("Cannot edit path specification not in repo hgrc\n"

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe "default path is from: %s" % source)

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe update_parent(path, int(target), parent)

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsondef backup_name(fullpath):

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson '''Create a backup directory name based on the specified path.

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson special = ['usr/closed']

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson fullpath = fullpath.rstrip(os.path.sep).split(os.path.sep)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson #

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson # If a path is 'special', we append the basename of the path to

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson # the path element preceding the constant, special, part.

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson #

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson # Such that for instance:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson # /foo/bar/onnv-fixes/usr/closed

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson # has a backup name of:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson # onnv-fixes-closed

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson #

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson for elt in special:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson elt = elt.split(os.path.sep)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson pathpos = len(elt)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson if fullpath[-pathpos:] == elt:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson return "%s-%s" % (fullpath[-pathpos - 1], elt[-1])

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson else:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson return fullpath[-1]

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsondef cdm_backup(ui, repo, if_newer=False):

8703921742d9c7d4d3724f89a39ff0e2725cbe7bRichard Lowe '''backup workspace changes and metadata

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson name = backup_name(repo.root)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson bk = CdmBackup(ui, wslist[repo], name)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe wlock = repo.wlock()

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe lock = repo.lock()

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe try:

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe if if_newer and not bk.need_backup():

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe ui.status('backup is up-to-date\n')

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe else:

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe bk.backup()

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe finally:

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe lock.release()

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe wlock.release()

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelsondef cdm_restore(ui, repo, backup, **opts):

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson '''restore workspace from backup

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson if not os.getcwd().startswith(repo.root):

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson raise util.Abort('restore is not safe to run with -R')

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe abort_if_dirty(wslist[repo])

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson if opts['generation']:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson gen = int(opts['generation'])

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson else:

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson gen = None

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson if os.path.exists(backup):

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson backup = os.path.abspath(backup)

cdf0c1d55d9b3b6beaf994835440dfb01aef5cf0mjnelson

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe wlock = repo.wlock()

c959a081a8aebb76386b6d8ea3afa850e328f6c7Richard Lowe lock = repo.lock()