This section is addressed to the mergers and to anyone interested in knowing\nhow code gets committed into Django. The Treoirlínte a apply\nto all contributors, with or without commit rights.
\nIf you're a community member who wants to contribute code to Django, look at\nAg obair le Git agus GitHub instead.
\nÓs rud é go bhfuil Django á óstáil ar GitHub, cuirtear paistí ar fáil i bhfoirm iarratais tarraingthe.
\nAgus iarratas tarraingthe á dhéanamh agat, déan cinnte go gcomhlíonann gach tiomantas aonair na treoirlínte tiomanta Táthar ag súil go soláthróidh ranníocóirí na hiarratais tarraingthe is fearr Go praiticiúil féadfaidh cumaisc - a mbeidh níos eolaí ar na treoirlínte tiomanta - cinneadh a dhéanamh tiomantas a thabhairt suas go dtí an caighdeán iad féin.
\nB'fhéidir gur mhaith leat gníomhartha Jenkins nó GitHub a thástáil ar an iarratas tarraingthe le duine de na tógálaithe iarratais tarraingthe nach ritheann go huathoibríoch, mar shampla Oracle nó Selenium. Féach an `leathanach wiki CI `_ le haghaidh treoracha.
\nMá aimsíonn tú tú féin ag seiceáil iarratais tarraingthe go háitiúil níos minice, beidh an t-alias git seo cabhrach:
\n[alias]\n pr = !sh -c \\"git fetch upstream pull/${1}/head:pr/${1} && git checkout pr/${1}\\"\nCuir é le do ~/.gitconfig, agus socraigh upstream mar django/django. Ansin is féidir leat git pr #### a rith chun an t-iarratas tarraingthe comhfhreagrach a sheiceáil.
Ag an bpointe seo, is féidir leat oibriú ar an gcód. Úsáid git rebase -i agus git commit --amend chun a chinntiú go bhfuil an leibhéal cáilíochta ag súil leis ag na gealltanais. Nuair a bheidh tú réidh:
Linux / macOS
$ # Pull in the latest changes from main.\n$ git checkout main\n$ git pull upstream main\n$ # Rebase the pull request on main.\n$ git checkout pr/####\n$ git rebase main\n$ git checkout main\n$ # Merge the work as "fast-forward" to main to avoid a merge commit.\n$ # (in practice, you can omit "--ff-only" since you just rebased)\n$ git merge --ff-only pr/XXXX\n$ # If you're not sure if you did things correctly, check that only the\n$ # changes you expect will be pushed to upstream.\n$ git push --dry-run upstream main\n$ # Push!\n$ git push upstream main\n$ # Delete the pull request branch.\n$ git branch -d pr/xxxx\nWindows
...\\> REM Pull in the latest changes from main.\n...\\> git checkout main\n...\\> git pull upstream main\n...\\> REM Rebase the pull request on main.\n...\\> git checkout pr/####\n...\\> git rebase main\n...\\> git checkout main\n...\\> REM Merge the work as "fast-forward" to main to avoid a merge commit.\n...\\> REM (in practice, you can omit "--ff-only" since you just rebased)\n...\\> git merge --ff-only pr/XXXX\n...\\> REM If you're not sure if you did things correctly, check that only the\n...\\> REM changes you expect will be pushed to upstream.\n...\\> git push --dry-run upstream main\n...\\> REM Push!\n...\\> git push upstream main\n...\\> REM Delete the pull request branch.\n...\\> git branch -d pr/xxxx\nFórsa brú go dtí an brainse tar éis athbhunú ar an bpríomhlíonra ach roimh chumasc agus brú go dtí an sruth. Ligeann sé seo do na hashes geallta ar an bpríomhlíonra agus an brainse a mheaitseáil a dhúnann an t-iarratas tarraingt go huathoibríoch.
\nMura gá iarraidh tarraingthe a chumasc mar ghealltanais iolracha, is féidir leat cnaipe “Squash agus cumaisc” GitHub a úsáid ar an suíomh Gréasáin. Cuir an teachtaireacht <committing-guidelines>tiomanta in eagar de réir mar is gá chun comhlíonadh la:ref: `na treoirlínte `agus bain an uimhir iarratais tarraingthe a chuirtear isteach go huathoibríoch le chéad líne na teachtaireachta.
\nAgus stair thiomanta iarratais tarraingthe á athscríobh agat, is é an aidhm stair thiomanta Django a dhéanamh chomh inúsáidte agus is féidir:
\nMá tá gealltanais anar-anall i bpaiste, ansin iad sin a athscríobh i gceann amháin. Mar shampla, má chuireann tiomantas cód éigin leis agus má shocraíonn an dara tiomantas saincheisteanna stíleacha a tugadh isteach sa chéad thiomantas, ba chóir na gealltanais sin a scriosadh sula ndéantar iad a chumasc.
Athruithe ar leithligh ar ghealltanais éagsúla trí ghrúpáil loighciúil: má dhéanann tú glantachán stíle ag an am céanna agus a dhéanann tú athruithe eile ar chomhad, beidh sé níos fusa athbhreithniú a dhéanamh ar an stair trí na hathruithe a roinnt ina dhá ghealltanas éagsúla.
Bí cúramach le cumaisc brainsí suas srutha sna hiarratais tarraingthe.
Ba chóir go rith na tástálacha agus ba chóir doiciméid a thógáil tar éis gach Níor chóir do na tástálacha ná na doiciméid rabhaidh a eisiúint.
Is fearr paistí triobhála agus beaga de ghnáth a dhéanamh i dtiomantas amháin. Féadfar obair mheánmhéide go mór a roinnt ina iliomad gealltanais má tá ciall aige.
Buaileann praiticiúlacht íonacht, mar sin tá sé faoi gach cumaisc cinneadh a dhéanamh cé mhéad staire atá le déanamh le haghaidh iarratas tarraingthe. Is iad na príomhphointí ná an pobal a mhealladh, obair a dhéanamh, agus stair tiomanta inúsáidte a bheith agat.
\nThese guidelines apply to all commits to Django's Git repository, whether\nsubmitted by a contributor via a pull request or landed directly by a merger:
\nNá athraigh stair foilsithe brainsí django/django trí bhrú fórsa. Más gá duit go hiomlán (ar chúiseanna slándála mar shampla), plé an cás leis an bhfoireann ar dtús.
For any medium-to-big changes, where "medium-to-big" is according to\nyour judgment, please bring things up on the Django Forum before making\nthe change.
\nIf you bring something up and nobody responds, please don't take that\nto mean your idea is great and should be implemented immediately because\nnobody contested it. Everyone doesn't always have a lot of time to read\ndiscussions immediately, so you may have to wait a couple of days before\ngetting a response.
\nWrite detailed commit messages in the past tense, not present tense, and\nend the subject line with a period.
\nCorrect: "Fixed Unicode bug in RSS API."
Incorrect: "Fixes Unicode bug in RSS API." (present tense)
Incorrect: "Fixing Unicode bug in RSS API." ("-ing" form)
Incorrect: "Fixed Unicode bug in RSS API" (missing trailing period)
The commit message should be in lines of 72 chars maximum. There should be\na subject line, separated by a blank line and then paragraphs of 72 char\nlines. The limits are soft. For the subject line, shorter is better.
\nIn the body of the commit message more detail is better than less, and should\nexplain why the change was made, not what was changed or how. The code\nitself shows what changed; the commit message should provide the context and\nreasoning that the code cannot.
\nCredit the contributors in the commit message: "Thanks A for the report and B\nfor review." Use git's Co-Authored-By as appropriate, including anyone\nwhose earlier work the change builds on.
\nMar shampla:
\nFixed #18307 -- Added git workflow guidelines.\n\nRefactored the Django's documentation to remove mentions of SVN\nspecific tasks. Added guidelines of how to use Git, GitHub, and\nhow to use pull request together with Trac instead.\n\nThanks to Full Name for the report, and to Reviewer for reviews.\nTiomann teorainn don athrú is gráinneach a dhéanann ciall. Ciallaíonn sé seo, bain úsáid as gealltanais bheaga go minic seachas tiomantas móra is annamh. Mar shampla, má éilíonn athrú beag ar leabharlann Y a chur i bhfeidhm gné X, déan an t-athrú a dhéanamh ar leabharlann Y ar dtús, ansin déan gné X i dtiomantas ar leithligh. Téann sé seo* bealach fad* chun cabhrú le gach duine d'athruithe a leanúint.
Separate bug fixes from feature changes. Bugfixes may need to be\nbackported.
Má dhúnann do thiomantas ticéad sa rianaitheoir ticéad Django, cuir tús le do theachtaireacht tiomanta leis an téacs “Seasta #xxxxx “, áit is é “xxxxx” uimhir an ticéad a shocraíonn do thiomantas. Sampla: “Seasta #123 -- Gné whizbang curtha leis.”. Tá Trac curtha againn ionas go ndúnfaidh aon teachtaireacht tiomanta san fhormáid sin an ticéad tagartha go huathoibríoch agus go gcuirfidh trácht air leis an teachtaireacht iomlán tiomanta.
\nMaidir le daoine fiosracha, táimid ag baint úsáide as `breiseán Trac `_ chuige seo.
\nMá thagraíonn do thiomantas ticéad sa rianaitheoir ticéad Django ach ní dhúnnaí* an ticéad, cuir an abairt “Refs #xxxxx “san áireamh, áit ar “xxxxx” uimhir an ticéid a thagann do thiomantas. Cuirfidh sé seo trácht ar an ticéad cuí go huathoibríoch.
Bug fix backports to stable branches are done exclusively by mergers, following\nthe Leaganacha tacaithe. A backport consists of cherry-picking a\ncommit from main onto the target stable/A.B.x branch.
A backport commit must include two things beyond the original commit message:
\nA prefix [A.B.x] on the subject line, where A.B.x is the name of the\nstable/A.B.x branch being targeted.
A suffix Backport of <sha> from main. line in the commit body, pointing\nto the original commit hash.
Mar shampla:
\n[1.3.x] Fixed #17028 -- Changed diveintopython.org -> diveintopython.net.\n\nBackport of 80c0cbf1c97047daed2c5b41b296bbc56fe1d7e3 from main.\nIf the backport also fixes a regression, add a line identifying the commit that\nintroduced it:
\nRegression in 6ecccad711b52f9273b1acb07a57d3f806e93928.\nThere are three ways to do a backport, depending on your workflow:
\nOption 1: fully manual
\nCherry-pick the commit onto the stable branch, then amend the commit message to\nadd the required prefix and backport note:
\ngit cherry-pick <sha>\ngit commit --amend\nIf the cherry-pick produces conflicts, resolve them, stage the changes, then\nrun git cherry-pick --continue before amending. This option requires no\nsetup but relies entirely on remembering to format the message correctly.
Option 2: using the helper script in the repo
\nThe scripts/backport.sh Bash script automates the cherry-pick and rewrites\nthe commit message with the correct prefix and backport note. Run it from the\ntarget stable branch:
bash scripts/backport.sh <sha>\nThis is straightforward for clean cherry-picks, but if conflicts are produced,\nyou will need to resolve them manually and add the prefix and backport note to\nthe commit message yourself.
\nOption 3: using the prepare-commit-msg git hook
The scripts/prepare_commit_msg.py Python script can be installed as a\nprepare-commit-msg git hook. It automatically adds the [A.B.x] prefix\nto the subject line, appends Backport of <sha> from main. to the commit\nbody, and ensures the subject line ends with a period, even when the\ncherry-pick produces conflicts. To install it, create an executable file\n.git/hooks/prepare-commit-msg containing:
#!/bin/sh\nexec python scripts/prepare_commit_msg.py "$@"\nOnce installed, a plain git cherry-pick <sha> on a stable branch is\nsufficient; the hook handles the message formatting in all cases.
Níl aon duine foirfe; déanfar botúin.
\nAch déan iarracht an-chrua a chinntiú nach dtarlóidh botúin. Díreach toisc go bhfuil beartas aisghabhála againn ní mhaolaítear do fhreagracht chun díriú a dhéanamh ar an gcaighdeán is airde is féidir. I ndáiríre: déan do chuid oibre a sheiceáil faoi dhó, nó déan í a sheiceáil trí chumasc eile** roimhe** déanann tú é sa chéad áit!
\nNuair a aimsítear tiomantas mícheart, lean na treoirlínte seo le do thoil:
\nMás féidir, cuir ar an údar bunaidh a thiomantas féin a chur ar ais.
Ná cuir athruithe údair eile ar ais gan cead ón údar bunaidh.
Úsáid git revert - déanfaidh sé seo tiomantas ar ais, ach beidh an tiomantas bunaidh fós mar chuid de stair an tiomanta.
If the original author can't be reached (within a reasonable amount\nof time -- a day or so) and the problem is severe -- crashing bug,\nmajor test failures, etc. -- then ask for objections on the Django Forum\nthen revert if there are none.
Má tá an fhadhb beag (gné a thiomann tar éis reoite gné, abair), fan amach í.
If there's a disagreement between the merger and the reverter-to-be then try\nto work it out on the Django Forum . If an agreement can't be reached then\nit should be put to a vote.
Má thug an tiomantas leochaileacht slándála dearbhaithe, nochtaithe isteach ansin féadfar an tiomantas a chur ar ais láithreach gan cead ó aon duine.
Féadfaidh an cothabhálaí brainse scaoilte gealltanais a chur ar ais don bhrainse scaoilte gan cead má bhriseann an tiomantas an brainse scaoilte.
Má bhrúiteann tú brainse ábhar ar dhearmad chuig django/django`, scrios é. Mar shampla, má rinne tú: git push upstream feature_antigravity`, déan brú droim: git push upstream:feature_antigravity.