brz-git

Merge lp:~jelmer/brz-git/walkdirs into lp:brz-git

  1. walkdirs
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 1816
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz-git/walkdirs
Merge into: lp:brz-git
Diff against target: 24 lines (+2/-1)
2 files modified
workingtree.py (+2/-0)
xfail (+0/-1)
To merge this branch: bzr merge lp:~jelmer/brz-git/walkdirs
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+340930@code.launchpad.net

Commit message

Handle root in walkdirs.

Description of the change

Handle root in walkdirs.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Rubberstamp! Proposer approves of own proposal.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'workingtree.py'
2--- workingtree.py 2018-03-06 01:46:14 +0000
3+++ workingtree.py 2018-03-07 01:55:04 +0000
4@@ -1156,6 +1156,8 @@
5 if prefix != "":
6 prefix += "/"
7 per_dir = defaultdict(list)
8+ if prefix == "":
9+ per_dir[('', self.get_root_id())] = []
10 for path, value in self.index.iteritems():
11 if self.mapping.is_special_file(path):
12 continue
13
14=== modified file 'xfail'
15--- xfail 2018-03-07 00:44:00 +0000
16+++ xfail 2018-03-07 01:55:04 +0000
17@@ -187,7 +187,6 @@
18 breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree_and_children(GitWorkingTreeFormat)
19 breezy.tests.per_workingtree.test_unversion.TestUnversion.test_unversion_subtree(GitWorkingTreeFormat)
20 breezy.tests.per_workingtree.test_walkdirs.TestWalkdirs.test_walkdir_missings(GitWorkingTreeFormat)
21-breezy.tests.per_workingtree.test_walkdirs.TestWalkdirs.test_walkdir_unknowns(GitWorkingTreeFormat)
22 breezy.tests.per_workingtree.test_workingtree.TestIllegalPaths.test_bad_fs_path(GitWorkingTreeFormat)
23 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_clear_merge_conflicts(GitWorkingTreeFormat)
24 breezy.tests.per_workingtree.test_workingtree.TestWorkingTree.test_clone_preserves_content(GitWorkingTreeFormat)

Subscribers

People subscribed via source and target branches

to all changes: