| Tue, 24 Nov 2015 22:21:51 -0800 |
Gregory Szorc |
mercurial: don't load C extensions from PyPy
|
| Tue, 24 Nov 2015 22:50:04 -0800 |
Gregory Szorc |
mercurial: be more strict about loading dual implemented modules
|
| Thu, 03 Dec 2015 21:48:12 -0800 |
Gregory Szorc |
setup: refactor handling of modules with C/Python implementations
|
| Tue, 24 Nov 2015 22:53:55 -0800 |
Gregory Szorc |
check-seclevel: set module load policy to Python only
|
| Thu, 03 Dec 2015 21:37:01 -0800 |
Gregory Szorc |
mercurial: implement import hook for handling C/Python modules
|
| Thu, 03 Dec 2015 10:56:05 -0500 |
Augie Fackler |
changegroup: document manifest linkrev callback some more
|
| Wed, 02 Dec 2015 14:32:17 -0500 |
Augie Fackler |
changegroup: note during bundle apply if the repo was empty
|
| Wed, 02 Dec 2015 07:41:35 +0000 |
timeless |
histedit: improve missing rule suggestion
|
| Sat, 14 Nov 2015 17:25:43 +0900 |
Yuya Nishihara |
graphlog: make node symbol templatable by ui.graphnodetemplate option
|
| Sat, 14 Nov 2015 17:02:57 +0900 |
Yuya Nishihara |
templatekw: avoid slow creation of changectx objects in showgraphnode()
|
| Sat, 14 Nov 2015 16:58:18 +0900 |
Yuya Nishihara |
graphlog: extract "graphnode" template keyword that represents node symbol
|
| Sat, 14 Nov 2015 16:45:15 +0900 |
Yuya Nishihara |
graphlog: move creation of workingdir-parent nodes to displaygraph()
|
| Wed, 25 Nov 2015 18:07:33 +0800 |
Anton Shestakov |
builddeb: read default distribution and codename from lsb_release
|
| Wed, 25 Nov 2015 15:26:03 +0800 |
Anton Shestakov |
builddeb: remove unused --debbuilddir option
|
| Wed, 25 Nov 2015 15:15:03 +0800 |
Anton Shestakov |
builddeb: add --distid option to specify Distributor ID
|
| Wed, 25 Nov 2015 14:59:43 +0800 |
Anton Shestakov |
builddeb: rename --release option to --codename
|
| Wed, 02 Dec 2015 12:19:01 -0800 |
Mateusz Kwapich |
histedit: get rid of state.rules
|
| Wed, 02 Dec 2015 12:19:01 -0800 |
Mateusz Kwapich |
histedit: change state.rules uses to state.actions
|
| Wed, 02 Dec 2015 12:19:01 -0800 |
Mateusz Kwapich |
histedit: add tostate method to histedit action
|
| Wed, 02 Dec 2015 12:19:01 -0800 |
Mateusz Kwapich |
histedit: remove makedesc
|
| Wed, 02 Dec 2015 12:19:01 -0800 |
Mateusz Kwapich |
histedit: use torule instead of makedesc in ruleeditor
|
| Wed, 02 Dec 2015 12:19:01 -0800 |
Mateusz Kwapich |
histedit: add torule method to histedit action objects
|
| Wed, 02 Dec 2015 12:19:01 -0800 |
Mateusz Kwapich |
histedit: add verify() to histeditaction
|
| Wed, 02 Dec 2015 12:19:01 -0800 |
Mateusz Kwapich |
histedit: add addhisteditaction decorator
|
| Wed, 02 Dec 2015 12:19:01 -0800 |
Mateusz Kwapich |
histedit: add actions property to histedit state
|
| Fri, 06 Nov 2015 17:27:42 -0500 |
Pierre-Yves David |
check-commit: remove confusion between summary line and other headers
|
| Wed, 02 Dec 2015 03:12:08 +0900 |
FUJIWARA Katsunori |
shelve: execute checkunfinished inside wlock scope
|
| Wed, 02 Dec 2015 03:12:08 +0900 |
FUJIWARA Katsunori |
shelve: widen wlock scope of shelve for consistency while processing
|
| Wed, 02 Dec 2015 03:12:08 +0900 |
FUJIWARA Katsunori |
gpg: make sign acquire wlock before processing
|
| Wed, 02 Dec 2015 03:12:08 +0900 |
FUJIWARA Katsunori |
commands: execute checkunfinished and bailifchanged inside wlock scope
|
| Wed, 02 Dec 2015 03:12:07 +0900 |
FUJIWARA Katsunori |
commands: widen wlock scope of graft for consitency while processing
|
| Wed, 02 Dec 2015 03:12:07 +0900 |
FUJIWARA Katsunori |
commands: make backout acquire locks before processing
|
| Wed, 02 Dec 2015 03:12:07 +0900 |
FUJIWARA Katsunori |
commands: make commit acquire locks before processing (issue4368)
|
| Tue, 01 Dec 2015 16:15:59 -0800 |
Pierre-Yves David |
addrevision: use general delta when the incoming base delta is bad
|
| Tue, 01 Dec 2015 18:11:00 -0800 |
Pierre-Yves David |
test: use a bigger manifest in general delta test
|
| Tue, 01 Dec 2015 18:45:16 -0800 |
Pierre-Yves David |
addrevision: rework generaldelta computation
|
| Wed, 11 Nov 2015 21:03:48 -0500 |
Augie Fackler |
bmstore: close file in a finally block in _writerepo
|
| Wed, 11 Nov 2015 21:01:23 -0500 |
Augie Fackler |
bmstore: add basic clean-state tracking
|
| Wed, 11 Nov 2015 20:45:38 -0500 |
Augie Fackler |
bookmarks: hoist getbkfile out of bmstore class
|
| Wed, 11 Nov 2015 20:43:25 -0500 |
Augie Fackler |
bookmarks: document getbkfile method
|
| Sat, 31 Oct 2015 22:50:03 +0900 |
Yuya Nishihara |
hgweb: load server settings from --web-conf (issue4699)
|
| Tue, 17 Nov 2015 16:42:52 -0600 |
Andrew Zwicky |
extdiff: correctly handle deleted subrepositories (issue3153)
|
| Sat, 21 Nov 2015 13:28:12 +0900 |
Yuya Nishihara |
hgweb: make sure command options are set to all ui objects
|
| Sat, 31 Oct 2015 22:26:50 +0900 |
Yuya Nishihara |
hgweb: eliminate duck-typing to select hgweb or hgwebdir by command option
|
| Tue, 01 Dec 2015 16:06:20 -0800 |
Pierre-Yves David |
addrevision: only use the incoming base if it is a good delta (issue4975)
|
| Tue, 01 Dec 2015 16:22:49 -0800 |
Pierre-Yves David |
addrevision: handle code path not producing delta
|
| Tue, 01 Dec 2015 15:29:11 -0800 |
Pierre-Yves David |
addrevision: rename 'd' to 'delta'
|
| Mon, 30 Nov 2015 11:23:15 -0800 |
Christian Delahousse |
strip: add a --keep test related to removing files from dirstate
|
| Mon, 30 Nov 2015 11:23:15 -0800 |
Christian Delahousse |
dirstate: change debugrebuilddirstate --minimal to use dirstate.rebuild
|
| Tue, 01 Dec 2015 10:52:36 -0800 |
Christian Delahousse |
debugrebuilddirstate: added tests for --minimal flag
|
| Tue, 01 Dec 2015 11:17:14 -0800 |
Christian Delahousse |
debugdirstate: add command to rebuildstate test to modify dirstate
|
| Wed, 02 Dec 2015 06:33:52 +0000 |
timeless |
graft: improve --continue abort message
|
| Wed, 02 Dec 2015 06:31:12 +0000 |
timeless |
summary: mention graft
|
| Wed, 02 Dec 2015 08:07:36 +0000 |
timeless |
histedit: mention histedit-last-edit.txt on abort
|
| Wed, 02 Dec 2015 07:40:42 +0000 |
timeless |
histedit: add missing raise keyword to statement
|
| Wed, 02 Dec 2015 07:39:49 +0000 |
timeless |
histedit: improve grammar for _histedit comment
|
| Tue, 01 Dec 2015 14:44:08 -0500 |
Augie Fackler |
test-fncache: ensure lock doesn't look held to __del__
|
| Wed, 11 Nov 2015 20:07:15 -0500 |
Augie Fackler |
commands: inline definition of localrepo.parents() and drop the method (API)
|
| Wed, 11 Nov 2015 20:02:05 -0500 |
Augie Fackler |
localrepo: document nodebookmarks
|
| Wed, 11 Nov 2015 19:47:49 -0500 |
Augie Fackler |
localrepo: remove clone method by hoisting into hg.py
|
| Tue, 01 Dec 2015 09:48:38 -0800 |
Siddharth Agarwal |
filemerge: default regular prompts to 'leave unresolved' (BC)
|
| Mon, 30 Nov 2015 13:43:55 -0800 |
Siddharth Agarwal |
filemerge: add a 'leave unresolved' option to change/delete prompts
|
| Mon, 30 Nov 2015 11:17:18 -0800 |
Siddharth Agarwal |
filemerge: add a 'leave unresolved' option to regular prompts
|
| Wed, 25 Nov 2015 14:25:26 -0800 |
Siddharth Agarwal |
filemerge: add debug output for whether this is a change/delete conflict
|
| Sat, 28 Nov 2015 17:06:29 +0800 |
Anton Shestakov |
webcommands: test that fctx is not None in filediff()
|
| Sat, 28 Nov 2015 16:46:31 +0800 |
Anton Shestakov |
webcommands: stop using ersatz if-else ternary operator for rename variable
|
| Sat, 28 Nov 2015 16:02:22 +0800 |
Anton Shestakov |
webcommands: get correct parents when comparing a removed file (issue4962)
|
| Mon, 30 Nov 2015 16:38:29 -0800 |
Laurent Charignon |
repair: use bookmarks.recordchange instead of bookmarks.write
|
| Mon, 30 Nov 2015 16:37:42 -0800 |
Laurent Charignon |
commit: add amend mode for commit -i
|
| Mon, 30 Nov 2015 16:35:21 -0800 |
Laurent Charignon |
commit: add a way to return more information from the chunkselector
|
| Sat, 21 Nov 2015 17:40:26 +0200 |
Mykola Nikishov |
histedit: edit with custom filename
|
| Sat, 21 Nov 2015 22:04:09 +0200 |
Mykola Nikishov |
ui: allow open editor with custom filename
|
| Mon, 30 Nov 2015 20:45:07 +0000 |
timeless |
help: make help deprecated mention the extension
|
| Mon, 30 Nov 2015 20:44:22 +0000 |
timeless |
help: make listexts less confusing for deprecated exts
|
| Sun, 29 Nov 2015 06:51:23 +0000 |
timeless |
patchbomb: rename email function
|
| Sun, 29 Nov 2015 06:51:23 +0000 |
timeless |
graphlog: rename glog function
|
| Sat, 28 Nov 2015 04:11:57 -0500 |
Mike Edgar |
commit: preserve extra when amending with commit --amend
|
| Sat, 28 Nov 2015 04:11:38 -0500 |
Mike Edgar |
graft: copy extra (except branch) when copying changesets
|
| Sat, 28 Nov 2015 04:11:14 -0500 |
Mike Edgar |
rebase: propagate extra dict from rebase source changeset
|
| Wed, 25 Nov 2015 18:26:48 +0100 |
Mathias De Maré |
histedit: add examples
|
| Wed, 25 Nov 2015 18:10:59 +0100 |
Mathias De Maré |
commands: add examples for 'addremove'
|
| Wed, 25 Nov 2015 18:10:31 +0100 |
Mathias De Maré |
commands: add example for 'hg add'
|
| 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()
|
| Tue, 24 Nov 2015 14:23:51 -0800 |
Gregory Szorc |
util: add versiontuple() for returning parsed version information
|
| Tue, 24 Nov 2015 16:38:54 -0800 |
Bryan O'Sullivan |
extensions: rename _ignore to _builtin, add descriptive comment
|
| Sun, 22 Nov 2015 14:44:55 -0800 |
Gregory Szorc |
ui: avoid needless casting to a str
|
| Tue, 24 Nov 2015 11:23:10 -0800 |
Gregory Szorc |
ui: remove labeled argument from popbuffer
|
| Sun, 22 Nov 2015 14:18:42 -0800 |
Gregory Szorc |
color: evaluate labels at write time
|
| Sun, 22 Nov 2015 14:13:25 -0800 |
Gregory Szorc |
cmdutil: pass labeled=True to pushbuffer()
|
| Sun, 22 Nov 2015 14:10:48 -0800 |
Gregory Szorc |
ui: track label expansion when creating buffers
|
| Tue, 01 Dec 2015 20:18:28 -0600 |
Matt Mackall |
Added signature for changeset 2d437a0f3355
stable
|
| Tue, 01 Dec 2015 20:18:27 -0600 |
Matt Mackall |
Added tag 3.6.2 for changeset 2d437a0f3355
stable
|
| Tue, 24 Nov 2015 18:13:25 -0800 |
Pierre-Yves David |
docker: match more version of 'hg docker version' (issue4967)
stable 3.6.2
|
| Mon, 30 Nov 2015 16:31:28 -0800 |
Siddharth Agarwal |
localrepo.commit: check all files for resolve state (issue4972)
stable
|
| Tue, 24 Nov 2015 21:41:12 +0000 |
timeless |
test-contrib-perf: add smoke tests for perf.py
|
| Tue, 24 Nov 2015 21:36:20 +0000 |
timeless |
contrib/perf: perfparents handle filtered repos
|
| Tue, 24 Nov 2015 20:54:14 +0000 |
timeless |
contrib/perf: perfparents handle tiny repos
|
| Tue, 24 Nov 2015 21:44:16 +0000 |
timeless |
contrib/perf: fix perfmergecalculate
|
| Tue, 24 Nov 2015 22:01:11 +0000 |
timeless |
contrib/perf: fix perffncachewrite
|
| Tue, 24 Nov 2015 20:05:15 +0000 |
timeless |
contrib/perf: omit duplicated function
|
| Tue, 24 Nov 2015 20:08:21 +0000 |
timeless |
contrib/perf: name functions to match decorators
|
| Tue, 24 Nov 2015 22:26:43 +0000 |
timeless |
hghave.py: remove execute bit
|
| Mon, 02 Nov 2015 17:33:18 +0000 |
Pierre-Yves David |
format: create new repository as 'generaldelta' by default
|
| Sun, 22 Nov 2015 21:40:23 -0800 |
Siddharth Agarwal |
shelve: use colon instead of quotes in 'changes to' description
|
| Sun, 22 Nov 2015 21:58:28 -0800 |
Siddharth Agarwal |
merge.applyupdates: create absentfilectxes for change/delete conflicts
|
| Sun, 22 Nov 2015 21:59:52 -0800 |
Siddharth Agarwal |
mergestate: add methods to queue files to remove, add or get
|
| Sun, 15 Nov 2015 21:27:22 -0800 |
Siddharth Agarwal |
resolve: record dirstate actions after performing resolutions
|
| Fri, 20 Nov 2015 16:55:01 -0800 |
Siddharth Agarwal |
mergestate: add a way to record pending dirstate actions
|
| Sun, 15 Nov 2015 21:55:46 -0800 |
Siddharth Agarwal |
merge.recordupdates: don't require action keys to be present in dict
|
| Mon, 23 Nov 2015 10:13:05 -0500 |
Augie Fackler |
histedit: constant-ify the constraints list
|
| Tue, 17 Nov 2015 15:04:31 -0800 |
Mateusz Kwapich |
histedit: add an experimental base action
|
| Tue, 17 Nov 2015 17:53:52 -0800 |
Mateusz Kwapich |
histedit: add abortdirty function
|
| Thu, 12 Nov 2015 16:40:33 -0800 |
Mateusz Kwapich |
histedit: add forceother constraint
|
| Tue, 17 Nov 2015 16:37:26 -0800 |
Mateusz Kwapich |
histedit: make verification configurable
|
| Fri, 13 Nov 2015 18:31:58 +0800 |
Anton Shestakov |
paper: show current revision on file log page
|
| Fri, 20 Nov 2015 11:26:31 -0800 |
Siddharth Agarwal |
merge.applyupdates: extend action queues with ones returned from mergestate
|
| Fri, 20 Nov 2015 16:43:25 -0800 |
Siddharth Agarwal |
mergestate: add a method to compute actions to perform on dirstate
|
| Fri, 20 Nov 2015 16:37:39 -0800 |
Siddharth Agarwal |
merge.applyupdates: use counters from mergestate
|
| Fri, 20 Nov 2015 16:18:51 -0800 |
Siddharth Agarwal |
mergestate: add a function to return the number of unresolved files
|
| Fri, 20 Nov 2015 16:17:54 -0800 |
Siddharth Agarwal |
mergestate: add a method to return updated/merged/removed counts
|
| Fri, 20 Nov 2015 16:32:47 -0800 |
Siddharth Agarwal |
mergestate._resolve: don't return the action any more
|
| Fri, 20 Nov 2015 16:08:22 -0800 |
Siddharth Agarwal |
mergestate._resolve: store return code and action for each file
|
| Sat, 21 Nov 2015 15:43:04 -0800 |
Gregory Szorc |
revsetbenchmarks: support benchmarking changectx loading
|
| Sat, 21 Nov 2015 15:39:18 -0800 |
Gregory Szorc |
perf: support obtaining contexts from perfrevset
|
| Sat, 21 Nov 2015 11:07:30 -0800 |
Gregory Szorc |
localrepo: improve docstring for revset methods
|
| Sun, 22 Nov 2015 16:23:20 -0800 |
Gregory Szorc |
revlog: improve documentation
|
| Sat, 21 Nov 2015 22:28:01 -0800 |
Gregory Szorc |
demandimport: don't enable when running under PyPy
|
| Sat, 14 Nov 2015 17:14:14 -0800 |
Gregory Szorc |
ui.write: don't clear progress bar when writing to a buffer
|
| Sun, 22 Nov 2015 21:20:08 -0500 |
Matt Harbison |
test-resolve: fix '--tool f' invocation for Windows
|
| Sat, 14 Nov 2015 17:30:10 -0800 |
Gregory Szorc |
util.datestr: use divmod()
|
| Sat, 14 Nov 2015 17:44:01 -0800 |
Gregory Szorc |
cmdutil.changeset_printer: pass context into showpatch()
|
| Sat, 21 Nov 2015 19:21:01 -0800 |
Gregory Szorc |
context: avoid extra parents lookups
|
| Sat, 21 Nov 2015 19:04:12 -0800 |
Gregory Szorc |
context: optimize _parents()
|
| Sun, 22 Nov 2015 13:05:21 -0500 |
Matt Harbison |
test-histedit: $TESTTMP quoting fixes for Windows
|
| Sat, 21 Nov 2015 23:26:22 -0800 |
Gregory Szorc |
lsprof: support PyPy (issue4573)
|
| Wed, 11 Nov 2015 19:10:45 -0500 |
Augie Fackler |
base85: clean up function definition style
|
| Fri, 20 Nov 2015 14:06:31 -0800 |
Laurent Charignon |
rebase: use bookmarks.recordchange instead of bookmarks.write
|
| Fri, 20 Nov 2015 11:36:05 -0800 |
Laurent Charignon |
rebase: indentation change to make the next patch more legible
|
| Mon, 16 Nov 2015 16:56:00 -0500 |
Matt Harbison |
test-run-tests: conditionalize the $TESTDIR check for Windows separator
|
| Mon, 09 Nov 2015 17:15:36 -0500 |
Matt Harbison |
test-context: conditionalize the workingfilectx date printing for Windows
|
| Mon, 16 Nov 2015 14:37:03 -0500 |
Matt Harbison |
test-mq-qrefresh: drop single quoting of HGEDITOR value for Windows
|
| Mon, 16 Nov 2015 14:12:27 -0500 |
Matt Harbison |
test-import: don't use printf to append an extension to $HGRCPATH
|
| Mon, 16 Nov 2015 13:44:27 -0500 |
Matt Harbison |
test-ssh: stop quoting dummyssh invocation for Windows
|
| Fri, 20 Nov 2015 13:46:36 -0800 |
Laurent Charignon |
strip: use repo._bookmarks.recordchange instead of repo._bookmarks.write
|
| Fri, 20 Nov 2015 13:23:47 -0800 |
Laurent Charignon |
histedit: make use of bookmarks.recordchange instead of bookmarks.write
|
| Wed, 18 Nov 2015 17:40:13 -0800 |
Siddharth Agarwal |
largefiles: fall back to the original for change/delete conflicts
|
| Sat, 14 Nov 2015 00:07:11 -0800 |
Siddharth Agarwal |
mergestate.add: store absentfilectxes as nullhex
|
| Fri, 20 Nov 2015 01:14:15 -0800 |
Siddharth Agarwal |
mergestate._resolve: handle change/delete conflicts
|
| Sat, 14 Nov 2015 00:00:46 -0800 |
Siddharth Agarwal |
filemerge: don't try to copy files known to be absent
|
| Sat, 31 Oct 2015 22:07:40 +0900 |
Yuya Nishihara |
hgweb: use absolute_import
|
| Sun, 01 Nov 2015 15:09:35 +0900 |
Yuya Nishihara |
hgweb: import wsgicgi at top level
|
| Sun, 01 Nov 2015 15:07:08 +0900 |
Yuya Nishihara |
hgweb: import BaseHTTPServer as module at top level
|
| Sun, 01 Nov 2015 14:23:23 +0900 |
Yuya Nishihara |
hgweb: do not import hgweb_mod.hgweb and .makebreadcrumb as symbol
|
| Fri, 13 Nov 2015 23:57:43 -0800 |
Siddharth Agarwal |
filemerge: don't try using external tools on change/delete conflicts
|
| Fri, 13 Nov 2015 23:56:00 -0800 |
Siddharth Agarwal |
filemerge: don't attempt to premerge change/delete conflicts
|
| Fri, 13 Nov 2015 23:58:05 -0800 |
Siddharth Agarwal |
filemerge._mergecheck: add check for change/delete conflicts
|
| Sun, 15 Nov 2015 21:40:15 -0800 |
Siddharth Agarwal |
filemerge._picktool: only pick from nomerge tools for change/delete conflicts
|
| Fri, 13 Nov 2015 23:52:26 -0800 |
Siddharth Agarwal |
filemerge: add support for change/delete conflicts to the ':prompt' tool
|
| Wed, 18 Nov 2015 15:41:50 -0800 |
Siddharth Agarwal |
filemerge: add support for change/delete conflicts to the ':other' merge tool
|
| Wed, 18 Nov 2015 15:40:28 -0800 |
Siddharth Agarwal |
filemerge: add support for change/delete conflicts to the ':local' merge tool
|
| Thu, 19 Nov 2015 10:50:02 -0800 |
Siddharth Agarwal |
merge.mergestate: compute dirstate action
|
| Wed, 18 Nov 2015 14:22:52 -0800 |
Siddharth Agarwal |
filemerge: return whether the file was deleted
|
| Wed, 18 Nov 2015 13:55:31 -0800 |
Siddharth Agarwal |
filemerge: return whether the file is deleted from all other merge tools
|
| Wed, 18 Nov 2015 13:52:28 -0800 |
Siddharth Agarwal |
filemerge: return whether the file is deleted for nomerge internal tools
|
| Wed, 18 Nov 2015 15:46:45 -0800 |
Siddharth Agarwal |
mergestate: allow storing and retrieving change/delete conflicts
|
| Thu, 19 Nov 2015 12:50:10 +0530 |
Shubhanshu Agrawal |
strip: changing bookmark argument to be a list
|
| Sun, 15 Nov 2015 21:03:44 +0530 |
Shubhanshu Agrawal |
strip: strip a list of bookmarks
|
| Wed, 18 Nov 2015 23:23:03 -0800 |
Pierre-Yves David |
revset: speed up '_matchfiles'
|
| Wed, 18 Nov 2015 15:46:45 -0800 |
Siddharth Agarwal |
mergestate: handle additional record types specially
|
| Wed, 18 Nov 2015 23:42:32 -0800 |
Siddharth Agarwal |
test-resolve.t: remove completely unnecessary line
|
| Wed, 18 Nov 2015 23:43:18 -0800 |
Siddharth Agarwal |
resolve: fix incorrect merge
|
| Wed, 18 Nov 2015 20:55:32 +0100 |
liscju |
fileset: add missing() predicate (issue4925)
|
| Tue, 10 Nov 2015 17:22:40 +0800 |
Anton Shestakov |
webutil: make _siblings into an object with __iter__ and __len__
|
| Wed, 18 Nov 2015 16:39:30 -0800 |
Siddharth Agarwal |
mergestate: move binary format documentation into _readrecordsv2
|
| Wed, 18 Nov 2015 15:11:23 -0800 |
Siddharth Agarwal |
unshelve: add support for custom merge tools
|
| Wed, 18 Nov 2015 15:18:16 -0800 |
Siddharth Agarwal |
unshelve: shed spurious space
|
| Wed, 18 Nov 2015 15:04:03 -0800 |
Siddharth Agarwal |
unshelve: add -k as short form of --keep
|
| Sun, 01 Nov 2015 13:55:21 +0900 |
Yuya Nishihara |
import-checker: allow symbol imports from hgweb.common and .request
|
| Thu, 19 Nov 2015 15:02:27 -0600 |
Matt Mackall |
perf: un-bitrot perfstatus
|
| Thu, 19 Nov 2015 13:15:17 -0600 |
Matt Mackall |
util: drop statmtimesec
|
| Thu, 19 Nov 2015 13:21:24 -0600 |
Matt Mackall |
util: disable floating point stat times (issue4836)
|
| Wed, 18 Nov 2015 15:58:06 -0800 |
Laurent Charignon |
rebase: refactoring to avoid repetition of expression
|
| Wed, 18 Nov 2015 16:06:00 -0800 |
Laurent Charignon |
rebase: remove an unused todo
|
| Wed, 18 Nov 2015 13:44:29 -0800 |
Laurent Charignon |
rebase: don't rebase obsolete commits with no successor
|
| Wed, 18 Nov 2015 13:46:42 -0800 |
Laurent Charignon |
rebase: fix a typo in test-rebase-obsolete
|
| Wed, 18 Nov 2015 20:59:17 -0600 |
Matt Mackall |
merge with stable
|
| Sun, 01 Nov 2015 14:43:25 +0900 |
Yuya Nishihara |
hgweb: unify import style of error classes
|
| Sun, 01 Nov 2015 14:00:14 +0900 |
Yuya Nishihara |
hgweb: do not import templatefilters.revescape and websub as symbol
|
| Sun, 01 Nov 2015 13:58:32 +0900 |
Yuya Nishihara |
hgweb: alias ui module as uimod
|
| Tue, 17 Nov 2015 14:23:26 -0800 |
Siddharth Agarwal |
mergestate.commit: factor out making the list of records
|
| Tue, 17 Nov 2015 14:04:56 -0800 |
Siddharth Agarwal |
mergestate: move _read() call to read constructor
|
| Tue, 17 Nov 2015 14:22:30 -0800 |
Siddharth Agarwal |
debugmergestate: explain why we create mergestate objects directly
|
| Wed, 11 Nov 2015 13:28:00 -0800 |
Christian Delahousse |
debugdirstate: convert keyword parameters to **opts
|
| Tue, 17 Nov 2015 18:01:21 -0800 |
Christian Delahousse |
convert: changed test's progress output format to ignore estimate
|
| Tue, 17 Nov 2015 13:12:33 -0800 |
Laurent Charignon |
mq: use repo._bookmarks.recordchange instead of repo._bookmarks.write
|
| Tue, 17 Nov 2015 13:12:46 -0800 |
Laurent Charignon |
mq: indentation change to make the next patch more legible
|
| Tue, 17 Nov 2015 12:49:57 -0800 |
Laurent Charignon |
bookmarks: use repo._bookmarks.recordchange instead of repo._bookmarks.write
|
| Wed, 18 Nov 2015 01:36:58 -0800 |
Laurent Charignon |
localrepo: put bookmark move following commit in one transaction
|
| Tue, 17 Nov 2015 15:43:21 -0800 |
Siddharth Agarwal |
test-resolve.t: switch to mergestate.read()
|
| Tue, 17 Nov 2015 13:58:50 -0800 |
Siddharth Agarwal |
localrepo.commit: switch to mergestate.read()
|
| Tue, 17 Nov 2015 13:57:38 -0800 |
Siddharth Agarwal |
fileset: switch to mergestate.read()
|
| Tue, 17 Nov 2015 14:20:55 -0800 |
Siddharth Agarwal |
commands.summary: switch to mergestate.read()
|
| Tue, 17 Nov 2015 13:56:46 -0800 |
Siddharth Agarwal |
commands.resolve: switch to mergestate.read()
|
| Tue, 17 Nov 2015 13:56:10 -0800 |
Siddharth Agarwal |
shelve: switch to mergestate.read()
|
| Tue, 17 Nov 2015 13:55:30 -0800 |
Siddharth Agarwal |
mergestate: add a constructor that reads state from disk
|
| Tue, 17 Nov 2015 17:04:53 -0800 |
Siddharth Agarwal |
merge.applyupdates: switch to mergestate.clean()
|
| Tue, 17 Nov 2015 17:04:32 -0800 |
Siddharth Agarwal |
localrepo: switch to mergestate.clean()
|
| Tue, 17 Nov 2015 17:02:35 -0800 |
Siddharth Agarwal |
strip: switch to mergestate.clean()
|
| Tue, 17 Nov 2015 17:00:54 -0800 |
Siddharth Agarwal |
mergestate: add a constructor that sets up a clean merge state
|
| Tue, 17 Nov 2015 14:11:52 -0800 |
Siddharth Agarwal |
mergestate: raise structured exception for unsupported merge records
|
| Tue, 17 Nov 2015 14:10:12 -0800 |
Siddharth Agarwal |
error: add a structured exception for unsupported merge records
|
