lp:ubuntu/trusty/git-buildpackage

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

76. By Guido Günther on 2014-02-15

[ Guido Günther ]
* [78f3673] Depend on newer devscripts.
  These contain a uscan that handles repackaging at the right level and
  won't let us pick up the wrong tarball name.
  Thanks to gregor herrmann and all others involved (Closes: #635920)
* [7c64575] Avoid backtrace on config file parse errors
  "gbp buildpackage" did this already but others didn't (Closes: #733759)
* [7b1eadd] Make parsing config file sections symmetric.
  Always read the legacy command's config file section prior to the
  subcommand's config file section.
  Until now 'gbp <subcommand>' would read '[subcommand]' as well as
  '[gbp-<subcommand>]' sections while 'gbp-<subcommand>' would only read
  '[gbp-<subcommand>]' sections. (Closes: #733759)
* [49f0e44] Change the default of cleaner to /bin/true.
  Running a clean command within version control by default nowadays
  causes more trouble than it helps. It's unnecessary with
  pbuilder/cowbuilder/sbuild and with export-dir. So change the default
  from 'debuild clean' to a noop ('/bin/true'). (Closes: #670624)
* [d93c89f] import_orig: test error paths of find_source
* [daf249f] docs: improve docs on using upstream's git repo.
  The documentation on using upstream's git directly instead of tarballs
  was very terse. Add a step by step guide on how to get started and
  how to update to new upstream versions.

[ Markus Lehtonen ]
* [e876beb] tests: adapt dch tests for older devscripts.
  Determine the default urgency level by determining the version number of
  the dch tool from command line.

75. By Guido Günther on 2013-12-20

* [f5718b8] No need to document --verbose. Properly document --help
  instead.
  Thanks to Olivier Berger for pointing this out (Closes: #731149)
* [e746d5f] Adjust test cases to newer devscripts (Closes: #732384)
* [ca93ccb] Run nosetest on executables too.
  They're all well behaved and this allows us to use doctests in them
* [eec8ce3] Determine changes file name based on dpkg-buildpackage options
  (Closes: #732678)

74. By Guido Günther on 2013-11-29

* [ab5a708] import-dsc; Merge upstream version by tag
  instead of simply using the upstream branch name. THis makes sure
  we also merge upstream versions that were imported previously with
  e.g. "gbp import-orig". (Closes: #698222)
* [2042144] log: add error and warning aliases since I tend to use them
  instead of err and warn. (Closes: #728896)
* [bc5ce39] Fix description of backports branches
* [00d830c] Use --distribution instead of --dist (Closes: #730788)

73. By Guido Günther on 2013-11-06

[ Guan Junchun ]
* [284eea5] gbp-clone: support repo URLs like "host:repo.git" Previously,
  gbp didn't correctly parse this kind of URL and clone failed.
* [d52abf3] gbp-clone: support cloning to a specific directory
  (Closes: #725666)

[ Guido Günther ]
* [3092623] Add missing bash completion for gbp import-dscs
  (Closes: #727749)
* [fc5b485] import-dsc: allow to skip Debian tag creation
  (Closes: #636368)
* [6f0c8f9] Update to git-pbuilder 1.30 that resyncs with what we shipped in
  gbp.
* [3e09958] Disable html coverage generation until python-nose is fixed.

[ Markus Lehtonen ]
* [c661c71] pq: rewrite patch export functionality.
  Use our own function for constructing the patch files instead of using
  the format-patch command of git. This way, we get the desired output
  format directly, without the need for the error-prone "format-patch,
  parse patch files, mangle and re-write patch files" cycle.
  Also, fix patch naming in patch generation when '--no-patch-numbers' is
  used. Previously, multiple commits with the same subject resulted in
  multiple patches having the same filename. This lead into broken series
  with missing patches as patch files were overwritten by the topmost
  commit.
* [017fac3] pq.format_patch: support file path filtering.
  Implements a filter option that allows filtering out changes to certain
  files/paths in the patch-generation. A commit is totally ignored if all
  files would be filtered out. The path filter is given as a Python
  regexp.
* [a0d6eb7] pq: properly generate non-ascii patch files.
  Encode non-ascii email headers properly. Also, set MIME headers
  correctly for the message body if the commit message body contains
  non-ascii characters.
  The reason for constructing the message in a little bit "clumsy" way is
  the intention is to match the output of git-format-patch as closely as
  possible.
* [91fbdc1] pq: support patch-export commands.
  Support giving commands to pq as a meta tag in commit message. The
  format is "Gbp: <command> [args]".
  Currently, only one command is supported. namely 'ignore'. That is, one
  can use 'Gbp: Ignore' in the commit message for ignoring the commit in
  patch-generation.
* [3dccca6] pq: add format_diff() function.
  For generating a patch file from a diff between two arbitrary commits.
* [34e85f7] pq: listen to 'Gbp-Pq:' commands, too
* [99c6995] pq: support 'Topic' patch-export command.
  Topic can be defined with either 'Gbp: Topic <topic>' or 'Gbp-Pq: Topic
  <topic>' in the commit message.
  This is to replace the "gbp-pq-topic: <topic>" command.
* [0c0086b] docs: update pq manpages regarding pq command meta tags

[ Felipe Sateler ]
* [babbc5e] Add zsh completion.
  (Closes: #717002)

72. By Guido Günther on 2013-10-16

[ Etienne Millon ]
* [ba4f778] doc: Fix git-pbuilder example (Closes: #725875)

[ Guido Günther ]
* [3be2947] Be more robust about git status output changes by using
  --porcelain. Heavily based on a patch by rian m. carlson
  (Closes: #726260)
* [ae460e1] Bump standards version

[ Andrew Starr-Bochicchio ]
* [4368694] Don't export DEB_VENDOR="Debian"
  Tests now take Ubuntu versions into consideration. (Closes: #723756)

71. By Andrew Starr-Bochicchio on 2013-09-19

debian/rules: Don't export DEB_VENDOR="Debian" as tests now
take Ubuntu versions into consideration (LP: #1215175).

70. By Guido Günther on 2013-08-28

* [60ffe95] --git-hooks doesn't take an argument
* [7a29e42] Move MockedChangelog to testutils and allow to specify the
  content so we can reuse it for other dch tests.
* [938e4cd] dch: make automatic adding of new sections more robust.
  The code that determined if we found a snapshot header was obfuscated by
  the code that determines the commits to add. Split those and better
  document their purpose. Also always return the commit to start from so we
  don't need to repeat the logic in the upper levels.
* [d0fb6d8] Minor docstring updates
* [388cfb8] docs: Add recommended branch layout.
  It'd be nice to have similar branch layouts among packages so recommend
  one that worked well so far.
* [34b2079] GitRepository: allow to use '..' instead of '...'
  The symmetric difference isn't always useful since it includes changes
  from both branches. See #680705.
* [f793ed0] pq: exclude patches from Debian packaging branch.
  When regenerating the patch queue including patches from the Debian
  branch is not useful. Addresses parts of #680705.
  Thanks to Benjamin Cama for the detailed analysis.
* [283c847] docs: Refert to gbp in the introduction since this wraps all
  commands now.
  Thanks to Ross Boylan for pointing out that the current wording is
  confusing.
* [8f073eb] docs: remove superfluous at
* [c9d3d93] Use open() instead of file() since the later doesn't exist in
  python3

69. By Guido Günther on 2013-07-09

* [194d396] Document gbp's help option
* [56068e5] Git.Repository.__git_inout: properly set stdin.
  We should set stdin to subprocess.PIPE when piping input according
  to the subprocess docs.
* [585439e] Git.Repository.__git_inout: Close all other file descriptors.
  No need to leak fds to the child.
* [9af1868] gbp.git.Repository.get_branch(): use _git_command
  instead of the deprecated _git_inout and clarify the return codes and
  exceptions raised.
* [a2ce387] gbp.git.GitRepository.has_branch(): use _git_command instead of
  the deprecated _git_getoutput
* [2145c58] Test succesful import too and make sure we don't spew to stderr
  during this test
* [8d2ceba] Make sure we keep our test coverage
* [00a4162] Switch to debhelper level 9 which is available in Wheezy
* [55ba9b8] Update Vcs-Browser URL
* [e829dc5] Add symlinks to the manpages for the deprecated commands and
  make lintian happy (Closes: #714489)
* [fc74aa2] Fix broken xrefs
* [2a233a7] Add examples for importing upstream sources
* [cef5bae] Add gbp buildpackage example showing git-pbuilder invocation
* [1b38d90] Remove duplicate config files section in the "gbp buildpackage"
  man page
* [a22eee2] GitRepository.set_upstream_branch: Newer git wants a valid
  remote repo entry so set one in the tests before trying to set the
  upstream branch. Found with git 1.8.3.2
* [7762b17] GitRepository.set_upstream_branch: don't try to set upstream
  twice. Move setting of the upstream branch out of the loop. This worked
  by accident so far.
* [b615db5] GitRepository.set_upstream_branch: Catch errors to set upstream
  branch
* [b8e921e] GitRepository.set_upstream_branch: use --set-upstream-to if
  available since --set-upstream is deprecated.

68. By Guido Günther on 2013-06-27

* [42769e3] Split {Build-,}Deps per line
  and sort alphabetically
* [747a273] Depend on python-pkg-resources (Closes: #714238)

67. By Guido Günther on 2013-06-26

[ Guido Günther ]
* Introduce gbp supercommand to get rid of the git-<command> vs.
  gbp-<command> inconsistencies:
    * [12dce5f] Add wrapper for all gbp commands. So like git you can now
      use gbp <command> instead of git-<command> or gbp-<command>. The
      manpages and docs aren't adjusted yet.
    * [416f690] Bash complete on "gbp <command>" too
    * [5684b18] Add gbp manpage
    * [6b1b41f] docs: Use gbp <command> instead of {git,gbp}-<command>
    * [daccfa0] manpages: Changes references from git- to gbp-
    * [1d90e73] docs: Rename the entities from &git-<command>; to
      &gbp-<command>;
    * [1eea5d5] gbp.conf: Use command names instead of {git,gbp}-
    * [c365f7c] Rename the sgml files from git- to gbp-
    * [55fded7] NEWS: add a note about the new gbp super command
    * [b47b7e8] Update package description
    * [fe9f925] GbpOptionParser: Make sure we parse the old config sections.
      For backward compatibility between {gbp,git}-<command> and "gbp
      <command>" make sure we parse the former sections if using the later.
    * [375014d] gbp: support --help
    * [a5aff11] Consistently call gbp the supercommand and robustify against
      invalid modules names.
    * [e09ef94] gbp-import-dscs: invoke gbp import-dsc instead of
      git-import-dsc
    * [38d43b4] config: Don't fill in the parser with all defaults.
* [4d6eecb] GitRepository.get_subject: use get_commit_info.
  This kills another _git_getoutput. Also deprecate the method since we
  don't need to special case the subject.
* [caff99c] GbpOptionParser: Make sure we access the GbpOptionParser*'s
  default dict and not the one from the OptionParser. The instance's default
  dict this gets reset to empty when invoking OptionParser.__init__.
* [1158503] GbpOptionParser: add test for 'filter' option handling
* [ed63276] Git-Ignore generated gbp.conf.5 too
* [3966076] Remove unused imports
* [b59818d] import-dsc: print filename instead of object name

[ Markus Lehtonen ]
* [fa414e5] gitmodifier: make the datetime object always have timezone. To
  be consistent with the date property and for easier compatibility with git
  dates.
* [f717975] GitRepository/get_commit_info: add patchname to info.
  Add a new 'patchname' field to the information returned by
  get_commit_info. That is, the subject in a sanitized format, similar to
  what git-format-patch uses.
* [74d956f] import-orig: keep working copy in sync with branch HEAD.
  Update working copy and index (to branch HEAD) if we modify the
  currently checked-out branch. Otherwise the repository is left in
  unclean state when the current branch is upstream or pristine-tar and
  the '--no-merge' option is used.
* [a30f9e7] buildpackage: use get_commit_info() instead of get_subject()
  Utilize the get_commit_info() method of GitRepository instead of the
  deprecated get_subject().
* [75cbd9a] GitRepository/diff: allow single object.
  Allow diffing a single object, e.g. getting diff from single commit.