/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/plugins/git/tests/test_fetch.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-03 23:54:50 UTC
  • mto: (7027.4.10 python3-blackbox)
  • mto: This revision was merged to the branch mainline in revision 7029.
  • Revision ID: jelmer@jelmer.uk-20180703235450-p10v67yhkzsebucd
Port fastimport to python3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/tests/test_fetch.py
91
91
        self.make_git_repo("d")
92
92
        os.chdir("d")
93
93
        bb = GitBranchBuilder()
94
 
        bb.set_file("foobar", "foo\nbar\n", False)
95
 
        mark = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
 
94
        bb.set_file("foobar", b"foo\nbar\n", False)
 
95
        mark = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg")
96
96
        gitsha = bb.finish()[mark]
97
97
        os.chdir("..")
98
98
        return "d", gitsha
115
115
        self.make_git_repo("d")
116
116
        os.chdir("d")
117
117
        bb = GitBranchBuilder()
118
 
        bb.set_file("foobar", "foo\nbar\n", False)
119
 
        mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
120
 
        bb.set_file("foobar", "fooll\nbar\n", False)
121
 
        mark2 = bb.commit("Somebody <somebody@someorg.org>", "nextmsg")
 
118
        bb.set_file("foobar", b"foo\nbar\n", False)
 
119
        mark1 = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg")
 
120
        bb.set_file("foobar", b"fooll\nbar\n", False)
 
121
        mark2 = bb.commit(b"Somebody <somebody@someorg.org>", b"nextmsg")
122
122
        marks = bb.finish()
123
123
        gitsha1 = marks[mark1]
124
124
        gitsha2 = marks[mark2]
135
135
        self.make_git_repo("d")
136
136
        os.chdir("d")
137
137
        bb = GitBranchBuilder()
138
 
        bb.set_file("mylink/somefile", "foo\nbar\n", False)
139
 
        mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg1")
 
138
        bb.set_file("mylink/somefile", b"foo\nbar\n", False)
 
139
        mark1 = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg1")
140
140
        bb.set_symlink("mylink", "target/")
141
 
        mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg2")
 
141
        mark2 = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg2")
142
142
        marks = bb.finish()
143
143
        gitsha1 = marks[mark1]
144
144
        gitsha2 = marks[mark2]
161
161
        os.chdir("d")
162
162
        bb = GitBranchBuilder()
163
163
        bb.set_symlink("mylink", "target/")
164
 
        mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg1")
165
 
        bb.set_file("mylink/somefile", "foo\nbar\n", False)
166
 
        mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg2")
 
164
        mark1 = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg1")
 
165
        bb.set_file("mylink/somefile", b"foo\nbar\n", False)
 
166
        mark2 = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg2")
167
167
        marks = bb.finish()
168
168
        gitsha1 = marks[mark1]
169
169
        gitsha2 = marks[mark2]
259
259
        tree.branch.set_stacked_on_url(b.user_url)
260
260
        os.chdir("d")
261
261
        bb = GitBranchBuilder()
262
 
        bb.set_file(u"barbar", "bar\n", False)
263
 
        bb.set_file(u"foo/blie/bla", "bla\n", False)
 
262
        bb.set_file(u"barbar", b"bar\n", False)
 
263
        bb.set_file(u"foo/blie/bla", b"bla\n", False)
264
264
        mark2 = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg2")
265
265
        gitsha2 = bb.finish()[mark2]
266
266
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)