| Tue, 24 Nov 2015 15:16:25 -0800 |
Gregory Szorc |
extensions: refuse to load extensions if minimum hg version not met
|
| Wed, 25 Nov 2015 00:39:05 +0000 |
timeless |
run-tests: add --slowtimeout and use it for slow tests
|
| Sat, 31 Oct 2015 22:17:05 +0900 |
Yuya Nishihara |
serve: unify cmdutil.service() calls of commandserver and hgweb
|
| Sat, 31 Oct 2015 22:15:16 +0900 |
Yuya Nishihara |
hgweb: extract factory function of httpservice object
|
| Sat, 31 Oct 2015 21:57:45 +0900 |
Yuya Nishihara |
hgweb: move httpservice object from commands module
|
| Wed, 25 Nov 2015 14:25:33 -0800 |
Siddharth Agarwal |
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
|
| Wed, 25 Nov 2015 14:26:46 -0800 |
Siddharth Agarwal |
test-merge-changedelete.t: print out debugmergestate
|
| Tue, 24 Nov 2015 18:26:21 -0800 |
Siddharth Agarwal |
debugmergestate: also recognize change/delete conflicts in the merge state
|
| Mon, 30 Nov 2015 10:26:37 -0800 |
Siddharth Agarwal |
debugmergestate: print out null nodes as 'null'
|
| Tue, 24 Nov 2015 15:03:00 -0800 |
Siddharth Agarwal |
test-merge-force.t: check .orig files separately
|
| Tue, 24 Nov 2015 15:26:51 -0800 |
Siddharth Agarwal |
merge.recordupdates: mark 'a' files as added unconditionally
|
| Mon, 30 Nov 2015 10:19:39 -0800 |
Siddharth Agarwal |
merge: add a new action type representing files to add/mark as modified
|
| Mon, 30 Nov 2015 10:03:21 -0800 |
Siddharth Agarwal |
mergestate: add a cached property accessor for the local context
|
| Mon, 30 Nov 2015 10:05:09 -0800 |
Siddharth Agarwal |
mergestate: raise exception if otherctx is accessed but _other isn't set
|
| Mon, 30 Nov 2015 18:47:33 +0000 |
timeless |
pager: improve help for --pager=
|
| Tue, 24 Nov 2015 21:17:26 -0800 |
Gregory Szorc |
setup: remove unused py_modules argument to setup()
|
| Mon, 23 Nov 2015 13:45:56 -0800 |
Siddharth Agarwal |
test-merge-changedelete.t: add resolve --list output
|
| Mon, 23 Nov 2015 13:43:14 -0800 |
Siddharth Agarwal |
test-merge-changedelete.t: add a file with regular merge conflicts
|
| Tue, 24 Nov 2015 10:58:35 -0800 |
Siddharth Agarwal |
filemerge: in ':prompt', use ':fail' tool rather than returning directly
|
| Tue, 24 Nov 2015 10:57:01 -0800 |
Siddharth Agarwal |
filemerge: in ':fail' tool, write out other side if local side is deleted
|
| Mon, 23 Nov 2015 18:03:25 -0800 |
Siddharth Agarwal |
mergestate: explicitly forget 'dc' conflicts where the deleted side is picked
|
| Mon, 23 Nov 2015 19:06:15 -0800 |
Siddharth Agarwal |
merge.applyupdates: add all actions returned from merge state
|
| Fri, 27 Nov 2015 20:23:23 +0100 |
Mathias De Maré |
identify: refer to log to be able to view full hashes
|
| Fri, 27 Nov 2015 20:23:02 +0100 |
Mathias De Maré |
log: add 'hg log' example for full hashes
|
| Fri, 02 Oct 2015 07:48:23 +0200 |
Mathias De Maré |
backout: add examples to clarify basic usage
|
| Wed, 25 Nov 2015 06:10:54 +0000 |
timeless |
gpg: rename sigcheck function
|
| Tue, 24 Nov 2015 18:40:16 -0500 |
Augie Fackler |
extensions: properly mark progress as part of core
|
| Fri, 27 Nov 2015 23:10:48 +0900 |
Yuya Nishihara |
test-help: don't use progress extension for the test of argument parsing
|
| Tue, 24 Nov 2015 22:31:56 +0000 |
timeless |
hghave.py: fix matchoutput documentation
|
| Tue, 24 Nov 2015 14:23:46 -0800 |
Gregory Szorc |
dispatch: use versiontuple()
|
