Summary: | repoman doesnt commit changelogs to git repos | ||
---|---|---|---|
Product: | Portage Development | Reporter: | Alexey Shvetsov <alexxy> |
Component: | Repoman | Assignee: | Portage team <dev-portage> |
Status: | RESOLVED FIXED | ||
Severity: | normal | Keywords: | InVCS |
Priority: | High | ||
Version: | unspecified | ||
Hardware: | All | ||
OS: | Linux | ||
Whiteboard: | |||
Package list: | Runtime testing required: | --- | |
Bug Depends on: | |||
Bug Blocks: | 210077, 254662 | ||
Attachments: | use git-diff-index for interrogation |
Description
Alexey Shvetsov
2008-12-27 18:38:58 UTC
I'm not sure how this could happen. Maybe if you give some details about your workflow then that will give us a clue. For example, did you use echangelog to create the changelog entry? The way that repoman queries git for relevant files is with `git ls-files -m --with-tree=HEAD`, `git diff --cached --name-only --diff-filter=A`, and `git diff --cached --name-only --diff-filter=D`. It seems like `git ls-files -m --with-tree=HEAD` should have picked up your changelog modification. Can you reproduce the problem, and post the repoman output? Also, the output of various git commands before and after, such as `git ls-files -m --with-tree=HEAD` and `git status`, might provide some helpful clues. I do it like thet make needed modifycations to ebuilds/adding ebuilds patches run git add . run echangelog run repoman manifest run repoman full run repoman commit as you can see previos example repoman commit doesnt add Changelog BTW I thinck it will be usefull if repoman commit message can be used as Changelog entry =) alexxy@xeon ~/kde/kde-base/kde-l10n $ vi kde-l10n-4.1.85.ebuild alexxy@xeon ~/kde/kde-base/kde-l10n $ alexxy@xeon ~/kde/kde-base/kde-l10n $ alexxy@xeon ~/kde/kde-base/kde-l10n $ echangelog Drop ~ppc ~ppc64 keywords --- ChangeLog 2008-12-20 22:45:19.000000000 +0300 +++ ChangeLog.new 2008-12-28 12:48:11.000000000 +0300 @@ -2,6 +2,9 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 28 Dec 2008; Alexey Shvetsov <alexxy@gentoo.ru> kde-l10n-4.1.85.ebuild: + Drop ~ppc ~ppc64 keywords + *kde-l10n-4.1.85 (15 Dec 2008) 15 Dec 2008; Alexey Shvetsov <alexxy@gentoo.ru> +kde-l10n-4.1.85.ebuild: alexxy@xeon ~/kde/kde-base/kde-l10n $ repoman manifest >>> Creating Manifest for /home/alexxy/kde/kde-base/kde-l10n alexxy@xeon ~/kde/kde-base/kde-l10n $ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: ChangeLog # # Changed but not updated: # (use "git add <file>..." to update what will be committed) # # modified: Manifest # modified: kde-l10n-4.1.85.ebuild # alexxy@xeon ~/kde/kde-base/kde-l10n $ git ls-files -m --with-tree=HEAD Manifest kde-l10n-4.1.85.ebuild So seems i need to run git add after echangelog again =) looks like a bug heh after git add . i have this alexxy@xeon ~/kde/kde-base/kde-l10n $ repoman commit RepoMan scours the neighborhood... >>> Creating Manifest for /home/alexxy/kde/kde-base/kde-l10n ebuild.allmasked 1 kde-base/kde-l10n Note: use --include-dev (-d) to check dependencies for 'dev' profiles RepoMan sez: "Doing nothing is not always good for QA." (Didn't find any changed files...) so its a real bug =) Hmm looks like a problem partialy related to echangelog since it run git add Changelog so repoman thinks thet this file already commited =) Created attachment 176663 [details, diff]
use git-diff-index for interrogation
If this patch is saved as /tmp/diff-index.patch, then it can be applied as follows:
patch /usr/lib/portage/bin/repoman /tmp/diff-index.patch
This is fixed in 2.1.6.5 and 2.2_rc21. |