##// END OF EJS Templates
phabricator: warn if unable to amend, instead of aborting after posting...
phabricator: warn if unable to amend, instead of aborting after posting There was a divergence in behavior here between obsolete and strip based amending. I first noticed the abort when testing outside of the test harness, but then had trouble recreating it here after reverting the code changes. It turns out, strip based amend was successfully amending the public commit after it was posted! It looks like the protection is in the `commit --amend` command, not in the underlying code that it calls. I considered doing a preflight check and aborting. But the locks are only acquired at the end, if amending, and this is too large a section of code to be wrapped in a maybe-it's-held-or-not context manager for my tastes. Additionally, some people do post-push reviews, and amending is the default behavior, so they shouldn't see a misleading error message. The lack of a 'Differential Revision' entry in the commit message breaks a {phabreview} test, so it had to be partially conditionalized.

File last commit:

r31472:75e4bae5 default
r41198:0101a35d default
Show More
test-trusted.py.out
195 lines | 4.5 KiB | text/plain | TextLexer
/ tests / test-trusted.py.out
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551 # same user, same group
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 trusted
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551 global = /some/path
local = /another/path
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 untrusted
. . global = /some/path
. . local = /another/path
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551
# same user, different group
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 trusted
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551 global = /some/path
local = /another/path
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 untrusted
. . global = /some/path
. . local = /another/path
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551
# different user, same group
Martin Geisler
ui: lowercase "not trusting file" warning message
r16939 not trusting file .hg/hgrc from untrusted user abc, group bar
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 trusted
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551 global = /some/path
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 untrusted
. . global = /some/path
. . local = /another/path
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551
# different user, same group, but we trust the group
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 trusted
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551 global = /some/path
local = /another/path
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 untrusted
. . global = /some/path
. . local = /another/path
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551
# different user, different group
Martin Geisler
ui: lowercase "not trusting file" warning message
r16939 not trusting file .hg/hgrc from untrusted user abc, group def
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 trusted
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551 global = /some/path
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 untrusted
. . global = /some/path
. . local = /another/path
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551
# different user, different group, but we trust the user
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 trusted
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551 global = /some/path
local = /another/path
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 untrusted
. . global = /some/path
. . local = /another/path
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551
# different user, different group, but we trust the group
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 trusted
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551 global = /some/path
local = /another/path
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 untrusted
. . global = /some/path
. . local = /another/path
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551
# different user, different group, but we trust the user and the group
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 trusted
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551 global = /some/path
local = /another/path
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 untrusted
. . global = /some/path
. . local = /another/path
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551
# we trust all users
# different user, different group
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 trusted
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551 global = /some/path
local = /another/path
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 untrusted
. . global = /some/path
. . local = /another/path
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551
# we trust all groups
# different user, different group
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 trusted
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551 global = /some/path
local = /another/path
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 untrusted
. . global = /some/path
. . local = /another/path
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551
# we trust all users and groups
# different user, different group
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 trusted
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551 global = /some/path
local = /another/path
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 untrusted
. . global = /some/path
. . local = /another/path
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551
# we don't get confused by users and groups with the same name
# different user, different group
Martin Geisler
ui: lowercase "not trusting file" warning message
r16939 not trusting file .hg/hgrc from untrusted user abc, group def
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 trusted
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551 global = /some/path
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 untrusted
. . global = /some/path
. . local = /another/path
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551
# list of user names
# different user, different group, but we trust the user
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 trusted
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551 global = /some/path
local = /another/path
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 untrusted
. . global = /some/path
. . local = /another/path
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551
# list of group names
# different user, different group, but we trust the group
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 trusted
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551 global = /some/path
local = /another/path
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 untrusted
. . global = /some/path
. . local = /another/path
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551
# Can't figure out the name of the user running this process
# different user, different group
Martin Geisler
ui: lowercase "not trusting file" warning message
r16939 not trusting file .hg/hgrc from untrusted user abc, group def
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 trusted
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551 global = /some/path
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 untrusted
. . global = /some/path
. . local = /another/path
Alexis S. L. Carvalho
Only read .hg/hgrc files from trusted users/groups...
r3551
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 # prints debug warnings
# different user, different group
Martin Geisler
ui: lowercase "not trusting file" warning message
r16939 not trusting file .hg/hgrc from untrusted user abc, group def
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 trusted
Matt Mackall
ui: report_untrusted fixes...
r8204 ignoring untrusted configuration option paths.local = /another/path
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 global = /some/path
untrusted
. . global = /some/path
Pulkit Goyal
tests: make test-trusted use print_function...
r28934 . ignoring untrusted configuration option paths.local = /another/path
Matt Mackall
ui: report_untrusted fixes...
r8204 . local = /another/path
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552
Ry4an Brase
ui: always report untrusted hgrc files when debug enabled...
r13493 # report_untrusted enabled without debug hides warnings
# different user, different group
trusted
global = /some/path
untrusted
. . global = /some/path
. . local = /another/path
# report_untrusted enabled with debug shows warnings
# different user, different group
Martin Geisler
ui: lowercase "not trusting file" warning message
r16939 not trusting file .hg/hgrc from untrusted user abc, group def
Ry4an Brase
ui: always report untrusted hgrc files when debug enabled...
r13493 trusted
ignoring untrusted configuration option paths.local = /another/path
global = /some/path
untrusted
. . global = /some/path
Pulkit Goyal
tests: make test-trusted use print_function...
r28934 . ignoring untrusted configuration option paths.local = /another/path
Ry4an Brase
ui: always report untrusted hgrc files when debug enabled...
r13493 . local = /another/path
Matt Mackall
ui: fold readsections into readconfig...
r8142 # ui.readconfig sections
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 quux
# read trusted, untrusted, new ui, trusted
Martin Geisler
ui: lowercase "not trusting file" warning message
r16939 not trusting file foobar from untrusted user abc, group def
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 trusted:
Matt Mackall
ui: report_untrusted fixes...
r8204 ignoring untrusted configuration option foobar.baz = quux
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 None
untrusted:
quux
# error handling
# file doesn't exist
# same user, same group
# different user, different group
# parse error
# different user, different group
Martin Geisler
ui: lowercase "not trusting file" warning message
r16939 not trusting file .hg/hgrc from untrusted user abc, group def
Matt Mackall
error: update test-trusted.py
r11291 ('foo', '.hg/hgrc:1')
Alexis S. L. Carvalho
save settings from untrusted config files in a separate configparser...
r3552 # same user, same group
Matt Mackall
error: update test-trusted.py
r11291 ('foo', '.hg/hgrc:1')
Martijn Pieters
config: honour the trusted flag in ui.configbytes
r31472
# access typed information
# different user, different group
not trusting file .hg/hgrc from untrusted user abc, group def
# suboptions, trusted and untrusted
(None, []) ('main', [('one', 'one'), ('two', 'two')])
# path, trusted and untrusted
None .hg/monty/python
# bool, trusted and untrusted
False True
# int, trusted and untrusted
0 42
# bytes, trusted and untrusted
0 84934656
# list, trusted and untrusted
[] ['spam', 'ham', 'eggs']