trunk

This is a Bazaar branch. To clone, pull or merge from it, use this URL.

For more help, check out the 5-minute Quick Hacking with Bzr or the full Introduction to Bzr.

Log

244 : 2008-06-24 : Jelmer Vernooij : jelmer@samba.org-20080624110453-jhnd2j51qnr50iqb
Import apt_pkg only when it's needed. Saves the allocation of about 1.3Mb worth of
data every time bzr is run.
243 : 2008-06-23 : Jelmer Vernooij : jelmer@samba.org-20080623155509-y1do7f3rtil6v5ee
Lock the tree in cmd_builddeb() to allow reading the configuration from a RevisionTree.
242 : 2008-06-23 : Jelmer Vernooij : jelmer@samba.org-20080623154402-x59sepquroganqcz
Move determination of configuration into a separate function.
241 : 2008-06-13 : James Westby : jw+debian@jameswestby.net-20080613143920-l44k40febr2hm1nn
Support +bzr for snapshots as well as ~bzr.
240 : 2008-05-30 : James Westby : jw+debian@jameswestby.net-20080529235248-pth1gkwslum26c98
Post release version bump.
239 : 2008-05-30 : James Westby : jw+debian@jameswestby.net-20080529235132-gy6h7ectkyqjuye7
Fix target of release.
238 : 2008-05-30 : James Westby : jw+debian@jameswestby.net-20080529233852-6p0p3xd8198fx20t
Default to doing everything in ./build-area/ when building a remote branch
237 : 2008-05-30 : James Westby : jw+debian@jameswestby.net-20080529230155-gnohsdywsyz5jie6
Add documentation on building remote branches.

The documentation warns the user about the strange directories that
may be used.
236 : 2008-05-29 : James Westby : jw+debian@jameswestby.net-20080529225116-3327lprg2nd6v77x
Support building remote branches, thanks Jelmer!
235 : 2008-05-16 : James Westby : jw+debian@jameswestby.net-20080516112916-drs8aifd6wptuivw
Post release version bump.
234 : 2008-05-16 : James Westby : jw+debian@jameswestby.net-20080516112446-kjylg3653o71lgo6
* Suggest bzr-svn to hint that you can work with svn. The version
is the one that exports the svn-buildpackage mergeWithUpstream
property as "merge = True", so that bzr-builddeb will seamlessly
build these branches.
233 : 2008-05-15 : James Westby : jw+debian@jameswestby.net-20080515155932-fyduk0tsomx5ulg4
Create the tarball dir before trying to download from the archive in to it.
232 : 2008-05-15 : James Westby : jw+debian@jameswestby.net-20080515155450-wem4839r2vg15i6r
Use DEB_BUILD_OPTIONS instead of DEBBUILDOPTS as the former is correct.
231 : 2008-05-15 : James Westby : jw+debian@jameswestby.net-20080515154058-rt5em5soc2n24ehw
Update the version number.
230 : 2008-05-15 : James Westby : jw+debian@jameswestby.net-20080515152117-vusad03lmur1u1ra
Fix the FTBFS by disabling the testsuite. Thanks Sebastian Bober.
229 : 2008-05-15 : James Westby : jw+debian@jameswestby.net-20080515151323-2f21vvqapt1ikdfa
Merge Jelmer's addition to the docs on snapshot handling.
228 : 2008-05-15 : James Westby : jw+debian@jameswestby.net-20080515151155-23qulvxsbn4cx94q
Merge Jelmer's change to make ~svn123 version numbers grab the corresponding revision

I have added support for ~svnX as well.
227 : 2008-05-15 : James Westby : jw+debian@jameswestby.net-20080515150412-w63w4gextxiwr51y
Merge patch from Jelmer to use the branch config as well.

This allows bzr-builddeb to use the mergeWithUpstream property
from svn-buildpackage if a recent enough bzr-svn is used.
226 : 2008-03-21 : James Westby : jw+debian@jameswestby.net-20080321175856-k1pq5xb7uh6fa8cv
Drop references to --dirstate-tags in the docs as tags are now default.
225 : 2008-03-19 : James Westby : jw+debian@jameswestby.net-20080319224015-xe21nvkf0q37w4o1
Make return code calculation clearer.
224 : 2008-03-19 : James Westby : jw+debian@jameswestby.net-20080319223612-p8ad98j0yszdmitn
Fix the return code of the test-builddeb command.
223 : 2008-03-19 : James Westby : jw+debian@jameswestby.net-20080319222657-1q9481uw0umvhbje
If there is no $SHELL in the environment just call /bin/sh
222 : 2008-03-19 : James Westby : jw+debian@jameswestby.net-20080319222313-57oxls147wasewj6
Install the tests as well.
221 : 2008-03-19 : James Westby : jw+debian@jameswestby.net-20080319220239-7er4kuftt1kv9gfp
Add a test-builddeb command.
220 : 2008-03-19 : James Westby : jw+debian@jameswestby.net-20080319213305-52bhw28z1al52e9k
* Avoid failing the testsuite because of a user's ~/.bazaar/builddeb.conf.
219 : 2008-03-19 : James Westby : jw+debian@jameswestby.net-20080319211918-orfd1gvabogbz1dd
Make running the tests during the build much more robust.
218 : 2008-03-19 : James Westby : jw+debian@jameswestby.net-20080319203317-8h4gcii2ooifgomg
* Update the dependencies on bzr and bzrtools to more recent versions.
* Update the VCS-Bzr: header for the new branch location.
217 : 2008-03-06 : James Westby : jw+debian@jameswestby.net-20080306235735-1liexid45g1op936
* Don't tell cp to be verbose when copying back the debian/ dir
in bd-do.
216 : 2008-03-06 : James Westby : jw+debian@jameswestby.net-20080306164737-hyp86itnvvoa6409
* Remove the .bzr-builddeb from merge builds not in "larstiq" mode.
(Closes: #464033)
215 : 2008-03-06 : James Westby : jw+debian@jameswestby.net-20080306144417-ca7vw3cegfrbd91l
Add thanks for Robert on the change.
214 : 2008-03-06 : James Westby : jw+debian@jameswestby.net-20080306000459-blfi5jg6b7xegq2i
Don't use relative imports.
213 : 2008-03-05 : James Westby : jw+debian@jameswestby.net-20080305172300-k6vb1ail3fr4d0ex
Clarified that bd-do will ignore any changes outside debian/.
212 : 2008-03-05 : James Westby : jw+debian@jameswestby.net-20080305163108-c2908yeryuugvj2a
patches.py isn't used, and wasn't meant to be committed.
211 : 2008-01-26 : James Westby : jw+debian@jameswestby.net-20080126101155-9r9cquqgdstd0al9
There is no need to loop rstrip.
210 : 2008-01-25 : James Westby : jw+debian@jameswestby.net-20080125181553-0jjmqpbnalhikcyx
* Don't silently skip unkown types when extracting a tarball, error
instead.
209 : 2008-01-25 : James Westby : jw+debian@jameswestby.net-20080125180431-7aw9nc45mjkqenil
Handle absolute pathnames in the tarfile.
208 : 2008-01-25 : James Westby : jw+debian@jameswestby.net-20080125172748-2yk341j0dqysrk0v
Handle the dot entry existing as well as a prefix.
207 : 2008-01-25 : James Westby : jw+debian@jameswestby.net-20080125172729-6xj9jfi9yr3k086z
* Treat hardlinks in tarballs as a copy of the file. This at least
gets the data, and is representable in bzr.
206 : 2008-01-25 : James Westby : jw+debian@jameswestby.net-20080125155832-oyr3rr6dp2h2w1bb
Add -g0 to patch command to make sure that patch never tries to access RCS.
205 : 2008-01-25 : James Westby : jw+debian@jameswestby.net-20080125154210-gjokdkr3rtg6aemg
Give the prefix finding code a touch of the lifeless.
204 : 2008-01-25 : James Westby : jw+debian@jameswestby.net-20080125151503-ed8dwixgyslzvja1
Don't eat the first two characters of a filename when the prefix is '.'
203 : 2008-01-25 : James Westby : jw+debian@jameswestby.net-20080125133252-u01t0tbeda4bp5r6
Also exclude RCS ,v files when importing.

For one thing they are version control meta-data, and so we don't want it.
However they also make patch do silly, silly things.
202 : 2008-01-25 : James Westby : jw+debian@jameswestby.net-20080125122242-nutf2lktj71qgi1o
* Normalise filenames from the tarballs when extracting to import a
dsc to avoid errors on strange tarballs.
201 : 2008-01-25 : James Westby : jw+debian@jameswestby.net-20080125111714-ugkx2z50gxxasxea
* Be more careful in excluding the root entry when extracting a tarball
from import of a package.
200 : 2008-01-25 : James Westby : jw2328@flash-20080125104206-1vyzl3g0gf9e7kp5
Incremental import is (sort) of supported, so remove the TODO.
199 : 2008-01-24 : James Westby : jw2328@flash-20080124184828-9uwcaooxgf5nqg0i
prefix has already been removed, so it is wrong to check for it.
198 : 2008-01-24 : James Westby : jw2328@flash-20080124180930-9qhxd2ynonqwv55c
* Exclude more files/directories than just .bzr when importing.
197 : 2008-01-24 : James Westby : jw2328@flash-20080124133342-uw3prtj9jieoyhwe
Only detect numeric revisions when looking for ~bzr.
196 : 2008-01-24 : James Westby : jw2328@flash-20080124132909-2dra3js3hmn9k6vl
* Allow building snapshots of packages based on version in changelog.
(Closes: #452130)
195 : 2008-01-24 : James Westby : jw2328@flash-20080124130943-c5oks78m412tweaa
* Fix the import diff code to not deadlock on large diffs. Thanks to
Jamie Wilkinson. (Closes: #451248)
194 : 2008-01-24 : James Westby : jw2328@flash-20080124124957-0o75jbafykes2eie
* Stop specifying a specific branch format when importing a .dsc.
This improves performance significantly as packs will now be used.
Require bzr 1.0 so that packs are default.
193 : 2007-11-23 : Arnaud Fontaine : arnau@milkypond.org-20071123001558-5f0xsba4269jx9fo
* Add Vcs-Bzr field (dpkg supports it now) in debian/control.
* Update GPL path to GPL-2 in debian/copyright as GPL-3 is now the default.
192 : 2007-10-31 : James Westby : jw+debian@jameswestby.net-20071031210748-dt4x9o1w7px1ky0i
* Don't complain when repacking the tarball if the target exists, but is the
same as the source. Only .tar.gz can be considered identical.
191 : 2007-10-31 : James Westby : jw+debian@jameswestby.net-20071031195828-vxkgc5go4nniwwiz
* Allow the last upstream not to be on the mainline during merge-upstream.
190 : 2007-10-31 : James Westby : jw+debian@jameswestby.net-20071031191723-pb4hs3we6amb0uzy
* Improve the error message when the upstream tag is not found to actually
give the name of the expected tag.
189 : 2007-10-31 : James Westby : jw+debian@jameswestby.net-20071031184537-nudrz806xorg38kd
* bzr 0.92 is required.
188 : 2007-10-31 : James Westby : jw+debian@jameswestby.net-20071031162340-aqmhhtc1q38svpe4
Merge development work.
187 : 2007-10-23 : James Westby : jw+debian@jameswestby.net-20071023212520-elpnsvz1ck3krq0m
* Many documentation fixes from dAniel hAhler. Thanks very much.
186 : 2007-10-23 : James Westby : jw+debian@jameswestby.net-20071023210637-clbqmem5cyujeqqf
* Correct the pointer to the user manual in the README. Thanks to Achim
Bohnet for noticing the mistake. (LP: #145019)
185 : 2007-09-30 : James Westby : jw+debian@jameswestby.net-20070930094117-m2m4b3g2c79yczoo
Fix merge-upstream options so that -v doesn't clash.
184 : 2007-09-21 : James Westby : jw+debian@jameswestby.net-20070921180058-tc912bat1g4g2lz1
Update the version_info for release.
183 : 2007-09-21 : James Westby : jw+debian@jameswestby.net-20070921175750-jgc4ahakaqk911kf
Remove the -dev from the python build dependency.

We don't need the headers, just all versions, so python-all is fine.
However this introduces two lintian warnings. The first is that
one of python | python-dev | python-all-dev should be in build-depends.
The first could be added, but I didn't.

The second is that python-all is not needed in Build-Depends, just
Build-Depends-Indep, as no architecture specific packages are built. However
it is used to run the clean target, so we need it. This is a lintian false
positive.
182 : 2007-09-21 : James Westby : jw+debian@jameswestby.net-20070921174317-rzbyc92b33ow8jdp
Update spec status.
181 : 2007-09-21 : James Westby : jw+debian@jameswestby.net-20070921174209-fve5ftble1hhjlwa
Merge some cool stuff like hooks, bd-do, blackbox tests.
180 : 2007-09-21 : James Westby : jw+debian@jameswestby.net-20070921173814-f8fsc6vftlzeq3vv
Change version_info to be in its own module to make it easily testable.
179 : 2007-09-17 : James Westby : jw+debian@jameswestby.net-20070917171501-nq9dwokjfg02aka1
Use None instead of [] to revert all files.

The latter is deprecated in 0.91. This requires a bump of the version of
bzr required.
178 : 2007-09-13 : James Westby : jw+debian@jameswestby.net-20070913193430-g88julq0faou4o4m
TODO fixes.
177 : 2007-09-12 : James Westby : jw+debian@jameswestby.net-20070912205704-qr10sa124zkp5lun
* Add version_info attribute so that bzrlib can find out the version of
the plugin. Please try and remember to update it when releasing (set
the word to 'final').
176 : 2007-09-05 : James Westby : jw+debian@jameswestby.net-20070905205844-fgze70fb0irh62eq
Handle multiple entries in the root of upstream's tarball when unpacking.

When this happens then just rename the tempdir we unpacked in to to the
source dir we want to end up in. The rules take care of the extra directory
there.
175 : 2007-09-04 : James Westby : jw+debian@jameswestby.net-20070904213033-3gj3rut6d82xb3gu
Finish of the chmod(debian/rules, 0755) change.

Add the tests for it, and also implement it for native packages as well.
174 : 2007-09-02 : Frederic Brin : frederic.brin@assonetworx.com-20070902144505-8cyodjpl3lw9pn73
Check if debian/rules exists before applying 755
173 : 2007-09-02 : Frederic Brin : frederic.brin@assonetworx.com-20070902143453-vgv1ptzluck6jhuf
Updated changelog
172 : 2007-09-02 : Frederic Brin : frederic.brin@assonetworx.com-20070902142747-gejewl14bmbknft3
chmod 755 debian/rules while importing dsc
171 : 2007-09-01 : Frederic Brin : frederic.brin@assonetworx.com-20070901163347-ave7pqq3eec0xp2j
Correct import of Dsc files
===========================

+ DscImporter class instanciation expects a list of dsc filesnames. Currently get an unknown variable.
170 : 2007-08-22 : James Westby : jw+debian@jameswestby.net-20070822212814-0ptwkj18wur0t2d3
Improve the error message of import-dsc slightly
169 : 2007-08-22 : James Westby : jw+debian@jameswestby.net-20070822212555-25ejz8z1zycopgmt
* Complete the transition of deb822 into python-debian.
168 : 2007-08-22 : James Westby : jw+debian@jameswestby.net-20070822212146-pkv8nt83nlj1chdj
Add entry to changelog for Frederic's fix
167 : 2007-08-22 : James Westby : jw+debian@jameswestby.net-20070822211819-lmw453y5ggwku68d
* Support exporting the working tree when it contains symlinks. Thanks
to John Arbash Meinel for help on fixing it. (LP: #132391)
166 : 2007-08-20 : Frederic Brin : frederic.brin@assonetworx.com-20070820145452-1jd64435sgaonxba
Corrects repack from tar.bz2 to tar.gz
======================================

Currently the repacking go wrong. Only tar info appeared in the imported files.
165 : 2007-08-13 : James Westby : jw+debian@jameswestby.net-20070813211210-vf8rl2ff03cs3wo8
* Drop the dependency on python-deb822 as it is now part of python-debian.
Thanks to Loïc Minier and Lucas Nussbaum for noticing.
(Closes: #436386, #436089)
164 : 2007-08-13 : James Westby : jw+debian@jameswestby.net-20070813210820-6jydsgfg3nwq7n4p
* Allow empty author information in the changelog for those that like to
develop without filling it in, and then add it while releasing.
163 : 2007-07-25 : James Westby : jw+debian@jameswestby.net-20070725195412-k5ubpgr8s1c30laa
Set urgency=medium
162 : 2007-07-25 : James Westby : jw+debian@jameswestby.net-20070725171507-1oxy2atdb9az5yj8
Require patchutils as a dependency.
161 : 2007-07-25 : James Westby : jw+debian@jameswestby.net-20070725164912-jvg89b3rfdn4vea2
Drop the allow_empty_author change as python-debian is not uploaded yet.
160 : 2007-07-10 : James Westby : jw+debian@jameswestby.net-20070710221517-9oy72ctluzc8yeea
Fix version of python-debian required.
159 : 2007-07-10 : James Westby : jw+debian@jameswestby.net-20070710220156-yvsvntj1di0dzmwt
A reprieve for local.conf.
158 : 2007-07-10 : James Westby : jw+debian@jameswestby.net-20070710214550-p3tbr2k8djnu538t
Bump the dependency on python-debian.
157 : 2007-07-10 : James Westby : jw+debian@jameswestby.net-20070710213623-xg1271i8qx10thgr
Briefly document the upstream tarball fetching with uscan.
156 : 2007-07-10 : James Westby : jw+debian@jameswestby.net-20070710212641-haeauzeo49uclq3n
Drop the ignore-unkowns options and just turn it on by default.
155 : 2007-07-10 : James Westby : jw+debian@jameswestby.net-20070710212119-vzyw8ntp5i83v9km
Clean the docs in the clean rule.
154 : 2007-07-10 : James Westby : jw+debian@jameswestby.net-20070710211918-2wqqzfygj3dtqpm5
When you remove some function, also remove its tests.
153 : 2007-07-10 : James Westby : jw+debian@jameswestby.net-20070710211431-lfw7xru65s2ncjqo
Switch to --version for merge-upstream, I have plans for that one.
152 : 2007-07-10 : James Westby : jw+debian@jameswestby.net-20070710210920-bsznn4x2q3546m06
Add changelog entries for all the work on this branch.
151 : 2007-07-10 : James Westby : jw+debian@jameswestby.net-20070710210428-pjuo329bedmhlp52
Merge upstream tarball fetching work.
150 : 2007-07-10 : James Westby : jw+debian@jameswestby.net-20070710210232-e4n8trbceq64g6as
Merge trunk.
149 : 2007-07-10 : James Westby : jw+debian@jameswestby.net-20070710205245-m8xq3c07ran3yj0k
Add the user manual.

* The user manual is now the authoratitive documentation, rather than the
rather short README.
* It is only provided in html at the moment due to it being in several
pieces and docutils not being able to link the pieces dynamically
depending on the output type.
* Thanks to Robey Pointer for the colour scheme.
* Register the user manual with doc base rather than the README.

Other changes

* Add dependency on bzrtools.
* Bump required version of bzr for the testsuite failures that are fixed in
0.18.
* Actually call dh_install, and use it for the docs so that they can go in
a subdir.
* Add nocheck and notest DEBBUILDOPTS support to avoid running the testsuite
during the build. My laptop is pleased.
148 : 2007-07-10 : James Westby : jw+debian@jameswestby.net-20070710194758-nklydlrcaqrjofe7
Fix up some copyright notices.
147 : 2007-07-09 : James Westby : jw+debian@jameswestby.net-20070709195245-r1231ey6uy4h82hg
Disallow merge-upstream for split mode as well.
146 : 2007-07-08 : James Westby : jw+debian@jameswestby.net-20070708194741-oqcnecsd8apn7odj
Add a -F option to allow specifying source packages to import in a file.
145 : 2007-07-08 : James Westby : jw+debian@jameswestby.net-20070708135027-dmszvvc71sdjhp7i
Create the import-dsc command.

This has a --snapshot option now, instead of import-snapshot command.

It also saves the upstream tarballs so the branch is ready
to build straight away.
144 : 2007-07-08 : James Westby : jw+debian@jameswestby.net-20070708101958-p6su3ur6y9zkan11
Repack the tarball after merge-upstream (well before actually).

When you do a merge-upstream then you want the tarball placing
where it can be found in the correct format. As it can now be
remote first download it and repack to the correct place, and
then use the local copy for the merging.
143 : 2007-07-08 : James Westby : jw+debian@jameswestby.net-20070708100635-6cxzuc1rv2tmv8qy
Don't check that the source exists when repacking, and encode unicode source.
142 : 2007-07-08 : James Westby : jw+debian@jameswestby.net-20070708094208-rf9hebw4mo156p2w
Support repacking over any transport.

The orig_file of repack_tarball can now be any URI or local path.
Transports are used to open the file.

Remote destinations are still not supported.
141 : 2007-07-04 : James Westby : jw+debian@jameswestby.net-20070704205421-5ud4xf0oerivems4
A couple more spec updates
140 : 2007-07-01 : James Westby : jw+debian@jameswestby.net-20070701183948-bk4sa2axkciuyrqa
Another TODO for incremental imports
139 : 2007-07-01 : James Westby : jw+debian@jameswestby.net-20070701181512-rkxkswhvpylzvezv
Make the config say 'native = True' when it is so that the packages will build.

This does remove the config file when it transitions to non-native, so it
might play funny buggers with merges a bit, but it's a rare situation.

Also add some helpers in the tests for common things. Doesn't reduce the line
count much, but it makes the intention a bit clearer for some.
138 : 2007-07-01 : James Westby : jw+debian@jameswestby.net-20070701145833-9jo7d49s7ivkb3zv
Test the native -> non-native transition.

This seems to work ok as well, but it is currently quite strange as the
packaging branch after has no relationship with the native package, and to
the file-ids are different, so debian/changelog etc. appear to disappear
and reappear, where they are probably related.
137 : 2007-07-01 : James Westby : jw+debian@jameswestby.net-20070701142331-dgcz17bwmya8s4u9
Tidy up, thanks to pyflakes.
136 : 2007-07-01 : James Westby : jw+debian@jameswestby.net-20070701141348-ucap7r7hyp6p5dvi
Add tests for non-native -> native transition on import.

When transitioning from a non-native package to native the first native version
is a merge of the last upstream and the last packaging changes. This required
pulling the import_tar code out of bzrtools, so that when a file moves from
the packaging branch to the native branch the file id is maintained.

I am not convinced that all cases are handled here, but it is a start.
135 : 2007-06-30 : James Westby : jw+debian@jameswestby.net-20070630210301-ls1bz5he33pahyc8
Initial support for importing native packages.

Support importing native packages. Transitions to and from native packages
are currently untested.
134 : 2007-06-30 : James Westby : jw+debian@jameswestby.net-20070630173757-k39pgf5fdzxm6wz3
Switch to iter_paragraphs, rather than splitting the source file myself.

deb822.Sources provides an iter_paragraphs method to get an object for each
package described in the file. This is a lot safer than splitting it myself.

Thanks to John Wright for pointing this method out.
133 : 2007-06-30 : James Westby : jw+debian@jameswestby.net-20070630141745-0urmcaf6v40ubbcx
Refactor import_dsc to be a bit cleaner. Still needs some work.
132 : 2007-06-26 : James Westby : jw+debian@jameswestby.net-20070626210956-zd9cnu3gkavbrtux
Update the spec a little to reflect the current status.
131 : 2007-06-26 : James Westby : jw+debian@jameswestby.net-20070626205543-ix6kzhv1a1t3qt3r
Add an (untested) import-snapshot command that imports from snapshot.d.n.

The command gets the old versions of the package from s.d.n and imports them
all in to a new branch for you.

Also fix up the import code to only import a file once.

There needs to be some testing for this, but I need to work out how to do it,
and there will probably be some complexity in setting it up. Also the way
the implementation is done means that there is lots of special cases. These
should be removed.
130 : 2007-06-26 : James Westby : jw+debian@jameswestby.net-20070626184553-sn14f9w99j44apn2
Improve the handling of strange .dsc files.
129 : 2007-06-26 : James Westby : jw+debian@jameswestby.net-20070626173310-43z61ck46sf5el2e
Support importing the second set of .dsc.

Import a second set of .dsc files, with a new upstream. The new upstream
has the last upstream version as a parent, and the associated diff is added
on top, and gets a second parent of the previous head. This matches the
behaviour of merge_upstream.

Also fix the sorting of .dsc files.
128 : 2007-06-25 : James Westby : jw+debian@jameswestby.net-20070625213731-95ncn1j2ij57q8zr
Make merge upstream support merging in to an empty branch.
127 : 2007-06-25 : James Westby : jw+debian@jameswestby.net-20070625213725-8210zdb6fj80wiwe
Extend the import_dsc code to handle .dsc with no .orig.tar.gz.

For the .dsc files with no .orig.tar.gz the upstream import must be looked up.
The patch must be applied to the parent tree, but then use the last revision
as a parent.

Switch to calling out to patch and lsdiff to do the patching and give the
information about what was touched.
126 : 2007-06-24 : James Westby : jw+debian@jameswestby.net-20070624212125-y09mbsw1iw4pv5bh
Start work on import_dsc, which creates a branch from a set of source packages.

The set of uploaded source packages contains some history about the package,
and can be used to create a branch for packaging.

This is the start of code to do that. It can currently import the first
source package.
125 : 2007-06-24 : James Westby : jw+debian@jameswestby.net-20070624150146-l1rxlpsc2gnwcisi
Start using tags to mark the upstream imports.

Asking the user for the revision of the last upstream import isn't pretty,
so start marking them with tags. This isn't perfect, as it requires
--dirstate-tags, but that has been available for a while.

The UI needs to be tidied up, with more information when things go wrong,
and a way to override it if there was no import of the last upstream or
similar.
124 : 2007-06-24 : James Westby : jw+debian@jameswestby.net-20070624101245-nbu2cbqxx1p6m61l
Add some 'throws' documentation to the repack_tarball docstring.
123 : 2007-06-24 : James Westby : jw+debian@jameswestby.net-20070624100921-ynj1sk7w7lll6shv
Add a target_dir parameter to the repack_tarball function.

If target_dir is specified then the directory will be created if it doesn't
exist, and the new_filename will be interpreted relative to it.
122 : 2007-06-23 : James Westby : jw+debian@jameswestby.net-20070623181514-0zui3ake21kf34us
Raise an error on trying to repack an unkown format.
121 : 2007-06-23 : James Westby : jw+debian@jameswestby.net-20070623103123-eyzn948y3fx7a3ea
Add a function to repack a tarball or dir to a .tar.gz.

When an import has been done the .orig.tar.gz is needed. This function is the
first step towards that as it can do the repacking of most types. Currently
zip is unhandled, as zipfile is horrible, but it will be handled eventually.

Also add suoport for plain .tar archives. This now works for both
merge_upstream and repack_tarball.

Throw more specific errors for missing or present files.
120 : 2007-06-23 : James Westby : jw+debian@jameswestby.net-20070623001029-sp949g3003yneef9
Add support for .zip archives on import.

Also make Aaron copyright holder for the code that is stolen from bzrtools.
119 : 2007-06-22 : James Westby : jw+debian@jameswestby.net-20070622225245-cnzapowifftzdz1u
Add support for importing from directories and .tar.bz2 archives.

Parameterise the test suite so that each test is run against each import
type.
118 : 2007-06-22 : James Westby : jw+debian@jameswestby.net-20070622175351-e80hisgr4s2bp265
Some more test refactoring to remove some common code.
117 : 2007-06-22 : James Westby : jw+debian@jameswestby.net-20070622170526-w00gc4gm40d03ikq
Fast forward the import when possible.

If we are told that the last upstream import was the last revision then
just do a plain import of the tarball. This would be rare, but before it
was an error, and it makes the command usable to maintain a separate upstream
branch.
116 : 2007-06-22 : James Westby : jw+debian@jameswestby.net-20070622164521-cknsg9loy3yl28z4
Test that the merge_upstream handles an invlid revision_id.
115 : 2007-06-22 : James Westby : jw+debian@jameswestby.net-20070622163909-ugcm8hdysjy8b4f6
Make sure that the source tarball exists.

Also refactor the tests a little.
114 : 2007-06-22 : James Westby : jw+debian@jameswestby.net-20070622160456-3wsbzusvcgqsczsm
Move the tree cleanliness checking in to merge_upstream and add a test for it.
113 : 2007-06-22 : James Westby : jw+debian@jameswestby.net-20070622155739-2gdjid4ti4ndk79r
Add some docstrings and TODO comments.
112 : 2007-06-22 : James Westby : jw+debian@jameswestby.net-20070622154318-yc5a71ogspl727nj
Add some more tests of merge_upstream.

* Test that the history is as expected, including the automatic commit
message.
* Add Reinhard to copyright.
* Add license header to merge_upstream.py.
111 : 2007-06-21 : James Westby : jw+debian@jameswestby.net-20070621225510-6o4wvyiizg91yknr
Merge trunk.

* Includes deprecation of local.conf, and fixes requiring new python-debian
and python-deb822.
110 : 2007-06-21 : James Westby : jw+debian@jameswestby.net-20070621224220-0usy9s1fxu85ajfk
Add the start of a testsuite for the merge upstream code.

* Move the code out to its own function to ease testing.
* Test merging in normal mode from a tarball, both when the merge
is clean and conflicts are generated.
109 : 2007-06-21 : Reinhard Tartler : siretart@tauware.de-20070621201350-o7lo74wtr4bdqc45
remove unneeded commands
108 : 2007-06-21 : Reinhard Tartler : siretart@tauware.de-20070621200125-24jilxuu2mcml8rf
first working version of cmd_merge_upstream.
implemented other helper and playground commands, not intended for end user use.
107 : 2007-06-18 : Reinhard Tartler : siretart@tauware.de-20070618120637-otmnpwiwpizqftx1
merge changes from unstable branch
106 : 2007-06-18 : Reinhard Tartler : siretart@tauware.de-20070618120119-ho58cm1svgf3z6ta
last work in progress state of hacksession in the night venue
105 : 2007-06-18 : Reinhard Tartler : siretart@tauware.de-20070617235411-cef8higjltmvn7yj
first version of an merge upstream command
104 : 2007-05-03 : James Westby : jw+debian@jameswestby.net-20070503185648-3te1qd2dbmxhjmqb
* Take the package under the wing of pkg-bazaar.
103 : 2007-05-03 : James Westby : jw+debian@jameswestby.net-20070503185452-8hkbcbb1m5pkw5dg
* Update the dependency on bzr to reflect the compatibility of this release.
(Closes: #421041)
102 : 2007-05-03 : James Westby : jw+debian@jameswestby.net-20070503184801-f2c8uv108dk69zcc
Turn on the testsuite in the build.
101 : 2007-05-03 : James Westby : jw+debian@jameswestby.net-20070503184247-3si8cp52q0soyy0f
* Lock the working trees to fix compatibility with 0.15+ dirstate trees.
(Closes: #421900)
* Add the start of a test suite to help avoid bugs like that.
100 : 2007-03-11 : James Westby : jw+debian@jameswestby.net-20070311215825-6dk1f45etaczjwif
Release rc1.
99 : 2007-03-11 : James Westby : jw+debian@jameswestby.net-20070311215113-0shpovq1nu43zg6y
Point to the correct files in the doc-base file (thanks lintian).
98 : 2007-03-11 : James Westby : jw+debian@jameswestby.net-20070311215036-opd2riw1ar6ur1xt
Escape the hypen in the manpage. (Thanks lintian)
97 : 2007-02-28 : James Westby : jw+debian@jameswestby.net-20070228191837-xay71af9g0g8c3jg
Fix the source_dir naming.

* Export the package build to the correct directory name, using the upstream
version rather than the full version. This removes a warning from
dpkg-source when building and Closes: #409981. Thanks to James Vega.
96 : 2007-02-27 : James Westby : jw+debian@jameswestby.net-20070227201801-t00237jrcjyeo6nq
* Install the plugin in .../plugins/builddeb instead of
.../plugins/bzr-builddeb, as the latter is not a valid python identifier
as is now required by bzr.
95 : 2007-02-04 : James Westby : jw+debian@jameswestby.net-20070204112021-ylafwn0ejps4baoe
* TarFile.extractall() is only in python2.5. Check for it and if not fall
back to a basic way of doing it with extract().