contributing.txt 28 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677
  1. ===================================
  2. Writing your first patch for Django
  3. ===================================
  4. Introduction
  5. ============
  6. Interested in giving back to the community a little? Maybe you've found a bug
  7. in Django that you'd like to see fixed, or maybe there's a small feature you
  8. want added.
  9. Contributing back to Django itself is the best way to see your own concerns
  10. addressed. This may seem daunting at first, but it's really pretty simple.
  11. We'll walk you through the entire process, so you can learn by example.
  12. Who's this tutorial for?
  13. ------------------------
  14. .. seealso::
  15. If you are looking for a reference on how to submit patches, see the
  16. :doc:`/internals/contributing/writing-code/submitting-patches`
  17. documentation.
  18. For this tutorial, we expect that you have at least a basic understanding of
  19. how Django works. This means you should be comfortable going through the
  20. existing tutorials on :doc:`writing your first Django app</intro/tutorial01>`.
  21. In addition, you should have a good understanding of Python itself. But if you
  22. don't, `Dive Into Python`__ is a fantastic (and free) online book for
  23. beginning Python programmers.
  24. Those of you who are unfamiliar with version control systems and Trac will find
  25. that this tutorial and its links include just enough information to get started.
  26. However, you'll probably want to read some more about these different tools if
  27. you plan on contributing to Django regularly.
  28. For the most part though, this tutorial tries to explain as much as possible,
  29. so that it can be of use to the widest audience.
  30. .. admonition:: Where to get help:
  31. If you're having trouble going through this tutorial, please post a message
  32. to |django-developers| or drop by `#django-dev on irc.freenode.net`__ to
  33. chat with other Django users who might be able to help.
  34. __ http://www.diveintopython3.net/
  35. __ irc://irc.freenode.net/django-dev
  36. What does this tutorial cover?
  37. ------------------------------
  38. We'll be walking you through contributing a patch to Django for the first time.
  39. By the end of this tutorial, you should have a basic understanding of both the
  40. tools and the processes involved. Specifically, we'll be covering the following:
  41. * Installing Git.
  42. * How to download a development copy of Django.
  43. * Running Django's test suite.
  44. * Writing a test for your patch.
  45. * Writing the code for your patch.
  46. * Testing your patch.
  47. * Generating a patch file for your changes.
  48. * Where to look for more information.
  49. Once you're done with the tutorial, you can look through the rest of
  50. :doc:`Django's documentation on contributing</internals/contributing/index>`.
  51. It contains lots of great information and is a must read for anyone who'd like
  52. to become a regular contributor to Django. If you've got questions, it's
  53. probably got the answers.
  54. .. admonition:: Python 3 required!
  55. This tutorial assumes you are using Python 3. Get the latest version at
  56. `Python's download page <https://www.python.org/download/>`_ or with your
  57. operating system's package manager.
  58. .. admonition:: For Windows users
  59. When installing Python on Windows, make sure you check the option "Add
  60. python.exe to Path", so that it is always available on the command line.
  61. Code of Conduct
  62. ===============
  63. As a contributor, you can help us keep the Django community open and inclusive.
  64. Please read and follow our `Code of Conduct <https://www.djangoproject.com/conduct/>`_.
  65. Installing Git
  66. ==============
  67. For this tutorial, you'll need Git installed to download the current
  68. development version of Django and to generate patch files for the changes you
  69. make.
  70. To check whether or not you have Git installed, enter ``git`` into the command
  71. line. If you get messages saying that this command could not be found, you'll
  72. have to download and install it, see `Git's download page`__.
  73. .. admonition:: For Windows users
  74. When installing Git on Windows, it is recommended that you pick the
  75. "Git Bash" option so that Git runs in its own shell. This tutorial assumes
  76. that's how you have installed it.
  77. If you're not that familiar with Git, you can always find out more about its
  78. commands (once it's installed) by typing ``git help`` into the command line.
  79. __ http://git-scm.com/download
  80. Getting a copy of Django's development version
  81. ==============================================
  82. The first step to contributing to Django is to get a copy of the source code.
  83. First, `fork Django on GitHub <https://github.com/django/django/fork>`__. Then,
  84. from the command line, use the ``cd`` command to navigate to the directory
  85. where you'll want your local copy of Django to live.
  86. Download the Django source code repository using the following command:
  87. .. code-block:: console
  88. $ git clone git@github.com:YourGitHubName/django.git
  89. Now that you have a local copy of Django, you can install it just like you would
  90. install any package using ``pip``. The most convenient way to do so is by using
  91. a *virtual environment* (or virtualenv) which is a feature built into Python
  92. that allows you to keep a separate directory of installed packages for each of
  93. your projects so that they don't interfere with each other.
  94. It's a good idea to keep all your virtualenvs in one place, for example in
  95. ``.virtualenvs/`` in your home directory. Create it if it doesn't exist yet:
  96. .. code-block:: console
  97. $ mkdir ~/.virtualenvs
  98. Now create a new virtualenv by running:
  99. .. code-block:: console
  100. $ python3 -m venv ~/.virtualenvs/djangodev
  101. The path is where the new environment will be saved on your computer.
  102. .. admonition:: For Windows users
  103. Using the built-in ``venv`` module will not work if you are also using the
  104. Git Bash shell on Windows, since activation scripts are only created for the
  105. system shell (``.bat``) and PowerShell (``.ps1``). Use the ``virtualenv``
  106. package instead:
  107. .. code-block:: none
  108. $ pip install virtualenv
  109. $ virtualenv ~/.virtualenvs/djangodev
  110. .. admonition:: For Ubuntu users
  111. On some versions of Ubuntu the above command might fail. Use the
  112. ``virtualenv`` package instead, first making sure you have ``pip3``:
  113. .. code-block:: console
  114. $ sudo apt-get install python3-pip
  115. $ # Prefix the next command with sudo if it gives a permission denied error
  116. $ pip3 install virtualenv
  117. $ virtualenv --python=`which python3` ~/.virtualenvs/djangodev
  118. The final step in setting up your virtualenv is to activate it:
  119. .. code-block:: console
  120. $ source ~/.virtualenvs/djangodev/bin/activate
  121. If the ``source`` command is not available, you can try using a dot instead:
  122. .. code-block:: console
  123. $ . ~/.virtualenvs/djangodev/bin/activate
  124. .. admonition:: For Windows users
  125. To activate your virtualenv on Windows, run:
  126. .. code-block:: none
  127. $ source ~/virtualenvs/djangodev/Scripts/activate
  128. You have to activate the virtualenv whenever you open a new terminal window.
  129. virtualenvwrapper__ is a useful tool for making this more convenient.
  130. __ https://virtualenvwrapper.readthedocs.io/en/latest/
  131. Anything you install through ``pip`` from now on will be installed in your new
  132. virtualenv, isolated from other environments and system-wide packages. Also, the
  133. name of the currently activated virtualenv is displayed on the command line to
  134. help you keep track of which one you are using. Go ahead and install the
  135. previously cloned copy of Django:
  136. .. code-block:: console
  137. $ pip install -e /path/to/your/local/clone/django/
  138. The installed version of Django is now pointing at your local copy. You will
  139. immediately see any changes you make to it, which is of great help when writing
  140. your first patch.
  141. Rolling back to a previous revision of Django
  142. =============================================
  143. For this tutorial, we'll be using ticket :ticket:`24788` as a case study, so
  144. we'll rewind Django's version history in git to before that ticket's patch was
  145. applied. This will allow us to go through all of the steps involved in writing
  146. that patch from scratch, including running Django's test suite.
  147. **Keep in mind that while we'll be using an older revision of Django's trunk
  148. for the purposes of the tutorial below, you should always use the current
  149. development revision of Django when working on your own patch for a ticket!**
  150. .. note::
  151. The patch for this ticket was written by Paweł Marczewski, and it was
  152. applied to Django as `commit 4df7e8483b2679fc1cba3410f08960bac6f51115`__.
  153. Consequently, we'll be using the revision of Django just prior to that,
  154. `commit 4ccfc4439a7add24f8db4ef3960d02ef8ae09887`__.
  155. __ https://github.com/django/django/commit/4df7e8483b2679fc1cba3410f08960bac6f51115
  156. __ https://github.com/django/django/commit/4ccfc4439a7add24f8db4ef3960d02ef8ae09887
  157. Navigate into Django's root directory (that's the one that contains ``django``,
  158. ``docs``, ``tests``, ``AUTHORS``, etc.). You can then check out the older
  159. revision of Django that we'll be using in the tutorial below:
  160. .. code-block:: console
  161. $ git checkout 4ccfc4439a7add24f8db4ef3960d02ef8ae09887
  162. Running Django's test suite for the first time
  163. ==============================================
  164. When contributing to Django it's very important that your code changes don't
  165. introduce bugs into other areas of Django. One way to check that Django still
  166. works after you make your changes is by running Django's test suite. If all
  167. the tests still pass, then you can be reasonably sure that your changes
  168. haven't completely broken Django. If you've never run Django's test suite
  169. before, it's a good idea to run it once beforehand just to get familiar with
  170. what its output is supposed to look like.
  171. Before running the test suite, install its dependencies by first ``cd``-ing
  172. into the Django ``tests/`` directory and then running:
  173. .. code-block:: console
  174. $ pip install -r requirements/py3.txt
  175. If you encounter an error during the installation, your system might be missing
  176. a dependency for one or more of the Python packages. Consult the failing
  177. package's documentation or search the Web with the error message that you
  178. encounter.
  179. Now we are ready to run the test suite. If you're using GNU/Linux, Mac OS X or
  180. some other flavor of Unix, run:
  181. .. code-block:: console
  182. $ ./runtests.py
  183. Now sit back and relax. Django's entire test suite has over 9,600 different
  184. tests, so it can take anywhere from 5 to 15 minutes to run, depending on the
  185. speed of your computer.
  186. While Django's test suite is running, you'll see a stream of characters
  187. representing the status of each test as it's run. ``E`` indicates that an error
  188. was raised during a test, and ``F`` indicates that a test's assertions failed.
  189. Both of these are considered to be test failures. Meanwhile, ``x`` and ``s``
  190. indicated expected failures and skipped tests, respectively. Dots indicate
  191. passing tests.
  192. Skipped tests are typically due to missing external libraries required to run
  193. the test; see :ref:`running-unit-tests-dependencies` for a list of dependencies
  194. and be sure to install any for tests related to the changes you are making (we
  195. won't need any for this tutorial). Some tests are specific to a particular
  196. database backend and will be skipped if not testing with that backend. SQLite
  197. is the database backend for the default settings. To run the tests using a
  198. different backend, see :ref:`running-unit-tests-settings`.
  199. Once the tests complete, you should be greeted with a message informing you
  200. whether the test suite passed or failed. Since you haven't yet made any changes
  201. to Django's code, the entire test suite **should** pass. If you get failures or
  202. errors make sure you've followed all of the previous steps properly. See
  203. :ref:`running-unit-tests` for more information. If you're using Python 3.5+,
  204. there will be a couple failures related to deprecation warnings that you can
  205. ignore. These failures have since been fixed in Django.
  206. Note that the latest Django trunk may not always be stable. When developing
  207. against trunk, you can check `Django's continuous integration builds`__ to
  208. determine if the failures are specific to your machine or if they are also
  209. present in Django's official builds. If you click to view a particular build,
  210. you can view the "Configuration Matrix" which shows failures broken down by
  211. Python version and database backend.
  212. __ http://djangoci.com
  213. .. note::
  214. For this tutorial and the ticket we're working on, testing against SQLite
  215. is sufficient, however, it's possible (and sometimes necessary) to
  216. :ref:`run the tests using a different database
  217. <running-unit-tests-settings>`.
  218. Writing some tests for your ticket
  219. ==================================
  220. In most cases, for a patch to be accepted into Django it has to include tests.
  221. For bug fix patches, this means writing a regression test to ensure that the
  222. bug is never reintroduced into Django later on. A regression test should be
  223. written in such a way that it will fail while the bug still exists and pass
  224. once the bug has been fixed. For patches containing new features, you'll need
  225. to include tests which ensure that the new features are working correctly.
  226. They too should fail when the new feature is not present, and then pass once it
  227. has been implemented.
  228. A good way to do this is to write your new tests first, before making any
  229. changes to the code. This style of development is called
  230. `test-driven development`__ and can be applied to both entire projects and
  231. single patches. After writing your tests, you then run them to make sure that
  232. they do indeed fail (since you haven't fixed that bug or added that feature
  233. yet). If your new tests don't fail, you'll need to fix them so that they do.
  234. After all, a regression test that passes regardless of whether a bug is present
  235. is not very helpful at preventing that bug from reoccurring down the road.
  236. Now for our hands-on example.
  237. __ https://en.wikipedia.org/wiki/Test-driven_development
  238. Writing some tests for ticket #24788
  239. ------------------------------------
  240. Ticket :ticket:`24788` proposes a small feature addition: the ability to
  241. specify the class level attribute ``prefix`` on Form classes, so that::
  242. […] forms which ship with apps could effectively namespace themselves such
  243. that N overlapping form fields could be POSTed at once and resolved to the
  244. correct form.
  245. In order to resolve this ticket, we'll add a ``prefix`` attribute to the
  246. ``BaseForm`` class. When creating instances of this class, passing a prefix to
  247. the ``__init__()`` method will still set that prefix on the created instance.
  248. But not passing a prefix (or passing ``None``) will use the class-level prefix.
  249. Before we make those changes though, we're going to write a couple tests to
  250. verify that our modification functions correctly and continues to function
  251. correctly in the future.
  252. Navigate to Django's ``tests/forms_tests/tests/`` folder and open the
  253. ``test_forms.py`` file. Add the following code on line 1674 right before the
  254. ``test_forms_with_null_boolean`` function::
  255. def test_class_prefix(self):
  256. # Prefix can be also specified at the class level.
  257. class Person(Form):
  258. first_name = CharField()
  259. prefix = 'foo'
  260. p = Person()
  261. self.assertEqual(p.prefix, 'foo')
  262. p = Person(prefix='bar')
  263. self.assertEqual(p.prefix, 'bar')
  264. This new test checks that setting a class level prefix works as expected, and
  265. that passing a ``prefix`` parameter when creating an instance still works too.
  266. .. admonition:: But this testing thing looks kinda hard...
  267. If you've never had to deal with tests before, they can look a little hard
  268. to write at first glance. Fortunately, testing is a *very* big subject in
  269. computer programming, so there's lots of information out there:
  270. * A good first look at writing tests for Django can be found in the
  271. documentation on :doc:`/topics/testing/overview`.
  272. * Dive Into Python (a free online book for beginning Python developers)
  273. includes a great `introduction to Unit Testing`__.
  274. * After reading those, if you want something a little meatier to sink
  275. your teeth into, there's always the Python :mod:`unittest` documentation.
  276. __ http://www.diveintopython.net/unit_testing/index.html
  277. Running your new test
  278. ---------------------
  279. Remember that we haven't actually made any modifications to ``BaseForm`` yet,
  280. so our tests are going to fail. Let's run all the tests in the ``forms_tests``
  281. folder to make sure that's really what happens. From the command line, ``cd``
  282. into the Django ``tests/`` directory and run:
  283. .. code-block:: console
  284. $ ./runtests.py forms_tests
  285. If the tests ran correctly, you should see one failure corresponding to the test
  286. method we added. If all of the tests passed, then you'll want to make sure that
  287. you added the new test shown above to the appropriate folder and class.
  288. Writing the code for your ticket
  289. ================================
  290. Next we'll be adding the functionality described in ticket :ticket:`24788` to
  291. Django.
  292. Writing the code for ticket #24788
  293. ----------------------------------
  294. Navigate to the ``django/django/forms/`` folder and open the ``forms.py`` file.
  295. Find the ``BaseForm`` class on line 72 and add the ``prefix`` class attribute
  296. right after the ``field_order`` attribute::
  297. class BaseForm(object):
  298. # This is the main implementation of all the Form logic. Note that this
  299. # class is different than Form. See the comments by the Form class for
  300. # more information. Any improvements to the form API should be made to
  301. # *this* class, not to the Form class.
  302. field_order = None
  303. prefix = None
  304. Verifying your test now passes
  305. ------------------------------
  306. Once you're done modifying Django, we need to make sure that the tests we wrote
  307. earlier pass, so we can see whether the code we wrote above is working
  308. correctly. To run the tests in the ``forms_tests`` folder, ``cd`` into the
  309. Django ``tests/`` directory and run:
  310. .. code-block:: console
  311. $ ./runtests.py forms_tests
  312. Oops, good thing we wrote those tests! You should still see one failure with
  313. the following exception::
  314. AssertionError: None != 'foo'
  315. We forgot to add the conditional statement in the ``__init__`` method. Go ahead
  316. and change ``self.prefix = prefix`` that is now on line 87 of
  317. ``django/forms/forms.py``, adding a conditional statement::
  318. if prefix is not None:
  319. self.prefix = prefix
  320. Re-run the tests and everything should pass. If it doesn't, make sure you
  321. correctly modified the ``BaseForm`` class as shown above and copied the new test
  322. correctly.
  323. Running Django's test suite for the second time
  324. ===============================================
  325. Once you've verified that your patch and your test are working correctly, it's
  326. a good idea to run the entire Django test suite just to verify that your change
  327. hasn't introduced any bugs into other areas of Django. While successfully
  328. passing the entire test suite doesn't guarantee your code is bug free, it does
  329. help identify many bugs and regressions that might otherwise go unnoticed.
  330. To run the entire Django test suite, ``cd`` into the Django ``tests/``
  331. directory and run:
  332. .. code-block:: console
  333. $ ./runtests.py
  334. As long as you don't see any failures, you're good to go.
  335. Writing Documentation
  336. =====================
  337. This is a new feature, so it should be documented. Add the following section on
  338. line 1068 (at the end of the file) of ``django/docs/ref/forms/api.txt``::
  339. The prefix can also be specified on the form class::
  340. >>> class PersonForm(forms.Form):
  341. ... ...
  342. ... prefix = 'person'
  343. .. versionadded:: 1.9
  344. The ability to specify ``prefix`` on the form class was added.
  345. Since this new feature will be in an upcoming release it is also added to the
  346. release notes for Django 1.9, on line 164 under the "Forms" section in the file
  347. ``docs/releases/1.9.txt``::
  348. * A form prefix can be specified inside a form class, not only when
  349. instantiating a form. See :ref:`form-prefix` for details.
  350. For more information on writing documentation, including an explanation of what
  351. the ``versionadded`` bit is all about, see
  352. :doc:`/internals/contributing/writing-documentation`. That page also includes
  353. an explanation of how to build a copy of the documentation locally, so you can
  354. preview the HTML that will be generated.
  355. Generating a patch for your changes
  356. ===================================
  357. Now it's time to generate a patch file that can be uploaded to Trac or applied
  358. to another copy of Django. To get a look at the content of your patch, run the
  359. following command:
  360. .. code-block:: console
  361. $ git diff
  362. This will display the differences between your current copy of Django (with
  363. your changes) and the revision that you initially checked out earlier in the
  364. tutorial.
  365. Once you're done looking at the patch, hit the ``q`` key to exit back to the
  366. command line. If the patch's content looked okay, you can run the following
  367. command to save the patch file to your current working directory:
  368. .. code-block:: console
  369. $ git diff > 24788.diff
  370. You should now have a file in the root Django directory called ``24788.diff``.
  371. This patch file contains all your changes and should look this:
  372. .. code-block:: diff
  373. diff --git a/django/forms/forms.py b/django/forms/forms.py
  374. index 509709f..d1370de 100644
  375. --- a/django/forms/forms.py
  376. +++ b/django/forms/forms.py
  377. @@ -75,6 +75,7 @@ class BaseForm(object):
  378. # information. Any improvements to the form API should be made to *this*
  379. # class, not to the Form class.
  380. field_order = None
  381. + prefix = None
  382. def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
  383. initial=None, error_class=ErrorList, label_suffix=None,
  384. @@ -83,7 +84,8 @@ class BaseForm(object):
  385. self.data = data or {}
  386. self.files = files or {}
  387. self.auto_id = auto_id
  388. - self.prefix = prefix
  389. + if prefix is not None:
  390. + self.prefix = prefix
  391. self.initial = initial or {}
  392. self.error_class = error_class
  393. # Translators: This is the default suffix added to form field labels
  394. diff --git a/docs/ref/forms/api.txt b/docs/ref/forms/api.txt
  395. index 3bc39cd..008170d 100644
  396. --- a/docs/ref/forms/api.txt
  397. +++ b/docs/ref/forms/api.txt
  398. @@ -1065,3 +1065,13 @@ You can put several Django forms inside one ``<form>`` tag. To give each
  399. >>> print(father.as_ul())
  400. <li><label for="id_father-first_name">First name:</label> <input type="text" name="father-first_name" id="id_father-first_name" /></li>
  401. <li><label for="id_father-last_name">Last name:</label> <input type="text" name="father-last_name" id="id_father-last_name" /></li>
  402. +
  403. +The prefix can also be specified on the form class::
  404. +
  405. + >>> class PersonForm(forms.Form):
  406. + ... ...
  407. + ... prefix = 'person'
  408. +
  409. +.. versionadded:: 1.9
  410. +
  411. + The ability to specify ``prefix`` on the form class was added.
  412. diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt
  413. index 5b58f79..f9bb9de 100644
  414. --- a/docs/releases/1.9.txt
  415. +++ b/docs/releases/1.9.txt
  416. @@ -161,6 +161,9 @@ Forms
  417. :attr:`~django.forms.Form.field_order` attribute, the ``field_order``
  418. constructor argument , or the :meth:`~django.forms.Form.order_fields` method.
  419. +* A form prefix can be specified inside a form class, not only when
  420. + instantiating a form. See :ref:`form-prefix` for details.
  421. +
  422. Generic Views
  423. ^^^^^^^^^^^^^
  424. diff --git a/tests/forms_tests/tests/test_forms.py b/tests/forms_tests/tests/test_forms.py
  425. index 690f205..e07fae2 100644
  426. --- a/tests/forms_tests/tests/test_forms.py
  427. +++ b/tests/forms_tests/tests/test_forms.py
  428. @@ -1671,6 +1671,18 @@ class FormsTestCase(SimpleTestCase):
  429. self.assertEqual(p.cleaned_data['last_name'], 'Lennon')
  430. self.assertEqual(p.cleaned_data['birthday'], datetime.date(1940, 10, 9))
  431. + def test_class_prefix(self):
  432. + # Prefix can be also specified at the class level.
  433. + class Person(Form):
  434. + first_name = CharField()
  435. + prefix = 'foo'
  436. +
  437. + p = Person()
  438. + self.assertEqual(p.prefix, 'foo')
  439. +
  440. + p = Person(prefix='bar')
  441. + self.assertEqual(p.prefix, 'bar')
  442. +
  443. def test_forms_with_null_boolean(self):
  444. # NullBooleanField is a bit of a special case because its presentation (widget)
  445. # is different than its data. This is handled transparently, though.
  446. So what do I do next?
  447. =====================
  448. Congratulations, you've generated your very first Django patch! Now that you've
  449. got that under your belt, you can put those skills to good use by helping to
  450. improve Django's codebase. Generating patches and attaching them to Trac
  451. tickets is useful, however, since we are using git - adopting a more :doc:`git
  452. oriented workflow </internals/contributing/writing-code/working-with-git>` is
  453. recommended.
  454. Since we never committed our changes locally, perform the following to get your
  455. git branch back to a good starting point:
  456. .. code-block:: console
  457. $ git reset --hard HEAD
  458. $ git checkout master
  459. More information for new contributors
  460. -------------------------------------
  461. Before you get too into writing patches for Django, there's a little more
  462. information on contributing that you should probably take a look at:
  463. * You should make sure to read Django's documentation on
  464. :doc:`claiming tickets and submitting patches
  465. </internals/contributing/writing-code/submitting-patches>`.
  466. It covers Trac etiquette, how to claim tickets for yourself, expected
  467. coding style for patches, and many other important details.
  468. * First time contributors should also read Django's :doc:`documentation
  469. for first time contributors</internals/contributing/new-contributors/>`.
  470. It has lots of good advice for those of us who are new to helping out
  471. with Django.
  472. * After those, if you're still hungry for more information about
  473. contributing, you can always browse through the rest of
  474. :doc:`Django's documentation on contributing</internals/contributing/index>`.
  475. It contains a ton of useful information and should be your first source
  476. for answering any questions you might have.
  477. Finding your first real ticket
  478. ------------------------------
  479. Once you've looked through some of that information, you'll be ready to go out
  480. and find a ticket of your own to write a patch for. Pay special attention to
  481. tickets with the "easy pickings" criterion. These tickets are often much
  482. simpler in nature and are great for first time contributors. Once you're
  483. familiar with contributing to Django, you can move on to writing patches for
  484. more difficult and complicated tickets.
  485. If you just want to get started already (and nobody would blame you!), try
  486. taking a look at the list of `easy tickets that need patches`__ and the
  487. `easy tickets that have patches which need improvement`__. If you're familiar
  488. with writing tests, you can also look at the list of
  489. `easy tickets that need tests`__. Just remember to follow the guidelines about
  490. claiming tickets that were mentioned in the link to Django's documentation on
  491. :doc:`claiming tickets and submitting patches
  492. </internals/contributing/writing-code/submitting-patches>`.
  493. __ https://code.djangoproject.com/query?status=new&status=reopened&has_patch=0&easy=1&col=id&col=summary&col=status&col=owner&col=type&col=milestone&order=priority
  494. __ https://code.djangoproject.com/query?status=new&status=reopened&needs_better_patch=1&easy=1&col=id&col=summary&col=status&col=owner&col=type&col=milestone&order=priority
  495. __ https://code.djangoproject.com/query?status=new&status=reopened&needs_tests=1&easy=1&col=id&col=summary&col=status&col=owner&col=type&col=milestone&order=priority
  496. What's next?
  497. ------------
  498. After a ticket has a patch, it needs to be reviewed by a second set of eyes.
  499. After uploading a patch or submitting a pull request, be sure to update the
  500. ticket metadata by setting the flags on the ticket to say "has patch",
  501. "doesn't need tests", etc, so others can find it for review. Contributing
  502. doesn't necessarily always mean writing a patch from scratch. Reviewing
  503. existing patches is also a very helpful contribution. See
  504. :doc:`/internals/contributing/triaging-tickets` for details.