Show More
@@ -158,6 +158,9 b" coreconfigitem('devel', 'warn-config'," | |||||
158 | coreconfigitem('devel', 'warn-config-default', |
|
158 | coreconfigitem('devel', 'warn-config-default', | |
159 | default=None, |
|
159 | default=None, | |
160 | ) |
|
160 | ) | |
|
161 | coreconfigitem('devel', 'user.obsmarker', | |||
|
162 | default=None, | |||
|
163 | ) | |||
161 | coreconfigitem('diff', 'nodates', |
|
164 | coreconfigitem('diff', 'nodates', | |
162 | default=None, |
|
165 | default=None, | |
163 | ) |
|
166 | ) |
@@ -1035,7 +1035,11 b' def createmarkers(repo, relations, flag=' | |||||
1035 | if metadata is None: |
|
1035 | if metadata is None: | |
1036 | metadata = {} |
|
1036 | metadata = {} | |
1037 | if 'user' not in metadata: |
|
1037 | if 'user' not in metadata: | |
1038 | metadata['user'] = repo.ui.username() |
|
1038 | develuser = repo.ui.config('devel', 'user.obsmarker') | |
|
1039 | if develuser: | |||
|
1040 | metadata['user'] = develuser | |||
|
1041 | else: | |||
|
1042 | metadata['user'] = repo.ui.username() | |||
1039 |
|
1043 | |||
1040 | # Operation metadata handling |
|
1044 | # Operation metadata handling | |
1041 | useoperation = repo.ui.configbool('experimental', |
|
1045 | useoperation = repo.ui.configbool('experimental', |
@@ -42,8 +42,8 b' Test setup' | |||||
42 | $ mkcommit ROOT |
|
42 | $ mkcommit ROOT | |
43 | $ mkcommit A0 |
|
43 | $ mkcommit A0 | |
44 | $ echo 42 >> A0 |
|
44 | $ echo 42 >> A0 | |
45 |
$ |
|
45 | $ hg commit --amend -m "A1" --config devel.default-date="1234567890 0" --config devel.user.obsmarker=test1 | |
46 |
$ |
|
46 | $ hg commit --amend -m "A2" --config devel.default-date="987654321 0" --config devel.user.obsmarker=test2 | |
47 |
|
47 | |||
48 | $ hg log --hidden -G |
|
48 | $ hg log --hidden -G | |
49 | @ changeset: 3:d004c8f274b9 |
|
49 | @ changeset: 3:d004c8f274b9 |
General Comments 0
You need to be logged in to leave comments.
Login now