Same problems svn -> svn

[ega@…]

I'm using the current version (0.9.22) of tailor and I've some problem.

I want import alfresco's project in my local svn server.

I've solve almost this problem :

• in vcpx/svn.py, line 234, the last is sincerev and not sincerev+1. When I've modify this line (become "--revision", "%d:HEAD" % (sincerev)) ) all works fine ;

• some comments have unknown characters, in vcpx/repository.py, line 101 I've modify "'encoding-errors-policy', 'strict')" to "'encoding-errors-policy', 'replace')" ;

• one comment has "^M" at this end of a line. In vcpx/svn.py; line 454, I've modify log.write(encode('\n'.join(logmessage))) to log.write(replace(encode('\n'.join(logmessage)), '\r', )) (need added "from string import replace" line 454).

Now, I've a new bug and I don't know how solve it :

08:03:01 [I] Updating "project" in "/tailor/alfresco"
08:03:01 [I] $ svn ls http://ega:svn@svn.atolcd.priv/svn/externe_alfresco_officiel
08:03:01 [I] [Ok]
08:03:01 [I] Applying pending upstream changesets
08:03:01 [I] Changeset "2751"
08:03:01 [I] Log message: SMB code in wrong place from merge
08:03:01 [I] /tailor/alfresco/externe $ svn update --revision 2751 .
08:03:10 [I] [Ok]
08:03:10 [I] $ rsync --delete --archive --exclude .svn --exclude .svn /tailor/alfresco/externe/ /tailor/alfresco/interne
08:03:10 [I] [Ok]
08:03:10 [I] /tailor/alfresco/interne $ svn add --quiet --no-auto-props --non-recursive projects projects/repository projects/repository/source projects/repository/source/java projects/repository/source/java/org projects/repository/source/java/org/alfresco projects/repository/source/java/org/alfresco/filesys projects/repository/source/java/org/alfresco/filesys/server projects/repository/source/java/org/alfresco/filesys/server/smb
08:03:10 [I] [Ok]
08:03:10 [I] /tailor/alfresco/interne $ svn mv --quiet --force projects/repository/source/java/org/alfresco/filesys/smb/repo projects/repository/source/java/org/alfresco/filesys/server/smb/repo
08:03:10 [W] [Status 1]
08:03:10 [E] Failure replaying: Revision: 2751
Date: 2006-05-04 08:52:16.747255
Author: paulhh
Renamed: projects/repository/source/java/org/alfresco/filesys/server/smb/repo (from projects/repository/source/java/org/alfresco/filesys/smb/repo)
Added: projects/repository/source/java/org/alfresco/filesys/server/smb
Log: SMB code in wrong place from merge
Traceback (most recent call last):
  File "/root/tailor-0.9.22/vcpx/target.py", line 112, in replayChangeset
    self._replayChangeset(changeset)
  File "/root/tailor-0.9.22/vcpx/target.py", line 296, in _replayChangeset
    if renamed: self._renameEntries(renamed)
  File "/root/tailor-0.9.22/vcpx/target.py", line 423, in _renameEntries
    self._renamePathname(e.old_name, e.name)
  File "/root/tailor-0.9.22/vcpx/svn.py", line 541, in _renamePathname
    raise ChangesetApplicationFailure("%s returned status %d"
NameError: global name 'err' is not defined
08:03:10 [E] Couldn't reply changeset
Revision: 2751
Date: 2006-05-04 08:52:16.747255
Author: paulhh
Renamed: projects/repository/source/java/org/alfresco/filesys/server/smb/repo (from projects/repository/source/java/org/alfresco/filesys/smb/repo)
Added: projects/repository/source/java/org/alfresco/filesys/server/smb
Log: SMB code in wrong place from merge
Traceback (most recent call last):
  File "/root/tailor-0.9.22/vcpx/source.py", line 133, in applyPendingChangesets
    replay(c)
  File "/root/tailor-0.9.22/vcpx/dualwd.py", line 107, in replayChangeset
    self.target.replayChangeset(changeset)
  File "/root/tailor-0.9.22/vcpx/target.py", line 112, in replayChangeset
    self._replayChangeset(changeset)
  File "/root/tailor-0.9.22/vcpx/target.py", line 296, in _replayChangeset
    if renamed: self._renameEntries(renamed)
  File "/root/tailor-0.9.22/vcpx/target.py", line 423, in _renameEntries
    self._renamePathname(e.old_name, e.name)
  File "/root/tailor-0.9.22/vcpx/svn.py", line 541, in _renamePathname
    raise ChangesetApplicationFailure("%s returned status %d"
NameError: global name 'err' is not defined
08:03:10 [C] Upstream change application failed
Traceback (most recent call last):
  File "./tailor", line 33, in ?
    main()
  File "/root/tailor-0.9.22/vcpx/tailor.py", line 332, in main
    tailorizer()
  File "/root/tailor-0.9.22/vcpx/tailor.py", line 144, in __call__
    self.update()
  File "/root/tailor-0.9.22/vcpx/tailor.py", line 107, in update
    last, conflicts = dwd.applyPendingChangesets(
  File "/root/tailor-0.9.22/vcpx/dualwd.py", line 97, in applyPendingChangesets
    applied=applied)
  File "/root/tailor-0.9.22/vcpx/source.py", line 133, in applyPendingChangesets
    replay(c)
  File "/root/tailor-0.9.22/vcpx/dualwd.py", line 107, in replayChangeset




    self.target.replayChangeset(changeset)
  File "/root/tailor-0.9.22/vcpx/target.py", line 112, in replayChangeset
    self._replayChangeset(changeset)
  File "/root/tailor-0.9.22/vcpx/target.py", line 296, in _replayChangeset
    if renamed: self._renameEntries(renamed)
  File "/root/tailor-0.9.22/vcpx/target.py", line 423, in _renameEntries
    self._renamePathname(e.old_name, e.name)
  File "/root/tailor-0.9.22/vcpx/svn.py", line 541, in _renamePathname
    raise ChangesetApplicationFailure("%s returned status %d"
NameError: global name 'err' is not defined

Configuration file :

[DEFAULT]
verbose = True
use-limit = False
ignore-externals = False

[project]
target = svn:target
start-revision = INITIAL
root-directory = /tailor/alfresco
state-file = tailor.state
source = svn:source
subdir = .

[svn:source]
module = /alfresco/HEAD/root
repository = svn://anonymous@www.alfresco.org
subdir = externe

[svn:target]
module = /trunk
repository = http://ega:svn@svn.atolcd.priv/svn/externe_alfresco_officiel
subdir = interne

[Lele Gaifax]

I'm fixing the cut&paste glitch, thanks for reporting.

On the other problems you mention:

1. Why you think sincerev is more correct than sincerev+1? Here sincerev is the last revision that was applied, and we want to collect what remains/what's new on the source repository, so I keep thinking that current code is right. Can you be a little more specific on this point?
2. There is no reason to change the code about encoding-errors-policy: that's actually an option that is being read from the configuration, so you can put encoding-errors-policy = replace in the config file with the same meaning.
3. About ^M in the changelog, it seem a rather specific glitch that should be better handled by a before-commit hook, rather than doing a replace in any case. BTW, instead of using string.replace(targetstring, old, new) newest Pythons recommends the idiom targetstring.replace(old, new) which is slightly faster.

[lele]

This should be fixed by [1128]. I'll leave the ticket open for a few days, waiting for submitter clarifications on the other points.

[ega@…]

Thanks for your reply.

In my test repository, "sincerev+1" make me an error, but not in other repositories (I've tried in other repositories now). Maybe a problem with this repository (I don't have time to investigate it).

Anyway, your fix work fine, but :

09:20:57 [I] /tailor/alfresco/interne $ svn mv --quiet --force projects/repository/source/java/org/alfresco/filesys/smb/repo projects/repository/source/java/org/alfresco/filesys/server/smb/repo
09:20:57 [W] [Status 1]
09:20:57 [E] Failure replaying: Revision: 2751
Date: 2006-05-04 08:52:16.747255
Author: paulhh
Renamed: projects/repository/source/java/org/alfresco/filesys/server/smb/repo (from projects/repository/source/java/org/alfresco/filesys/smb/repo)
Added: projects/repository/source/java/org/alfresco/filesys/server/smb
Log: SMB code in wrong place from merge
Traceback (most recent call last):
  File "/root/tailor-0.9.22/vcpx/target.py", line 112, in replayChangeset
    self._replayChangeset(changeset)
  File "/root/tailor-0.9.22/vcpx/target.py", line 296, in _replayChangeset
    if renamed: self._renameEntries(renamed)
  File "/root/tailor-0.9.22/vcpx/target.py", line 423, in _renameEntries
    self._renamePathname(e.old_name, e.name)
  File "/root/tailor-0.9.22/vcpx/svn.py", line 542, in _renamePathname
    raise ChangesetApplicationFailure("%s returned status %d"
TypeError: not all arguments converted during string formatting
09:20:57 [E] Couldn't reply changeset
Revision: 2751
Date: 2006-05-04 08:52:16.747255
Author: paulhh
Renamed: projects/repository/source/java/org/alfresco/filesys/server/smb/repo (from projects/repository/source/java/org/alfresco/filesys/smb/repo)
Added: projects/repository/source/java/org/alfresco/filesys/server/smb
Log: SMB code in wrong place from merge
Traceback (most recent call last):
  File "/root/tailor-0.9.22/vcpx/source.py", line 133, in applyPendingChangesets
    replay(c)
  File "/root/tailor-0.9.22/vcpx/dualwd.py", line 107, in replayChangeset
    self.target.replayChangeset(changeset)
  File "/root/tailor-0.9.22/vcpx/target.py", line 112, in replayChangeset
    self._replayChangeset(changeset)
  File "/root/tailor-0.9.22/vcpx/target.py", line 296, in _replayChangeset
    if renamed: self._renameEntries(renamed)
  File "/root/tailor-0.9.22/vcpx/target.py", line 423, in _renameEntries
    self._renamePathname(e.old_name, e.name)
  File "/root/tailor-0.9.22/vcpx/svn.py", line 542, in _renamePathname
    raise ChangesetApplicationFailure("%s returned status %d"
TypeError: not all arguments converted during string formatting
09:20:57 [C] Upstream change application failed
Traceback (most recent call last):
  File "./tailor", line 33, in ?
    main()
  File "/root/tailor-0.9.22/vcpx/tailor.py", line 332, in main
    tailorizer()
  File "/root/tailor-0.9.22/vcpx/tailor.py", line 144, in __call__
    self.update()
  File "/root/tailor-0.9.22/vcpx/tailor.py", line 107, in update
    last, conflicts = dwd.applyPendingChangesets(
  File "/root/tailor-0.9.22/vcpx/dualwd.py", line 97, in applyPendingChangesets
    applied=applied)
  File "/root/tailor-0.9.22/vcpx/source.py", line 133, in applyPendingChangesets
    replay(c)
  File "/root/tailor-0.9.22/vcpx/dualwd.py", line 107, in replayChangeset
    self.target.replayChangeset(changeset)
  File "/root/tailor-0.9.22/vcpx/target.py", line 112, in replayChangeset
    self._replayChangeset(changeset)
  File "/root/tailor-0.9.22/vcpx/target.py", line 296, in _replayChangeset
    if renamed: self._renameEntries(renamed)
  File "/root/tailor-0.9.22/vcpx/target.py", line 423, in _renameEntries
    self._renamePathname(e.old_name, e.name)
  File "/root/tailor-0.9.22/vcpx/svn.py", line 542, in _renamePathname
    raise ChangesetApplicationFailure("%s returned status %d"
TypeError: not all arguments converted during string formatting

I've tried in fresh uncompress version with only your fix and no change.

Thanks for all.

[lele]

The error above should be fixed in 0.9.23, which was released yesterday.

Trying out your recipe, I had to add "trust-root = True" in the svn:source section otherwise tailor stops at bootstrap time. No time now to wait it reach revision 2751, but it committed the very first few revisions...

Please, try again with latest version and report back.

[ega]

It doesn't work. I'm using the version 0.9.23 of tailor. I've suppress all sources to restart from begining, but I've this error too :

09:50:57 [I] -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
09:50:57 [I] Changeset "2751"
09:50:57 [I] Log message: SMB code in wrong place from merge
09:50:57 [I] /tailor/alfresco/externe $ svn update --revision 2751 .
09:50:59 [I] [Ok]
09:50:59 [I] $ rsync --archive --exclude .svn --exclude .svn /tailor/alfresco/externe/ /tailor/alfresco/interne
09:50:59 [I] [Ok]
09:50:59 [I] /tailor/alfresco/interne $ svn add --quiet --no-auto-props --non-recursive projects/repository/source/java/org/alfresco/filesys/server/smb
09:50:59 [I] [Ok]
09:50:59 [I] /tailor/alfresco/interne $ svn add --quiet --no-auto-props --non-recursive projects projects/repository projects/repository/source projects/repository/source/java projects/repository/source/java/org projects/repository/source/java/org/alfresco projects/repository/source/java/org/alfresco/filesys projects/repository/source/java/org/alfresco/filesys/server projects/repository/source/java/org/alfresco/filesys/server/smb
09:50:59 [I] [Ok]
09:50:59 [I] /tailor/alfresco/interne $ svn mv --quiet --force projects/repository/source/java/org/alfresco/filesys/smb/repo projects/repository/source/java/org/alfresco/filesys/server/smb/repo
09:50:59 [I] [Ok]
09:50:59 [E] Failure replaying: Revision: 2751
Date: 2006-05-04 08:52:16.747255
Author: paulhh
Renamed: projects/repository/source/java/org/alfresco/filesys/server/smb/repo (from projects/repository/source/java/org/alfresco/filesys/smb/repo)
Added: projects/repository/source/java/org/alfresco/filesys/server/smb
Log: SMB code in wrong place from merge
Traceback (most recent call last):
  File "/root/tailor-0.9.23/vcpx/target.py", line 112, in replayChangeset
    self._replayChangeset(changeset)
  File "/root/tailor-0.9.23/vcpx/target.py", line 294, in _replayChangeset
    action(group)
  File "/root/tailor-0.9.23/vcpx/target.py", line 439, in _renameEntries
    rename(absnew + '-TAILOR-HACKED-TEMP-NAME', absnew)
OSError: [Errno 39] Directory not empty
09:50:59 [E] Couldn't replay changeset
Revision: 2751
Date: 2006-05-04 08:52:16.747255
Author: paulhh
Renamed: projects/repository/source/java/org/alfresco/filesys/server/smb/repo (from projects/repository/source/java/org/alfresco/filesys/smb/repo)
Added: projects/repository/source/java/org/alfresco/filesys/server/smb
Log: SMB code in wrong place from merge
Traceback (most recent call last):
  File "/root/tailor-0.9.23/vcpx/source.py", line 133, in applyPendingChangesets
    replay(c)
  File "/root/tailor-0.9.23/vcpx/dualwd.py", line 107, in replayChangeset
    self.target.replayChangeset(changeset)
  File "/root/tailor-0.9.23/vcpx/target.py", line 112, in replayChangeset
    self._replayChangeset(changeset)
  File "/root/tailor-0.9.23/vcpx/target.py", line 294, in _replayChangeset
    action(group)
  File "/root/tailor-0.9.23/vcpx/target.py", line 439, in _renameEntries
    rename(absnew + '-TAILOR-HACKED-TEMP-NAME', absnew)
OSError: [Errno 39] Directory not empty
09:50:59 [I] 186 pending changesets in state file
09:50:59 [C] Upstream change application failed
Traceback (most recent call last):
  File "./tailor", line 33, in ?
    main()
  File "/root/tailor-0.9.23/vcpx/tailor.py", line 332, in main
    tailorizer()
  File "/root/tailor-0.9.23/vcpx/tailor.py", line 144, in __call__
    self.update()
  File "/root/tailor-0.9.23/vcpx/tailor.py", line 107, in update
    last, conflicts = dwd.applyPendingChangesets(
  File "/root/tailor-0.9.23/vcpx/dualwd.py", line 97, in applyPendingChangesets
    applied=applied)
  File "/root/tailor-0.9.23/vcpx/source.py", line 133, in applyPendingChangesets
    replay(c)
  File "/root/tailor-0.9.23/vcpx/dualwd.py", line 107, in replayChangeset
    self.target.replayChangeset(changeset)
  File "/root/tailor-0.9.23/vcpx/target.py", line 112, in replayChangeset
    self._replayChangeset(changeset)
  File "/root/tailor-0.9.23/vcpx/target.py", line 294, in _replayChangeset
    action(group)
  File "/root/tailor-0.9.23/vcpx/target.py", line 439, in _renameEntries
    rename(absnew + '-TAILOR-HACKED-TEMP-NAME', absnew)
OSError: [Errno 39] Directory not empty
machine:~/tailor-0.9.23#

I've tried to remove /tailor/alfresco/interne/projects/repository/source/java/org/alfresco/filesys/server/smb/repo-TAILOR-HACKED-TEMP-NAME but the script re-create it.

[ega]

There is no more problem with last version.