bzr commit -x doesn't change the --show-diff output (iter_changes does not support excludes)

Bug #268135 reported by James Westby
32
This bug affects 6 people
Affects Status Importance Assigned to Milestone
Bazaar
Confirmed
Medium
Unassigned
Breezy
Fix Released
Medium
Jelmer Vernooij

Bug Description

"bzr commit -x" correctly excludes files from the commit, but the --show-diff
output still includes all of those changes, which can worry the user, and make
it harder to see the parts of the diff that you care about.

This is caused by the workhorse that commit depends on - iter_changes - not supporting excludes.

Tags: commit ui

Related branches

John A Meinel (jameinel)
Changed in bzr:
importance: Undecided → Medium
status: New → Triaged
Martin Pool (mbp)
Changed in bzr:
status: Triaged → Confirmed
Martin Pool (mbp)
tags: added: commit
Revision history for this message
Robert Collins (lifeless) wrote : Re: [Bug 268135] Re: bzr commit -x doesn't change the --show-diff output

On 19/03/10 08:29, Martin Pool wrote:
> ** Tags added: commit

I think the root cause for this is a dupe: show-diff output uses the
diff feature of bzr, and that depends on iter changes and there is abug
open that iter changes doeswn't support excludes.

Cheers,
Rob

Revision history for this message
Robert Collins (lifeless) wrote : Re: bzr commit -x doesn't change the --show-diff output

Well, I can't find that bug, so we may as well make this be it.

summary: - bzr commit -x doesn't change the --show-diff output
+ bzr commit -x doesn't change the --show-diff output (iter_changes does
+ not support excludes)
description: updated
Revision history for this message
Aaron Bentley (abentley) wrote :

I don't agree that this is the cause. Adding excludes support to iter_changes would be one approach, but it would be equally effective to filter the iter_changes output, and this would avoid the need to implement such filtering on every iter_changes implementation.

Revision history for this message
Robert Collins (lifeless) wrote : Re: [Bug 268135] Re: bzr commit -x doesn't change the --show-diff output (iter_changes does not support excludes)

On Sat, 2010-04-10 at 15:49 +0000, Aaron Bentley wrote:
> I don't agree that this is the cause. Adding excludes support to
> iter_changes would be one approach, but it would be equally effective to
> filter the iter_changes output, and this would avoid the need to
> implement such filtering on every iter_changes implementation.

Assuming that filtering can be done correctly by layering (I'm not sure
that that is the case), we could build that helper into the core.

-Rob

Jelmer Vernooij (jelmer)
Changed in brz:
status: New → Triaged
importance: Undecided → Medium
assignee: nobody → Jelmer Vernooij (jelmer)
Jelmer Vernooij (jelmer)
Changed in brz:
status: Triaged → Fix Released
milestone: none → 3.0.0
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Duplicates of this bug

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.