1,847
edits
Mercurial: Difference between revisions
Jump to navigation
Jump to search
→Mercurial configuration: Add missing color "gray". Minor changes of spelling and whitespace.
Carandraug (talk | contribs) (start updating. Specially drop, usage of the mercurial patch system) |
(→Mercurial configuration: Add missing color "gray". Minor changes of spelling and whitespace.) |
||
| (8 intermediate revisions by 3 users not shown) | |||
| Line 1: | Line 1: | ||
[[wikipedia:Mercurial|Mercurial]] (sometimes referred to as {{codeline|hg}}) is | [[wikipedia:Mercurial|Mercurial]] (sometimes referred to as {{codeline|hg}}) | ||
the | is the source code management system currently used to develop | ||
Octave. | |||
== Introduction to | == Introduction to Mercurial == | ||
An introduction to | An introduction to Mercurial is completely outside the scope of this document. | ||
There are plenty of available documentation on the topic. Some recommendations | There are plenty of available documentation on the topic. Some recommendations | ||
are: | are: | ||
* [http://hginit.com/ Hg Init] | * [http://hginit.com/ Hg Init] | ||
* [https://mercurial. | * [https://www.mercurial-scm.org/wiki/Tutorial Mercurial tutorial] | ||
* [https://mercurial. | * [https://www.mercurial-scm.org/wiki/QuickStart Mercurial quick start] | ||
== Contributing to Octave == | |||
The preferred method to contribute to Octave is with Mercurial changesets. | |||
Other forms of contributions (e.g., simple diff patches) are | |||
also acceptable, but they slow down the review process. | |||
If you plan on contributing to Octave: | |||
* See other [[Contribution guidelines]] | |||
* Always include commit messages in changesets. Please follow the Octave [[commit message guidelines]] | |||
* Follow the style guides for both [[Octave style guide|Octave]] and [[C++ style guide|C++]] languages. | |||
== Getting the development sources == | == Getting the development sources == | ||
| Line 31: | Line 43: | ||
You can use the following to start your hgrc | You can use the following to start your hgrc | ||
{{File||<pre> | |||
[ui] | |||
username = Your Name <your@email> | |||
[extensions] | |||
color = | |||
histedit = | |||
pager = | |||
rebase = | |||
strip = | |||
[pager] | |||
pager = LESS='FSRX' less | |||
attend = help, annotate, cat, diff, export, glog, log, outgoing, incoming | |||
[diff] | |||
showfunc = True | |||
[color] | |||
mode = terminfo | |||
## Custom colors | |||
color.gray = 244 | |||
color.orange = 202 | |||
color.lightyellow = 191 | |||
color.darkorange = 220 | |||
color.brightyellow = 226 | |||
status.modified = magenta bold | |||
status.added = green bold | |||
status.removed = red bold | |||
status.deleted = cyan bold | |||
status.unknown = gray bold | |||
status.ignored = gray bold | |||
## Colours for each label | |||
log.branch = cyan | |||
log.summary = lightyellow | |||
log.description = lightyellow | |||
log.bookmark = green | |||
log.tag = darkorange | |||
log.graph = blue | |||
## Colors for each phase | |||
changeset.secret = blue bold | |||
changeset.draft = red bold | |||
changeset.public = orange | |||
desc.here = bold blue_background | |||
[bookmarks] | |||
track.current = True | |||
[alias] | |||
glog = log --graph | |||
top = log --graph -l | |||
</pre>}} | |||
== Submitting patches == | == Submitting patches == | ||
| Line 165: | Line 202: | ||
<code>hg commit </code><br/> | <code>hg commit </code><br/> | ||
<code>hg export @ > mid-term-review.changeset </code><br/> | <code>hg export @ > mid-term-review.changeset </code><br/> | ||
the file mid-term-review.changeset can then be sent to the | the file mid-term-review.changeset can then be sent to the [mailto:octave-maintainers@octave.org mailing list] or posted | ||
to the [ | to the [https://savannah.gnu.org/patch/?group=octave patch tracker]</li> | ||
</ol> </li> | </ol> </li> | ||
</ol> | </ol> | ||
| Line 197: | Line 234: | ||
==External links== | ==External links== | ||
* [ | * [https://www.mercurial-scm.org/ Official website] | ||
[[Category:Development]] | [[Category:Development]] | ||