| Mon, 30 Nov 2015 13:43:55 -0800 |
Siddharth Agarwal |
filemerge: add a 'leave unresolved' option to change/delete prompts
|
changeset |
files
|
| Mon, 30 Nov 2015 11:17:18 -0800 |
Siddharth Agarwal |
filemerge: add a 'leave unresolved' option to regular prompts
|
changeset |
files
|
| Wed, 25 Nov 2015 14:25:26 -0800 |
Siddharth Agarwal |
filemerge: add debug output for whether this is a change/delete conflict
|
changeset |
files
|
| Sat, 28 Nov 2015 17:06:29 +0800 |
Anton Shestakov |
webcommands: test that fctx is not None in filediff()
|
changeset |
files
|
| Sat, 28 Nov 2015 16:46:31 +0800 |
Anton Shestakov |
webcommands: stop using ersatz if-else ternary operator for rename variable
|
changeset |
files
|
| Sat, 28 Nov 2015 16:02:22 +0800 |
Anton Shestakov |
webcommands: get correct parents when comparing a removed file (issue4962)
|
changeset |
files
|
| Mon, 30 Nov 2015 16:38:29 -0800 |
Laurent Charignon |
repair: use bookmarks.recordchange instead of bookmarks.write
|
changeset |
files
|
| Mon, 30 Nov 2015 16:37:42 -0800 |
Laurent Charignon |
commit: add amend mode for commit -i
|
changeset |
files
|
| Mon, 30 Nov 2015 16:35:21 -0800 |
Laurent Charignon |
commit: add a way to return more information from the chunkselector
|
changeset |
files
|
| Sat, 21 Nov 2015 17:40:26 +0200 |
Mykola Nikishov |
histedit: edit with custom filename
|
changeset |
files
|
| Sat, 21 Nov 2015 22:04:09 +0200 |
Mykola Nikishov |
ui: allow open editor with custom filename
|
changeset |
files
|
| Mon, 30 Nov 2015 20:45:07 +0000 |
timeless |
help: make help deprecated mention the extension
|
changeset |
files
|
| Mon, 30 Nov 2015 20:44:22 +0000 |
timeless |
help: make listexts less confusing for deprecated exts
|
changeset |
files
|
| Sun, 29 Nov 2015 06:51:23 +0000 |
timeless |
patchbomb: rename email function
|
changeset |
files
|
| Sun, 29 Nov 2015 06:51:23 +0000 |
timeless |
graphlog: rename glog function
|
changeset |
files
|
| Sat, 28 Nov 2015 04:11:57 -0500 |
Mike Edgar |
commit: preserve extra when amending with commit --amend
|
changeset |
files
|
| Sat, 28 Nov 2015 04:11:38 -0500 |
Mike Edgar |
graft: copy extra (except branch) when copying changesets
|
changeset |
files
|
| Sat, 28 Nov 2015 04:11:14 -0500 |
Mike Edgar |
rebase: propagate extra dict from rebase source changeset
|
changeset |
files
|
| Wed, 25 Nov 2015 18:26:48 +0100 |
Mathias De Maré |
histedit: add examples
|
changeset |
files
|
| Wed, 25 Nov 2015 18:10:59 +0100 |
Mathias De Maré |
commands: add examples for 'addremove'
|
changeset |
files
|
| Wed, 25 Nov 2015 18:10:31 +0100 |
Mathias De Maré |
commands: add example for 'hg add'
|
changeset |
files
|
| Tue, 24 Nov 2015 15:16:25 -0800 |
Gregory Szorc |
extensions: refuse to load extensions if minimum hg version not met
|
changeset |
files
|
| Wed, 25 Nov 2015 00:39:05 +0000 |
timeless |
run-tests: add --slowtimeout and use it for slow tests
|
changeset |
files
|
| Sat, 31 Oct 2015 22:17:05 +0900 |
Yuya Nishihara |
serve: unify cmdutil.service() calls of commandserver and hgweb
|
changeset |
files
|
| Sat, 31 Oct 2015 22:15:16 +0900 |
Yuya Nishihara |
hgweb: extract factory function of httpservice object
|
changeset |
files
|
| Sat, 31 Oct 2015 21:57:45 +0900 |
Yuya Nishihara |
hgweb: move httpservice object from commands module
|
changeset |
files
|
| Wed, 25 Nov 2015 14:25:33 -0800 |
Siddharth Agarwal |
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
|
changeset |
files
|
| Wed, 25 Nov 2015 14:26:46 -0800 |
Siddharth Agarwal |
test-merge-changedelete.t: print out debugmergestate
|
changeset |
files
|
| Tue, 24 Nov 2015 18:26:21 -0800 |
Siddharth Agarwal |
debugmergestate: also recognize change/delete conflicts in the merge state
|
changeset |
files
|
| Mon, 30 Nov 2015 10:26:37 -0800 |
Siddharth Agarwal |
debugmergestate: print out null nodes as 'null'
|
changeset |
files
|
| Tue, 24 Nov 2015 15:03:00 -0800 |
Siddharth Agarwal |
test-merge-force.t: check .orig files separately
|
changeset |
files
|
| Tue, 24 Nov 2015 15:26:51 -0800 |
Siddharth Agarwal |
merge.recordupdates: mark 'a' files as added unconditionally
|
changeset |
files
|
| Mon, 30 Nov 2015 10:19:39 -0800 |
Siddharth Agarwal |
merge: add a new action type representing files to add/mark as modified
|
changeset |
files
|
| Mon, 30 Nov 2015 10:03:21 -0800 |
Siddharth Agarwal |
mergestate: add a cached property accessor for the local context
|
changeset |
files
|
| Mon, 30 Nov 2015 10:05:09 -0800 |
Siddharth Agarwal |
mergestate: raise exception if otherctx is accessed but _other isn't set
|
changeset |
files
|
| Mon, 30 Nov 2015 18:47:33 +0000 |
timeless |
pager: improve help for --pager=
|
changeset |
files
|
| Tue, 24 Nov 2015 21:17:26 -0800 |
Gregory Szorc |
setup: remove unused py_modules argument to setup()
|
changeset |
files
|
| Mon, 23 Nov 2015 13:45:56 -0800 |
Siddharth Agarwal |
test-merge-changedelete.t: add resolve --list output
|
changeset |
files
|
| Mon, 23 Nov 2015 13:43:14 -0800 |
Siddharth Agarwal |
test-merge-changedelete.t: add a file with regular merge conflicts
|
changeset |
files
|
| Tue, 24 Nov 2015 10:58:35 -0800 |
Siddharth Agarwal |
filemerge: in ':prompt', use ':fail' tool rather than returning directly
|
changeset |
files
|
| Tue, 24 Nov 2015 10:57:01 -0800 |
Siddharth Agarwal |
filemerge: in ':fail' tool, write out other side if local side is deleted
|
changeset |
files
|
| Mon, 23 Nov 2015 18:03:25 -0800 |
Siddharth Agarwal |
mergestate: explicitly forget 'dc' conflicts where the deleted side is picked
|
changeset |
files
|
| Mon, 23 Nov 2015 19:06:15 -0800 |
Siddharth Agarwal |
merge.applyupdates: add all actions returned from merge state
|
changeset |
files
|
| Fri, 27 Nov 2015 20:23:23 +0100 |
Mathias De Maré |
identify: refer to log to be able to view full hashes
|
changeset |
files
|
| Fri, 27 Nov 2015 20:23:02 +0100 |
Mathias De Maré |
log: add 'hg log' example for full hashes
|
changeset |
files
|
| Fri, 02 Oct 2015 07:48:23 +0200 |
Mathias De Maré |
backout: add examples to clarify basic usage
|
changeset |
files
|
| Wed, 25 Nov 2015 06:10:54 +0000 |
timeless |
gpg: rename sigcheck function
|
changeset |
files
|
| Tue, 24 Nov 2015 18:40:16 -0500 |
Augie Fackler |
extensions: properly mark progress as part of core
|
changeset |
files
|
| Fri, 27 Nov 2015 23:10:48 +0900 |
Yuya Nishihara |
test-help: don't use progress extension for the test of argument parsing
|
changeset |
files
|
| Tue, 24 Nov 2015 22:31:56 +0000 |
timeless |
hghave.py: fix matchoutput documentation
|
changeset |
files
|
| Tue, 24 Nov 2015 14:23:46 -0800 |
Gregory Szorc |
dispatch: use versiontuple()
|
changeset |
files
|
| Tue, 24 Nov 2015 14:23:51 -0800 |
Gregory Szorc |
util: add versiontuple() for returning parsed version information
|
changeset |
files
|
| Tue, 24 Nov 2015 16:38:54 -0800 |
Bryan O'Sullivan |
extensions: rename _ignore to _builtin, add descriptive comment
|
changeset |
files
|
| Sun, 22 Nov 2015 14:44:55 -0800 |
Gregory Szorc |
ui: avoid needless casting to a str
|
changeset |
files
|
| Tue, 24 Nov 2015 11:23:10 -0800 |
Gregory Szorc |
ui: remove labeled argument from popbuffer
|
changeset |
files
|
| Sun, 22 Nov 2015 14:18:42 -0800 |
Gregory Szorc |
color: evaluate labels at write time
|
changeset |
files
|
| Sun, 22 Nov 2015 14:13:25 -0800 |
Gregory Szorc |
cmdutil: pass labeled=True to pushbuffer()
|
changeset |
files
|
| Sun, 22 Nov 2015 14:10:48 -0800 |
Gregory Szorc |
ui: track label expansion when creating buffers
|
changeset |
files
|
| Tue, 01 Dec 2015 20:18:28 -0600 |
Matt Mackall |
Added signature for changeset 2d437a0f3355
stable
|
changeset |
files
|
| Tue, 01 Dec 2015 20:18:27 -0600 |
Matt Mackall |
Added tag 3.6.2 for changeset 2d437a0f3355
stable
|
changeset |
files
|