Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: hgrc

Issue 29336739: Add recommended hgrc (Closed)
Left Patch Set: Address comments, plus some other changes Created Feb. 20, 2016, 8:15 p.m.
Right Patch Set: Address comments Created Feb. 22, 2016, 10:15 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 # This .hgrc is recommended for working on the Adblock Plus project. 1 # This .hgrc is recommended for working on the Adblock Plus project.
2 # 2 #
3 # When using this as your .hgrc as-is, it provides a nicer user interface and 3 # When using this as your .hgrc as-is, it provides a nicer user interface and
4 # enables some extensions that are useful for working on pretty much any 4 # enables some extensions that are useful for working on pretty much any
5 # project. 5 # project.
6 # 6 #
7 # The commented parts do either not work on all systems, are a matter of taste, 7 # The commented parts either do not work on all systems, are a matter of taste,
8 # or specific to the Adblock Plus project and might not make sense for everyone. 8 # or specific to the Adblock Plus project and might not make sense for everyone.
9 # Have a good look and decide for yourself what you want to enable. 9 # Have a good look and decide for yourself what you want to enable.
10 10
11 ## User interface controls 11 ## User interface controls
12 [ui] 12 [ui]
13 13
14 # Sets your global user name. If you do not uncomment this, you will have to 14 # Sets your global user name. If you do not uncomment this, you will have to
15 # set it on a per-repository basis. 15 # set it on a per-repository basis.
16 #username = Jane Bloggs <jane@adblockplus.org> 16 #username = Jane Doe <jdoe@example.com>
17 17
18 ## Diff (i.e. patch) format configuration 18 ## Diff (i.e. patch) format configuration
19 [diff] 19 [diff]
20 20
21 # We ue Git's extended diff format which includes more information (such as 21 # We use Git's extended diff format which includes more information (such as
22 # changes to binary files). 22 # changes to binary files).
23 git = true 23 git = true
24
25 # Makes diff output include eight lines of context.
26 unified = 8
24 27
25 ## Defaults 28 ## Defaults
26 # 29 #
27 # These change the default behaviour of common Mercurial commands. 30 # These change the default behaviour of common Mercurial commands.
28 [defaults] 31 [defaults]
29 32
30 # `hg log` shows the history of all branches by default, not just that of the 33 # `hg log` shows the history of all branches by default, not just that of the
31 # current branch. The `--graph` option shows this as an ASCII tree, which makes 34 # current branch. The `--graph` option shows this as an ASCII tree and marks
32 # the history a lot easier to read. 35 # the revision you are currently at, which makes the history a lot easier to
36 # read.
33 log = --graph 37 log = --graph
34 38
35 # The "master" bookmark 39 # The "master" bookmark
36 # 40 #
37 # Most repositories of the Adblock Plus project use bookmarked branches to track 41 # Most repositories of the Adblock Plus project use bookmarked branches to track
38 # multiple lines of development. The bookmark for the main line of development 42 # multiple lines of development. The bookmark for the main line of development
39 # is, by convention, called "master". 43 # is, by convention, called "master".
40 # 44 #
41 # Unless you are working with Mercurial repositories that do not have a "master" 45 # Unless you are working with Mercurial repositories that do not have a "master"
42 # bookmark, it is recommended that you uncomment the following defaults. 46 # bookmark, it is recommended that you uncomment the following defaults.
43 47
44 # `hg clone` updates to "tip" by default, which is just the latest changeset, on 48 # `hg clone` updates to the latest changeset on the default branch. When working
45 # any branch. You most likely want to update to the "master" bookmark instead, 49 # with repositories that have a "master" branch, you will want to update to that
46 # which you can do by adding `--updaterev master`. By uncommenting the following 50 # one instead, which you can do by adding `--updaterev master`. By uncommenting
47 # line, you won't have to worry about that: 51 # the following line, you won't have to worry about that. Note that when
52 # enabling this, you can still update to the latest changeset in the default
53 # branch by specifying `--updaterev default`.
48 #clone = --updaterev master 54 #clone = --updaterev master
49 55
50 # `hg push` and `hg outgoing` will by default include all changesets, including 56 # `hg push` and `hg outgoing` will by default include all changesets, including
51 # bookmarked branches that you might want to just keep locally. To avoid this, 57 # bookmarked branches that you might want to just keep locally. To avoid this,
52 # you need to add `--rev master`. By uncommenting the following two lines, you 58 # you need to add `--rev master`. By uncommenting the following two lines, you
53 # won't have to worry about that: 59 # won't have to worry about that. Note that when enabling this, you can still
60 # push any branch by specifying the `--rev` option.
54 #push = --rev master 61 #push = --rev master
55 #outgoing = --rev master 62 #outgoing = --rev master
56 63
57 ## Extensions 64 ## Extensions
58 # 65 #
59 # Mercurial is, out of the box, fairly minimal. A lot of useful functionality 66 # Mercurial is, out of the box, fairly minimal. A lot of useful functionality
60 # comes as extensions. Most of the useful extensions are even part of the 67 # comes as extensions. Most of the useful extensions are even part of the
61 # default Mercurial distribution, but not enabled by default. 68 # default Mercurial distribution, but not enabled by default.
62 [extensions] 69 [extensions]
63 70
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 103
97 # Shelve extension, provides the `hg shelve` command that allows you to set 104 # Shelve extension, provides the `hg shelve` command that allows you to set
98 # pending changes aside, see: 105 # pending changes aside, see:
99 # https://www.mercurial-scm.org/wiki/ShelveExtension 106 # https://www.mercurial-scm.org/wiki/ShelveExtension
100 shelve = 107 shelve =
101 108
102 # Configuration for the pager extension. This doesn't have any effect unless 109 # Configuration for the pager extension. This doesn't have any effect unless
103 # you enable the pager extension above. 110 # you enable the pager extension above.
104 [pager] 111 [pager]
105 pager = LESS='FSRX' less 112 pager = LESS='FSRX' less
LEFTRIGHT
« no previous file | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld