Annotation of wikisrc/mailing-lists/tech-repository.mdwn, revision 1.10
1.1 spz 1: ## Requirements
2:
3: A list of requirements for a possible replacement for CVS as repo software for NetBSD and pkgsrc so we don't keep starting over listing these (and forgetting half) all of the time:
4:
5: - the license would be nice to be BSDish, must be open source and free to use
6: - the software should be includeable in NetBSD base without too much excess baggage
7: - it should be possible to do development on old or small hardware
8: - it must support automated updating of source trees
9: - it must support branches
10: - there should be a conversion for the present history (that actually works)
11: - the resulting repository must not break easily
12: - the software should be reasonably mature and reliable
1.3 spz 13: - checkout of a pkgsrc tree must be feasible on a 32MB system
14: - checkout of a stable pkgsrc tree and then updating select package subdirs to the latest version of the main branch should be possible
15: - lasting removal of legally tainted code must be possible
1.1 spz 16:
17: Please add/correct.
18:
19: ***
20:
1.2 spz 21: ## Experiences in using the software
22:
1.9 asau 23: ### Experiences with Fossil
24:
25: #### Aleksej Saushev (asau)
26:
27: I started using it before conversion tool were available
28: (basically it isn't available yet, to my knowledge Joerg is working on it),
29: in addition I wanted to start as soon as possible
30: and to try operation with no conversion tool available.
31: Thus I've tried to simulate working with "vendor branches".
32:
33: For now Fossil lacks some essential features and has other severe problems:
1.10 ! asau 34:
1.9 asau 35: 1. No support for vendor branches.
36: 1. It is impossible to merge between trees growing from the very root.
37: The initial commit is too special, this prevents using these trees for vendor branches.
38: 1. There's no support for importing vendor source,
39: even "addremove" command isn't in trunk at the time of writing.
40: 1. Merge state sticks. You can't undo it.
41: 1. You can't amend your source when you've just merged, you are forced to commit after merge.
42: 1. You can't tune diff command to ignore RCS keywords.
43: 1. You can't diff single file between two given versions.
44: 1. There's no way to change commit messages.
45: 1. There's no documented way to select commit messages of current branch, or branch by given commit id.
46: Or there's a bug preventing it.
47: 1. Commands are underdocumented, usage messages don't list many available options.
48: This applies to trunk at least, there's a branch that states documentation as its goal.
49: 1. There's no convenient way to look at commit contents: files affected, diff.
50:
51: Some of above problems are reported.
52:
53: Note, all problems above are usability problems, I didn't explore e.g. scalability,
54: Joerg did and had problems, but this is another story.
55:
1.2 spz 56: ### Experiences with git
57:
58: please fill in
59:
60: ### Experiences with Subversion
61:
62: please fill in
63:
1.8 wiki 64: ### Experiences with Bazaar
65:
66: #### Jonathan Perkin (sketch)
67:
68: We use bzr at work (MySQL), and while it has a number of problems, it does make dev work easy.
69:
70: The Good
71:
72: * easy to use
73: * shared repositories keep local disk usage down
74: * commercial backing (Canonical)
75: * cross-platform (works on Windows)
76: * numerous GUI available
77:
78: The Bad:
79:
80: * slow
81: * requires python
82:
83: The Ugly:
84:
85: * can be really slow
86: * changing repository formats is a hassle
87:
88: A basic example workflow
89:
90: <pre>
91: # create a local shared repository. all objects are held in a .bzr sub-directory, with branches essentially a lightweight checkout
92: $ bzr init-repo bzr
93: $ cd bzr
94:
95: # fetch HEAD, will take a long time, depending on connectivity
96: $ bzr branch bzr+ssh://bzr.netbsd.org/netbsd-trunk
97:
98: # fetch netbsd-5, as we already have the majority of the code in netbsd-trunk (and therefore .bzr), this takes a fraction of the time
99: $ bzr branch bzr+ssh://bzr.netbsd.org//netbsd-5
100:
101: # ok, let's do some dev work
102: $ bzr branch netbsd-trunk netbsd-trunk-sketch-fix-msk
103: $ cd netbsd-trunk-sketch-fix-msk; hack hack hack
104:
105: # the usual cycle of hack/commit/merge
106: $ bzr diff # show uncommitted diffs
107: $ bzr commit # commit to local clone
108: $ bzr merge ../netbsd-trunk # update clone to latest local trunk, OR
109: $ bzr merge bzr+ssh://bzr.netbsd.org/netbsd-trunk # merge directly from upstream
110:
111: # publish our tree for others to review/hack on
112: $ bzr push bzr+ssh://bzr.netbsd.org/netbsd-trunk-fix-msk
113:
114: # got reviewed/tested, let's push it
115: $ bzr merge bzr+ssh://bzr.netbsd.org/netbsd-trunk
116: $ bzr missing bzr+ssh://bzr.netbsd.org/netbsd-trunk # show changeset differences
117: $ bzr push bzr+ssh://bzr.netbsd.org/netbsd-trunk
118: </pre>
119:
120: I personally find this approach a lot more natural than git's way of managing branches itself inside a single working directory.
121:
1.2 spz 122: ***
123:
1.1 spz 124: ## Conversion experiences
125:
1.6 wiki 126: ### git
127:
1.5 wiki 128: Conversion of all modules to git succeeded using fromcvs togit. The resulting git repository of src contains several errors where files have a wrong version (eg in hunt/Makefile the contents of the file on the vendor branch appear as tip of the master branch, which is quite wrong).
129: There have been no reports of errors in the other modules; this may be due to a lack of testing.
1.6 wiki 130:
131: ### hg
132:
133: Conversion of src failed. Afair the rest worked when using Mercurial 1.3.*. Alas, fromcvs tohg is not compatible with Mercurial 1.4 which is in pkgsrc now and is the version to use with Python 2.6 (afair). Two identified problems:
134: <pre>
135: self.ui = ui.ui(interactive = False)
136: </pre>
137: wants to be
138: <pre>
139: self.ui = ui.ui()
140: self.ui.setconfig('ui', 'interactive', 'off')
141: </pre>
142: in /usr/pkg/share/fromcvs/tohg.py line 10 (easily fixed, obviously)
143: and
144: <pre>
145: n = self.hgrepo.commit(files = files,
146: text = text,
147: user = user,
148: date = "%s 0" % date,
149: p1 = p1,
150: p2 = p2,
151: extra = {'branch': branch})
152: </pre>
153: needs to be replaces with something that works with the 1.4 commit that looks like this:
154: <pre>
155: def commit(self, text="", user=None, date=None, match=None, force=False,
156: editor=False, extra={}):
157: </pre>
158: which is where I remembered that I wasn't planning to learn Python this week.
159:
160: Next try: hg convert on pkgsrc
161: <pre>
162: --- /usr/pkg/lib/python2.6/site-packages/hgext/convert/cvsps.py 2009-12-02 01:30:45.000000000 +0000
163: +++ /tmp/cvsps.py 2010-01-20 12:52:11.000000000 +0000
164: @@ -271,14 +271,14 @@
165: tags[rev].append(match.group(1))
166: branchmap[match.group(1)] = match.group(2)
167:
168: - elif re_31.match(line):
169: + elif re_31.match(line) and re_50.match(peek):
170: state = 5
171: elif re_32.match(line):
172: state = 0
173:
174: elif state == 4:
175: # expecting '------' separator before first revision
176: - if re_31.match(line):
177: + if re_31.match(line) and re_50.match(peek):
178: state = 5
179: else:
180: assert not re_32.match(line), _('must have at least '
181: @@ -357,7 +357,7 @@
182:
183: elif state == 8:
184: # store commit log message
185: - if re_31.match(line):
186: + if re_31.match(line) and re_50.match(peek):
187: state = 5
188: store = True
189: elif re_32.match(line):
190: </pre>
191: helps it to cope with the output of cvs rlog -N -r1.66 pkgsrc/databases/rrdtool/Makefile (that's the easy one)
192: but then it tries to parse the output of (eg) cvs rlog -N -r1.19 pkgsrc/graphics/dcraw/Makefile and it's not clear
193: to me how it could hope to get that one right just from cvs rlog, and all alternatives are going to be rather tedious
1.7 wiki 194: and I'm still not planning to learn Python this week. If you feel more energetic, feel free to hand over patches.
CVSweb for NetBSD wikisrc <wikimaster@NetBSD.org> software: FreeBSD-CVSweb
![[BACK]](/icons/back.gif){kind=icon}
Return to tech-repository.mdwn CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [NetBSD Developer Wiki] / wikisrc / mailing-lists