cvsps source cannot read patches from a branch

[ydirson]

Using this config:

[DEFAULT]
patch-name-format=%(firstlogline)s
remove-first-log-line=True
# that one seems necessary to force ordering
projects = trunk-pull, branch-pull

[trunk-pull]
root-directory = /export/work/yann/tailor/test/rootps
source = cvsps:bigdiesel
target = git:bigdiesel
start-revision = INITIAL
state-file = trunk-pull.state
subdir = trunk

[branch-pull]
root-directory = /export/work/yann/tailor/test/rootps
source = cvsps:bigdiesel
target = git:bigdiesel-branch
#start-revision = INITIAL
start-revision = bigloo-parser INITIAL
state-file = branch-pull.state
subdir = bigloo-parser

[cvsps:bigdiesel]
repository = :pserver:anonymous@cvs.savannah.nongnu.org:/sources/dsssl-utils
module = dsssl-utils/bigdiesel

[git:bigdiesel]

[git:bigdiesel-branch]
parent-repo = ../trunk
parent-rev = ec3b45d3733129f88422c3983b82a4fcc943a760

tailorizing "branch-pull" (after having tailorized trunk-pull) gives:

$ ./tailor/tailor -v --configfile test/bigdiesel-cvsps.tailor 
23:42:49 [I] Updating "trunk-pull" in "/export/work/yann/tailor/test/rootps"
23:42:49 [I] $ cvsps --cvs-direct -u -b HEAD --root :pserver:anonymous@cvs.savannah.nongnu.org:/sources/dsssl-utils dsssl-utils/bigdiesel
23:42:52 [I] [Ok]
23:42:52 [I] Cached information about 0 pending changesets
23:42:52 [I] Update completed with no upstream changes
23:42:52 [I] Bootstrapping "branch-pull" in "/export/work/yann/tailor/test/rootps"
23:42:52 [I] /export/work/yann/tailor/test/rootps/bigloo-parser $ git clone --shared -n ../trunk tmp
23:42:52 [I] [Ok]
23:42:52 [I] /export/work/yann/tailor/test/rootps/bigloo-parser $ git reset --soft bigloo-parser_branchpoint
23:42:52 [I] [Ok]
23:42:52 [C] Checkout of branch-pull failed!
Traceback (most recent call last):
  File "./tailor/tailor", line 33, in ?
    main()
  File "/export/work/yann/tailor/tailor/vcpx/tailor.py", line 334, in main
    tailorizer()
  File "/export/work/yann/tailor/tailor/vcpx/tailor.py", line 143, in __call__
    self.bootstrap()
  File "/export/work/yann/tailor/tailor/vcpx/tailor.py", line 71, in bootstrap
    actual = dwd.checkoutUpstreamRevision(revision)
  File "/export/work/yann/tailor/tailor/vcpx/source.py", line 245, in checkoutUpstreamRevision
    last = self._checkoutUpstreamRevision(revision)
  File "/export/work/yann/tailor/tailor/vcpx/cvsps.py", line 310, in _checkoutUpstreamRevision
    csets = self.getPendingChangesets(revision)
  File "/export/work/yann/tailor/tailor/vcpx/source.py", line 213, in getPendingChangesets
    self.state_file.setPendingChangesets(changesets)
  File "/export/work/yann/tailor/tailor/vcpx/statefile.py", line 253, in setPendingChangesets
    self._write(changesets)
  File "/export/work/yann/tailor/tailor/vcpx/statefile.py", line 86, in _write
    for cs in changesets:
  File "/export/work/yann/tailor/tailor/vcpx/cvsps.py", line 160, in _getUpstreamChangesets
    sincerev = int(sincerev)
ValueError: invalid literal for int(): bigloo-parser

Requesting the trunk instead of the branch does not show this failure.

[lele]

This should be fixed by [1165].

[ydirson]

It is better, but with the same config files, it now fails with:

$ ../tailor/tailor --configfile=bigdiesel-cvsps.tailor

2006-06-16 21:39:43     INFO: Bootstrapping "branch-pull" in "/export/work/yann/tailor/test/rootps"
2006-06-16 21:39:43     INFO: /export/work/yann/tailor/test/rootps/bigloo-parser $ git clone --shared -n ../trunk tmp
2006-06-16 21:39:43     INFO: [Ok]
2006-06-16 21:39:43     INFO: /export/work/yann/tailor/test/rootps/bigloo-parser $ git reset --soft ec3b45d3733129f88422c3983b82a4fcc943a760
2006-06-16 21:39:43     INFO: [Ok]
2006-06-16 21:39:43     INFO: $ cvsps --cvs-direct -u -b bigloo-parser --root :pserver:anonymous@cvs.savannah.nongnu.org:/sources/dsssl-utils dsssl-utils/bigdiesel
2006-06-16 21:39:45     INFO: [Ok]
2006-06-16 21:39:45     INFO: Cached information about 37 pending changesets
2006-06-16 21:39:45     INFO: /export/work/yann/tailor/test/rootps $ cvs -q -d :pserver:anonymous@cvs.savannah.nongnu.org:/sources/dsssl-utils checkout -d bigloo-parser -r
 bigloo-parser -D "2001-11-26 22:00:02 UTC" dsssl-utils/bigdiesel
2006-06-16 21:39:46     INFO: [Ok]
2006-06-16 21:39:46     INFO: Forcing CVS sticky tag in /export/work/yann/tailor/test/rootps/bigloo-parser
2006-06-16 21:39:46 CRITICAL: Checkout of branch-pull failed!

[ydirson]

Looking closer, it is trying to do the initial checkout of the branch, using the date for the initial revision of the trunk. This is why the working dir is empty.