| Tue, 08 Dec 2015 08:37:12 +0000 |
timeless |
convert/svn: quiet check-config
|
| Tue, 08 Dec 2015 08:21:46 +0000 |
timeless |
check-config: handle multiline config
|
| Tue, 08 Dec 2015 08:36:00 +0000 |
timeless |
check-config: escape period in regexp for inline comments
|
| Tue, 08 Dec 2015 09:09:01 +0000 |
timeless |
check-config: allow numbers in configs
|
| Tue, 08 Dec 2015 09:22:53 +0000 |
timeless |
check-config: recognize convert style documentation
|
| Tue, 08 Dec 2015 04:56:26 +0000 |
timeless |
tests: use a single repo for test-contrib-perf
|
| Fri, 04 Dec 2015 19:05:56 +0000 |
timeless |
perf: perfrevlog optimize for perf.stub
|
| Fri, 04 Dec 2015 19:05:32 +0000 |
timeless |
perf: add getlen
|
| Fri, 04 Dec 2015 18:08:50 +0000 |
timeless |
perf: add optional rev for perflog and perftemplating
|
| Fri, 04 Dec 2015 18:18:07 +0000 |
timeless |
perf: perfparents honor config perf.parentscount
|
| Fri, 04 Dec 2015 17:41:30 +0000 |
timeless |
perf: offer perf.stub to only run one loop
|
| Fri, 04 Dec 2015 17:41:02 +0000 |
timeless |
perf: improve grammar of gettimer comment
|
| Sun, 06 Dec 2015 22:20:08 -0800 |
Gregory Szorc |
tests: use absolute_import in tinyproxy
|
| Sun, 06 Dec 2015 22:02:39 -0800 |
Gregory Szorc |
tests: use absolulte_import in test-wireproto.py
|
| Sun, 06 Dec 2015 22:05:19 -0800 |
Gregory Szorc |
tests: use absolute_import in test-walkrepo
|
| Sun, 06 Dec 2015 22:27:53 -0800 |
Gregory Szorc |
tests: use absolute_import in hgweberror.py
|
| Sun, 06 Dec 2015 22:27:18 -0800 |
Gregory Szorc |
tests: use absolute_import in hghave.py
|
| Sun, 06 Dec 2015 22:26:12 -0800 |
Gregory Szorc |
tests: use absolute_import for heredoctest.py
|
| Sun, 06 Dec 2015 22:25:41 -0800 |
Gregory Szorc |
tests: use absolute_import in /get-with-headers.py
|
| Sun, 06 Dec 2015 22:23:37 -0800 |
Gregory Szorc |
tests: use absolute_import in generate-working-copy-states.py
|
| Fri, 13 Nov 2015 14:35:36 +0800 |
Anton Shestakov |
hgweb: move entry-preparing code from webcommands to webutils.commonentry()
|
| Mon, 30 Nov 2015 19:30:16 +0000 |
timeless |
grammar: favor zero, one, two over ... or no
|
| Mon, 30 Nov 2015 19:29:46 +0000 |
timeless |
commands: use Oxford comma (help clone)
|
| Wed, 09 Dec 2015 08:28:53 +0900 |
FUJIWARA Katsunori |
commit: make commit acquire store lock before processing for consistency
|
| Wed, 09 Dec 2015 08:28:53 +0900 |
FUJIWARA Katsunori |
censor: make censor acquire locks before processing
|
| Wed, 09 Dec 2015 08:28:53 +0900 |
FUJIWARA Katsunori |
transplant: widen wlock scope of transplant for consitency while processing
|
| Wed, 09 Dec 2015 08:28:53 +0900 |
FUJIWARA Katsunori |
shelve: remove redundant acquisition of wlock for sub commands of unshelve
|
| Wed, 09 Dec 2015 08:28:53 +0900 |
FUJIWARA Katsunori |
shelve: widen wlock scope of unshelve for consistency while processing
|
| Sun, 06 Dec 2015 17:07:50 -0800 |
Gregory Szorc |
perf: add perflrucachedict command
|
| Sun, 06 Dec 2015 22:22:09 -0800 |
Gregory Szorc |
tests/filterpyflakes: use absolute_import
|
| Sun, 06 Dec 2015 22:14:39 -0800 |
Gregory Szorc |
tests/fakepatchtime.py: use absolute_import
|
| Sun, 06 Dec 2015 22:13:36 -0800 |
Gregory Szorc |
tests/fakedirstatewritetime.py: use absolute_import
|
| Sun, 06 Dec 2015 22:12:07 -0800 |
Gregory Szorc |
tests/dumbhttp: use absolute_import
|
| Sun, 06 Dec 2015 22:10:10 -0800 |
Gregory Szorc |
tests/autodiff.py: use absolute_import
|
| Sun, 06 Dec 2015 22:07:13 -0800 |
Gregory Szorc |
tests/test-ancestor: use absolute_import
|
| Sun, 06 Dec 2015 22:39:12 -0800 |
Gregory Szorc |
tests: add test for Python 3 compatibility
|
| Mon, 07 Dec 2015 18:06:13 -0600 |
Matt Mackall |
merge with stable
|
| Sat, 05 Dec 2015 23:14:49 -0800 |
Pierre-Yves David |
localrepo: reinstate localrepo.parents with a deprecation warning
|
| Sat, 05 Dec 2015 23:34:07 -0800 |
Pierre-Yves David |
bookmark: deprecate 'bmstore.write' method
|
| Sat, 05 Dec 2015 23:05:49 -0800 |
Pierre-Yves David |
ui: add a 'deprecwarn' helper to issue deprecation warnings
|
| Sat, 05 Dec 2015 23:05:33 -0800 |
Pierre-Yves David |
ui: add a 'stacklevel' argument to 'develwarn'
|
| Sun, 06 Dec 2015 14:28:35 +0900 |
Yuya Nishihara |
import-checker: tell which symbol causes "direct symbol import"
|
| Sun, 06 Dec 2015 14:18:19 +0900 |
Yuya Nishihara |
import-checker: allow absolute imports of sub modules from local packages
|
| Fri, 04 Dec 2015 14:24:45 -0800 |
Martin von Zweigbergk |
manifest: use 't' for tree manifest flag
|
| Sat, 05 Dec 2015 23:06:03 -0800 |
Pierre-Yves David |
test: update the docstring of 'test-devel-warnings.t' extension
|
| Sat, 05 Dec 2015 17:52:50 -0800 |
Gregory Szorc |
setup.py: don't rewrite @LIBDIR@ when creating wheels
|
| Fri, 04 Dec 2015 00:24:48 -0800 |
Gregory Szorc |
setup.py: attempt to build and install hg.exe on Windows
|
| Thu, 03 Dec 2015 23:01:59 -0500 |
Andrew Halberstadt |
merge.graft: add option to keep second parent
|
| Sat, 05 Dec 2015 21:11:04 -0800 |
Gregory Szorc |
ui: support declaring path push urls as sub-options
|
| Sun, 06 Dec 2015 12:31:46 -0800 |
Gregory Szorc |
ui: pass ui instance to path.__init__
|
| Sun, 06 Dec 2015 11:49:02 -0800 |
Gregory Szorc |
ui: store pushloc as separate attribute
|
| Sat, 05 Dec 2015 23:37:46 -0800 |
Gregory Szorc |
commands: add debugdeltachain command
|
| Sat, 24 Oct 2015 19:56:39 +0100 |
Gregory Szorc |
histedit: pick an appropriate base changeset by default (BC)
|
| Sat, 05 Dec 2015 23:50:13 +0900 |
Yuya Nishihara |
rebase: remove extra "if" from check of collapsing named branches
|
| Sat, 05 Dec 2015 23:48:22 +0900 |
Yuya Nishihara |
rebase: drop redundant functions to keep branch and graft source explicitly
|
| Sat, 05 Dec 2015 23:41:11 +0900 |
Yuya Nishihara |
color: drop useless override of ui.popbuffer()
|
| Fri, 04 Dec 2015 14:22:15 -0800 |
Pierre-Yves David |
repoview: bypass changelog method to computed cache key
|
| Fri, 04 Dec 2015 14:04:24 -0800 |
Pierre-Yves David |
repoview: stop recomputing cached key in all case
|
| Sat, 05 Dec 2015 21:40:38 -0800 |
Gregory Szorc |
commands.debugindexdot: use cmdutil.openrevlog()
|
| Sat, 05 Dec 2015 21:47:39 -0800 |
Gregory Szorc |
commands: unify argument handling for revlog debug commands
|
| Sun, 06 Dec 2015 17:16:37 +0900 |
Yuya Nishihara |
commit: fix rest syntax of examples
|
| Sat, 05 Dec 2015 20:24:39 -0800 |
Gregory Szorc |
ui: optionally ignore sub-options from configitems()
|
| Sat, 05 Dec 2015 20:20:57 -0800 |
Gregory Szorc |
ui: add method to return option and all sub-options
|
| Fri, 04 Dec 2015 17:46:56 -0800 |
Martin von Zweigbergk |
revlog: don't consider nullrev when choosing delta base
|
| Fri, 04 Dec 2015 17:14:14 -0800 |
Martin von Zweigbergk |
revlog: make calls to _isgooddelta() consistent
|
| Fri, 04 Dec 2015 16:45:06 -0800 |
Martin von Zweigbergk |
revlog: clarify which revision is added to 'tested' when using cached delta
|
| Fri, 04 Dec 2015 17:22:26 -0800 |
Martin von Zweigbergk |
revlog: remove unused variable 'chainlen'
|
| Sat, 05 Dec 2015 22:19:48 -0500 |
Matt Harbison |
commit: adjust the quoting in the examples to be Windows friendly
|
| Fri, 04 Dec 2015 15:12:11 -0800 |
Gregory Szorc |
wireproto: config options to disable bundle1
|
| Mon, 07 Dec 2015 17:39:31 +0100 |
Mathias De Maré |
dockerlib: short form for non-unique uid/gid for CentOS 5 compat (issue4977)
stable
|
| Fri, 04 Dec 2015 13:31:01 -0800 |
Gregory Szorc |
exchange: standalone function to determine if bundle2 is requested
|
| Fri, 04 Dec 2015 13:15:14 -0800 |
Gregory Szorc |
wireproto: add docstring for wirepeer
|
| Fri, 04 Dec 2015 15:24:05 -0500 |
Augie Fackler |
commit: add some help examples (issue4963)
|
| Fri, 04 Dec 2015 11:39:03 -0500 |
Augie Fackler |
changegroup: restate file linknode callback using generator expressions
|
| Fri, 04 Dec 2015 11:38:02 -0500 |
Augie Fackler |
changegroup: clean up file lookup function
|
| Fri, 04 Dec 2015 10:55:46 -0500 |
Augie Fackler |
changegroup: remove one special case from lookupmflinknode
|
| Fri, 04 Dec 2015 10:35:45 -0500 |
Augie Fackler |
changegroup: drop 'if True' that made the previous change clearer
|
| Fri, 04 Dec 2015 10:34:58 -0500 |
Augie Fackler |
changegroup: avoid iterating the whole manifest
|
| Fri, 04 Dec 2015 15:59:46 -0500 |
Augie Fackler |
posix: work around "posix" systems without os.link available (issue4974)
|
| Thu, 03 Dec 2015 13:14:20 -0800 |
Pierre-Yves David |
pathutil: use temporary variables instead of complicated wrapping
|
| Thu, 03 Dec 2015 13:23:46 -0800 |
Pierre-Yves David |
context: use a the nofsauditor when matching file in history (issue4749)
|
| Thu, 03 Dec 2015 13:22:36 -0800 |
Pierre-Yves David |
localrepo: add a second auditor without file system check
|
| Thu, 03 Dec 2015 10:40:19 -0800 |
Pierre-Yves David |
pathauditor: add a way to skip file system check
|
| Thu, 03 Dec 2015 12:22:48 -0800 |
Pierre-Yves David |
pathauditor: move file system specific check in their own function
|
| Sat, 07 Nov 2015 16:31:04 +0900 |
Yuya Nishihara |
contrib: disable SSLv3_method() to build old Python with recent libssl
|
| Thu, 03 Dec 2015 08:31:20 -0800 |
Laurent Charignon |
rebase: only clear rebase status after the rebase transaction has completed
|
| Thu, 03 Dec 2015 01:38:21 +0100 |
Sietse Brouwer |
dirstate: don't write repo.currenttransaction to repo.dirstate if repo
stable
|
| Wed, 02 Dec 2015 14:20:13 -0800 |
Gregory Szorc |
tests: test changegroup generation for filtered changesets (issue4982)
stable
|
| Wed, 02 Dec 2015 23:04:58 +0900 |
Yuya Nishihara |
parsers: fix parse_dirstate to check len before unpacking header (issue4979)
stable
|
| Thu, 03 Dec 2015 21:25:05 -0800 |
Gregory Szorc |
mercurial: support loading modules from zipimporter
|
| 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
|
