http://bugs.grommit.com/show_bug.cgi?id=315
Summary: WorkSpace.py gets util.pathto() wrong
Product: SCM Migration
Version: unspecified
Platform: SPARC (32bit+64bit)
OS/Version: Solaris 11/Nevada
Status: NEW
Severity: blocker
Priority: P3
Component: cdm
AssignedTo: scm-migration-dev at opensolaris.org
ReportedBy: levon at movementarian.org
I get:
error: precommit.cdm hook raised an exception: pathto() takes exactly 2
arguments (3 given)
Traceback (most recent call last):
File "/usr/bin/hg", line 12, in ?
commands.run()
File "/usr/lib/python2.4/commands.py", line 3000, in run
File "/usr/lib/python2.4/commands.py", line 3223, in dispatch
File "/usr/lib/python2.4/commands.py", line 3182, in <lambda>
File "build/proto/lib/python/hgext/mq.py", line 1780, in push
File "build/proto/lib/python/hgext/mq.py", line 824, in push
File "build/proto/lib/python/hgext/mq.py", line 466, in apply
File "build/proto/lib/python/hgext/mq.py", line 2020, in commit
File "build/proto/lib/python/mercurial/localrepo.py", line 705, in commit
File "build/proto/lib/python/mercurial/localrepo.py", line 207, in hook
File "build/proto/lib/python/mercurial/localrepo.py", line 170, in callhook
File "cdm.py", line 83, in pre_commitchk
File "cdm.py", line 623, in cdm_keywords
File "WorkSpace.py", line 708, in filepath
TypeError: pathto() takes exactly 2 arguments (3 given)
I think this code needs to be:
$ hg diff
diff --git a/usr/src/tools/onbld/Scm/WorkSpace.py
b/usr/src/tools/onbld/Scm/WorkSpace.py
--- a/usr/src/tools/onbld/Scm/WorkSpace.py
+++ b/usr/src/tools/onbld/Scm/WorkSpace.py
@@ -705,7 +705,7 @@ class WorkSpace(object):
def filepath(self, path):
'Return the full path to a workspace file.'
- return util.pathto(self.repo.root, os.getcwd(), path)
+ return util.pathto(os.getcwd(), path)
def clean(self, rev=None, wlock=None):
'''Bring workspace up to REV (or tip) forcefully (disgarding in
--
Configure bugmail: http://bugs.grommit.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
