Your message dated Thu, 24 May 2012 12:47:57 +0000
with message-id <[email protected]>
and subject line Bug#672642: fixed in git-buildpackage 0.6.0~git20120524
has caused the Debian Bug report #672642,
regarding git-buildpackage: Add a "git merge-base" wrapper
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
672642: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672642
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: git-buildpackage
Version: 0.6.0~git20120419
Severity: wishlist
Tags: patch
Dear Maintainer,
During my work on #669171, I found useful to have a wrapper to "git
merge-base".
I include the patch for review followed by a pull request.
Regards.
From e375b4f9fb4654159e1efcfae4a14a513234c683 Mon Sep 17 00:00:00 2001
From: Daniel Dehennin <[email protected]>
Date: Sat, 12 May 2012 17:00:24 +0200
Subject: [PATCH] Add "git merge-base" wrapper.
* gbp/git/repository.py (GitRepository.get_merge_base): New method which
return SHA1 of a common ancestor between to commits.
---
gbp/git/repository.py | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/gbp/git/repository.py b/gbp/git/repository.py
index 2cc5eda..a02d4ef 100644
--- a/gbp/git/repository.py
+++ b/gbp/git/repository.py
@@ -299,6 +299,21 @@ class GitRepository(object):
remote += merge.replace("refs/heads","", 1)
return remote
+ def get_merge_base(self, commit1, commit2):
+ """
+ Get the common ancestor between two commits
+ The commits can be SHA1 or names of branch or tag
+
+ @return: SHA1 of the common ancestor
+ @rtype: C{str}
+ """
+ args = [commit1, commit2]
+ sha1, stderr, ret = self._git_inout('merge-base', args)
+ if not ret:
+ return sha1.strip()
+ else:
+ raise GbpError("Failed to get common ancestor: %s" % stderr)
+
def merge(self, commit, verbose=False, edit=False):
"""
Merge changes from the named commit into the current branch
--
1.7.10
The following changes since commit 5de6410bc6c5155c38caa332321c8fe0087f819f:
docs: compolete git-dch synopsis (2012-05-06 22:54:54 +0200)
are available in the git repository at:
git://git.baby-gnu.org/git-buildpackage tags/dad/add-git-merge-base-wrapper
for you to fetch changes up to e375b4f9fb4654159e1efcfae4a14a513234c683:
Add "git merge-base" wrapper. (2012-05-12 17:09:20 +0200)
----------------------------------------------------------------
This wrapper is needed for debian bug #669171.
----------------------------------------------------------------
Daniel Dehennin (1):
Add "git merge-base" wrapper.
gbp/git/repository.py | 15 +++++++++++++++
1 file changed, 15 insertions(+)
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (90, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.4+hati.1+ (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages git-buildpackage depends on:
ii devscripts 2.11.6
ii git 1:1.7.10-1
ii python 2.7.2-10
ii python-dateutil 1.5-1
ii python2.6 2.6.7-4
ii python2.7 2.7.3~rc2-2.1
Versions of packages git-buildpackage recommends:
ii cowbuilder <none>
ii pristine-tar 1.24
Versions of packages git-buildpackage suggests:
ii python-notify 0.1.1-3
ii unzip 6.0-6
-- no debconf information
-- debsums errors found:
debsums: changed file /usr/share/pyshared/gbp/deb/changelog.py (from
git-buildpackage package)
debsums: changed file /usr/share/pyshared/gbp/scripts/dch.py (from
git-buildpackage package)
--
Daniel Dehennin
Récupérer ma clef GPG:
gpg --keyserver pgp.mit.edu --recv-keys 0x7A6FE2DF
pgpXXelR3W37p.pgp
Description: PGP signature
--- End Message ---
--- Begin Message ---
Source: git-buildpackage
Source-Version: 0.6.0~git20120524
We believe that the bug you reported is fixed in the latest version of
git-buildpackage, which is due to be installed in the Debian FTP archive:
git-buildpackage_0.6.0~git20120524.dsc
to main/g/git-buildpackage/git-buildpackage_0.6.0~git20120524.dsc
git-buildpackage_0.6.0~git20120524.tar.gz
to main/g/git-buildpackage/git-buildpackage_0.6.0~git20120524.tar.gz
git-buildpackage_0.6.0~git20120524_all.deb
to main/g/git-buildpackage/git-buildpackage_0.6.0~git20120524_all.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Guido Günther <[email protected]> (supplier of updated git-buildpackage package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Thu, 24 May 2012 14:05:47 +0200
Source: git-buildpackage
Binary: git-buildpackage
Architecture: source all
Version: 0.6.0~git20120524
Distribution: experimental
Urgency: low
Maintainer: Guido Günther <[email protected]>
Changed-By: Guido Günther <[email protected]>
Description:
git-buildpackage - Suite to help with Debian packages in Git repositories
Closes: 672642 673368 673422 673473
Changes:
git-buildpackage (0.6.0~git20120524) experimental; urgency=low
.
[ Markus Lehtonen ]
* [3308868] Refactor deb helpers: introduce PkgPolicy class. Create a new
'pkg' basemodule, intended to be re-used by the upcoming rpm package
helpers. Move some deb functionality to a new pkg.PkgPolicy class, to be
used as a base for different package types. Introduces Deb-specific
deb.DebianPkgPolicy.
* [082679d] Refactor deb helpers: move build_tarball_name() from
UpstreamSource class to DebianPkgPolicy.
* [f495df9] Refactor deb helpers: move UpstreamSource class to pkg base
module. This refactor is preparation to the upcoming rpm support.
.
[ Guido Günther ]
* [83165aa] GitRepository.format_patches: allow to set threading format
and disable it by default.
* [5de6410] docs: complete git-dch synopsis
* [1eeb298] Add gbp.deb.ChangeLogSection to parse package and version out of
a changelog section
* [1ea487e] Don't explicitly refer to lenny-backports.
Thanks to Salvatore Bonaccorso
* [9d1459b] gbp.deb.changelog: Split parsing into a separate function
this will allow us to reparse the changelog after manipulation with dch.
* [2ecf9e3] gbp.deb.ChangeLog: Add filename property
.
[ Jérémy Lal ]
* [ae850da] --ignore-branch config help fix
.
[ Daniel Dehennin ]
* [c57d4af] gbp.git.repository: Add a "git merge-base" wrapper
(Closes: #672642)
* [edc6483] Provide minimalist debian/control object
(Closes: #673473)
.
[ Salvatore Bonaccorso ]
* [bb32e94] git-dch: Add support for --team switch for Team uploads
(Closes: #673368)
* [016bf21] Document --bpo, --nmu and --qa in git-dch's manpage
(Closes: #673422)
Checksums-Sha1:
6bf1315a7853a98f565f0d1436ec969b6e3cbaf5 1270
git-buildpackage_0.6.0~git20120524.dsc
237940aaad5ccbddb7b8194ab8392b79b7a25858 154245
git-buildpackage_0.6.0~git20120524.tar.gz
85e992c03bf782f055caf417eb78246eb2ce350e 308838
git-buildpackage_0.6.0~git20120524_all.deb
Checksums-Sha256:
bd90f81b107c9104d7bfc433c49f8c0d0c0c706e98445d17949fbe37a559fff8 1270
git-buildpackage_0.6.0~git20120524.dsc
53ea430576d6de779df243b0b900135bca59094c5b073f111de2326012862144 154245
git-buildpackage_0.6.0~git20120524.tar.gz
17b4b7baeda4726054f6eeba963922b22409b30722df7d3bd351f0fdb90695fa 308838
git-buildpackage_0.6.0~git20120524_all.deb
Files:
483a253181c17cecf79b7721f8990097 1270 vcs optional
git-buildpackage_0.6.0~git20120524.dsc
ada53f514f52ae47c9d5da884151fbdb 154245 vcs optional
git-buildpackage_0.6.0~git20120524.tar.gz
b20839c94f990da93528b2363b3f813e 308838 vcs optional
git-buildpackage_0.6.0~git20120524_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iD8DBQFPviqPn88szT8+ZCYRAjbMAJ9LEgmEJcuwDwcBkHdvsyzHrTy9jgCdHiAE
WsvG+cgQZks7/Mm8zbwLuO4=
=0xc9
-----END PGP SIGNATURE-----
--- End Message ---
