Marko Maček <Marko.Macek@gmx.net> (mmacek)


Patch Suggested
r844776, r844656, r844655, r844654, r844595, r844207, r844205, r844019, r844018, r844017, r844015, r844013, r844003, r843998, r843983, r843566 r845240

r843566 | brane | 2002-10-25 06:07:21 +0000 (Fri, 25 Oct 2002)

Patch by: Marko Macek <Marko.Macek@gmx.net>

* tools/cvs2svn/cvs2svn.py:
   - added --trunk, --tags and --branches command line options for
     specifying relative repository paths
   - changed the default behavior to import into an existing repository
   - added a command line option --create for creating a new repository
   - added infrastructure for handling branches


r843983 | mmacek | 2002-11-26 19:13:38 +0000 (Tue, 26 Nov 2002)

Rename svn_time_to_nts -> svn_time_to_cstring


r843998 | mmacek | 2002-11-27 06:13:48 +0000 (Wed, 27 Nov 2002)

experimental cvs2svn branch

r844003 | mmacek | 2002-11-28 06:56:17 +0000 (Thu, 28 Nov 2002)

Simplistic test framework for cvs2svn.
Allows checking of conversion by tag name



r844013 | mmacek | 2002-11-30 18:08:15 +0000 (Sat, 30 Nov 2002)

* cvs2svn.py:
   - Added get_tag_path function that returns path for a cvs tag in the
     svn repository.
   - Moved code from Commit.commit to separate make_path funciton



r844015 | mmacek | 2002-11-30 18:43:24 +0000 (Sat, 30 Nov 2002)

* cvs2svn.py:
  - parse_revs_line: simplify parsing (use split)
  - Add write_revs_line function for writing the revs data.
    Update two call sites to use it.


r844017 | mmacek | 2002-11-30 20:10:45 +0000 (Sat, 30 Nov 2002)

* cvs2svn/tests/cmptag.py
  - Remove temporary files on when test is successful.
  - Removed obsolete commented out code.

* cvs2svn/tests/space-fname.py:
  - Test for files with space in file name.

* cvs2svn/tests/runtest.py
  - Added 'space-fname' test.

* cvs2svn/tests/testcvs1/space-fname:
  - Test CVS repository with space in one of the files.



r844018 | mmacek | 2002-11-30 20:34:18 +0000 (Sat, 30 Nov 2002)

* cvs2svn.py:

  Simple branch and tag support. Branches and tags for each revision are
  saved to the .revs file. As soon as a revision is commited to the repository,
  a copy is also made for each branch and tag (file by file copying).
  This is naive, but should handle even the most unusual CVS repositories.

  - Added patterns for branch_tag and vendor_tag.
  - CollectData: Added methods for maintaining a list of tags and branches.
  - CollectData.set_revision_info: get the branch name for this revision,
    and store it to .revs file, together with all the tags and branches
    made from this revision.
  - Commit: Added branch_name, tags, branches arguments to several methods.
  - Commit.commit: maintain a list of copies that need to be made from
    files in the current SVN revision. If there are any, create a new 
    commit transaction and perform the copies.
  - parse_revs_line, write_revs_line: add branch_name, tags, and branches
    to the revs file format.
  - pass2, pass4: pass around branch_name, tags, branches.
  - pass4: enable conversion of all branches (TODO: option to specify branch)


r844019 | mmacek | 2002-11-30 21:03:30 +0000 (Sat, 30 Nov 2002)

* cvs2svn.py:
  
  Quick fix for the problem where file revisions would get lost during 
  conversion if the file was modified more than once within the 
  COMMIT_THRESHOLD. See code for more information (the solution is not ideal)

* cvs2svn/tests/testcvs2/twoquick:
* cvs2svn/tests/twoquick.py:
* cvs2svn/tests/runtest.py:
  
  Test dataloss when a file is modified twice within the COMMIT_THRESHOLD.
  Test case contributed by: Shun-ichi Goto <gotoh@taiyo.co.jp>


r844205 | mmacek | 2002-12-15 09:32:42 +0000 (Sun, 15 Dec 2002)

* cvs2svn.py:
  Merge revisions up to 4130 from trunk/tools/cvs2svn:
    - import svn_node_none and others from "util"
    - rename _delta, _repos to delta, repos


r844207 | mmacek | 2002-12-15 19:38:53 +0000 (Sun, 15 Dec 2002)

* cvs2svn-mmacek/tests/cmptag.py: 
    change system("rm -rf ...") to os.remove, shutil.rmtree for temporary file
    removal


r844595 | gstein | 2003-01-23 12:16:57 +0000 (Thu, 23 Jan 2003)

Errors were being generated but never cleared. Fix it.

Patch by: Marko Macek <Marko.Macek@gmx.net>

* libsvn_fs/bdb/nodes-table.c
  (svn_fs__bdb_new_successor_id): clear the error that was generated


r844654 | mmacek | 2003-01-25 17:57:05 +0000 (Sat, 25 Jan 2003)

* /branches/cvs2svn-mmacek/:
  merge changes from /trunk/tools/cvs2svn revisions 4130:4523


r844655 | mmacek | 2003-01-25 20:28:07 +0000 (Sat, 25 Jan 2003)

* cvs2svn.py:
  - set "svn:executable" for executable files (fix issue 1105)

* tests/cmptag.py:
* tests/runtests.py:
  - add test for executable files


r844656 | mmacek | 2003-01-25 20:31:32 +0000 (Sat, 25 Jan 2003)

* tests/attr-exec.py:
* tests/testcvs1/attr-exec:
* tests/testcvs1/attr-exec/script,v:
  - test and repository for svn:executable convertion


r844776 | mmacek | 2003-02-02 11:48:18 +0000 (Sun, 02 Feb 2003)

* /branches/cvs2svn-mmacek/cvs2svn.1: 
  - merged from /trunk (rev 4696): new file
* /branches/cvs2svn-mmacek/cvs2svn.py:
  - merged from /trunk (rev 4680): 
    Replace calls to svn_stream_from_stdio with svn_stream_from_aprfile.



r845240 | gstein | 2003-03-01 21:07:07 +0000 (Sat, 01 Mar 2003)

Suggested by: Marko Macek <Marko.Macek@gmx.net>
(Patch concept by Marko.)

* tools/cvs2svn/tests/cmptag.py:
  (get_exec_flag): For sorting, remember the full relative path,
    instead of just the file name.
  (cmp_attr): Pass the base directory name to get_exec_flag. Sort the
    file list so that a list comparison will properly compare the
    attributes of the files.
  (cmp_attr): Fix syntax error/typo when printing differences.