lp://staging/ubuntu/wily-proposed/gitpkg

Created by Ubuntu Package Importer and last modified
Get this branch:
bzr branch lp://staging/ubuntu/wily-proposed/gitpkg
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Ubuntu branches
Review team:
Ubuntu Development Team
Status:
Development

Recent revisions

22. By Ron Lee <email address hidden>

* git-debcherry: Strip trailing slash from patch dir. Closes: #784130
* Preserve git notes in git-debcherry. Closes: #784159
* Don't include a signature in patch series output. Closes: #772626

  Thanks to Niko Tyni and Tino Mettler for reports and patches,
  and David Bremner for reviewing the debcherry changes.

21. By Ron Lee <email address hidden>

* Avoid ambiguity in the pristine-tar hook when branch and directory names
  are the same, which isn't entirely unlikely if people have a branch named
  'debian'. Thanks to David Bremner for further testing and a patch.
* Low urgency because we're in the pre-freeze 'be cautious' slowdown now.

20. By Ron Lee <email address hidden>

Introduce a new command 'git-debcherry' and an export hook to use it
'debcherry-deb-export-hook'. This exports a quilt patch series for
the differences between 'ref' and 'origref' by analysing the changes
in the repository to files outside the debian directory. It allows
a much more natural workflow of pushing proper patches to git that
upstream can cherry-pick, and automatically removes them from your
quilt patch series when they do. Many, many thanks to David Bremner
for the many, many hours he spent patiently writing, and testing,
and rewriting, and refining this until I stopped finding things to
whine about and saying "wait, but what if we ...". It's time to see
if others can find a way to surprise us with it now. Closes: #662726

19. By Ron Lee <email address hidden>

* Actually support orig.tar.xz in git-debimport, by fixing the copy/paste
  fail that returned .bz2 as the extension for those.
* Update sanitise_git_ref() for the git 2.1.0 rules.
* Add a command line parser. Mostly this is for the benefit of hook scripts
  which can reasonably be passed per-invocation options to control their
  behaviour that don't actually change the source package which is exported
  for a particular treeish (such as passing --dist or --arch options to the
  cowpoke exit hook). For gitpkg itself, the --deb-dir and --exit-hook
  options are similarly 'harmless' so overriding the normal gitconfig can be
  useful to do sometimes. The cowpoke exit hook can now have its options
  overridden with --cowpoke, and the dpkg-buildpackage exit hook can have
  its options overridden by passing --dpkg-bp. People who create their own
  hooks can also transparently add their own options for them if needed.
  Closes: #674246
* Make the --version and --help options work even when not running inside a
  git repository.
* Report all errors to stderr. Previously we leaked some of them to stdout.
* Add a --keep-unpacked-source option (and corresponding gitconfig).
  Previously we always kept the unpacked source directory unless people
  removed it themselves in their own exit hook, but that wasn't everybody's
  ideal behaviour. Now that it's easy to request this on invocation, let's
  keep the export directory clean by default.

18. By Ron Lee <email address hidden>

Depend on git with an epoch, since the versions of gnuit before the name
change otherwise satisfy this dep, as do earlier versions of git which
already have an epoch too. Thanks to Jonathan Nieder for catching this.
Closes: #676851

17. By Ron Lee <email address hidden>

Add bash completion for gitpkg. Closes: #675522
Many thanks to Stig Sandbeck Mathisen for contributing this.

16. By Ron Lee <email address hidden>

* Remove the quilt hook git-patches file if no patches were exported.
  This avoids the lintian check misfiring if people keep a wildcard revision
  range in it but there are no patches to export for a particular release.
  Closes: #633891
* Don't try to export the --help revision of a package if people pass that
  to gitpkg without reading its manual page first. This is a community-
  service exception to the usual policy of having no command line options
  (and so no way to screw up an export by passing the wrong ones).
  Closes: #633869

15. By Ron Lee <email address hidden>

Check if PATCHES is empty in quilt-patches-deb-export-hook, to avoid adding
an empty line to the series file, which will in turn trigger the lintian
warning about patches not being exported.

14. By Ron Lee <email address hidden>

Move sanitise_git_ref to repo-config-helper.
Use it in quilt-patches-deb-export-hook to export valid git refnames,
based on {DEB,UPSTREAM}_VERSION, in {DEB,UPSTREAM}_REF. Closes: #620969

13. By Ron Lee <email address hidden>

* Be nice to emacs users of the quilt-patches hook.
* We don't call the package clean target by default anymore. There's a bunch
  of good reasons not to, and not many packages that really need this. If you
  want the old behaviour back, you can enable it with:

  $ git config gitpkg.prebuild-target clean

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp://staging/ubuntu/wily/gitpkg
This branch contains Public information 
Everyone can see this information.

Subscribers