test_porcelain.py 53 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124112511261127112811291130113111321133113411351136113711381139114011411142114311441145114611471148114911501151115211531154115511561157115811591160116111621163116411651166116711681169117011711172117311741175117611771178117911801181118211831184118511861187118811891190119111921193119411951196119711981199120012011202120312041205120612071208120912101211121212131214121512161217121812191220122112221223122412251226122712281229123012311232123312341235123612371238123912401241124212431244124512461247124812491250125112521253125412551256125712581259126012611262126312641265126612671268126912701271127212731274127512761277127812791280128112821283128412851286128712881289129012911292129312941295129612971298129913001301130213031304130513061307130813091310131113121313131413151316131713181319132013211322132313241325132613271328132913301331133213331334133513361337133813391340134113421343134413451346134713481349135013511352135313541355135613571358135913601361136213631364136513661367136813691370137113721373137413751376137713781379138013811382138313841385138613871388138913901391139213931394139513961397139813991400140114021403140414051406140714081409141014111412141314141415141614171418141914201421142214231424142514261427142814291430143114321433
  1. # test_porcelain.py -- porcelain tests
  2. # Copyright (C) 2013 Jelmer Vernooij <jelmer@jelmer.uk>
  3. #
  4. # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
  5. # General Public License as public by the Free Software Foundation; version 2.0
  6. # or (at your option) any later version. You can redistribute it and/or
  7. # modify it under the terms of either of these two licenses.
  8. #
  9. # Unless required by applicable law or agreed to in writing, software
  10. # distributed under the License is distributed on an "AS IS" BASIS,
  11. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  12. # See the License for the specific language governing permissions and
  13. # limitations under the License.
  14. #
  15. # You should have received a copy of the licenses; if not, see
  16. # <http://www.gnu.org/licenses/> for a copy of the GNU General Public License
  17. # and <http://www.apache.org/licenses/LICENSE-2.0> for a copy of the Apache
  18. # License, Version 2.0.
  19. #
  20. """Tests for dulwich.porcelain."""
  21. from io import BytesIO
  22. try:
  23. from StringIO import StringIO
  24. except ImportError:
  25. from io import StringIO
  26. import os
  27. import shutil
  28. import tarfile
  29. import tempfile
  30. import time
  31. from dulwich import porcelain
  32. from dulwich.diff_tree import tree_changes
  33. from dulwich.objects import (
  34. Blob,
  35. Tag,
  36. Tree,
  37. ZERO_SHA,
  38. )
  39. from dulwich.repo import (
  40. NoIndexPresent,
  41. Repo,
  42. )
  43. from dulwich.tests import (
  44. TestCase,
  45. )
  46. from dulwich.tests.utils import (
  47. build_commit_graph,
  48. make_commit,
  49. make_object,
  50. )
  51. class PorcelainTestCase(TestCase):
  52. def setUp(self):
  53. super(PorcelainTestCase, self).setUp()
  54. self.test_dir = tempfile.mkdtemp()
  55. self.addCleanup(shutil.rmtree, self.test_dir)
  56. self.repo = Repo.init(os.path.join(self.test_dir, 'repo'), mkdir=True)
  57. self.addCleanup(self.repo.close)
  58. class ArchiveTests(PorcelainTestCase):
  59. """Tests for the archive command."""
  60. def test_simple(self):
  61. c1, c2, c3 = build_commit_graph(
  62. self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
  63. self.repo.refs[b"refs/heads/master"] = c3.id
  64. out = BytesIO()
  65. err = BytesIO()
  66. porcelain.archive(self.repo.path, b"refs/heads/master", outstream=out,
  67. errstream=err)
  68. self.assertEqual(b"", err.getvalue())
  69. tf = tarfile.TarFile(fileobj=out)
  70. self.addCleanup(tf.close)
  71. self.assertEqual([], tf.getnames())
  72. class UpdateServerInfoTests(PorcelainTestCase):
  73. def test_simple(self):
  74. c1, c2, c3 = build_commit_graph(
  75. self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
  76. self.repo.refs[b"refs/heads/foo"] = c3.id
  77. porcelain.update_server_info(self.repo.path)
  78. self.assertTrue(os.path.exists(
  79. os.path.join(self.repo.controldir(), 'info', 'refs')))
  80. class CommitTests(PorcelainTestCase):
  81. def test_custom_author(self):
  82. c1, c2, c3 = build_commit_graph(
  83. self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
  84. self.repo.refs[b"refs/heads/foo"] = c3.id
  85. sha = porcelain.commit(
  86. self.repo.path, message=b"Some message",
  87. author=b"Joe <joe@example.com>",
  88. committer=b"Bob <bob@example.com>")
  89. self.assertTrue(isinstance(sha, bytes))
  90. self.assertEqual(len(sha), 40)
  91. def test_unicode(self):
  92. c1, c2, c3 = build_commit_graph(
  93. self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
  94. self.repo.refs[b"refs/heads/foo"] = c3.id
  95. sha = porcelain.commit(
  96. self.repo.path, message="Some message",
  97. author="Joe <joe@example.com>",
  98. committer="Bob <bob@example.com>")
  99. self.assertTrue(isinstance(sha, bytes))
  100. self.assertEqual(len(sha), 40)
  101. class CloneTests(PorcelainTestCase):
  102. def test_simple_local(self):
  103. f1_1 = make_object(Blob, data=b'f1')
  104. commit_spec = [[1], [2, 1], [3, 1, 2]]
  105. trees = {1: [(b'f1', f1_1), (b'f2', f1_1)],
  106. 2: [(b'f1', f1_1), (b'f2', f1_1)],
  107. 3: [(b'f1', f1_1), (b'f2', f1_1)], }
  108. c1, c2, c3 = build_commit_graph(self.repo.object_store,
  109. commit_spec, trees)
  110. self.repo.refs[b"refs/heads/master"] = c3.id
  111. self.repo.refs[b"refs/tags/foo"] = c3.id
  112. target_path = tempfile.mkdtemp()
  113. errstream = BytesIO()
  114. self.addCleanup(shutil.rmtree, target_path)
  115. r = porcelain.clone(self.repo.path, target_path,
  116. checkout=False, errstream=errstream)
  117. self.addCleanup(r.close)
  118. self.assertEqual(r.path, target_path)
  119. target_repo = Repo(target_path)
  120. self.assertEqual(0, len(target_repo.open_index()))
  121. self.assertEqual(c3.id, target_repo.refs[b'refs/tags/foo'])
  122. self.assertTrue(b'f1' not in os.listdir(target_path))
  123. self.assertTrue(b'f2' not in os.listdir(target_path))
  124. c = r.get_config()
  125. encoded_path = self.repo.path
  126. if not isinstance(encoded_path, bytes):
  127. encoded_path = encoded_path.encode('utf-8')
  128. self.assertEqual(encoded_path, c.get((b'remote', b'origin'), b'url'))
  129. self.assertEqual(
  130. b'+refs/heads/*:refs/remotes/origin/*',
  131. c.get((b'remote', b'origin'), b'fetch'))
  132. def test_simple_local_with_checkout(self):
  133. f1_1 = make_object(Blob, data=b'f1')
  134. commit_spec = [[1], [2, 1], [3, 1, 2]]
  135. trees = {1: [(b'f1', f1_1), (b'f2', f1_1)],
  136. 2: [(b'f1', f1_1), (b'f2', f1_1)],
  137. 3: [(b'f1', f1_1), (b'f2', f1_1)], }
  138. c1, c2, c3 = build_commit_graph(self.repo.object_store,
  139. commit_spec, trees)
  140. self.repo.refs[b"refs/heads/master"] = c3.id
  141. target_path = tempfile.mkdtemp()
  142. errstream = BytesIO()
  143. self.addCleanup(shutil.rmtree, target_path)
  144. with porcelain.clone(self.repo.path, target_path,
  145. checkout=True,
  146. errstream=errstream) as r:
  147. self.assertEqual(r.path, target_path)
  148. with Repo(target_path) as r:
  149. self.assertEqual(r.head(), c3.id)
  150. self.assertTrue('f1' in os.listdir(target_path))
  151. self.assertTrue('f2' in os.listdir(target_path))
  152. def test_bare_local_with_checkout(self):
  153. f1_1 = make_object(Blob, data=b'f1')
  154. commit_spec = [[1], [2, 1], [3, 1, 2]]
  155. trees = {1: [(b'f1', f1_1), (b'f2', f1_1)],
  156. 2: [(b'f1', f1_1), (b'f2', f1_1)],
  157. 3: [(b'f1', f1_1), (b'f2', f1_1)], }
  158. c1, c2, c3 = build_commit_graph(self.repo.object_store,
  159. commit_spec, trees)
  160. self.repo.refs[b"refs/heads/master"] = c3.id
  161. target_path = tempfile.mkdtemp()
  162. errstream = BytesIO()
  163. self.addCleanup(shutil.rmtree, target_path)
  164. with porcelain.clone(
  165. self.repo.path, target_path, bare=True,
  166. errstream=errstream) as r:
  167. self.assertEqual(r.path, target_path)
  168. with Repo(target_path) as r:
  169. r.head()
  170. self.assertRaises(NoIndexPresent, r.open_index)
  171. self.assertFalse(b'f1' in os.listdir(target_path))
  172. self.assertFalse(b'f2' in os.listdir(target_path))
  173. def test_no_checkout_with_bare(self):
  174. f1_1 = make_object(Blob, data=b'f1')
  175. commit_spec = [[1]]
  176. trees = {1: [(b'f1', f1_1), (b'f2', f1_1)]}
  177. (c1, ) = build_commit_graph(self.repo.object_store, commit_spec, trees)
  178. self.repo.refs[b"refs/heads/master"] = c1.id
  179. self.repo.refs[b"HEAD"] = c1.id
  180. target_path = tempfile.mkdtemp()
  181. errstream = BytesIO()
  182. self.addCleanup(shutil.rmtree, target_path)
  183. self.assertRaises(
  184. ValueError, porcelain.clone, self.repo.path,
  185. target_path, checkout=True, bare=True, errstream=errstream)
  186. def test_no_head_no_checkout(self):
  187. f1_1 = make_object(Blob, data=b'f1')
  188. commit_spec = [[1]]
  189. trees = {1: [(b'f1', f1_1), (b'f2', f1_1)]}
  190. (c1, ) = build_commit_graph(self.repo.object_store, commit_spec, trees)
  191. self.repo.refs[b"refs/heads/master"] = c1.id
  192. target_path = tempfile.mkdtemp()
  193. self.addCleanup(shutil.rmtree, target_path)
  194. errstream = BytesIO()
  195. r = porcelain.clone(
  196. self.repo.path, target_path, checkout=True, errstream=errstream)
  197. r.close()
  198. class InitTests(TestCase):
  199. def test_non_bare(self):
  200. repo_dir = tempfile.mkdtemp()
  201. self.addCleanup(shutil.rmtree, repo_dir)
  202. porcelain.init(repo_dir)
  203. def test_bare(self):
  204. repo_dir = tempfile.mkdtemp()
  205. self.addCleanup(shutil.rmtree, repo_dir)
  206. porcelain.init(repo_dir, bare=True)
  207. class AddTests(PorcelainTestCase):
  208. def test_add_default_paths(self):
  209. # create a file for initial commit
  210. fullpath = os.path.join(self.repo.path, 'blah')
  211. with open(fullpath, 'w') as f:
  212. f.write("\n")
  213. porcelain.add(repo=self.repo.path, paths=[fullpath])
  214. porcelain.commit(repo=self.repo.path, message=b'test',
  215. author=b'test <email>', committer=b'test <email>')
  216. # Add a second test file and a file in a directory
  217. with open(os.path.join(self.repo.path, 'foo'), 'w') as f:
  218. f.write("\n")
  219. os.mkdir(os.path.join(self.repo.path, 'adir'))
  220. with open(os.path.join(self.repo.path, 'adir', 'afile'), 'w') as f:
  221. f.write("\n")
  222. cwd = os.getcwd()
  223. try:
  224. os.chdir(self.repo.path)
  225. porcelain.add(self.repo.path)
  226. finally:
  227. os.chdir(cwd)
  228. # Check that foo was added and nothing in .git was modified
  229. index = self.repo.open_index()
  230. self.assertEqual(sorted(index), [b'adir/afile', b'blah', b'foo'])
  231. def test_add_default_paths_subdir(self):
  232. os.mkdir(os.path.join(self.repo.path, 'foo'))
  233. with open(os.path.join(self.repo.path, 'blah'), 'w') as f:
  234. f.write("\n")
  235. with open(os.path.join(self.repo.path, 'foo', 'blie'), 'w') as f:
  236. f.write("\n")
  237. cwd = os.getcwd()
  238. try:
  239. os.chdir(os.path.join(self.repo.path, 'foo'))
  240. porcelain.add(repo=self.repo.path)
  241. porcelain.commit(repo=self.repo.path, message=b'test',
  242. author=b'test <email>',
  243. committer=b'test <email>')
  244. finally:
  245. os.chdir(cwd)
  246. index = self.repo.open_index()
  247. self.assertEqual(sorted(index), [b'foo/blie'])
  248. def test_add_file(self):
  249. fullpath = os.path.join(self.repo.path, 'foo')
  250. with open(fullpath, 'w') as f:
  251. f.write("BAR")
  252. porcelain.add(self.repo.path, paths=[fullpath])
  253. self.assertIn(b"foo", self.repo.open_index())
  254. def test_add_ignored(self):
  255. with open(os.path.join(self.repo.path, '.gitignore'), 'w') as f:
  256. f.write("foo")
  257. with open(os.path.join(self.repo.path, 'foo'), 'w') as f:
  258. f.write("BAR")
  259. with open(os.path.join(self.repo.path, 'bar'), 'w') as f:
  260. f.write("BAR")
  261. (added, ignored) = porcelain.add(self.repo.path, paths=[
  262. os.path.join(self.repo.path, "foo"),
  263. os.path.join(self.repo.path, "bar")])
  264. self.assertIn(b"bar", self.repo.open_index())
  265. self.assertEqual(set(['bar']), set(added))
  266. self.assertEqual(set(['foo']), ignored)
  267. def test_add_file_absolute_path(self):
  268. # Absolute paths are (not yet) supported
  269. with open(os.path.join(self.repo.path, 'foo'), 'w') as f:
  270. f.write("BAR")
  271. porcelain.add(self.repo, paths=[os.path.join(self.repo.path, "foo")])
  272. self.assertIn(b"foo", self.repo.open_index())
  273. def test_add_not_in_repo(self):
  274. with open(os.path.join(self.test_dir, 'foo'), 'w') as f:
  275. f.write("BAR")
  276. self.assertRaises(
  277. ValueError,
  278. porcelain.add, self.repo,
  279. paths=[os.path.join(self.test_dir, "foo")])
  280. self.assertRaises(
  281. ValueError,
  282. porcelain.add, self.repo,
  283. paths=["../foo"])
  284. self.assertEqual([], list(self.repo.open_index()))
  285. class RemoveTests(PorcelainTestCase):
  286. def test_remove_file(self):
  287. fullpath = os.path.join(self.repo.path, 'foo')
  288. with open(fullpath, 'w') as f:
  289. f.write("BAR")
  290. porcelain.add(self.repo.path, paths=[fullpath])
  291. porcelain.commit(repo=self.repo, message=b'test',
  292. author=b'test <email>',
  293. committer=b'test <email>')
  294. self.assertTrue(os.path.exists(os.path.join(self.repo.path, 'foo')))
  295. cwd = os.getcwd()
  296. try:
  297. os.chdir(self.repo.path)
  298. porcelain.remove(self.repo.path, paths=["foo"])
  299. finally:
  300. os.chdir(cwd)
  301. self.assertFalse(os.path.exists(os.path.join(self.repo.path, 'foo')))
  302. def test_remove_file_staged(self):
  303. fullpath = os.path.join(self.repo.path, 'foo')
  304. with open(fullpath, 'w') as f:
  305. f.write("BAR")
  306. cwd = os.getcwd()
  307. try:
  308. os.chdir(self.repo.path)
  309. porcelain.add(self.repo.path, paths=[fullpath])
  310. self.assertRaises(Exception, porcelain.rm, self.repo.path,
  311. paths=["foo"])
  312. finally:
  313. os.chdir(cwd)
  314. class LogTests(PorcelainTestCase):
  315. def test_simple(self):
  316. c1, c2, c3 = build_commit_graph(
  317. self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
  318. self.repo.refs[b"HEAD"] = c3.id
  319. outstream = StringIO()
  320. porcelain.log(self.repo.path, outstream=outstream)
  321. self.assertEqual(3, outstream.getvalue().count("-" * 50))
  322. def test_max_entries(self):
  323. c1, c2, c3 = build_commit_graph(
  324. self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
  325. self.repo.refs[b"HEAD"] = c3.id
  326. outstream = StringIO()
  327. porcelain.log(self.repo.path, outstream=outstream, max_entries=1)
  328. self.assertEqual(1, outstream.getvalue().count("-" * 50))
  329. class ShowTests(PorcelainTestCase):
  330. def test_nolist(self):
  331. c1, c2, c3 = build_commit_graph(
  332. self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
  333. self.repo.refs[b"HEAD"] = c3.id
  334. outstream = StringIO()
  335. porcelain.show(self.repo.path, objects=c3.id, outstream=outstream)
  336. self.assertTrue(outstream.getvalue().startswith("-" * 50))
  337. def test_simple(self):
  338. c1, c2, c3 = build_commit_graph(
  339. self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
  340. self.repo.refs[b"HEAD"] = c3.id
  341. outstream = StringIO()
  342. porcelain.show(self.repo.path, objects=[c3.id], outstream=outstream)
  343. self.assertTrue(outstream.getvalue().startswith("-" * 50))
  344. def test_blob(self):
  345. b = Blob.from_string(b"The Foo\n")
  346. self.repo.object_store.add_object(b)
  347. outstream = StringIO()
  348. porcelain.show(self.repo.path, objects=[b.id], outstream=outstream)
  349. self.assertEqual(outstream.getvalue(), "The Foo\n")
  350. def test_commit_no_parent(self):
  351. a = Blob.from_string(b"The Foo\n")
  352. ta = Tree()
  353. ta.add(b"somename", 0o100644, a.id)
  354. ca = make_commit(tree=ta.id)
  355. self.repo.object_store.add_objects([(a, None), (ta, None), (ca, None)])
  356. outstream = StringIO()
  357. porcelain.show(self.repo.path, objects=[ca.id], outstream=outstream)
  358. self.assertMultiLineEqual(outstream.getvalue(), """\
  359. --------------------------------------------------
  360. commit: 344da06c1bb85901270b3e8875c988a027ec087d
  361. Author: Test Author <test@nodomain.com>
  362. Committer: Test Committer <test@nodomain.com>
  363. Date: Fri Jan 01 2010 00:00:00 +0000
  364. Test message.
  365. diff --git /dev/null b/somename
  366. new mode 100644
  367. index 0000000..ea5c7bf 100644
  368. --- /dev/null
  369. +++ b/somename
  370. @@ -0,0 +1 @@
  371. +The Foo
  372. """)
  373. def test_commit_with_change(self):
  374. a = Blob.from_string(b"The Foo\n")
  375. ta = Tree()
  376. ta.add(b"somename", 0o100644, a.id)
  377. ca = make_commit(tree=ta.id)
  378. b = Blob.from_string(b"The Bar\n")
  379. tb = Tree()
  380. tb.add(b"somename", 0o100644, b.id)
  381. cb = make_commit(tree=tb.id, parents=[ca.id])
  382. self.repo.object_store.add_objects(
  383. [(a, None), (b, None), (ta, None), (tb, None),
  384. (ca, None), (cb, None)])
  385. outstream = StringIO()
  386. porcelain.show(self.repo.path, objects=[cb.id], outstream=outstream)
  387. self.assertMultiLineEqual(outstream.getvalue(), """\
  388. --------------------------------------------------
  389. commit: 2c6b6c9cb72c130956657e1fdae58e5b103744fa
  390. Author: Test Author <test@nodomain.com>
  391. Committer: Test Committer <test@nodomain.com>
  392. Date: Fri Jan 01 2010 00:00:00 +0000
  393. Test message.
  394. diff --git a/somename b/somename
  395. index ea5c7bf..fd38bcb 100644
  396. --- a/somename
  397. +++ b/somename
  398. @@ -1 +1 @@
  399. -The Foo
  400. +The Bar
  401. """)
  402. class SymbolicRefTests(PorcelainTestCase):
  403. def test_set_wrong_symbolic_ref(self):
  404. c1, c2, c3 = build_commit_graph(
  405. self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
  406. self.repo.refs[b"HEAD"] = c3.id
  407. self.assertRaises(ValueError, porcelain.symbolic_ref, self.repo.path,
  408. b'foobar')
  409. def test_set_force_wrong_symbolic_ref(self):
  410. c1, c2, c3 = build_commit_graph(
  411. self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
  412. self.repo.refs[b"HEAD"] = c3.id
  413. porcelain.symbolic_ref(self.repo.path, b'force_foobar', force=True)
  414. # test if we actually changed the file
  415. with self.repo.get_named_file('HEAD') as f:
  416. new_ref = f.read()
  417. self.assertEqual(new_ref, b'ref: refs/heads/force_foobar\n')
  418. def test_set_symbolic_ref(self):
  419. c1, c2, c3 = build_commit_graph(
  420. self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
  421. self.repo.refs[b"HEAD"] = c3.id
  422. porcelain.symbolic_ref(self.repo.path, b'master')
  423. def test_set_symbolic_ref_other_than_master(self):
  424. c1, c2, c3 = build_commit_graph(
  425. self.repo.object_store, [[1], [2, 1], [3, 1, 2]],
  426. attrs=dict(refs='develop'))
  427. self.repo.refs[b"HEAD"] = c3.id
  428. self.repo.refs[b"refs/heads/develop"] = c3.id
  429. porcelain.symbolic_ref(self.repo.path, b'develop')
  430. # test if we actually changed the file
  431. with self.repo.get_named_file('HEAD') as f:
  432. new_ref = f.read()
  433. self.assertEqual(new_ref, b'ref: refs/heads/develop\n')
  434. class DiffTreeTests(PorcelainTestCase):
  435. def test_empty(self):
  436. c1, c2, c3 = build_commit_graph(
  437. self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
  438. self.repo.refs[b"HEAD"] = c3.id
  439. outstream = BytesIO()
  440. porcelain.diff_tree(self.repo.path, c2.tree, c3.tree,
  441. outstream=outstream)
  442. self.assertEqual(outstream.getvalue(), b"")
  443. class CommitTreeTests(PorcelainTestCase):
  444. def test_simple(self):
  445. c1, c2, c3 = build_commit_graph(
  446. self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
  447. b = Blob()
  448. b.data = b"foo the bar"
  449. t = Tree()
  450. t.add(b"somename", 0o100644, b.id)
  451. self.repo.object_store.add_object(t)
  452. self.repo.object_store.add_object(b)
  453. sha = porcelain.commit_tree(
  454. self.repo.path, t.id, message=b"Withcommit.",
  455. author=b"Joe <joe@example.com>",
  456. committer=b"Jane <jane@example.com>")
  457. self.assertTrue(isinstance(sha, bytes))
  458. self.assertEqual(len(sha), 40)
  459. class RevListTests(PorcelainTestCase):
  460. def test_simple(self):
  461. c1, c2, c3 = build_commit_graph(
  462. self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
  463. outstream = BytesIO()
  464. porcelain.rev_list(
  465. self.repo.path, [c3.id], outstream=outstream)
  466. self.assertEqual(
  467. c3.id + b"\n" +
  468. c2.id + b"\n" +
  469. c1.id + b"\n",
  470. outstream.getvalue())
  471. class TagCreateTests(PorcelainTestCase):
  472. def test_annotated(self):
  473. c1, c2, c3 = build_commit_graph(
  474. self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
  475. self.repo.refs[b"HEAD"] = c3.id
  476. porcelain.tag_create(self.repo.path, b"tryme", b'foo <foo@bar.com>',
  477. b'bar', annotated=True)
  478. tags = self.repo.refs.as_dict(b"refs/tags")
  479. self.assertEqual(list(tags.keys()), [b"tryme"])
  480. tag = self.repo[b'refs/tags/tryme']
  481. self.assertTrue(isinstance(tag, Tag))
  482. self.assertEqual(b"foo <foo@bar.com>", tag.tagger)
  483. self.assertEqual(b"bar", tag.message)
  484. self.assertLess(time.time() - tag.tag_time, 5)
  485. def test_unannotated(self):
  486. c1, c2, c3 = build_commit_graph(
  487. self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
  488. self.repo.refs[b"HEAD"] = c3.id
  489. porcelain.tag_create(self.repo.path, b"tryme", annotated=False)
  490. tags = self.repo.refs.as_dict(b"refs/tags")
  491. self.assertEqual(list(tags.keys()), [b"tryme"])
  492. self.repo[b'refs/tags/tryme']
  493. self.assertEqual(list(tags.values()), [self.repo.head()])
  494. def test_unannotated_unicode(self):
  495. c1, c2, c3 = build_commit_graph(
  496. self.repo.object_store, [[1], [2, 1], [3, 1, 2]])
  497. self.repo.refs[b"HEAD"] = c3.id
  498. porcelain.tag_create(self.repo.path, "tryme", annotated=False)
  499. tags = self.repo.refs.as_dict(b"refs/tags")
  500. self.assertEqual(list(tags.keys()), [b"tryme"])
  501. self.repo[b'refs/tags/tryme']
  502. self.assertEqual(list(tags.values()), [self.repo.head()])
  503. class TagListTests(PorcelainTestCase):
  504. def test_empty(self):
  505. tags = porcelain.tag_list(self.repo.path)
  506. self.assertEqual([], tags)
  507. def test_simple(self):
  508. self.repo.refs[b"refs/tags/foo"] = b"aa" * 20
  509. self.repo.refs[b"refs/tags/bar/bla"] = b"bb" * 20
  510. tags = porcelain.tag_list(self.repo.path)
  511. self.assertEqual([b"bar/bla", b"foo"], tags)
  512. class TagDeleteTests(PorcelainTestCase):
  513. def test_simple(self):
  514. [c1] = build_commit_graph(self.repo.object_store, [[1]])
  515. self.repo[b"HEAD"] = c1.id
  516. porcelain.tag_create(self.repo, b'foo')
  517. self.assertTrue(b"foo" in porcelain.tag_list(self.repo))
  518. porcelain.tag_delete(self.repo, b'foo')
  519. self.assertFalse(b"foo" in porcelain.tag_list(self.repo))
  520. class ResetTests(PorcelainTestCase):
  521. def test_hard_head(self):
  522. fullpath = os.path.join(self.repo.path, 'foo')
  523. with open(fullpath, 'w') as f:
  524. f.write("BAR")
  525. porcelain.add(self.repo.path, paths=[fullpath])
  526. porcelain.commit(self.repo.path, message=b"Some message",
  527. committer=b"Jane <jane@example.com>",
  528. author=b"John <john@example.com>")
  529. with open(os.path.join(self.repo.path, 'foo'), 'wb') as f:
  530. f.write(b"OOH")
  531. porcelain.reset(self.repo, "hard", b"HEAD")
  532. index = self.repo.open_index()
  533. changes = list(tree_changes(self.repo,
  534. index.commit(self.repo.object_store),
  535. self.repo[b'HEAD'].tree))
  536. self.assertEqual([], changes)
  537. def test_hard_commit(self):
  538. fullpath = os.path.join(self.repo.path, 'foo')
  539. with open(fullpath, 'w') as f:
  540. f.write("BAR")
  541. porcelain.add(self.repo.path, paths=[fullpath])
  542. sha = porcelain.commit(self.repo.path, message=b"Some message",
  543. committer=b"Jane <jane@example.com>",
  544. author=b"John <john@example.com>")
  545. with open(fullpath, 'wb') as f:
  546. f.write(b"BAZ")
  547. porcelain.add(self.repo.path, paths=[fullpath])
  548. porcelain.commit(self.repo.path, message=b"Some other message",
  549. committer=b"Jane <jane@example.com>",
  550. author=b"John <john@example.com>")
  551. porcelain.reset(self.repo, "hard", sha)
  552. index = self.repo.open_index()
  553. changes = list(tree_changes(self.repo,
  554. index.commit(self.repo.object_store),
  555. self.repo[sha].tree))
  556. self.assertEqual([], changes)
  557. class PushTests(PorcelainTestCase):
  558. def test_simple(self):
  559. """
  560. Basic test of porcelain push where self.repo is the remote. First
  561. clone the remote, commit a file to the clone, then push the changes
  562. back to the remote.
  563. """
  564. outstream = BytesIO()
  565. errstream = BytesIO()
  566. porcelain.commit(repo=self.repo.path, message=b'init',
  567. author=b'author <email>',
  568. committer=b'committer <email>')
  569. # Setup target repo cloned from temp test repo
  570. clone_path = tempfile.mkdtemp()
  571. self.addCleanup(shutil.rmtree, clone_path)
  572. target_repo = porcelain.clone(self.repo.path, target=clone_path,
  573. errstream=errstream)
  574. try:
  575. self.assertEqual(target_repo[b'HEAD'], self.repo[b'HEAD'])
  576. finally:
  577. target_repo.close()
  578. # create a second file to be pushed back to origin
  579. handle, fullpath = tempfile.mkstemp(dir=clone_path)
  580. os.close(handle)
  581. porcelain.add(repo=clone_path, paths=[fullpath])
  582. porcelain.commit(repo=clone_path, message=b'push',
  583. author=b'author <email>',
  584. committer=b'committer <email>')
  585. # Setup a non-checked out branch in the remote
  586. refs_path = b"refs/heads/foo"
  587. new_id = self.repo[b'HEAD'].id
  588. self.assertNotEqual(new_id, ZERO_SHA)
  589. self.repo.refs[refs_path] = new_id
  590. # Push to the remote
  591. porcelain.push(clone_path, self.repo.path, b"HEAD:" + refs_path,
  592. outstream=outstream, errstream=errstream)
  593. # Check that the target and source
  594. with Repo(clone_path) as r_clone:
  595. self.assertEqual({
  596. b'HEAD': new_id,
  597. b'refs/heads/foo': r_clone[b'HEAD'].id,
  598. b'refs/heads/master': new_id,
  599. }, self.repo.get_refs())
  600. self.assertEqual(r_clone[b'HEAD'].id, self.repo[refs_path].id)
  601. # Get the change in the target repo corresponding to the add
  602. # this will be in the foo branch.
  603. change = list(tree_changes(self.repo, self.repo[b'HEAD'].tree,
  604. self.repo[b'refs/heads/foo'].tree))[0]
  605. self.assertEqual(os.path.basename(fullpath),
  606. change.new.path.decode('ascii'))
  607. def test_delete(self):
  608. """Basic test of porcelain push, removing a branch.
  609. """
  610. outstream = BytesIO()
  611. errstream = BytesIO()
  612. porcelain.commit(repo=self.repo.path, message=b'init',
  613. author=b'author <email>',
  614. committer=b'committer <email>')
  615. # Setup target repo cloned from temp test repo
  616. clone_path = tempfile.mkdtemp()
  617. self.addCleanup(shutil.rmtree, clone_path)
  618. target_repo = porcelain.clone(self.repo.path, target=clone_path,
  619. errstream=errstream)
  620. target_repo.close()
  621. # Setup a non-checked out branch in the remote
  622. refs_path = b"refs/heads/foo"
  623. new_id = self.repo[b'HEAD'].id
  624. self.assertNotEqual(new_id, ZERO_SHA)
  625. self.repo.refs[refs_path] = new_id
  626. # Push to the remote
  627. porcelain.push(clone_path, self.repo.path, b":" + refs_path,
  628. outstream=outstream, errstream=errstream)
  629. self.assertEqual({
  630. b'HEAD': new_id,
  631. b'refs/heads/master': new_id,
  632. }, self.repo.get_refs())
  633. class PullTests(PorcelainTestCase):
  634. def setUp(self):
  635. super(PullTests, self).setUp()
  636. # create a file for initial commit
  637. handle, fullpath = tempfile.mkstemp(dir=self.repo.path)
  638. os.close(handle)
  639. porcelain.add(repo=self.repo.path, paths=fullpath)
  640. porcelain.commit(repo=self.repo.path, message=b'test',
  641. author=b'test <email>',
  642. committer=b'test <email>')
  643. # Setup target repo
  644. self.target_path = tempfile.mkdtemp()
  645. self.addCleanup(shutil.rmtree, self.target_path)
  646. target_repo = porcelain.clone(self.repo.path, target=self.target_path,
  647. errstream=BytesIO())
  648. target_repo.close()
  649. # create a second file to be pushed
  650. handle, fullpath = tempfile.mkstemp(dir=self.repo.path)
  651. os.close(handle)
  652. porcelain.add(repo=self.repo.path, paths=fullpath)
  653. porcelain.commit(repo=self.repo.path, message=b'test2',
  654. author=b'test2 <email>',
  655. committer=b'test2 <email>')
  656. self.assertTrue(b'refs/heads/master' in self.repo.refs)
  657. self.assertTrue(b'refs/heads/master' in target_repo.refs)
  658. def test_simple(self):
  659. outstream = BytesIO()
  660. errstream = BytesIO()
  661. # Pull changes into the cloned repo
  662. porcelain.pull(self.target_path, self.repo.path, b'refs/heads/master',
  663. outstream=outstream, errstream=errstream)
  664. # Check the target repo for pushed changes
  665. with Repo(self.target_path) as r:
  666. self.assertEqual(r[b'HEAD'].id, self.repo[b'HEAD'].id)
  667. def test_no_refspec(self):
  668. outstream = BytesIO()
  669. errstream = BytesIO()
  670. # Pull changes into the cloned repo
  671. porcelain.pull(self.target_path, self.repo.path, outstream=outstream,
  672. errstream=errstream)
  673. # Check the target repo for pushed changes
  674. with Repo(self.target_path) as r:
  675. self.assertEqual(r[b'HEAD'].id, self.repo[b'HEAD'].id)
  676. class StatusTests(PorcelainTestCase):
  677. def test_empty(self):
  678. results = porcelain.status(self.repo)
  679. self.assertEqual(
  680. {'add': [], 'delete': [], 'modify': []},
  681. results.staged)
  682. self.assertEqual([], results.unstaged)
  683. def test_status(self):
  684. """Integration test for `status` functionality."""
  685. # Commit a dummy file then modify it
  686. fullpath = os.path.join(self.repo.path, 'foo')
  687. with open(fullpath, 'w') as f:
  688. f.write('origstuff')
  689. porcelain.add(repo=self.repo.path, paths=[fullpath])
  690. porcelain.commit(repo=self.repo.path, message=b'test status',
  691. author=b'author <email>',
  692. committer=b'committer <email>')
  693. # modify access and modify time of path
  694. os.utime(fullpath, (0, 0))
  695. with open(fullpath, 'wb') as f:
  696. f.write(b'stuff')
  697. # Make a dummy file and stage it
  698. filename_add = 'bar'
  699. fullpath = os.path.join(self.repo.path, filename_add)
  700. with open(fullpath, 'w') as f:
  701. f.write('stuff')
  702. porcelain.add(repo=self.repo.path, paths=fullpath)
  703. results = porcelain.status(self.repo)
  704. self.assertEqual(results.staged['add'][0],
  705. filename_add.encode('ascii'))
  706. self.assertEqual(results.unstaged, [b'foo'])
  707. def test_get_tree_changes_add(self):
  708. """Unit test for get_tree_changes add."""
  709. # Make a dummy file, stage
  710. filename = 'bar'
  711. fullpath = os.path.join(self.repo.path, filename)
  712. with open(fullpath, 'w') as f:
  713. f.write('stuff')
  714. porcelain.add(repo=self.repo.path, paths=fullpath)
  715. porcelain.commit(repo=self.repo.path, message=b'test status',
  716. author=b'author <email>',
  717. committer=b'committer <email>')
  718. filename = 'foo'
  719. fullpath = os.path.join(self.repo.path, filename)
  720. with open(fullpath, 'w') as f:
  721. f.write('stuff')
  722. porcelain.add(repo=self.repo.path, paths=fullpath)
  723. changes = porcelain.get_tree_changes(self.repo.path)
  724. self.assertEqual(changes['add'][0], filename.encode('ascii'))
  725. self.assertEqual(len(changes['add']), 1)
  726. self.assertEqual(len(changes['modify']), 0)
  727. self.assertEqual(len(changes['delete']), 0)
  728. def test_get_tree_changes_modify(self):
  729. """Unit test for get_tree_changes modify."""
  730. # Make a dummy file, stage, commit, modify
  731. filename = 'foo'
  732. fullpath = os.path.join(self.repo.path, filename)
  733. with open(fullpath, 'w') as f:
  734. f.write('stuff')
  735. porcelain.add(repo=self.repo.path, paths=fullpath)
  736. porcelain.commit(repo=self.repo.path, message=b'test status',
  737. author=b'author <email>',
  738. committer=b'committer <email>')
  739. with open(fullpath, 'w') as f:
  740. f.write('otherstuff')
  741. porcelain.add(repo=self.repo.path, paths=fullpath)
  742. changes = porcelain.get_tree_changes(self.repo.path)
  743. self.assertEqual(changes['modify'][0], filename.encode('ascii'))
  744. self.assertEqual(len(changes['add']), 0)
  745. self.assertEqual(len(changes['modify']), 1)
  746. self.assertEqual(len(changes['delete']), 0)
  747. def test_get_tree_changes_delete(self):
  748. """Unit test for get_tree_changes delete."""
  749. # Make a dummy file, stage, commit, remove
  750. filename = 'foo'
  751. fullpath = os.path.join(self.repo.path, filename)
  752. with open(fullpath, 'w') as f:
  753. f.write('stuff')
  754. porcelain.add(repo=self.repo.path, paths=fullpath)
  755. porcelain.commit(repo=self.repo.path, message=b'test status',
  756. author=b'author <email>',
  757. committer=b'committer <email>')
  758. cwd = os.getcwd()
  759. try:
  760. os.chdir(self.repo.path)
  761. porcelain.remove(repo=self.repo.path, paths=[filename])
  762. finally:
  763. os.chdir(cwd)
  764. changes = porcelain.get_tree_changes(self.repo.path)
  765. self.assertEqual(changes['delete'][0], filename.encode('ascii'))
  766. self.assertEqual(len(changes['add']), 0)
  767. self.assertEqual(len(changes['modify']), 0)
  768. self.assertEqual(len(changes['delete']), 1)
  769. def test_get_untracked_paths(self):
  770. with open(os.path.join(self.repo.path, '.gitignore'), 'w') as f:
  771. f.write('ignored\n')
  772. with open(os.path.join(self.repo.path, 'ignored'), 'w') as f:
  773. f.write('blah\n')
  774. with open(os.path.join(self.repo.path, 'notignored'), 'w') as f:
  775. f.write('blah\n')
  776. self.assertEqual(
  777. set(['ignored', 'notignored', '.gitignore']),
  778. set(porcelain.get_untracked_paths(self.repo.path, self.repo.path,
  779. self.repo.open_index())))
  780. self.assertEqual(set(['.gitignore', 'notignored']),
  781. set(porcelain.status(self.repo).untracked))
  782. self.assertEqual(set(['.gitignore', 'notignored', 'ignored']),
  783. set(porcelain.status(self.repo, ignored=True)
  784. .untracked))
  785. def test_get_untracked_paths_nested(self):
  786. with open(os.path.join(self.repo.path, 'notignored'), 'w') as f:
  787. f.write('blah\n')
  788. subrepo = Repo.init(os.path.join(self.repo.path, 'nested'), mkdir=True)
  789. with open(os.path.join(subrepo.path, 'another'), 'w') as f:
  790. f.write('foo\n')
  791. self.assertEqual(
  792. set(['notignored']),
  793. set(porcelain.get_untracked_paths(self.repo.path, self.repo.path,
  794. self.repo.open_index())))
  795. self.assertEqual(
  796. set(['another']),
  797. set(porcelain.get_untracked_paths(subrepo.path, subrepo.path,
  798. subrepo.open_index())))
  799. # TODO(jelmer): Add test for dulwich.porcelain.daemon
  800. class UploadPackTests(PorcelainTestCase):
  801. """Tests for upload_pack."""
  802. def test_upload_pack(self):
  803. outf = BytesIO()
  804. exitcode = porcelain.upload_pack(
  805. self.repo.path, BytesIO(b"0000"), outf)
  806. outlines = outf.getvalue().splitlines()
  807. self.assertEqual([b"0000"], outlines)
  808. self.assertEqual(0, exitcode)
  809. class ReceivePackTests(PorcelainTestCase):
  810. """Tests for receive_pack."""
  811. def test_receive_pack(self):
  812. filename = 'foo'
  813. fullpath = os.path.join(self.repo.path, filename)
  814. with open(fullpath, 'w') as f:
  815. f.write('stuff')
  816. porcelain.add(repo=self.repo.path, paths=fullpath)
  817. self.repo.do_commit(message=b'test status',
  818. author=b'author <email>',
  819. committer=b'committer <email>',
  820. author_timestamp=1402354300,
  821. commit_timestamp=1402354300, author_timezone=0,
  822. commit_timezone=0)
  823. outf = BytesIO()
  824. exitcode = porcelain.receive_pack(
  825. self.repo.path, BytesIO(b"0000"), outf)
  826. outlines = outf.getvalue().splitlines()
  827. self.assertEqual([
  828. b'0091319b56ce3aee2d489f759736a79cc552c9bb86d9 HEAD\x00 report-status ' # noqa: E501
  829. b'delete-refs quiet ofs-delta side-band-64k '
  830. b'no-done symref=HEAD:refs/heads/master',
  831. b'003f319b56ce3aee2d489f759736a79cc552c9bb86d9 refs/heads/master',
  832. b'0000'], outlines)
  833. self.assertEqual(0, exitcode)
  834. class BranchListTests(PorcelainTestCase):
  835. def test_standard(self):
  836. self.assertEqual(set([]), set(porcelain.branch_list(self.repo)))
  837. def test_new_branch(self):
  838. [c1] = build_commit_graph(self.repo.object_store, [[1]])
  839. self.repo[b"HEAD"] = c1.id
  840. porcelain.branch_create(self.repo, b"foo")
  841. self.assertEqual(
  842. set([b"master", b"foo"]),
  843. set(porcelain.branch_list(self.repo)))
  844. class BranchCreateTests(PorcelainTestCase):
  845. def test_branch_exists(self):
  846. [c1] = build_commit_graph(self.repo.object_store, [[1]])
  847. self.repo[b"HEAD"] = c1.id
  848. porcelain.branch_create(self.repo, b"foo")
  849. self.assertRaises(KeyError, porcelain.branch_create, self.repo, b"foo")
  850. porcelain.branch_create(self.repo, b"foo", force=True)
  851. def test_new_branch(self):
  852. [c1] = build_commit_graph(self.repo.object_store, [[1]])
  853. self.repo[b"HEAD"] = c1.id
  854. porcelain.branch_create(self.repo, b"foo")
  855. self.assertEqual(
  856. set([b"master", b"foo"]),
  857. set(porcelain.branch_list(self.repo)))
  858. class BranchDeleteTests(PorcelainTestCase):
  859. def test_simple(self):
  860. [c1] = build_commit_graph(self.repo.object_store, [[1]])
  861. self.repo[b"HEAD"] = c1.id
  862. porcelain.branch_create(self.repo, b'foo')
  863. self.assertTrue(b"foo" in porcelain.branch_list(self.repo))
  864. porcelain.branch_delete(self.repo, b'foo')
  865. self.assertFalse(b"foo" in porcelain.branch_list(self.repo))
  866. def test_simple_unicode(self):
  867. [c1] = build_commit_graph(self.repo.object_store, [[1]])
  868. self.repo[b"HEAD"] = c1.id
  869. porcelain.branch_create(self.repo, 'foo')
  870. self.assertTrue(b"foo" in porcelain.branch_list(self.repo))
  871. porcelain.branch_delete(self.repo, 'foo')
  872. self.assertFalse(b"foo" in porcelain.branch_list(self.repo))
  873. class FetchTests(PorcelainTestCase):
  874. def test_simple(self):
  875. outstream = BytesIO()
  876. errstream = BytesIO()
  877. # create a file for initial commit
  878. handle, fullpath = tempfile.mkstemp(dir=self.repo.path)
  879. os.close(handle)
  880. porcelain.add(repo=self.repo.path, paths=fullpath)
  881. porcelain.commit(repo=self.repo.path, message=b'test',
  882. author=b'test <email>',
  883. committer=b'test <email>')
  884. # Setup target repo
  885. target_path = tempfile.mkdtemp()
  886. self.addCleanup(shutil.rmtree, target_path)
  887. target_repo = porcelain.clone(self.repo.path, target=target_path,
  888. errstream=errstream)
  889. # create a second file to be pushed
  890. handle, fullpath = tempfile.mkstemp(dir=self.repo.path)
  891. os.close(handle)
  892. porcelain.add(repo=self.repo.path, paths=fullpath)
  893. porcelain.commit(repo=self.repo.path, message=b'test2',
  894. author=b'test2 <email>',
  895. committer=b'test2 <email>')
  896. self.assertFalse(self.repo[b'HEAD'].id in target_repo)
  897. target_repo.close()
  898. # Fetch changes into the cloned repo
  899. porcelain.fetch(target_path, self.repo.path,
  900. outstream=outstream, errstream=errstream)
  901. # Assert that fetch updated the local image of the remote
  902. self.assert_correct_remote_refs(
  903. target_repo.get_refs(), self.repo.get_refs())
  904. # Check the target repo for pushed changes
  905. with Repo(target_path) as r:
  906. self.assertTrue(self.repo[b'HEAD'].id in r)
  907. def test_with_remote_name(self):
  908. remote_name = b'origin'
  909. outstream = BytesIO()
  910. errstream = BytesIO()
  911. # create a file for initial commit
  912. handle, fullpath = tempfile.mkstemp(dir=self.repo.path)
  913. os.close(handle)
  914. porcelain.add(repo=self.repo.path, paths=fullpath)
  915. porcelain.commit(repo=self.repo.path, message=b'test',
  916. author=b'test <email>',
  917. committer=b'test <email>')
  918. # Setup target repo
  919. target_path = tempfile.mkdtemp()
  920. self.addCleanup(shutil.rmtree, target_path)
  921. target_repo = porcelain.clone(self.repo.path, target=target_path,
  922. errstream=errstream)
  923. # Capture current refs
  924. target_refs = target_repo.get_refs()
  925. # create a second file to be pushed
  926. handle, fullpath = tempfile.mkstemp(dir=self.repo.path)
  927. os.close(handle)
  928. porcelain.add(repo=self.repo.path, paths=fullpath)
  929. porcelain.commit(repo=self.repo.path, message=b'test2',
  930. author=b'test2 <email>',
  931. committer=b'test2 <email>')
  932. self.assertFalse(self.repo[b'HEAD'].id in target_repo)
  933. target_repo.close()
  934. # Fetch changes into the cloned repo
  935. porcelain.fetch(target_path, self.repo.path, remote_name=remote_name,
  936. outstream=outstream, errstream=errstream)
  937. # Assert that fetch updated the local image of the remote
  938. self.assert_correct_remote_refs(
  939. target_repo.get_refs(), self.repo.get_refs())
  940. # Check the target repo for pushed changes, as well as updates
  941. # for the refs
  942. with Repo(target_path) as r:
  943. self.assertTrue(self.repo[b'HEAD'].id in r)
  944. self.assertNotEqual(self.repo.get_refs(), target_refs)
  945. def assert_correct_remote_refs(
  946. self, local_refs, remote_refs, remote_name=b'origin'):
  947. """Assert that known remote refs corresponds to actual remote refs."""
  948. local_ref_prefix = b'refs/heads'
  949. remote_ref_prefix = b'refs/remotes/' + remote_name
  950. locally_known_remote_refs = {
  951. k[len(remote_ref_prefix) + 1:]: v for k, v in local_refs.items()
  952. if k.startswith(remote_ref_prefix)}
  953. normalized_remote_refs = {
  954. k[len(local_ref_prefix) + 1:]: v for k, v in remote_refs.items()
  955. if k.startswith(local_ref_prefix)}
  956. self.assertEqual(locally_known_remote_refs, normalized_remote_refs)
  957. class RepackTests(PorcelainTestCase):
  958. def test_empty(self):
  959. porcelain.repack(self.repo)
  960. def test_simple(self):
  961. handle, fullpath = tempfile.mkstemp(dir=self.repo.path)
  962. os.close(handle)
  963. porcelain.add(repo=self.repo.path, paths=fullpath)
  964. porcelain.repack(self.repo)
  965. class LsTreeTests(PorcelainTestCase):
  966. def test_empty(self):
  967. porcelain.commit(repo=self.repo.path, message=b'test status',
  968. author=b'author <email>',
  969. committer=b'committer <email>')
  970. f = StringIO()
  971. porcelain.ls_tree(self.repo, b"HEAD", outstream=f)
  972. self.assertEqual(f.getvalue(), "")
  973. def test_simple(self):
  974. # Commit a dummy file then modify it
  975. fullpath = os.path.join(self.repo.path, 'foo')
  976. with open(fullpath, 'w') as f:
  977. f.write('origstuff')
  978. porcelain.add(repo=self.repo.path, paths=[fullpath])
  979. porcelain.commit(repo=self.repo.path, message=b'test status',
  980. author=b'author <email>',
  981. committer=b'committer <email>')
  982. f = StringIO()
  983. porcelain.ls_tree(self.repo, b"HEAD", outstream=f)
  984. self.assertEqual(
  985. f.getvalue(),
  986. '100644 blob 8b82634d7eae019850bb883f06abf428c58bc9aa\tfoo\n')
  987. def test_recursive(self):
  988. # Create a directory then write a dummy file in it
  989. dirpath = os.path.join(self.repo.path, 'adir')
  990. filepath = os.path.join(dirpath, 'afile')
  991. os.mkdir(dirpath)
  992. with open(filepath, 'w') as f:
  993. f.write('origstuff')
  994. porcelain.add(repo=self.repo.path, paths=[filepath])
  995. porcelain.commit(repo=self.repo.path, message=b'test status',
  996. author=b'author <email>',
  997. committer=b'committer <email>')
  998. f = StringIO()
  999. porcelain.ls_tree(self.repo, b"HEAD", outstream=f)
  1000. self.assertEqual(
  1001. f.getvalue(),
  1002. '40000 tree b145cc69a5e17693e24d8a7be0016ed8075de66d\tadir\n')
  1003. f = StringIO()
  1004. porcelain.ls_tree(self.repo, b"HEAD", outstream=f, recursive=True)
  1005. self.assertEqual(
  1006. f.getvalue(),
  1007. '40000 tree b145cc69a5e17693e24d8a7be0016ed8075de66d\tadir\n'
  1008. '100644 blob 8b82634d7eae019850bb883f06abf428c58bc9aa\tadir'
  1009. '/afile\n')
  1010. class LsRemoteTests(PorcelainTestCase):
  1011. def test_empty(self):
  1012. self.assertEqual({}, porcelain.ls_remote(self.repo.path))
  1013. def test_some(self):
  1014. cid = porcelain.commit(repo=self.repo.path, message=b'test status',
  1015. author=b'author <email>',
  1016. committer=b'committer <email>')
  1017. self.assertEqual({
  1018. b'refs/heads/master': cid,
  1019. b'HEAD': cid},
  1020. porcelain.ls_remote(self.repo.path))
  1021. class LsFilesTests(PorcelainTestCase):
  1022. def test_empty(self):
  1023. self.assertEqual([], list(porcelain.ls_files(self.repo)))
  1024. def test_simple(self):
  1025. # Commit a dummy file then modify it
  1026. fullpath = os.path.join(self.repo.path, 'foo')
  1027. with open(fullpath, 'w') as f:
  1028. f.write('origstuff')
  1029. porcelain.add(repo=self.repo.path, paths=[fullpath])
  1030. self.assertEqual([b'foo'], list(porcelain.ls_files(self.repo)))
  1031. class RemoteAddTests(PorcelainTestCase):
  1032. def test_new(self):
  1033. porcelain.remote_add(
  1034. self.repo, 'jelmer', 'git://jelmer.uk/code/dulwich')
  1035. c = self.repo.get_config()
  1036. self.assertEqual(
  1037. c.get((b'remote', b'jelmer'), b'url'),
  1038. b'git://jelmer.uk/code/dulwich')
  1039. def test_exists(self):
  1040. porcelain.remote_add(
  1041. self.repo, 'jelmer', 'git://jelmer.uk/code/dulwich')
  1042. self.assertRaises(porcelain.RemoteExists, porcelain.remote_add,
  1043. self.repo, 'jelmer', 'git://jelmer.uk/code/dulwich')
  1044. class CheckIgnoreTests(PorcelainTestCase):
  1045. def test_check_ignored(self):
  1046. with open(os.path.join(self.repo.path, '.gitignore'), 'w') as f:
  1047. f.write("foo")
  1048. with open(os.path.join(self.repo.path, 'foo'), 'w') as f:
  1049. f.write("BAR")
  1050. with open(os.path.join(self.repo.path, 'bar'), 'w') as f:
  1051. f.write("BAR")
  1052. self.assertEqual(
  1053. ['foo'],
  1054. list(porcelain.check_ignore(self.repo, ['foo'])))
  1055. self.assertEqual([], list(porcelain.check_ignore(self.repo, ['bar'])))
  1056. def test_check_added(self):
  1057. with open(os.path.join(self.repo.path, 'foo'), 'w') as f:
  1058. f.write("BAR")
  1059. self.repo.stage(['foo'])
  1060. with open(os.path.join(self.repo.path, '.gitignore'), 'w') as f:
  1061. f.write("foo\n")
  1062. self.assertEqual(
  1063. [], list(porcelain.check_ignore(self.repo, ['foo'])))
  1064. self.assertEqual(
  1065. ['foo'],
  1066. list(porcelain.check_ignore(self.repo, ['foo'], no_index=True)))
  1067. class UpdateHeadTests(PorcelainTestCase):
  1068. def test_set_to_branch(self):
  1069. [c1] = build_commit_graph(self.repo.object_store, [[1]])
  1070. self.repo.refs[b"refs/heads/blah"] = c1.id
  1071. porcelain.update_head(self.repo, "blah")
  1072. self.assertEqual(c1.id, self.repo.head())
  1073. self.assertEqual(b'ref: refs/heads/blah',
  1074. self.repo.refs.read_ref(b'HEAD'))
  1075. def test_set_to_branch_detached(self):
  1076. [c1] = build_commit_graph(self.repo.object_store, [[1]])
  1077. self.repo.refs[b"refs/heads/blah"] = c1.id
  1078. porcelain.update_head(self.repo, "blah", detached=True)
  1079. self.assertEqual(c1.id, self.repo.head())
  1080. self.assertEqual(c1.id, self.repo.refs.read_ref(b'HEAD'))
  1081. def test_set_to_commit_detached(self):
  1082. [c1] = build_commit_graph(self.repo.object_store, [[1]])
  1083. self.repo.refs[b"refs/heads/blah"] = c1.id
  1084. porcelain.update_head(self.repo, c1.id, detached=True)
  1085. self.assertEqual(c1.id, self.repo.head())
  1086. self.assertEqual(c1.id, self.repo.refs.read_ref(b'HEAD'))
  1087. def test_set_new_branch(self):
  1088. [c1] = build_commit_graph(self.repo.object_store, [[1]])
  1089. self.repo.refs[b"refs/heads/blah"] = c1.id
  1090. porcelain.update_head(self.repo, "blah", new_branch="bar")
  1091. self.assertEqual(c1.id, self.repo.head())
  1092. self.assertEqual(b'ref: refs/heads/bar',
  1093. self.repo.refs.read_ref(b'HEAD'))
  1094. class MailmapTests(PorcelainTestCase):
  1095. def test_no_mailmap(self):
  1096. self.assertEqual(
  1097. b'Jelmer Vernooij <jelmer@samba.org>',
  1098. porcelain.check_mailmap(
  1099. self.repo, b'Jelmer Vernooij <jelmer@samba.org>'))
  1100. def test_mailmap_lookup(self):
  1101. with open(os.path.join(self.repo.path, '.mailmap'), 'wb') as f:
  1102. f.write(b"""\
  1103. Jelmer Vernooij <jelmer@debian.org>
  1104. """)
  1105. self.assertEqual(
  1106. b'Jelmer Vernooij <jelmer@debian.org>',
  1107. porcelain.check_mailmap(
  1108. self.repo, b'Jelmer Vernooij <jelmer@samba.org>'))
  1109. class FsckTests(PorcelainTestCase):
  1110. def test_none(self):
  1111. self.assertEqual(
  1112. [],
  1113. list(porcelain.fsck(self.repo)))
  1114. def test_git_dir(self):
  1115. obj = Tree()
  1116. a = Blob()
  1117. a.data = b"foo"
  1118. obj.add(b".git", 0o100644, a.id)
  1119. self.repo.object_store.add_objects(
  1120. [(a, None), (obj, None)])
  1121. self.assertEqual(
  1122. [(obj.id, 'invalid name .git')],
  1123. [(sha, str(e)) for (sha, e) in porcelain.fsck(self.repo)])
  1124. class DescribeTests(PorcelainTestCase):
  1125. def test_no_commits(self):
  1126. self.assertRaises(KeyError, porcelain.describe, self.repo.path)
  1127. def test_single_commit(self):
  1128. fullpath = os.path.join(self.repo.path, 'foo')
  1129. with open(fullpath, 'w') as f:
  1130. f.write("BAR")
  1131. porcelain.add(repo=self.repo.path, paths=[fullpath])
  1132. sha = porcelain.commit(
  1133. self.repo.path, message=b"Some message",
  1134. author=b"Joe <joe@example.com>",
  1135. committer=b"Bob <bob@example.com>")
  1136. self.assertEqual(
  1137. 'g{}'.format(sha[:7].decode('ascii')),
  1138. porcelain.describe(self.repo.path))
  1139. def test_tag(self):
  1140. fullpath = os.path.join(self.repo.path, 'foo')
  1141. with open(fullpath, 'w') as f:
  1142. f.write("BAR")
  1143. porcelain.add(repo=self.repo.path, paths=[fullpath])
  1144. porcelain.commit(
  1145. self.repo.path, message=b"Some message",
  1146. author=b"Joe <joe@example.com>",
  1147. committer=b"Bob <bob@example.com>")
  1148. porcelain.tag_create(self.repo.path, b"tryme", b'foo <foo@bar.com>',
  1149. b'bar', annotated=True)
  1150. self.assertEqual(
  1151. "tryme",
  1152. porcelain.describe(self.repo.path))
  1153. def test_tag_and_commit(self):
  1154. fullpath = os.path.join(self.repo.path, 'foo')
  1155. with open(fullpath, 'w') as f:
  1156. f.write("BAR")
  1157. porcelain.add(repo=self.repo.path, paths=[fullpath])
  1158. porcelain.commit(
  1159. self.repo.path, message=b"Some message",
  1160. author=b"Joe <joe@example.com>",
  1161. committer=b"Bob <bob@example.com>")
  1162. porcelain.tag_create(self.repo.path, b"tryme", b'foo <foo@bar.com>',
  1163. b'bar', annotated=True)
  1164. with open(fullpath, 'w') as f:
  1165. f.write("BAR2")
  1166. porcelain.add(repo=self.repo.path, paths=[fullpath])
  1167. sha = porcelain.commit(
  1168. self.repo.path, message=b"Some message",
  1169. author=b"Joe <joe@example.com>",
  1170. committer=b"Bob <bob@example.com>")
  1171. self.assertEqual(
  1172. 'tryme-1-g{}'.format(sha[:7].decode('ascii')),
  1173. porcelain.describe(self.repo.path))