Mercurial > hg
annotate .jshintrc @ 36927:17a744c5e270
rebase: also include commit of collapsed commits in single transaction
When rebase.singletransaction is set, we still used to create a second
transaction when committing with --collapse. It's simpler to create a
single transaction.
Note that in the affected .t file, the test that uses --collapse still
appears to create two transactions (it prints "rebase status stored"
twice). However, only a single transaction is actually created and the
second printout comes from cmdutil.commitforceeditor() that explicitly
calls tr.writepending().
Also note the that we now roll back any commits if the user closes the
commit message editor with an error code (or leaves the message
empty). That might be unfortunate, but it's consistent with how we
behave in the --no-collapse case (if the user passed --edit). If we
want to change that, I think it should be done consistently in a
separate patch.
Differential Revision: https://phab.mercurial-scm.org/D2728
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 09 Mar 2018 10:35:48 -0800 |
parents | bdd2e18b54c5 |
children |
rev | line source |
---|---|
35162
bdd2e18b54c5
hgweb: add .jshintrc with some basic rules
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
1 { |
bdd2e18b54c5
hgweb: add .jshintrc with some basic rules
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
2 // Enforcing |
bdd2e18b54c5
hgweb: add .jshintrc with some basic rules
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
3 "eqeqeq" : true, // true: Require triple equals (===) for comparison |
bdd2e18b54c5
hgweb: add .jshintrc with some basic rules
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
4 "forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty() |
bdd2e18b54c5
hgweb: add .jshintrc with some basic rules
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
5 "freeze" : true, // true: prohibits overwriting prototypes of native objects such as Array, Date etc. |
bdd2e18b54c5
hgweb: add .jshintrc with some basic rules
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
6 "nonbsp" : true, // true: Prohibit "non-breaking whitespace" characters. |
bdd2e18b54c5
hgweb: add .jshintrc with some basic rules
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
7 "undef" : true, // true: Require all non-global variables to be declared (prevents global leaks) |
bdd2e18b54c5
hgweb: add .jshintrc with some basic rules
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
8 |
bdd2e18b54c5
hgweb: add .jshintrc with some basic rules
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
9 // Environments |
bdd2e18b54c5
hgweb: add .jshintrc with some basic rules
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
10 "browser" : true // Web Browser (window, document, etc) |
bdd2e18b54c5
hgweb: add .jshintrc with some basic rules
Anton Shestakov <av6@dwimlabs.net>
parents:
diff
changeset
|
11 } |