Annotation of wikisrc/mailing-lists/tech-repository.mdwn, revision 1.12
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.
1.11 wiki 36: * Redundant to "There's no support for importing vendor source"?
1.12 ! asau 37: * No, it is different. I would import manually, if only some support were there.
1.9 asau 38: 1. It is impossible to merge between trees growing from the very root.
39: The initial commit is too special, this prevents using these trees for vendor branches.
1.11 wiki 40: * Fixed in [4e3cd6ce4e].
1.12 ! asau 41: * 2010-11-08, not in pkgsrc.
1.9 asau 42: 1. There's no support for importing vendor source,
43: even "addremove" command isn't in trunk at the time of writing.
1.11 wiki 44: * It has been merged to trunk and is part of the pkgsrc version.
1.12 ! asau 45: * No, it isn't part of pkgsrc version at the moment, TIAS.
1.9 asau 46: 1. Merge state sticks. You can't undo it.
1.11 wiki 47: * Not sure what you mean, but "revert" resets the merge state since [d13054ce84].
1.12 ! asau 48: * This is quite recent (late October) fix, I didn't check it.
1.9 asau 49: 1. You can't amend your source when you've just merged, you are forced to commit after merge.
1.11 wiki 50: * To clarify, the merge has to be committed first, no separate commits are possible from the checkout before that.
1.9 asau 51: 1. You can't tune diff command to ignore RCS keywords.
1.11 wiki 52: * Since RCS keywords are not really a native command, it is no surprise. An external diff program can be used for this purpose though.
1.9 asau 53: 1. You can't diff single file between two given versions.
1.11 wiki 54: * diff --from version1 --to version2 path/to/file
1.12 ! asau 55: * That didn't work, and I'm not sure it works now. It used to ignore path-to-file argument. (It used to bail out when both "--from" and "--to" were used.)
1.9 asau 56: 1. There's no way to change commit messages.
1.11 wiki 57: * easily done via ui.
1.12 ! asau 58: * How? It should be possible via command line nevertheless.
1.9 asau 59: 1. There's no documented way to select commit messages of current branch, or branch by given commit id.
60: Or there's a bug preventing it.
1.11 wiki 61: * fossil info <commitid>
1.12 ! asau 62: * This isn't about "info" command, it is about "timeline"
! 63: * BTW, this command doesn't support "-R" flag, perhaps you have to check the source out to use it.
1.9 asau 64: 1. Commands are underdocumented, usage messages don't list many available options.
65: This applies to trunk at least, there's a branch that states documentation as its goal.
66: 1. There's no convenient way to look at commit contents: files affected, diff.
1.11 wiki 67: * fossil ui and use a web browser
1.12 ! asau 68: * We don't have web browser in base system, this information should be accessible with command line.
1.9 asau 69:
70: Some of above problems are reported.
71:
72: Note, all problems above are usability problems, I didn't explore e.g. scalability,
73: Joerg did and had problems, but this is another story.
74:
1.2 spz 75: ### Experiences with git
76:
77: please fill in
78:
79: ### Experiences with Subversion
80:
81: please fill in
82:
1.8 wiki 83: ### Experiences with Bazaar
84:
85: #### Jonathan Perkin (sketch)
86:
87: We use bzr at work (MySQL), and while it has a number of problems, it does make dev work easy.
88:
89: The Good
90:
91: * easy to use
92: * shared repositories keep local disk usage down
93: * commercial backing (Canonical)
94: * cross-platform (works on Windows)
95: * numerous GUI available
96:
97: The Bad:
98:
99: * slow
100: * requires python
101:
102: The Ugly:
103:
104: * can be really slow
105: * changing repository formats is a hassle
106:
107: A basic example workflow
108:
109: <pre>
110: # create a local shared repository. all objects are held in a .bzr sub-directory, with branches essentially a lightweight checkout
111: $ bzr init-repo bzr
112: $ cd bzr
113:
114: # fetch HEAD, will take a long time, depending on connectivity
115: $ bzr branch bzr+ssh://bzr.netbsd.org/netbsd-trunk
116:
117: # 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
118: $ bzr branch bzr+ssh://bzr.netbsd.org//netbsd-5
119:
120: # ok, let's do some dev work
121: $ bzr branch netbsd-trunk netbsd-trunk-sketch-fix-msk
122: $ cd netbsd-trunk-sketch-fix-msk; hack hack hack
123:
124: # the usual cycle of hack/commit/merge
125: $ bzr diff # show uncommitted diffs
126: $ bzr commit # commit to local clone
127: $ bzr merge ../netbsd-trunk # update clone to latest local trunk, OR
128: $ bzr merge bzr+ssh://bzr.netbsd.org/netbsd-trunk # merge directly from upstream
129:
130: # publish our tree for others to review/hack on
131: $ bzr push bzr+ssh://bzr.netbsd.org/netbsd-trunk-fix-msk
132:
133: # got reviewed/tested, let's push it
134: $ bzr merge bzr+ssh://bzr.netbsd.org/netbsd-trunk
135: $ bzr missing bzr+ssh://bzr.netbsd.org/netbsd-trunk # show changeset differences
136: $ bzr push bzr+ssh://bzr.netbsd.org/netbsd-trunk
137: </pre>
138:
139: I personally find this approach a lot more natural than git's way of managing branches itself inside a single working directory.
140:
1.2 spz 141: ***
142:
1.1 spz 143: ## Conversion experiences
144:
1.6 wiki 145: ### git
146:
1.5 wiki 147: 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).
148: There have been no reports of errors in the other modules; this may be due to a lack of testing.
1.6 wiki 149:
150: ### hg
151:
152: 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:
153: <pre>
154: self.ui = ui.ui(interactive = False)
155: </pre>
156: wants to be
157: <pre>
158: self.ui = ui.ui()
159: self.ui.setconfig('ui', 'interactive', 'off')
160: </pre>
161: in /usr/pkg/share/fromcvs/tohg.py line 10 (easily fixed, obviously)
162: and
163: <pre>
164: n = self.hgrepo.commit(files = files,
165: text = text,
166: user = user,
167: date = "%s 0" % date,
168: p1 = p1,
169: p2 = p2,
170: extra = {'branch': branch})
171: </pre>
172: needs to be replaces with something that works with the 1.4 commit that looks like this:
173: <pre>
174: def commit(self, text="", user=None, date=None, match=None, force=False,
175: editor=False, extra={}):
176: </pre>
177: which is where I remembered that I wasn't planning to learn Python this week.
178:
179: Next try: hg convert on pkgsrc
180: <pre>
181: --- /usr/pkg/lib/python2.6/site-packages/hgext/convert/cvsps.py 2009-12-02 01:30:45.000000000 +0000
182: +++ /tmp/cvsps.py 2010-01-20 12:52:11.000000000 +0000
183: @@ -271,14 +271,14 @@
184: tags[rev].append(match.group(1))
185: branchmap[match.group(1)] = match.group(2)
186:
187: - elif re_31.match(line):
188: + elif re_31.match(line) and re_50.match(peek):
189: state = 5
190: elif re_32.match(line):
191: state = 0
192:
193: elif state == 4:
194: # expecting '------' separator before first revision
195: - if re_31.match(line):
196: + if re_31.match(line) and re_50.match(peek):
197: state = 5
198: else:
199: assert not re_32.match(line), _('must have at least '
200: @@ -357,7 +357,7 @@
201:
202: elif state == 8:
203: # store commit log message
204: - if re_31.match(line):
205: + if re_31.match(line) and re_50.match(peek):
206: state = 5
207: store = True
208: elif re_32.match(line):
209: </pre>
210: helps it to cope with the output of cvs rlog -N -r1.66 pkgsrc/databases/rrdtool/Makefile (that's the easy one)
211: but then it tries to parse the output of (eg) cvs rlog -N -r1.19 pkgsrc/graphics/dcraw/Makefile and it's not clear
212: 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 213: 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