Mercurial > hg

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 36356: (0) -30000 -10000 -3000 -1000 -192 +192 +1000 +3000 +10000 tip
age author description
Wed, 21 Feb 2018 23:24:51 -0500 Augie Fackler py3: whitelist another 11 passing tests
Wed, 21 Feb 2018 22:49:40 -0500 Augie Fackler narrowbundle2: use native string to get kwargs from dict
Wed, 21 Feb 2018 22:49:15 -0500 Augie Fackler narrowbundle2: drop legacy getcgkwargs variable
Wed, 21 Feb 2018 20:05:29 -0800 Daniel Ploch fancyopts: add support for custom multi-arg opts in fancyopts.py
Wed, 21 Feb 2018 11:57:11 -0500 Augie Fackler narrowcommands: add some missing strkwargs calls for py3
Wed, 21 Feb 2018 11:56:51 -0500 Augie Fackler narrowwirepeer: add some strkwargs to fix a crash on py3
Wed, 21 Feb 2018 12:03:44 -0500 Augie Fackler narrowchangegroup: remove backwards compatibility with old hg
Wed, 21 Feb 2018 19:11:11 -0800 Augie Fackler narrowbundle2: replace map() with equivalent list comprehension
Wed, 21 Feb 2018 11:58:41 -0500 Augie Fackler narrowbundle2: this dict contains native strings, look kws up as such
Wed, 21 Feb 2018 11:56:22 -0500 Augie Fackler tests: port extension in test-narrow-expanddirstate.t to Python 3
Wed, 21 Feb 2018 10:10:02 -0500 Augie Fackler py3: use list comprehensions instead of filter where we need to eagerly filter
Wed, 21 Feb 2018 10:08:35 -0500 Augie Fackler narrow: use list comprehension instead of filter for filtering lists
Wed, 21 Feb 2018 09:43:35 -0500 Augie Fackler py3: whitelist another eight passing tests
Tue, 06 Feb 2018 08:57:22 -0800 Martin von Zweigbergk mq: don't reimplement any()
Tue, 06 Feb 2018 08:55:54 -0800 Martin von Zweigbergk mq: don't reimplement any()
Tue, 06 Feb 2018 08:54:36 -0800 Martin von Zweigbergk strip: don't reimplement any()
Tue, 06 Feb 2018 08:52:12 -0800 Martin von Zweigbergk convert: don't reimplement any()
Tue, 06 Feb 2018 08:49:37 -0800 Martin von Zweigbergk verify: don't reimplement any()
Tue, 06 Feb 2018 08:48:05 -0800 Martin von Zweigbergk walkrepos: don't reimplement any()
Wed, 21 Feb 2018 00:25:16 +0530 Pulkit Goyal py3: make sure we open file in bytes mode
Wed, 21 Feb 2018 00:24:44 +0530 Pulkit Goyal py3: add b'' to test-ui-color.py
Tue, 20 Feb 2018 22:03:13 -0500 Matt Harbison debuginstall: strip double quotes from editorbin on Windows
Tue, 20 Feb 2018 21:37:30 -0500 Matt Harbison pycompat: correct the shlex.split() proxy method signature in py3
Tue, 20 Feb 2018 22:23:06 -0500 Augie Fackler merge with stable
Mon, 19 Feb 2018 23:47:53 +0530 Pulkit Goyal convert: don't use type as a variable name
Mon, 19 Feb 2018 23:47:15 +0530 Pulkit Goyal convert: don't use bytes as a variable name
Mon, 19 Feb 2018 23:46:42 +0530 Pulkit Goyal py3: add a r'' prefix to prevent transformer from adding b''
Mon, 19 Feb 2018 23:44:41 +0530 Pulkit Goyal py3: use pycompat.byteskwargs in hgext/convert/
Mon, 19 Feb 2018 21:45:49 +0530 Pulkit Goyal py3: add b'' prefixes in test-mdiff.py
Mon, 19 Feb 2018 21:18:52 +0530 Pulkit Goyal py3: use dict.items() instead of dict.iteritems() in tests
Mon, 19 Feb 2018 15:28:54 +0530 Pulkit Goyal py3: add b'' prefixes in test-transplant.t
Mon, 19 Feb 2018 15:28:16 +0530 Pulkit Goyal py3: add b'' prefixes in fakepatchtime.py
Mon, 19 Feb 2018 15:27:25 +0530 Pulkit Goyal py3: add b'' prefixes in fakedirstatewritetime.py
Mon, 19 Feb 2018 15:26:07 +0530 Pulkit Goyal py3: use '%d' to convert integer to bytes
Mon, 19 Feb 2018 12:48:50 +0800 Anton Shestakov hgweb: show each obsfateentry on its own line
Mon, 19 Feb 2018 12:30:23 +0800 Anton Shestakov tests: check obsolete changeset with two obsfate entries
Sun, 18 Feb 2018 15:53:48 -0500 Augie Fackler py3: whitelist another six passing tests
Sun, 18 Feb 2018 15:38:29 -0500 Augie Fackler lock: delay is numeric, use %d for formatting
Sun, 18 Feb 2018 15:23:26 -0500 Augie Fackler debugbuilddag: use '%d' instead of str() to get numbered lines
Sun, 18 Feb 2018 15:18:07 -0500 Augie Fackler tests: add missing b prefixes in test-pending.t
Sun, 18 Feb 2018 14:53:55 -0500 Augie Fackler merge: make a copy of dict.items() before mutating the dict during iteration
Sun, 18 Feb 2018 14:53:31 -0500 Augie Fackler largefiles: give some **opts some strkwargs love
Sun, 18 Feb 2018 14:43:55 -0500 Augie Fackler wireproto: fix lingering str(exception) with util.forcebytestr(exception)
Sun, 18 Feb 2018 14:37:36 -0500 Augie Fackler scmutil: fix requires-file isalnum() check on first byte
Sun, 18 Feb 2018 14:29:04 -0500 Augie Fackler largefiles: mark headre as bytes regex
Sun, 18 Feb 2018 14:28:31 -0500 Augie Fackler largfiles: replace filter() with listcomp when result needs to be a list
Sun, 18 Feb 2018 14:25:03 -0500 Augie Fackler largefiles: make scheme regex a bytes regex
Sat, 17 Feb 2018 13:13:04 +0900 Yuya Nishihara debuginstall: do not parse editor command in posix way on Windows
Sun, 18 Feb 2018 22:13:25 +0900 Yuya Nishihara py3: use bytes() to byte-stringify url object in url.py
Sun, 18 Feb 2018 22:12:11 +0900 Yuya Nishihara url: show full url of proxy server in debug message
Mon, 19 Feb 2018 00:31:01 +0530 Pulkit Goyal py3: make sure we are doing integer division by using '//'
Mon, 19 Feb 2018 00:15:50 +0530 Pulkit Goyal py3: make sure regex is bytes in crecord.py
Mon, 19 Feb 2018 00:14:33 +0530 Pulkit Goyal py3: use "%d" for integers instead of "%s"
Sun, 18 Feb 2018 18:22:40 +0530 Pulkit Goyal py3: make sure we open the files in bytes mode
Sun, 18 Feb 2018 00:59:03 -0500 Augie Fackler py3: whitelist another three passing tests
Sun, 18 Feb 2018 00:49:29 -0500 Augie Fackler manifest: use list(dict) instead of dict.keys() to get a list of keys
Sun, 18 Feb 2018 00:49:11 -0500 Augie Fackler manifest: correct the one use of iterkeys() on a dict
Sun, 18 Feb 2018 00:43:50 -0500 Augie Fackler py3: use default dict iterator instead of iterkeys
Sun, 18 Feb 2018 00:35:37 -0500 Augie Fackler py3: whitelist five more passing tests
Sun, 18 Feb 2018 00:03:39 -0500 Augie Fackler httppeer: headers are native strings
Sun, 18 Feb 2018 00:03:27 -0500 Augie Fackler hgweb: header dict entries are native strings
Sun, 18 Feb 2018 00:03:05 -0500 Augie Fackler keepalive: headers are native strings, mark them as such
Sun, 18 Feb 2018 18:22:15 +0530 Pulkit Goyal py3: use range instead of xrange on py3 in tests/test-ui-verbosity.py
Sun, 18 Feb 2018 18:20:57 +0530 Pulkit Goyal py3: use range instead of xrange in tests/test-revset2.t
Sun, 18 Feb 2018 18:20:21 +0530 Pulkit Goyal py3: use range instead of xrange in tests/test-mq-qimport.t
Sun, 18 Feb 2018 18:19:10 +0530 Pulkit Goyal py3: use range instead of xrange in tests/test-issue4074.t
Sun, 18 Feb 2018 18:18:24 +0530 Pulkit Goyal py3: use range instead of xrange in tests/test-convert-mtn.t
Sun, 18 Feb 2018 18:28:45 +0530 Pulkit Goyal py3: use range instead of xrange in tests/test-commandserver.t
Sun, 18 Feb 2018 18:07:12 +0530 Pulkit Goyal py3: use range instead of xrange in tests/test-walk.t
Sun, 18 Feb 2018 17:43:12 +0530 Pulkit Goyal py3: use range instead of xrange in tests/test-mq-missingfiles.t
Sun, 18 Feb 2018 17:42:33 +0530 Pulkit Goyal py3: use range instead of xrange on py3 in tests/test-filecache.py
Sun, 18 Feb 2018 17:41:56 +0530 Pulkit Goyal py3: use range instead on xrange on py3 in tests/test-atomictempfile.py
Sun, 18 Feb 2018 17:37:47 +0530 Pulkit Goyal py3: add b'' prefix in test-mq-qrefresh-replace-log-message.t
Sun, 18 Feb 2018 17:36:52 +0530 Pulkit Goyal py3: add b'' prefixes in test-mq-eol.t
Sun, 18 Feb 2018 17:35:44 +0530 Pulkit Goyal py3: explicitly convert result of dict.items() into list
Sun, 18 Feb 2018 17:35:13 +0530 Pulkit Goyal py3: use pycompat.byteskwargs() to convert opts keys to bytes
Sun, 18 Feb 2018 00:02:33 -0500 Augie Fackler wireprotoserver: py3 helpfully calls adds HTTP_ to CONTENT_LENGTH
Sun, 18 Feb 2018 00:01:43 -0500 Augie Fackler tests: port inline Python in test-http-branchmap.t to Python 3
Sat, 17 Feb 2018 22:52:24 -0500 Augie Fackler hgweb_mod: partially undo 8afc25e7effc to fix py3
Sat, 17 Feb 2018 22:39:38 -0500 Augie Fackler tags: don't feed both int and None to min()
Sat, 17 Feb 2018 22:39:12 -0500 Augie Fackler tests: fix get-with-headers.py on python3 when writing to stdout
Sat, 17 Feb 2018 22:38:53 -0500 Augie Fackler webcommands: use pycompat.strkwargs as needed
Sat, 17 Feb 2018 22:38:25 -0500 Augie Fackler webcommands: unpack contents of length-1 dict portably
Sat, 17 Feb 2018 22:37:35 -0500 Augie Fackler bundle2: use pycompat.strkwargs as needed
Sat, 17 Feb 2018 21:47:49 -0500 Augie Fackler tests: add b prefixes to test-rebase-dest.t
Sat, 17 Feb 2018 21:47:26 -0500 Augie Fackler rebase: sort roots by revision
Sat, 17 Feb 2018 21:25:14 -0500 Augie Fackler httppeer: use %d to format int
Sat, 17 Feb 2018 17:24:29 +0900 Yuya Nishihara extensions: reject any unicode strings in tables before loading
Sat, 17 Feb 2018 18:20:15 +0900 Yuya Nishihara py3: make test-extdiff.t pass on Python 3
Sat, 17 Feb 2018 18:15:37 +0900 Yuya Nishihara py3: make regexp patterns bytes in extdiff
Sat, 17 Feb 2018 18:14:51 +0900 Yuya Nishihara py3: fix bytes-unicode dance while building docstring of extdiff
Sat, 17 Feb 2018 18:09:56 +0900 Yuya Nishihara py3: factor out byterepr() which returns an asciified value on py3
Thu, 15 Feb 2018 17:14:45 +0530 Pulkit Goyal remotenames: don't use the default value of logfmt for namespaces
Sat, 17 Feb 2018 01:41:08 -0500 Augie Fackler py3: whitelist test-pull-http.t
Sat, 17 Feb 2018 00:29:23 -0500 Augie Fackler scmutil: bytes-ify IOErrors before wrapping them in abort message
Sat, 17 Feb 2018 13:55:12 -0700 Gregory Szorc py3: port f to Python 3
Sun, 11 Feb 2018 17:17:56 +0530 Pulkit Goyal py3: replace file() with open() in test-convert-git.t
Thu, 15 Feb 2018 12:45:46 +0530 Sushil khanchi bundle: updates the help text for hg bundle (issue5744)
Sat, 17 Feb 2018 01:11:48 -0500 Augie Fackler py3: get bytes-repr of network errors portably
Sat, 17 Feb 2018 01:09:56 -0500 Augie Fackler hgweb: open server logs in binary mode
Sat, 17 Feb 2018 00:29:46 -0500 Augie Fackler tests: add some b prefixes in test-http-bundle1.t
Sat, 17 Feb 2018 00:28:55 -0500 Augie Fackler hgweb: correctly bytes-ify status, not string-ify
Sat, 17 Feb 2018 00:28:24 -0500 Augie Fackler printenv: port to python3
Thu, 15 Feb 2018 09:18:20 -0500 Augie Fackler py3: whitelist another eight passing tests
Wed, 14 Feb 2018 23:23:57 -0500 Augie Fackler remotenames: port partway to python3 by using collections.MutableMapping
Fri, 16 Feb 2018 11:33:56 -0800 Martin von Zweigbergk tests: avoid referring to pvec in demandimport test
Mon, 08 Jan 2018 12:09:43 +0900 Yuya Nishihara help: use cmdutil.parsealiases() to resolve command name
Sun, 27 Dec 2015 14:13:27 +0900 Yuya Nishihara help: list deprecated and experimental extensions if --verbose
Sun, 27 Dec 2015 13:08:51 +0900 Yuya Nishihara hgweb: translate Abort in help command to 404 error
Mon, 08 Jan 2018 11:11:06 +0900 Yuya Nishihara templatekw: add {reporoot} keyword
Sun, 07 Jan 2018 12:09:33 +0900 Yuya Nishihara templatefilters: add dirname() filter
Sun, 07 Jan 2018 11:21:25 +0900 Yuya Nishihara templater: add function to help substituting patterns in template string
Sun, 07 Jan 2018 11:04:53 +0900 Yuya Nishihara templater: extract function scanning template string
Sun, 18 Feb 2018 16:19:26 -0800 Gregory Szorc tests: expand test coverage for updating phases stable
Sun, 18 Feb 2018 10:00:34 -0800 Gregory Szorc tests: consolidate test-push-http.t and test-push-http-bundle1.t stable
Sun, 18 Feb 2018 08:52:57 -0800 Gregory Szorc tests: port value-less unbundle capability test to test-push-http.t stable
Sun, 18 Feb 2018 08:49:18 -0800 Gregory Szorc tests: add phase testing to test-push-http-bundle1.t stable
Sun, 07 Jan 2018 11:26:16 +0900 Yuya Nishihara cmdutil: narrow scope of KeyError in makefilename()
Wed, 14 Feb 2018 21:34:12 -0500 Augie Fackler node: make bin() be a wrapper instead of just an alias
Fri, 16 Feb 2018 11:30:18 -0800 Martin von Zweigbergk tests: actually check that HGDEMANDIMPORT=disable disables demandimport
Thu, 04 Jan 2018 16:29:07 -0800 Kyle Lippincott debugcommands: print out the editor that was searched for (post shlexsplit)
Fri, 16 Feb 2018 17:24:31 -0500 Augie Fackler merge with stable
Fri, 16 Feb 2018 13:25:39 -0800 Jun Wu date: fix parsing months stable
Thu, 15 Feb 2018 21:14:57 +0800 Anton Shestakov hgweb: show dates recorded in obsolescence markers
Thu, 15 Feb 2018 21:05:31 +0800 Anton Shestakov gitweb: make span.age CSS selector more specific
Thu, 15 Feb 2018 17:30:43 -0500 Augie Fackler wireprotoserver: return to using iscmd() method
Sun, 11 Feb 2018 17:23:58 -0800 Gregory Szorc githelp: cast commands to bytes
Wed, 14 Feb 2018 17:43:33 +0530 Pulkit Goyal py3: use util.forcebytestr instead of str for converting errors to bytes
Wed, 14 Feb 2018 16:37:46 +0530 Pulkit Goyal py3: use pycompat.bytestr to convert str to bytes
Mon, 12 Feb 2018 10:41:00 -0500 Augie Fackler mpatch: allow clang-format oversight
Mon, 12 Feb 2018 10:39:46 -0500 Augie Fackler base85: allow clang-format oversight
Mon, 12 Feb 2018 10:38:11 -0500 Augie Fackler charencode: allow clang-format oversight
Wed, 14 Feb 2018 21:12:48 -0500 Augie Fackler formatting: enforce system headers before local headers
Mon, 12 Feb 2018 17:20:20 -0800 Gregory Szorc wireprotoserver: add version to HTTP protocol name (API)
Mon, 12 Feb 2018 17:19:51 -0800 Gregory Szorc wireprotoserver: rename webproto to httpv1protocolhandler
Mon, 12 Feb 2018 17:16:52 -0800 Gregory Szorc wireproto: improve docstring for "hello"
Mon, 12 Feb 2018 17:14:29 -0800 Gregory Szorc httppeer: remove httpspeer
Mon, 12 Feb 2018 17:10:58 -0800 Gregory Szorc httppeer: remove redundant code to fetch capabilities
Thu, 01 Feb 2018 19:32:42 -0800 Gregory Szorc httppeer: change logic around argument handling
Mon, 12 Feb 2018 16:35:06 -0800 Gregory Szorc tests: test using both versions of SSH protocol
Thu, 08 Feb 2018 11:39:23 -0800 Gregory Szorc sshpeer: log remote capabilities after protocol upgrade
Mon, 12 Feb 2018 16:33:54 -0800 Gregory Szorc wireprotoserver: handle SSH protocol version 2 upgrade requests
Thu, 08 Feb 2018 15:09:59 -0800 Gregory Szorc wireprotoserver: move SSH server operation to a standalone function
Wed, 14 Feb 2018 17:35:13 -0700 Gregory Szorc py3: stringify integer with %d instead of bytes()
Wed, 14 Feb 2018 17:23:26 -0700 Gregory Szorc py3: add b'' to test-sshserver.py
Wed, 14 Feb 2018 17:21:42 -0700 Gregory Szorc py3: add b'' to config options in test extension
Tue, 13 Feb 2018 14:15:29 -0800 Martin von Zweigbergk manifest: add support for including directories outside narrowspec
Tue, 13 Feb 2018 13:50:24 -0800 Martin von Zweigbergk narrow: restrict manifest iteration by using manifest.walk(matcher)
Tue, 13 Feb 2018 13:16:06 -0800 Martin von Zweigbergk narrow: only diff manifest part within narrowspec when generating changegroup
Sat, 06 Jan 2018 17:44:57 +0900 Yuya Nishihara cmdutil: build "%m" (desc|firstline) in makefilename()
Thu, 02 Apr 2015 23:37:07 +0900 Yuya Nishihara cmdutil: rewrite makefilename() to use ctx methods
Thu, 02 Apr 2015 23:28:16 +0900 Yuya Nishihara cmdutil: pass ctx to makefileobj() in place of repo/node pair (API)
Thu, 02 Apr 2015 23:32:28 +0900 Yuya Nishihara cmdutil: pass ctx to makefilename() in place of repo/node pair (API)
Thu, 02 Apr 2015 23:22:02 +0900 Yuya Nishihara cmdutil: make node parameter of makefileobj() mandatory (API)
Wed, 14 Feb 2018 21:36:15 +0900 Yuya Nishihara progress: use '%*d' to pad progress value
Wed, 14 Feb 2018 21:29:27 +0900 Yuya Nishihara py3: stringify IOError/OSError without loosing local character
Fri, 26 Jan 2018 19:48:39 +0900 Yuya Nishihara dirstate: drop explicit files that shouldn't match (BC) (issue4679)
Sun, 21 Jan 2018 17:04:42 +0900 Yuya Nishihara log: add TODO comments about --line-range processing
Sun, 21 Jan 2018 16:15:20 +0900 Yuya Nishihara log: factor out function to feed revisions to displayer
Sun, 21 Jan 2018 16:04:59 +0900 Yuya Nishihara graphlog: unblock --line-range option
Sun, 21 Jan 2018 16:03:14 +0900 Yuya Nishihara graphlog: deduplicate preprocessing of log command
Wed, 14 Feb 2018 20:32:32 +0800 Anton Shestakov hgweb: show users recorded in obsolescence markers
Wed, 14 Feb 2018 14:12:05 +0100 Denis Laxalde revert: use an exact matcher in interactive diff selection (issue5789)
Sun, 11 Feb 2018 20:37:44 +0100 Denis Laxalde tests: add a test demonstrate that 'revert -i' ignores nonexistent patterns
Wed, 14 Feb 2018 17:44:54 +0530 Pulkit Goyal py3: slice over bytes to prevent getting ascii values
Wed, 14 Feb 2018 17:44:19 +0530 Pulkit Goyal py3: converts bytes to pycompat.bytestr to get bytechrs while enumerating
Wed, 14 Feb 2018 17:42:14 +0530 Pulkit Goyal py3: use pycompat.{bytes|str}kwargs in transplant.py
Wed, 14 Feb 2018 17:41:27 +0530 Pulkit Goyal py3: replace file() with open() in transplant.py
Wed, 14 Feb 2018 17:40:51 +0530 Pulkit Goyal py3: use "%d" for converting int to bytes in transplant.py
Wed, 14 Feb 2018 17:39:56 +0530 Pulkit Goyal py3: open files in bytes mode in transplant.py
Wed, 14 Feb 2018 17:06:20 +0530 Pulkit Goyal py3: use pycompat.bytestr instead of str
Wed, 14 Feb 2018 17:05:33 +0530 Pulkit Goyal py3: use "%d" to convert integers to bytes
Wed, 14 Feb 2018 16:38:15 +0530 Pulkit Goyal py3: add couple of missing b'' in fakemergerecord.py
Wed, 14 Feb 2018 16:06:54 +0530 Pulkit Goyal py3: add b'' to make sure regex pattern are bytes in hgweb/webutil.py
Wed, 14 Feb 2018 15:58:11 +0530 Pulkit Goyal py3: add b'' prefixes in test-worker.t
Wed, 14 Feb 2018 15:46:57 +0530 Pulkit Goyal py3: add b'' prefixes to make printrevset.py work in test-glog.t
Wed, 14 Feb 2018 15:43:03 +0530 Pulkit Goyal py3: slice over bytes to prevent getting ascii values
Wed, 14 Feb 2018 00:18:35 -0500 Augie Fackler python3: whitelist another 5 passing tests
Tue, 13 Feb 2018 23:00:01 -0700 Augie Fackler py3: introduce and use pycompat.getargspec
Tue, 13 Feb 2018 23:37:58 -0500 Augie Fackler merge: coerce nodes to bytes, not str
Tue, 13 Feb 2018 19:12:44 -0500 Augie Fackler py3: whitelist more passing tests
Tue, 13 Feb 2018 18:46:47 -0500 Augie Fackler histedit: binascii.unhexlify (aka node.bin) throws new exception type on py3
Tue, 13 Feb 2018 13:23:18 -0800 Martin von Zweigbergk treemanifest: add an optimized __nonzero__()
Tue, 13 Feb 2018 18:49:06 -0500 Augie Fackler tests: port fakemergerecord to python3
Tue, 13 Feb 2018 18:48:47 -0500 Augie Fackler tests: add some b-prefixes on local script in test-histedit-arguments
Tue, 13 Feb 2018 18:47:55 -0500 Augie Fackler tests: add bytes prefixes to test-histedit-fold.t's local extension
Tue, 13 Feb 2018 18:25:05 -0500 Augie Fackler histedit: fix silly bug that was unpacking a bytestr before writing it
Tue, 13 Feb 2018 18:13:33 -0500 Augie Fackler py3: whitelist another 8 passing tests
Tue, 13 Feb 2018 17:25:43 -0500 Augie Fackler histedit: modernize write of histedit-last-edit file
Tue, 13 Feb 2018 17:25:25 -0500 Augie Fackler histedit: convert bool to bytestring manually
Tue, 13 Feb 2018 13:38:38 -0500 Augie Fackler narrowcommands: more byteskwargs cleanup
Tue, 13 Feb 2018 13:37:43 -0500 Augie Fackler narrowmerge: iterate over a copy of dict items so we can mutate the dict
less more | rev 36356: (0) -30000 -10000 -3000 -1000 -192 +192 +1000 +3000 +10000 tip