`brz add` in git format doesn't report files added
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Breezy |
Fix Released
|
High
|
Brian de Alwis |
Bug Description
Version: brz at HEAD (`brz version` = `3.0a1`)
Steps to repeat:
```
$ brz init --format git foo
$ cd foo
$ mkdir a b
$ echo a > a/file.txt
$ echo b > b/file.txt
$ brz add a b
adding a
adding b
adding b
adding b
```
I expected to see:
```
$ brz add a b
adding a
adding b
adding a/file.txt
adding b/file.txt
```
It looks like the culprit is `breezy/
```
-> call_action(
(Pdb) l
499 if subpath in index:
500 # Already present
501 continue
502 if subp in conflicts_related:
503 continue
504 -> call_action(
505 if save:
506 self._index_
507 added.append(subp)
508 return added, ignored
509
```
Related branches
- Martin Packman: Approve
-
Diff: 150 lines (+38/-15)4 files modifiedbreezy/git/workingtree.py (+3/-1)
breezy/mutabletree.py (+4/-4)
breezy/tests/per_workingtree/test_smart_add.py (+28/-10)
doc/en/release-notes/brz-3.0.txt (+3/-0)
Changed in brz: | |
status: | New → Triaged |
importance: | Undecided → High |
milestone: | none → 3.0.0 |
Changed in brz: | |
status: | Triaged → Fix Committed |
Changed in brz: | |
assignee: | nobody → Brian de Alwis (slyguy) |
Changed in brz: | |
status: | Fix Committed → Fix Released |
On Tue, Oct 23, 2018 at 02:35:38PM -0000, Brian de Alwis wrote: git/workingtree .py(504) smart_add( )` where it should be using `call_action(subp, kind)` filepath, kind) filepath, kind) add_entry( subp, kind)
> Public bug reported:
>
> Version: brz at HEAD (`brz version` = `3.0a1`)
>
> Steps to repeat:
> ```
> $ brz init --format git foo
> $ cd foo
> $ mkdir a b
> $ echo a > a/file.txt
> $ echo b > b/file.txt
> $ brz add a b
> adding a
> adding b
> adding b
> adding b
> ```
>
> I expected to see:
> ```
> $ brz add a b
> adding a
> adding b
> adding a/file.txt
> adding b/file.txt
> ```
>
> It looks like the culprit is `breezy/
> ```
> -> call_action(
> (Pdb) l
> 499 if subpath in index:
> 500 # Already present
> 501 continue
> 502 if subp in conflicts_related:
> 503 continue
> 504 -> call_action(
> 505 if save:
> 506 self._index_
> 507 added.append(subp)
> 508 return added, ignored
> 509
> ```
Thanks for the report and suggested fix. Can you create a merge
proposal? With tests would be great, but without is fine too.
Cheers,
Jelmer